From 43df068d2e005d8f19ba202160f507eba4adaa04 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 30 Jan 2012 13:22:16 +0100
Subject: [PATCH 1/3] quattro: styling of the edit profile page

---
 view/theme/quattro/quattro.less | 49 +++++++++++++++++++++++++++++++++
 view/theme/quattro/style.css    | 48 ++++++++++++++++++++++++++++++++
 2 files changed, 97 insertions(+)

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 8fcf7f817..8b63686fd 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -852,6 +852,55 @@ ul.tabs {
 
 #profile-edit-links li {
 	list-style: none;
+        margin-top: 10px;
+}
+
+#profile-edit-default-desc {
+	color: #FF0000;
+	border: 1px solid #FF8888;
+	background-color: #FFEEEE;
+	padding: 7px;
+}
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-with-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-homepage-label {
+	float: left;
+	width: 175px;
+}
+#profile-edit-profile-name,
+#profile-edit-name,
+#profile-edit-pdesc,
+#profile-edit-gender,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#profile-edit-marital,
+#profile-edit-with,
+#profile-edit-sexual,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-edit-homepage {
+    margin-top: 5px;
 }
 
 /* oauth */
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 3f90f8915..7a524fcb7 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -1208,6 +1208,54 @@ ul.tabs li .active {
 }
 #profile-edit-links li {
   list-style: none;
+  margin-top: 10px;
+}
+#profile-edit-default-desc {
+  color: #FF0000;
+  border: 1px solid #FF8888;
+  background-color: #FFEEEE;
+  padding: 7px;
+}
+#profile-edit-profile-name-label,
+#profile-edit-name-label,
+#profile-edit-pdesc-label,
+#profile-edit-gender-label,
+#profile-edit-dob-label,
+#profile-edit-address-label,
+#profile-edit-locality-label,
+#profile-edit-region-label,
+#profile-edit-postal-code-label,
+#profile-edit-country-name-label,
+#profile-edit-marital-label,
+#profile-edit-with-label,
+#profile-edit-sexual-label,
+#profile-edit-politic-label,
+#profile-edit-religion-label,
+#profile-edit-pubkeywords-label,
+#profile-edit-prvkeywords-label,
+#profile-edit-homepage-label {
+  float: left;
+  width: 175px;
+}
+#profile-edit-profile-name,
+#profile-edit-name,
+#profile-edit-pdesc,
+#profile-edit-gender,
+#profile-edit-dob,
+#profile-edit-address,
+#profile-edit-locality,
+#profile-edit-region,
+#profile-edit-postal-code,
+#profile-edit-country-name,
+#profile-edit-marital,
+#profile-edit-with,
+#profile-edit-sexual,
+#profile-edit-politic,
+#profile-edit-religion,
+#profile-edit-pubkeywords,
+#profile-edit-prvkeywords,
+#profile-edit-homepage {
+  margin-top: 5px;
 }
 /* oauth */
 .oauthapp {

From d658cdaa84cb4e0c5c8bf7b9fb902da9efe3c919 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Mon, 30 Jan 2012 14:25:24 +0100
Subject: [PATCH 2/3] quattro: small adjustments to the profile edit style

---
 view/theme/quattro/quattro.less | 3 +++
 view/theme/quattro/style.css    | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 8b63686fd..c9fda0e1d 100755
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -878,12 +878,15 @@ ul.tabs {
 #profile-edit-religion-label,
 #profile-edit-pubkeywords-label,
 #profile-edit-prvkeywords-label,
+#profile-edit-gender-select,
 #profile-edit-homepage-label {
 	float: left;
 	width: 175px;
+        padding-top: 7px;
 }
 #profile-edit-profile-name,
 #profile-edit-name,
+#gender-select, 
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,
diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index 7a524fcb7..41adcd8d2 100755
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -1233,12 +1233,15 @@ ul.tabs li .active {
 #profile-edit-religion-label,
 #profile-edit-pubkeywords-label,
 #profile-edit-prvkeywords-label,
+#profile-edit-gender-select,
 #profile-edit-homepage-label {
   float: left;
   width: 175px;
+  padding-top: 7px;
 }
 #profile-edit-profile-name,
 #profile-edit-name,
+#gender-select,
 #profile-edit-pdesc,
 #profile-edit-gender,
 #profile-edit-dob,

From 3149e3cd3efc62bda255a49324c9292b7a4dd993 Mon Sep 17 00:00:00 2001
From: zottel <github@zottel.net>
Date: Mon, 30 Jan 2012 13:33:25 -0800
Subject: [PATCH 3/3] testbubble fix: tools for wall-to-wall items now appear
 at the bottom where they should be

---
 view/theme/testbubble/wallwall_item.tpl | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index 015e62f3e..e29b66c57 100755
--- a/view/theme/testbubble/wallwall_item.tpl
+++ b/view/theme/testbubble/wallwall_item.tpl
@@ -26,6 +26,17 @@
 				{{ if $lock }}<div class="wall-item-lock"><img src="images/lock_icon.gif" class="lockview" alt="$lock" onclick="lockview(event,$id);" /></div>
 				{{ else }}<div class="wall-item-lock"></div>{{ endif }}
 		</div>
+		<div class="wall-item-content" id="wall-item-content-$id" >
+			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
+			<div class="wall-item-title-end"></div>
+			<div class="wall-item-body" id="wall-item-body-$id" >$body
+					<div class="body-tag">
+						{{ for $tags as $tag }}
+							<span class='tag'>$tag</span>
+						{{ endfor }}
+					</div>
+			</div>
+		</div>
 		<div class="wall-item-tools" id="wall-item-tools-$id">
 			{{ if $vote }}
 			<div class="wall-item-like-buttons" id="wall-item-like-buttons-$id">
@@ -53,17 +64,6 @@
 				{{ if $drop.dropping }}<input type="checkbox" onclick="checkboxhighlight(this);" title="$drop.select" class="item-select" name="itemselected[]" value="$id" />{{ endif }}
 			<div class="wall-item-delete-end"></div>
 		</div>
-		<div class="wall-item-content" id="wall-item-content-$id" >
-			<div class="wall-item-title" id="wall-item-title-$id">$title</div>
-			<div class="wall-item-title-end"></div>
-			<div class="wall-item-body" id="wall-item-body-$id" >$body
-					<div class="body-tag">
-						{{ for $tags as $tag }}
-							<span class='tag'>$tag</span>
-						{{ endfor }}
-					</div>
-			</div>
-		</div>
 		<div class="wall-item-author">
 			<a href="$profile_url" title="$linktitle" class="wall-item-name-link"><span class="wall-item-name$sparkle" id="wall-item-name-$id" >$name</span></a>
 			<div class="wall-item-ago"  id="wall-item-ago-$id">$ago</div>