diff options
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/bootstrap-red.css | 8 | ||||
| -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 | 82 |
4 files changed, 88 insertions, 26 deletions
diff --git a/view/css/bootstrap-red.css b/view/css/bootstrap-red.css index cea911440..6cc4a4238 100644 --- a/view/css/bootstrap-red.css +++ b/view/css/bootstrap-red.css @@ -44,14 +44,6 @@ nav .dropdown-menu { margin-top: 0px; } -nav .navbar-collapse .navbar-left { - float: left; -} - -nav .navbar-collapse .navbar-right { - float: right; -} - /* nav overrides end */ 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 cd222e06d..3f1d9e992 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -2118,4 +2118,4 @@ dl.bb-dl > dd > li { border: 1px solid #ccc; border-radius: $radiuspx; -}
\ No newline at end of file +} diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index 86f9d5cf9..e131bbbf5 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -58,7 +58,79 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> +{{if $navapps}} + {{if $nav.network}} + <li class="{{$sel.network}} net-button" style="display: none;"> + <a href="#" title="{{$nav.network.3}}" id="{{$nav.network.4}}" onclick="return false;" data-toggle="dropdown" rel="#nav-network-menu"><i class="fa fa-th"></i></a> + <span class="net-update badge" data-toggle="dropdown"></span> + <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> + {{/if}} + + {{if $nav.home}} + <li class="{{$sel.home}} home-button" style="display: none;"> + <a class="{{$nav.home.2}}" href="#" title="{{$nav.home.3}}" id="{{$nav.home.4}}" onclick="return false;" data-toggle="dropdown" rel="#nav-home-menu"><i class="fa fa-home"></i></a> + <span class="home-update badge" data-toggle="dropdown"></span> + <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> + {{/if}} + {{if $nav.messages}} + <li class="{{$sel.messages}} mail-button" style="display: none;"> + <a class="{{$nav.messages.2}}" href="#" title="{{$nav.messages.3}}" id="{{$nav.messages.4}}" onclick="return false;" data-toggle="dropdown" rel="#nav-messages-menu"><i class="fa fa-envelope"></i></a> + <span class="mail-update badge" data-toggle="dropdown"></span> + <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> + {{/if}} + + {{if $nav.all_events}} + <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}}" onclick="return false;" data-toggle="dropdown" rel="#nav-all_events-menu"><i class="fa fa-calendar"></i></a> + <span class="all_events-update badge" data-toggle="dropdown"></span> + <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> + {{/if}} + + {{if $nav.intros}} + <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></a> + <span class="intro-update badge" data-toggle="dropdown"></span> + <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> + {{/if}} + + {{if $nav.notifications}} + <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></a> + <span class="notify-update badge" data-toggle="dropdown"></span> + <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> + {{/if}} + +{{else}} {{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> @@ -75,6 +147,7 @@ </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> @@ -91,6 +164,7 @@ </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> @@ -109,7 +183,7 @@ {{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> + <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> <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> @@ -137,7 +211,7 @@ <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> @@ -153,6 +227,7 @@ <span class="notify-update badge" rel="#nav-notify-menu"></span> </li> {{/if}} +{{/if}} {{if $nav.login && !$userinfo}} <li class="nav-login hidden-xs"> @@ -187,6 +262,7 @@ <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> +{{if ! $navapps}} <li class="visible-xs"> <a href="/search" title="{{$nav.search.3}}"><i class="fa fa-search"></i></a> </li> @@ -194,7 +270,7 @@ {{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> |