From 6f709a6f57d10df73bf6d6ba5fc44c22d80f8717 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sat, 7 Oct 2017 23:44:27 -0700 Subject: navbar controls now functionally hidden with too low z-index when cover_photo is showing and navbar doesn't have class fixed-top --- view/theme/redbasic/css/style.css | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'view') diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index de6f8dac1..22bdc2dbc 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1454,6 +1454,10 @@ blockquote { background-color: $nav_bg !important; } +.navbar { + z-index:1030; +} + .navbar-dark .navbar-nav .nav-link, .usermenu i { color: $nav_icon_colour; -- cgit v1.2.3 From 4011dd18f01d275620b13815573e359c77664e3a Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 8 Oct 2017 16:48:24 -0700 Subject: alternate navbar layouts --- view/tpl/nav.tpl | 1 + view/tpl/navbar_tucson.tpl | 289 +++++++++++++++++++++++++++++++++++++++++++++ view/tpl/profile_tabs.tpl | 3 - 3 files changed, 290 insertions(+), 3 deletions(-) create mode 100755 view/tpl/navbar_tucson.tpl (limited to 'view') diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index a19fa15a1..1d905d173 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -252,6 +252,7 @@ {{foreach $channel_apps as $channel_app}} {{$channel_app}} {{/foreach}} +
{{$sysapps_toggle}}
diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl new file mode 100755 index 000000000..15f06eda1 --- /dev/null +++ b/view/tpl/navbar_tucson.tpl @@ -0,0 +1,289 @@ +{{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.logout}} +
+ {{$nav.logout.1}} + {{/if}} +
+ {{/if}} + {{if ! $is_owner}} + + {{/if}} +
+{{/if}} +
+ {{if $nav.help.6}} + + {{/if}} + + {{if ! $experimental_notif}} + {{if $localuser || $nav.pubs}} + + {{/if}} + {{else}} + {{if $localuser || $nav.pubs}} + + {{/if}} + {{/if}} + +
+ + +{{if $nav.help.6}} +
+ {{$nav.help.5}} +
+  {{$fulldocs}} + +
+
+{{/if}} diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl index b59135209..72e98ae82 100644 --- a/view/tpl/profile_tabs.tpl +++ b/view/tpl/profile_tabs.tpl @@ -2,6 +2,3 @@ {{foreach $tabs as $tab}} {{$tab.label}} {{/foreach}} -{{if ! $channel_menu}} -
-{{/if}} \ No newline at end of file -- cgit v1.2.3 From 23812e5b48b7a4d4f0c275c0fbb3d244a582397c Mon Sep 17 00:00:00 2001 From: zotlabs Date: Sun, 8 Oct 2017 19:43:03 -0700 Subject: ability to pin apps to the navbar when using named navbars --- view/tpl/app_nav.tpl | 1 + view/tpl/navbar_tucson.tpl | 7 +++++++ 2 files changed, 8 insertions(+) create mode 100644 view/tpl/app_nav.tpl (limited to 'view') diff --git a/view/tpl/app_nav.tpl b/view/tpl/app_nav.tpl new file mode 100644 index 000000000..1ee5adb70 --- /dev/null +++ b/view/tpl/app_nav.tpl @@ -0,0 +1 @@ +{{if $icon}}{{else}}{{/if}} diff --git a/view/tpl/navbar_tucson.tpl b/view/tpl/navbar_tucson.tpl index 15f06eda1..ace22a880 100755 --- a/view/tpl/navbar_tucson.tpl +++ b/view/tpl/navbar_tucson.tpl @@ -213,6 +213,13 @@