Merge branch 'release/ui-improvements'

diff --git a/view/global.css b/view/global.css
index 1588d339390c202830966bc9c426d17c985f8c4e..5c414cb35989e941641aee76b0febba4fdf92565 100644 (file)
--- a/view/global.css
+++ b/view/global.css
@@ -122,3 +122,7 @@ blockquote.shared_content {
   color: #000;
   border: none;
 }
+
+.settings-heading {
+       cursor: pointer;
+}
\ No newline at end of file

diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl
index 774bc00deb338d5933bb87465cc0d016b817cc2c..5797196ebb7dc4d0b20912d4acd52150ce658438 100644 (file)
--- a/view/templates/contacts-template.tpl
+++ b/view/templates/contacts-template.tpl
@@ -19,7 +19,7 @@
        {{include file="contact_template.tpl"}}
 {{/foreach}}
 <div id="contact-edit-end"></div>
-<div id="contats-actions">
+<div id="contacts-actions">
 {{foreach $batch_actions as $n=>$l}}
  <input class="batch-action" name="{{$n}}" value="{{$l}}" type="submit">
  {{/foreach}}

diff --git a/view/templates/settings-head.tpl b/view/templates/settings-head.tpl
index b150c232ce4fc044c78072b22c5a0f5c0e125461..536ebd2f443d2bcf29e15077811cb0dd1b75ce8c 100644 (file)
--- a/view/templates/settings-head.tpl
+++ b/view/templates/settings-head.tpl
@@ -19,6 +19,12 @@
                        }
 
                }).trigger('change');
+               
+               $('.settings-block').hide();
+               $('.settings-heading').click(function(){
+                       $('.settings-block').hide();
+                       $(this).next('.settings-block').toggle();
+               });
 
        });
 

diff --git a/view/templates/settings.tpl b/view/templates/settings.tpl
index 5a964ae7a3f72285f20882ec232048b43225b80d..ed92e101107d195dd60387407a2697519568b4ac 100644 (file)
--- a/view/templates/settings.tpl
+++ b/view/templates/settings.tpl
@@ -6,7 +6,7 @@
 <input type='hidden' name='form_security_token' value='{{$form_security_token}}'>
 
 <h3 class="settings-heading">{{$h_pass}}</h3>
-
+<div class="settings-block">
 {{include file="field_password.tpl" field=$password1}}
 {{include file="field_password.tpl" field=$password2}}
 {{include file="field_password.tpl" field=$password3}}
@@ -18,9 +18,10 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
-
+</div>
 
 <h3 class="settings-heading">{{$h_basic}}</h3>
+<div class="settings-block">
 
 {{include file="field_input.tpl" field=$username}}
 {{include file="field_input.tpl" field=$email}}
@@ -33,10 +34,11 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
 
 
 <h3 class="settings-heading">{{$h_prv}}</h3>
-
+<div class="settings-block">
 
 <input type="hidden" name="visibility" value="{{$visibility}}" />
 
@@ -102,10 +104,13 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
+
 
 
 
 <h3 class="settings-heading">{{$h_not}}</h3>
+<div class="settings-block">
 <div id="settings-notifications">
 
 <div id="settings-activity-desc">{{$activity_options}}</div>
@@ -133,9 +138,11 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
 
 
 <h3 class="settings-heading">{{$h_advn}}</h3>
+<div class="settings-block">
 <div id="settings-pagetype-desc">{{$h_descadvn}}</div>
 
 {{$pagetype}}
@@ -143,13 +150,16 @@
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-submit" value="{{$submit}}" />
 </div>
+</div>
 
 <h3 class="settings-heading">{{$relocate}}</h3>
+<div class="settings-block">
 <div id="settings-pagetype-desc">{{$relocate_text}}</div>
 
 <div class="settings-submit-wrapper" >
 <input type="submit" name="resend_relocate" class="settings-submit" value="{{$relocate_button}}" />
 </div>
+</div>
 
 
 

diff --git a/view/templates/settings_features.tpl b/view/templates/settings_features.tpl
index e169d46c41a625756ba4d38f8f165859e4d465a6..6218dfbd4f5807d94077d0ef0d4bcf42ce9cc0ed 100644 (file)
--- a/view/templates/settings_features.tpl
+++ b/view/templates/settings_features.tpl
@@ -7,15 +7,16 @@
 
 {{foreach $features as $f}}
 <h3 class="settings-heading">{{$f.0}}</h3>
+<div class="settings-block">
 
 {{foreach $f.1 as $fcat}}
        {{include file="field_yesno.tpl" field=$fcat}}
 {{/foreach}}
-{{/foreach}}
-
 <div class="settings-submit-wrapper" >
 <input type="submit" name="submit" class="settings-features-submit" value="{{$submit}}" />
 </div>
+</div>
+{{/foreach}}
 
 </form>
 

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 8436b56d5130662e6b1ec28aced26a143f8be85f..dba3d8ad115158c4c0d18c68406906d8a877ca09 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -1396,7 +1396,7 @@ span[id^="showmore-wrap"] {
 .contact-photo:hover .contact-select {
   display: block;
 }
-#contats-actions {
+#contacts-actions {
   clear: both;
 }
 .contact-photo {

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 19c5170066de09c87316ddbbb18960d3dfad9dd7..ea54da6b4bbd4b52c3f36f6577e94eff9ecde02a 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -1396,7 +1396,7 @@ span[id^="showmore-wrap"] {
 .contact-photo:hover .contact-select {
   display: block;
 }
-#contats-actions {
+#contacts-actions {
   clear: both;
 }
 .contact-photo {

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 9b191dab97b33f1cce51c8b2d75c8a2006ee390a..1acbe781356f27ddd8fb4cc657ddf462b12a3e3a 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -1396,7 +1396,7 @@ span[id^="showmore-wrap"] {
 .contact-photo:hover .contact-select {
   display: block;
 }
-#contats-actions {
+#contacts-actions {
   clear: both;
 }
 .contact-photo {

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index 60f70d421a3c71014b8dac4ddd2eff9c30c184f1..46eed3d6c0d791bce4aae23ea1976654fd0d69f0 100644 (file)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -788,7 +788,7 @@ span[id^="showmore-wrap"] {
 .contact-select {      position: absolute; top:64px; left:64px; display:none; }
 .contact-select:checked,
 .contact-photo:hover .contact-select { display:block; }
-#contats-actions { clear: both; }
+#contacts-actions { clear: both; }
 .contact-photo { 
        width: 48px; height: 48px;
        img { width: 48px; height: 48px; }

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index 44f3b0ee0559bfb3f9aa6989eb023acf47140a58..a3cc593d36fbcc7e053382c09e1b9fc4462826ef 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -246,6 +246,10 @@ div.pager {
   float: left;
 }
 
+#contacts-actions {
+  clear: both;
+}
+
 #contact-edit-drop-link-end {
   /* clear: both; */
 }
@@ -2723,4 +2727,3 @@ a.mail-list-link {
 .mail-conv-delete-icon {
         border: none;
 }
-