Merge branch 'pull'

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 8fcf7f8171e69d50053fbf401fc354b69d9dcc0a..c9fda0e1d7734eef8973801eb2bac17f56519555 100755 (executable)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -852,6 +852,58 @@ 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-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,
+#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 3f90f8915731ee8495fa3fd3e943339ccbd670eb..41adcd8d2c692b544fe5d08330d60144f67d668b 100755 (executable)
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -1208,6 +1208,57 @@ 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-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,
+#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 {

diff --git a/view/theme/testbubble/wallwall_item.tpl b/view/theme/testbubble/wallwall_item.tpl
index 015e62f3e8fa3ae5b6a44eca9b662e4eacdb73fa..e29b66c578517dbbf957c6bf54076091ebc04e16 100755 (executable)
--- 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>