Merge branch 'release/ui-improvements'

view/global.css

@@ -122,3 +122,7 @@ blockquote.shared_content {
   color: #000;
   border: none;
 }
+
+.settings-heading {
+	cursor: pointer;
+}

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}}

view/templates/settings-head.tpl

@@ -20,6 +20,12 @@
 
 		}).trigger('change');
 		
+		$('.settings-block').hide();
+		$('.settings-heading').click(function(){
+			$('.settings-block').hide();
+			$(this).next('.settings-block').toggle();
+		});
+
 	});
 
 </script>

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>
 
 
 

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>
 

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 {

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 {

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 {

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; }

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;
 }
-