Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

[friendica.git] / view / theme / diabook-aerith / nav.tpl

diff --git a/view/theme/diabook-aerith/nav.tpl b/view/theme/diabook-aerith/nav.tpl
index d73dd047ab1dd4acf7fbc7ffef903919d93b796c..6fab83afc740feb4ed763673d6ab2a696f1e77b3 100644 (file)
--- a/view/theme/diabook-aerith/nav.tpl
+++ b/view/theme/diabook-aerith/nav.tpl
@@ -11,18 +11,18 @@
                        {{ if $nav.network }}
                        <li id="nav-network-link" class="nav-menu-icon">
                                <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" >
-                               <span class="icon notifications">Benachrichtigungen</span></a>
-                               <span id="net-update" class="nav-notify"></span>
+                               <span class="icon notifications">Benachrichtigungen</span>
+                               <span id="net-update" class="nav-notify"></span></a>
                        </li>
                    {{ endif }}
        
                        {{ if $nav.contacts }}
                        <li class="nav-menu-icon" id="nav-contacts-linkmenu">
                                <a href="$nav.contacts.0" rel="#nav-contacts-menu" title="$nav.contacts.1">
-                               <span class="icon contacts">$nav.contacts.1</span></a>
-                               <span id="intro-update" class="nav-notify"></span>
+                               <span class="icon contacts">$nav.contacts.1</span>
+                               <span id="intro-update" class="nav-notify"></span></a>
                                <ul id="nav-contacts-menu" class="menu-popup">
-                                       <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update" class="nav-notify"></span></li>
+                                       <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">$nav.introductions.1</a><span id="intro-update-li" class="nav-notify"></span></li>
                                        <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> 
                                </ul>
                        </li>   
@@ -31,11 +31,11 @@
                        {{ if $nav.messages }}
                        <li  id="nav-messages-linkmenu" class="nav-menu-icon">
                          <a href="$nav.messages.0" rel="#nav-messages-menu" title="$nav.messages.1">
-                         <span class="icon messages">$nav.messages.1</span></a>
-                               <span id="mail-update" class="nav-notify"></span>
+                         <span class="icon messages">$nav.messages.1</span>
+                               <span id="mail-update" class="nav-notify"></span></a>
                                <ul id="nav-messages-menu" class="menu-popup">
                                        <li id="nav-messages-see-all"><a href="$nav.messages.0">$nav.messages.1</a></li>
-                                       <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a></li>
+                                       <li id="nav-messages-see-all"><a href="$nav.messages.inbox.0">$nav.messages.inbox.1</a><span id="mail-update-li" class="nav-notify"></span></li>
                                        <li id="nav-messages-see-all"><a href="$nav.messages.outbox.0">$nav.messages.outbox.1</a></li>
                                        <li id="nav-messages-see-all"><a href="$nav.messages.new.0">$nav.messages.new.1</a></li>
                                </ul>
@@ -43,8 +43,10 @@
                        {{ endif }}
                
       {{ if $nav.notifications }}
-                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon notify">$nav.notifications.1</span></a>
-                               <span id="notify-update" class="nav-notify"></span>
+                       <li  id="nav-notifications-linkmenu" class="nav-menu-icon">
+                       <a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1">
+                          <span class="icon notify">$nav.notifications.1</span>
+                               <span id="notify-update" class="nav-notify"></span></a>
                                <ul id="nav-notifications-menu" class="menu-popup">
                                        <li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
                                        <li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
@@ -100,8 +102,8 @@
                
       {{ if $nav.settings }}
                        <li id="nav-home-link" class="nav-menu $sel.home">
-                               <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1</a>
-                               <span id="home-update" class="nav-notify"></span>
+                               <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" >$nav.home.1
+                               <span id="home-update" class="nav-notify"></span></a>
                        </li>
                {{ endif }}             
                
@@ -135,9 +137,9 @@
 </nav>
 
 
-<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook/icons/scroll_top.png" title="scroll to top"></a></div>
+<div style="position: fixed; bottom: 5px; right: 10px;"><a href="javascript:scroll(0,0); "><img src="view/theme/diabook-aerith/icons/scroll_top.png" title="scroll to top"></a></div>
 <div style="position: fixed; bottom: 3px; left: 25px;">$langselector</div>
-<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/bluebug.png" title="report bugs for the theme diabook"/></a></div>
+<div style="position: fixed; bottom: 23px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook-aerith/icons/bluebug.png" title="report bugs for the theme diabook-aerith"/></a></div>