From 9a8d1064143233794bb2e2852137882e7264e719 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 6 Sep 2014 11:49:31 +0200 Subject: [PATCH 1/3] fixed contact action button bar, typo correction --- view/templates/contacts-template.tpl | 2 +- view/theme/quattro/dark/style.css | 2 +- view/theme/quattro/green/style.css | 2 +- view/theme/quattro/lilac/style.css | 2 +- view/theme/quattro/quattro.less | 2 +- view/theme/vier/style.css | 4 ++++ 6 files changed, 9 insertions(+), 5 deletions(-) diff --git a/view/templates/contacts-template.tpl b/view/templates/contacts-template.tpl index 774bc00de..5797196eb 100644 --- a/view/templates/contacts-template.tpl +++ b/view/templates/contacts-template.tpl @@ -19,7 +19,7 @@ {{include file="contact_template.tpl"}} {{/foreach}}
-
+
{{foreach $batch_actions as $n=>$l}} {{/foreach}} diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 8436b56d5..dba3d8ad1 100644 --- 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 19c517006..ea54da6b4 100644 --- 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 9b191dab9..1acbe7813 100644 --- 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 60f70d421..46eed3d6c 100644 --- 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 44f3b0ee0..c64f70bc6 100644 --- 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; */ } From ec68e33c6b91293531a3ef34d3e3a5c089273739 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 6 Sep 2014 13:53:23 +0200 Subject: [PATCH 2/3] make items on settings pages fold/unfold on click --- view/templates/settings-head.tpl | 6 ++++++ view/templates/settings.tpl | 16 +++++++++++++--- view/templates/settings_features.tpl | 5 +++-- view/theme/vier/style.css | 3 +++ 4 files changed, 25 insertions(+), 5 deletions(-) diff --git a/view/templates/settings-head.tpl b/view/templates/settings-head.tpl index b150c232c..536ebd2f4 100644 --- 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 5a964ae7a..ed92e1011 100644 --- a/view/templates/settings.tpl +++ b/view/templates/settings.tpl @@ -6,7 +6,7 @@

{{$h_pass}}

- +
{{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 @@
- +

{{$h_basic}}

+
{{include file="field_input.tpl" field=$username}} {{include file="field_input.tpl" field=$email}} @@ -33,10 +34,11 @@
+

{{$h_prv}}

- +
@@ -102,10 +104,13 @@
+
+

{{$h_not}}

+
{{$activity_options}}
@@ -133,9 +138,11 @@
+

{{$h_advn}}

+
{{$h_descadvn}}
{{$pagetype}} @@ -143,13 +150,16 @@
+

{{$relocate}}

+
{{$relocate_text}}
+
diff --git a/view/templates/settings_features.tpl b/view/templates/settings_features.tpl index e169d46c4..6218dfbd4 100644 --- a/view/templates/settings_features.tpl +++ b/view/templates/settings_features.tpl @@ -7,15 +7,16 @@ {{foreach $features as $f}}

{{$f.0}}

+
{{foreach $f.1 as $fcat}} {{include file="field_yesno.tpl" field=$fcat}} {{/foreach}} -{{/foreach}} -
+
+{{/foreach}} diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index c64f70bc6..e71676649 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2728,3 +2728,6 @@ a.mail-list-link { border: none; } +.settings-heading { + cursor: pointer; +} From 7dcf37f053404b8a58cbc85b38158e3496637366 Mon Sep 17 00:00:00 2001 From: hauke Date: Sat, 6 Sep 2014 17:01:05 +0200 Subject: [PATCH 3/3] changed cursor style on settings page globally --- view/global.css | 4 ++++ view/theme/vier/style.css | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/view/global.css b/view/global.css index 1588d3393..5c414cb35 100644 --- 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/theme/vier/style.css b/view/theme/vier/style.css index e71676649..a3cc593d3 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -2727,7 +2727,3 @@ a.mail-list-link { .mail-conv-delete-icon { border: none; } - -.settings-heading { - cursor: pointer; -}