diff options
| -rw-r--r-- | js/main.js | 8 | ||||
| -rw-r--r-- | view/tpl/nav.tpl | 2 | ||||
| -rw-r--r-- | view/tpl/smarty3/nav.tpl | 10 |
3 files changed, 10 insertions, 10 deletions
diff --git a/js/main.js b/js/main.js index 169717404..e825d837a 100644 --- a/js/main.js +++ b/js/main.js @@ -317,10 +317,10 @@ if(data.birthdays_today == 0) { data.birthdays_today = ''; $('#birthdays-today-update').removeClass('show') } else { $('#birthdays-today-update').addClass('show') } $('#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') } - $('#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-today-update').html(data.all_events_today); + if(data.all_events == 0) { data.all_events = ''; $('#all_events-update').removeClass('show') } else { $('#all_events-update').addClass('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-today-update').html(data.all_events_today); $(data.notice).each(function() { diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index dc4e50e33..b0eb098aa 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -50,7 +50,7 @@ {{ if $nav.all_events }} <li id="nav-all_events-link" class="nav-menu $sel.all_events"> <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a> - <span id="all-all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> + <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> <ul id="nav-all_events-menu" class="menu-popup notify-menus" 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="/*fixme*/ return false;">$nav.all_events.mark.1</a></li> diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl index c1d300978..da50bc7bb 100644 --- a/view/tpl/smarty3/nav.tpl +++ b/view/tpl/smarty3/nav.tpl @@ -48,12 +48,12 @@ {{/if}} {{if $nav.all_events}} - <li id="nav-all-events-link" class="nav-menu {{$sel.all_events}}"> + <li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}"> <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="icon events">{{$nav.all_events.1}}</span></a> - <span id="all-events-update" class="nav-notify fakelink" rel="#nav-events-menu"></span> - <ul id="nav-events-menu" class="menu-popup notify-menus" rel="events"> - <li id="nav-events-see-all"><a href="{{$nav.events.all.0}}">{{$nav.events.all.1}}</a></li> - <li id="nav-events-mark-all"><a href="#" onclick="/*fixme*/ return false;">{{$nav.events.mark.1}}</a></li> + <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> + <ul id="nav-all_events-menu" class="menu-popup notify-menus" 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="/*fixme*/ return false;">{{$nav.all_events.mark.1}}</a></li> <li class="empty">{{$emptynotifications}}</li> </ul> </li> |