From 2a3e235f9ac87474d673981bc5cd01bef1168cdc Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Wed, 5 Oct 2016 14:45:19 +0200 Subject: [PATCH] show/hide page-flags according to the account-type --- mod/settings.php | 2 +- view/global.css | 5 ++ view/templates/pagetypes.tpl | 26 ---------- view/templates/settings_pagetypes.tpl | 71 +++++++++++++++++++++++++++ 4 files changed, 77 insertions(+), 27 deletions(-) delete mode 100644 view/templates/pagetypes.tpl create mode 100644 view/templates/settings_pagetypes.tpl diff --git a/mod/settings.php b/mod/settings.php index 908d82845..37498a0dd 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -1083,7 +1083,7 @@ function settings_content(&$a) { ($a->user['account-type'] != ACCOUNT_TYPE_COMMUNITY)) $a->user['account-type'] = ACCOUNT_TYPE_COMMUNITY; - $pageset_tpl = get_markup_template('pagetypes.tpl'); + $pageset_tpl = get_markup_template('settings_pagetypes.tpl'); $pagetype = replace_macros($pageset_tpl, array( '$account_types' => t("Account Types"), diff --git a/view/global.css b/view/global.css index 40919542d..1bc2f11d6 100644 --- a/view/global.css +++ b/view/global.css @@ -455,3 +455,8 @@ td.federation-data { display: none; margin: 10px 0; } + +/* settings page */ +#settings-form .pageflags { + margin: 0 0 20px 30px; +} diff --git a/view/templates/pagetypes.tpl b/view/templates/pagetypes.tpl deleted file mode 100644 index b970f7745..000000000 --- a/view/templates/pagetypes.tpl +++ /dev/null @@ -1,26 +0,0 @@ -

{{$account_types}}

-{{include file="field_radio.tpl" field=$account_person}} -{{include file="field_radio.tpl" field=$account_organisation}} -{{include file="field_radio.tpl" field=$account_news}} -{{include file="field_radio.tpl" field=$account_community}} - -{{if $account_type == $type_person}} -
{{$user}}
- {{include file="field_radio.tpl" field=$page_normal}} - {{include file="field_radio.tpl" field=$page_soapbox}} - {{include file="field_radio.tpl" field=$page_freelove}} -{{/if}} - -{{if $account_type == $type_organisation}} - -{{/if}} - -{{if $account_type == $type_news}} - -{{/if}} - -{{if $account_type == $type_community}} -
{{$community}}
- {{include file="field_radio.tpl" field=$page_community}} - {{include file="field_radio.tpl" field=$page_prvgroup}} -{{/if}} diff --git a/view/templates/settings_pagetypes.tpl b/view/templates/settings_pagetypes.tpl new file mode 100644 index 000000000..1c2f96e81 --- /dev/null +++ b/view/templates/settings_pagetypes.tpl @@ -0,0 +1,71 @@ + +

{{$account_types}}

+{{include file="field_radio.tpl" field=$account_person}} +
+
{{$user}}
+ {{include file="field_radio.tpl" field=$page_normal}} + {{include file="field_radio.tpl" field=$page_soapbox}} + {{include file="field_radio.tpl" field=$page_freelove}} +
+ +{{include file="field_radio.tpl" field=$account_organisation}} +{{include file="field_radio.tpl" field=$account_news}} + +{{include file="field_radio.tpl" field=$account_community}} +
+
{{$community}}
+ {{include file="field_radio.tpl" field=$page_community}} + {{include file="field_radio.tpl" field=$page_prvgroup}} +
+ +