From cef1aa6d1b21b15458783661ed4c7e6fe8a99011 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Mon, 3 Oct 2016 17:16:24 -0700 Subject: add some more stuff to admin/account_edit (service class, language, and techlevel if appropriate). Fix en-au and en-gb so they are listed as languages, and move language selector stuff to include/language.php instead of include/text.php; new file Zotlabs/Lib/Techlevels.php so we only need to write the selection array once. --- view/tpl/admin_account_edit.tpl | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/admin_account_edit.tpl b/view/tpl/admin_account_edit.tpl index 5e8cb5f47..82d137de4 100644 --- a/view/tpl/admin_account_edit.tpl +++ b/view/tpl/admin_account_edit.tpl @@ -9,6 +9,15 @@ {{include file="field_password.tpl" field=$pass1}} {{include file="field_password.tpl" field=$pass2}} +{{if $z_server_role == 'pro'}} +{{include file="field_select.tpl" field=$account_level}} +{{else}} + +{{/if}} +{{include file="field_select.tpl" field=$account_language}} +{{include file="field_input.tpl" field=$service_class}} + + -- cgit v1.2.3 From bf02e0428347350126abdd1726aa3e58c9ed63bb Mon Sep 17 00:00:00 2001 From: redmatrix Date: Thu, 6 Oct 2016 17:41:52 -0700 Subject: merge usermenu and caret when using pro --- view/tpl/nav.tpl | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'view/tpl') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index d08cb29ea..dfcd3f609 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -17,7 +17,14 @@ {{/if}} {{if $userinfo}} + {{if $z_server_role == 'pro'}} +
+ {{$userinfo.name}} + +
+ {{else}} {{$userinfo.name}} + {{/if}} {{if $localuser}}