diff options
| -rw-r--r-- | include/nav.php | 36 | ||||
| -rw-r--r-- | view/css/bootstrap-red.css | 41 | ||||
| -rw-r--r-- | view/js/main.js | 22 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 2 | ||||
| -rwxr-xr-x | view/tpl/nav.tpl | 113 | ||||
| -rw-r--r-- | view/tpl/navapps.tpl | 2 |
6 files changed, 70 insertions, 146 deletions
diff --git a/include/nav.php b/include/nav.php index 7d6877600..894b30b45 100644 --- a/include/nav.php +++ b/include/nav.php @@ -244,29 +244,27 @@ EOT; //app bin - $navapps = ''; - if(get_config('system','experimental_app_bin')) { - if(local_channel()) { - //Zlib\Apps::import_system_apps(); - $syslist = array(); - $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app'); - if($list) { - foreach($list as $li) { - $syslist[] = Zlib\Apps::app_encode($li); - } + if(local_channel()) { + //Zlib\Apps::import_system_apps(); + $syslist = array(); + $list = Zlib\Apps::app_list(local_channel(), false, 'nav_featured_app'); + if($list) { + foreach($list as $li) { + $syslist[] = Zlib\Apps::app_encode($li); } - Zlib\Apps::translate_system_apps($syslist); - } - else { - $syslist = Zlib\Apps::get_system_apps(true); } - - $navapps = replace_macros(get_markup_template('navapps.tpl'), array( - '$apps' => $syslist, - '$localuser' => local_channel(), - )); + Zlib\Apps::translate_system_apps($syslist); + } + else { + $syslist = Zlib\Apps::get_system_apps(true); } + $navapps = replace_macros(get_markup_template('navapps.tpl'), array( + '$apps' => $syslist, + '$localuser' => local_channel(), + )); + + $tpl = get_markup_template('nav.tpl'); App::$page['nav'] .= replace_macros($tpl, array( diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index cea911440..b7310954a 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -3,10 +3,8 @@ /* nav overrides */ nav .badge { - position: relative; - top: -49px; - left: 2px; - float: left; + margin-top: -30px; + margin-left: -30px; font-size: 10px; line-height: 20px; padding: 0px 5px; @@ -14,12 +12,7 @@ nav .badge { min-width: 20px; border-radius: 10px; cursor: pointer; -} - -@media screen and (max-width: 767px) { - nav .badge { - top: -46px; - } + display: inline-block !important; } #navbar-collapse-1 i, @@ -27,31 +20,12 @@ nav .badge { font-size: 14px; } -nav ul li { - max-height: 50px; -} - nav .navbar-header img { height: 49px; width: 49px; margin-top: 1px; } -nav .dropdown-menu { - max-height: 450px; - width: 270px; - overflow-y: auto; - margin-top: 0px; -} - -nav .navbar-collapse .navbar-left { - float: left; -} - -nav .navbar-collapse .navbar-right { - float: right; -} - /* nav overrides end */ @@ -60,13 +34,12 @@ aside .nav-pills > li > a, padding: 6px 10px; } -.wall-item-tools .dropdown-menu { - min-width: auto; +nav .dropdown-menu { + margin-top: 0px; } -.dropdown-menu li a { - overflow: hidden; - text-overflow: ellipsis; +.wall-item-tools .dropdown-menu { + min-width: auto; } .nav-tabs.nav-justified > li { diff --git a/view/js/main.js b/view/js/main.js index 2fc912093..ed2f6a2e1 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -308,12 +308,6 @@ $(function() { } } - // fancyboxes - // Is this actually used anywhere? - $("a.popupbox").colorbox({ - 'transition' : 'elastic' - }); - NavUpdate(); // Allow folks to stop the ajax page updates with the pause/break key $(document).keydown(function(event) { @@ -376,28 +370,28 @@ function NavUpdate() { if(data.network == 0) { data.network = ''; - $('.net-update').removeClass('show'); + $('.net-update, .net-button').hide(); } else { - $('.net-update').addClass('show'); + $('.net-update, .net-button').show(); } $('.net-update').html(data.network); - if(data.home == 0) { data.home = ''; $('.home-update').removeClass('show'); } else { $('.home-update').addClass('show'); } + if(data.home == 0) { data.home = ''; $('.home-update, .home-button').hide(); } else { $('.home-update, .home-button').show(); } $('.home-update').html(data.home); - if(data.intros == 0) { data.intros = ''; $('.intro-update').removeClass('show'); } else { $('.intro-update').addClass('show'); } + if(data.intros == 0) { data.intros = ''; $('.intro-update, .intro-button').hide(); } else { $('.intro-update, .intro-button').show(); } $('.intro-update').html(data.intros); - if(data.mail == 0) { data.mail = ''; $('.mail-update').removeClass('show'); } else { $('.mail-update').addClass('show'); } + if(data.mail == 0) { data.mail = ''; $('.mail-update, .mail-button').hide(); } else { $('.mail-update, .mail-button').show(); } $('.mail-update').html(data.mail); - if(data.notify == 0) { data.notify = ''; $('.notify-update').removeClass('show'); } else { $('.notify-update').addClass('show'); } + if(data.notify == 0) { data.notify = ''; $('.notify-update, .notify-button').hide(); } else { $('.notify-update, .notify-button').show(); } $('.notify-update').html(data.notify); if(data.register == 0) { data.register = ''; $('.register-update').removeClass('show'); } else { $('.register-update').addClass('show'); } $('.register-update').html(data.register); - if(data.events == 0) { data.events = ''; $('.events-update').removeClass('show'); } else { $('.events-update').addClass('show'); } + if(data.events == 0) { data.events = ''; $('.events-update, .events-button').hide(); } else { $('.events-update, .events-button').show(); } $('.events-update').html(data.events); if(data.events_today == 0) { data.events_today = ''; $('.events-today-update').removeClass('show'); } else { $('.events-today-update').addClass('show'); $('.events-update').html(data.events + '*'); } @@ -409,7 +403,7 @@ function NavUpdate() { if(data.birthdays_today == 0) { data.birthdays_today = ''; $('.birthdays-today-update').removeClass('show'); } else { $('.birthdays-today-update').addClass('show'); $('.birthdays-update').html(data.birthdays + '*'); } $('.birthdays-today-update').html(data.birthdays_today); - if(data.all_events == 0) { data.all_events = ''; $('.all_events-update').removeClass('show'); } else { $('.all_events-update').addClass('show'); } + if(data.all_events == 0) { data.all_events = ''; $('.all_events-update, .all_events-button').hide(); } else { $('.all_events-update, .all_events-button').show(); } $('.all_events-update').html(data.all_events); if(data.all_events_today == 0) { data.all_events_today = ''; $('.all_events-today-update').removeClass('show'); } else { $('.all_events-today-update').addClass('show'); $('.all_events-update').html(data.all_events + '*'); } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 77b969712..d599fee50 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2122,4 +2122,4 @@ dl.bb-dl > dd > li { .rmagic-button { margin: 15px 0 5px; -}
\ No newline at end of file +} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index bda833b94..f74c88ce7 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -58,100 +58,87 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> - {{if $nav.network}} - <li class="{{$sel.network}} hidden-xs"> - <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" id="{{$nav.network.4}}"><i class="fa fa-th"></i></a> - <span class="net-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-network-menu"></span> + <li class="{{$sel.network}} net-button" style="display: none;"> + <a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" data-toggle="dropdown" rel="#nav-network-menu"> + <i class="fa fa-th"></i> + <span class="net-update badge"></span> + </a> <ul id="nav-network-menu" role="menu" class="dropdown-menu" rel="network"> {{* <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> *}} <li id="nav-network-mark-all"><a href="#" onclick="markRead('network'); return false;">{{$nav.network.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> - <li class="{{$sel.network}} visible-xs"> - <a href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><i class="fa fa-th"></i></a> - <span class="net-update badge" rel="#nav-network-menu"></span> - </li> {{/if}} {{if $nav.home}} - <li class="{{$sel.home}} hidden-xs"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" id="{{$nav.home.4}}"><i class="fa fa-home"></i></a> - <span class="home-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-home-menu"></span> + <li class="{{$sel.home}} home-button" style="display: none;"> + <a class="{{$nav.home.2}}" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" data-toggle="dropdown" rel="#nav-home-menu"> + <i class="fa fa-home"></i> + <span class="home-update badge" data-toggle="dropdown"></span> + </a> <ul id="nav-home-menu" class="dropdown-menu" rel="home"> {{* <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> *}} <li id="nav-home-mark-all"><a href="#" onclick="markRead('home'); return false;">{{$nav.home.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> - <li class="{{$sel.home}} visible-xs"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><i class="fa fa-home"></i></a> - <span class="home-update badge" rel="#nav-home-menu"></span> - </li> {{/if}} {{if $nav.messages}} - <li class="{{$sel.messages}} hidden-xs"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}"><i class="fa fa-envelope"></i></a> - <span class="mail-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-messages-menu"></span> + <li class="{{$sel.messages}} mail-button" style="display: none;"> + <a class="{{$nav.messages.2}}" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" data-toggle="dropdown" rel="#nav-messages-menu"> + <i class="fa fa-envelope"></i> + <span class="mail-update badge" data-toggle="dropdown"></span> + </a> <ul id="nav-messages-menu" class="dropdown-menu" rel="messages"> <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> <li id="nav-messages-mark-all"><a href="#" onclick="markRead('messages'); return false;">{{$nav.messages.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> - <li class="{{$sel.messages}} visible-xs"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><i class="fa fa-envelope"></i></a> - <span class="mail-update badge" rel="#nav-messages-menu"></span> - </li> {{/if}} {{if $nav.all_events}} - <li class="{{$sel.all_events}} hidden-xs"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" id='{{$nav.all_events.4}}'><i class="fa fa-calendar"></i></a> - <span class="all_events-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-all_events-menu"></span> + <li class="{{$sel.all_events}} all_events-button" style="display: none;"> + <a class="{{$nav.all_events.2}}" href="#" title="{{$nav.all_events.3}}" id="{{$nav.all_events.4}}" data-toggle="dropdown" rel="#nav-all_events-menu"> + <i class="fa fa-calendar"></i> + <span class="all_events-update badge" data-toggle="dropdown"></span> + </a> <ul id="nav-all_events-menu" class="dropdown-menu" rel="all_events"> <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> <li id="nav-all_events-mark-all"><a href="#" onclick="markRead('all_events'); return false;">{{$nav.all_events.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> - <li class="{{$sel.all_events}} visible-xs"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><i class="fa fa-calendar"></i></a> - <span class="all_events-update badge" rel="#nav-all_events-menu"></span> - </li> {{/if}} {{if $nav.intros}} - <li class="{{$sel.intros}} hidden-xs"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}"><i class="fa fa-user"></i></a> - <span class="intro-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-intros-menu"></span> + <li class="{{$sel.intros}} intro-button" style="display: none;"> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" id="{{$nav.intros.4}}" data-toggle="dropdown" rel="#nav-intros-menu"> + <i class="fa fa-user"></i> + <span class="intro-update badge" data-toggle="dropdown"></span> + </a> <ul id="nav-intros-menu" class="dropdown-menu" rel="intros"> <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> - <li class="{{$sel.intros}} visible-xs"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><i class="fa fa-user"></i></a> - <span class="intro-update badge" rel="#nav-intros-menu"></span> - </li> {{/if}} - + {{if $nav.notifications}} - <li class="{{$sel.notifications}} hidden-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}"><i class="fa fa-exclamation"></i></a> - <span class="notify-update badge dropdown-toggle" data-toggle="dropdown" rel="#nav-notify-menu"></span> + <li class="{{$sel.notifications}} notify-button" style="display: none;"> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}" id="{{$nav.notifications.4}}" data-toggle="dropdown" rel="#nav-notify-menu"> + <i class="fa fa-exclamation"></i> + <span class="notify-update badge" data-toggle="dropdown"></span> + </a> <ul id="nav-notify-menu" class="dropdown-menu" rel="notify"> <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> <li id="nav-notify-mark-all"><a href="#" onclick="markRead('notify'); return false;">{{$nav.notifications.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> - <li class="{{$sel.notifications}} visible-xs"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><i class="fa fa-exclamation"></i></a> - <span class="notify-update badge" rel="#nav-notify-menu"></span> - </li> {{/if}} {{if $nav.login && !$userinfo}} @@ -179,44 +166,16 @@ <div id="nav-search-spinner"></div><input class="fa-search" id="nav-search-text" type="text" value="" placeholder=" {{$help}}" name="search" title="{{$nav.search.3}}" onclick="this.submit();"/> </form> </li> - <li class="visible-xs"> - <a href="/search" title="{{$nav.search.3}}"><i class="fa fa-search"></i></a> - </li> - {{if $powered_by}} - <div id="powered-by">{{$powered_by}}</div> - {{/if}} -{{if ! $navapps}} - {{if $nav.directory}} - <li class="{{$sel.directory}}"> - <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}" id="{{$nav.directory.4}}"><i class="fa fa-sitemap"></i></a> - </li> - {{/if}} - - {{if $nav.apps}} - <li class="{{$sel.apps}}"> - <a class="{{$nav.apps.2}}" href="{{$nav.apps.0}}" title="{{$nav.apps.3}}" id="{{$nav.apps.4}}"><i class="fa fa-cogs"></i></a> - </li> - {{/if}} - - {{if $nav.help}} - <li class="{{$sel.help}}{{if $nav.help.6}} hidden-xs{{/if}}"> - <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}"{{if $nav.help.6}} onclick="contextualHelp(); return false;"{{/if}}>{{if $nav.help.6}}<i class="fa fa-question-circle"></i>{{else}}<i class="fa fa-question"></i>{{/if}}</a> - </li> - {{/if}} -{{/if}} - - {{if $navapps}} - {{if $nav.help.6}} + {{if $nav.help.6}} <li class="{{$sel.help}} hidden-xs"> <a class="{{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-question-circle"></i></a> </li> - {{/if}} - <li class="dropdown-toggle" data-toggle="dropdown"> - <a href="#"><i class="fa fa-bars"></i></a> - </li> - {{$navapps}} {{/if}} + <li> + <a href="#" data-toggle="dropdown"><i class="fa fa-bars"></i></a> + {{$navapps}} + </li> </ul> diff --git a/view/tpl/navapps.tpl b/view/tpl/navapps.tpl index de4a6223c..a90fdbaf2 100644 --- a/view/tpl/navapps.tpl +++ b/view/tpl/navapps.tpl @@ -1,4 +1,4 @@ -<ul class="dropdown-menu" style="max-height: 80vh"> +<ul class="dropdown-menu"> {{foreach $apps as $app}} <li><a href="{{$app.url}}">{{if $icon}}<i class="app-icon fa fa-{{$icon}}"></i>{{else}}<img src="{{$app.photo}}" width="16" height="16" />{{/if}} {{$app.name}}</a></li> {{/foreach}} |