From 04bdba0d78e764ce3bae9d7c897874d602be1a03 Mon Sep 17 00:00:00 2001 From: rabuzarus Date: Sun, 22 Apr 2018 23:06:06 +0200 Subject: [PATCH] frio - some work on the admin contactblock template to be more consistant with other setting pages --- view/theme/frio/css/mod_admin.css | 10 +- .../frio/templates/admin/contactblock.tpl | 153 +++++++++++------- view/theme/frio/templates/admin/users.tpl | 4 +- 3 files changed, 107 insertions(+), 60 deletions(-) diff --git a/view/theme/frio/css/mod_admin.css b/view/theme/frio/css/mod_admin.css index 5199d5a55d..b690577d11 100644 --- a/view/theme/frio/css/mod_admin.css +++ b/view/theme/frio/css/mod_admin.css @@ -1,12 +1,10 @@ #admin-users.adminpage > h1 { padding: 0 15px; } #admin-users.adminpage .panel-collapse { margin-left: -15px; margin-right: -15px; } -#admin-users td { word-break: break-all; } #admin-users #users th:first-of-type { width: 1em; } #admin-users #users th:nth-of-type(2) { width: 40px; } #admin-users #users th:last-of-type { width: 1em; } -#admin-users td > .checkbox { margin: 0; } #admin-users .admin-settings-footer-elements { padding-left: 8px; padding-right: 8px; } #admin-users #deleted th:first-of-type { width: 40px; } @@ -14,5 +12,9 @@ #admin-users #users img.avatar-nano, #deleted img.avatar-nano { height: 24px; width: 24px; } .opened .caret { transform: rotate(180deg); } tr.details td, -tr.details th -{ border-top: 0!important; } +tr.details th { + border-top: 0!important; +} + +.adminpage td > .checkbox { margin: 0; } +.adminpage td { word-break: break-all; } \ No newline at end of file diff --git a/view/theme/frio/templates/admin/contactblock.tpl b/view/theme/frio/templates/admin/contactblock.tpl index 9c3f9165bc..3173c238b6 100644 --- a/view/theme/frio/templates/admin/contactblock.tpl +++ b/view/theme/frio/templates/admin/contactblock.tpl @@ -1,60 +1,105 @@ -
+ + +

{{$title}} - {{$page}}

{{$description}}

-
- -

{{$h_contacts}}

- {{if $contacts}} - - - - - {{foreach $th_contacts as $th}} - - {{/foreach}} - - - - - {{foreach $contacts as $contact}} - - - - - - - {{/foreach}} - - - - - - - -
- {{$th}} -
{{$contact.nickname}}{{$contact.name}}{{$contact.url}}
- {{$total_contacts}} -
-
- {{$paginate}} - {{else}} -

{{$no_data|escape:'html'}}

- {{/if}} -
+ {{* We organize the settings in collapsable panel-groups *}} +
+ {{* The form for entering user profile which should be blocked *}} +
+ -

{{$h_newblock}}

-
- - - - - - - -
{{include file="field_input.tpl" field=$contacturl}}
-
-
+
+
+ + + {{include file="field_input.tpl" field=$contacturl}} + +
+ +
+
+
+
+
+ + {{* The list of blocked user profiles with the possibility to unblock them *}} +
+ + +
+
+ + + {{if $contacts}} + + + + + {{foreach $th_contacts as $th}} + + {{/foreach}} + + + + + {{foreach $contacts as $contact}} + + + + + + + {{/foreach}} + + + + + + + +
+ {{$th}} +
+
+ + +
+
{{$contact.nickname}}{{$contact.name}}{{$contact.url}}
+ {{* Checkbox to select all blocked contacts *}} +
+ + +
+
+ {{$total_contacts}} +
+ +
+
+
+ + {{$paginate}} + + {{else}} +

{{$no_data|escape:'html'}}

+ {{/if}} +
+
+
+
diff --git a/view/theme/frio/templates/admin/users.tpl b/view/theme/frio/templates/admin/users.tpl index 4d4d2a31ef..348ce8a2c0 100644 --- a/view/theme/frio/templates/admin/users.tpl +++ b/view/theme/frio/templates/admin/users.tpl @@ -1,7 +1,7 @@ -
+

{{$title}} - {{$page}}

@@ -20,7 +20,7 @@