diff options
| -rw-r--r-- | Zotlabs/Module/Cal.php | 2 | ||||
| -rw-r--r-- | include/nav.php | 18 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 15 | ||||
| -rwxr-xr-x | view/tpl/navbar_default.tpl | 15 |
5 files changed, 35 insertions, 17 deletions
diff --git a/Zotlabs/Module/Cal.php b/Zotlabs/Module/Cal.php index 41676ce02..c8403e979 100644 --- a/Zotlabs/Module/Cal.php +++ b/Zotlabs/Module/Cal.php @@ -69,6 +69,8 @@ class Cal extends \Zotlabs\Web\Controller { notice( t('Permissions denied.') . EOL); return; } + + nav_set_selected('Calendar'); $sql_extra = permissions_sql($channel['channel_id'],get_observer_hash(),'event'); diff --git a/include/nav.php b/include/nav.php index af0ebbae2..9df50c9fe 100644 --- a/include/nav.php +++ b/include/nav.php @@ -27,6 +27,8 @@ function nav($template = 'default') { </script> EOT; + $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + if(local_channel()) { $channel = App::get_channel(); $observer = App::get_observer(); @@ -39,17 +41,17 @@ EOT; intval(get_account_id()) ); } + $sitelocation = (($is_owner) ? '' : App::$profile['reddress']); } - elseif(remote_channel()) + elseif(remote_channel()) { $observer = App::get_observer(); + $sitelocation = ((App::$profile['reddress']) ? App::$profile['reddress'] : '@' . App::get_hostname()); + } require_once('include/conversation.php'); - $is_owner = (((local_channel()) && ((App::$profile_uid == local_channel()) || (App::$profile_uid == 0))) ? true : false); + $channel_apps[] = channel_apps($is_owner, App::$profile['channel_address']); - $myident = (($channel) ? $channel['xchan_addr'] : ''); - - $sitelocation = (($myident) ? $myident : App::get_hostname()); /** * @@ -438,10 +440,10 @@ function channel_apps($is_owner = false, $nickname = null) { if($p['view_stream'] && $cal_link) { $tabs[] = [ - 'label' => t('Events'), + 'label' => t('Calendar'), 'url' => z_root() . $cal_link, - 'sel' => ((argv(0) == 'cal' || argv(0) == 'events') ? 'active' : ''), - 'title' => t('Events'), + 'sel' => ((argv(0) == 'cal') ? 'active' : ''), + 'title' => t('Calendar'), 'id' => 'event-tab', 'icon' => 'calendar' ]; diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index 2dfc9e07b..18efd69e4 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -19,7 +19,6 @@ nav .dropdown-menu { } } - @media screen and (max-width: 767px) { .navbar { padding: .5rem 7px; @@ -41,6 +40,7 @@ nav .dropdown-menu { .navbar-toggler-right { padding: 0.2rem 0; + white-space: nowrap; } #navbar-collapse-1 i { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 3228a8b02..6df5a060b 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -161,10 +161,6 @@ nav { filter:alpha(opacity=$nav_percent_min_opacity); } -#nav-app-link { - white-space: nowrap; -} - #powered-by { font-size: 0.5rem; position: absolute; @@ -1260,6 +1256,12 @@ img.mail-conv-sender-photo { border-radius: $radius; } +#nav-app-link { + padding: 0 !important; + line-height: 1.175; + white-space: nowrap; +} + .page-title { margin: 7px 0px; } @@ -1497,6 +1499,11 @@ blockquote { left: 0px; } + #nav-app-link-wrapper { + min-width: 0; + flex-basis: 25%; + } + } .shareable_element_text { diff --git a/view/tpl/navbar_default.tpl b/view/tpl/navbar_default.tpl index b330993c8..426d32047 100755 --- a/view/tpl/navbar_default.tpl +++ b/view/tpl/navbar_default.tpl @@ -17,8 +17,8 @@ </div> {{/if}} {{if $userinfo}} -<div class="dropdown usermenu"> - <div class="fakelink" data-toggle="dropdown"> +<div class="dropdown"> + <div class="fakelink usermenu" data-toggle="dropdown"> <img id="avatar" src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"> <i class="fa fa-caret-down"></i> </div> @@ -59,10 +59,17 @@ </div> {{/if}} </div> -<div class="navbar-nav mr-auto"> - <div><a id="nav-app-link" href="{{$url}}" class="nav-link">{{$sel.name}}</a></div> +{{if $sel.name}} +<div id="nav-app-link-wrapper" class="navbar-nav mr-auto"> + <a id="nav-app-link" href="{{$url}}" class="nav-link text-truncate"> + {{$sel.name}} + {{if $sitelocation}} + <br><small class="text-muted">{{$sitelocation}}</small> + {{/if}} + </a> </div> {{/if}} +{{/if}} <div class="navbar-toggler-right"> {{if $nav.help.6}} <button id="context-help-btn" class="navbar-toggler border-0" type="button" onclick="contextualHelp(); return false;"> |