Merge commit 'upstream/master'

[friendica.git] / view / theme / dispy-dark / nav.tpl

diff --git a/view/theme/dispy-dark/nav.tpl b/view/theme/dispy-dark/nav.tpl
index 589d6835215759d539826a6b42a128945dfb1de4..34aba50de3c724ac0a9d2d74fb13d576f4c3014e 100644 (file)
--- a/view/theme/dispy-dark/nav.tpl
+++ b/view/theme/dispy-dark/nav.tpl
@@ -45,13 +45,7 @@ works -->
     {{ endif }}
        </div>
 
-       <div class="search-box">
-               <form method="get" action="$nav.search.0">
-                       <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
-               </form>
-       </div>
-
-    <div id="user-menu">
+       <div id="user-menu">
         <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
         <ul id="user-menu-popup"
             onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
@@ -62,7 +56,6 @@ works -->
         <a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1"></a>
         </li>
         {{ endif }}
-
         {{ if $nav.contacts }}
         <li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.1">$nav.contacts.1</a></li>
         {{ endif }}
@@ -81,11 +74,9 @@ works -->
         {{ if $nav.admin }}
         <li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0" title="$nav.admin.1">$nav.admin.1</a></li>
         {{ endif }}
-
         {{ if $nav.login }}
         <li><a id="nav-login-link" class="nav-commlink $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li>
         {{ endif }}
-
         {{ if $nav.logout }}
         <li><a id="nav-logout-link" class="nav-commlink $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>
         {{ endif }}
@@ -125,6 +116,12 @@ works -->
 $langselector
 </div>
 
+<div class="search-box">
+       <form method="get" action="$nav.search.0">
+               <input id="search-text" class="nav-menu-search" type="search" placeholder="Search" value="" id="search" name="search" />
+       </form>
+</div>
+
 <ul id="nav-notifications-template" style="display:none;" rel="template">
        <li class="{4}"><a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a></li>
 </ul>