From 6a2c5e07310e723d020e4b6d4123181db5c805db Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 10 Oct 2017 16:05:10 -0700 Subject: pdledit usability improvements --- view/tpl/pdledit.tpl | 3 +++ 1 file changed, 3 insertions(+) (limited to 'view') diff --git a/view/tpl/pdledit.tpl b/view/tpl/pdledit.tpl index cef93d324..2ea89b6c1 100644 --- a/view/tpl/pdledit.tpl +++ b/view/tpl/pdledit.tpl @@ -5,6 +5,9 @@
{{$help}} +
+
+{{$another}}

-- cgit v1.2.3 From 09b4660c7d8d15cf2419202116199a725c7c109c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 10 Oct 2017 18:50:01 -0700 Subject: rename view/tpl/nav.tpl to navbar_default.tpl so that all navbar selection code is consistent --- view/tpl/nav.tpl | 170 -------------------------------------------- view/tpl/navbar_default.tpl | 170 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 170 insertions(+), 170 deletions(-) delete mode 100755 view/tpl/nav.tpl create mode 100755 view/tpl/navbar_default.tpl (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl deleted file mode 100755 index b6faad0c2..000000000 --- a/view/tpl/nav.tpl +++ /dev/null @@ -1,170 +0,0 @@ -{{if $nav.login && !$userinfo}} -
- - {{$nav.loginmenu.1.1}} - - {{if $nav.register}} - - {{$nav.register.1}} - - {{/if}} -
-{{/if}} -{{if $userinfo}} -
-
- {{$userinfo.name}} - -
- {{if $is_owner}} -
- {{foreach $nav.usermenu as $usermenu}} - {{$usermenu.1}} - {{/foreach}} - {{if $nav.manage}} - {{$nav.manage.1}} - {{/if}} - {{if $nav.channels}} - {{foreach $nav.channels as $chan}} - {{$chan.channel_name}} - {{/foreach}} - {{/if}} - {{if $nav.profiles}} - {{$nav.profiles.1}} - {{/if}} - {{if $nav.settings}} -
- {{$nav.settings.1}} - {{/if}} - {{if $nav.admin}} -
- {{$nav.admin.1}} - {{/if}} - {{if $nav.logout}} -
- {{$nav.logout.1}} - {{/if}} -
- {{/if}} - {{if ! $is_owner}} - - {{/if}} -
-
-
{{$sel.name}}
-
-{{/if}} -
- {{if $nav.help.6}} - - {{/if}} - - {{if $localuser || $nav.pubs}} - - {{/if}} - -
- - -{{if $nav.help.6}} -
- {{$nav.help.5}} -
-  {{$fulldocs}} - -
-
-{{/if}} diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl new file mode 100755 index 000000000..b6faad0c2 --- /dev/null +++ b/view/tpl/navbar_default.tpl @@ -0,0 +1,170 @@ +{{if $nav.login && !$userinfo}} +
+ + {{$nav.loginmenu.1.1}} + + {{if $nav.register}} + + {{$nav.register.1}} + + {{/if}} +
+{{/if}} +{{if $userinfo}} +
+
+ {{$userinfo.name}} + +
+ {{if $is_owner}} +
+ {{foreach $nav.usermenu as $usermenu}} + {{$usermenu.1}} + {{/foreach}} + {{if $nav.manage}} + {{$nav.manage.1}} + {{/if}} + {{if $nav.channels}} + {{foreach $nav.channels as $chan}} + {{$chan.channel_name}} + {{/foreach}} + {{/if}} + {{if $nav.profiles}} + {{$nav.profiles.1}} + {{/if}} + {{if $nav.settings}} +
+ {{$nav.settings.1}} + {{/if}} + {{if $nav.admin}} +
+ {{$nav.admin.1}} + {{/if}} + {{if $nav.logout}} +
+ {{$nav.logout.1}} + {{/if}} +
+ {{/if}} + {{if ! $is_owner}} + + {{/if}} +
+
+
{{$sel.name}}
+
+{{/if}} +
+ {{if $nav.help.6}} + + {{/if}} + + {{if $localuser || $nav.pubs}} + + {{/if}} + +
+ + +{{if $nav.help.6}} +
+ {{$nav.help.5}} +
+  {{$fulldocs}} + +
+
+{{/if}} -- cgit v1.2.3 From ba55400f14c7930786785db13a18a6333c20ee7d Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Wed, 11 Oct 2017 11:49:03 +0200 Subject: bring nav pinned apps to navbar_default --- view/tpl/app_nav.tpl | 2 +- view/tpl/navbar_default.tpl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl index 1ee5adb70..046cd7237 100644 --- a/view/tpl/app_nav.tpl +++ b/view/tpl/app_nav.tpl @@ -1 +1 @@ -{{if $icon}}{{else}}{{/if}} +{{if $icon}}{{else}}{{/if}} diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b6faad0c2..9495ea7a4 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -107,6 +107,13 @@ {{/if}} + {{if $navbar_apps}} + {{foreach $navbar_apps as $navbar_app}} +
  • + {{$navbar_app}} +
    • + {{/foreach}} + {{/if}}