diff options
| author | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-28 15:21:01 +0200 |
|---|---|---|
| committer | Fabio Comuni <fabrix.xm@gmail.com> | 2012-03-28 15:21:01 +0200 |
| commit | f86e909a82c372ff01222431a7084b4cc47a6e81 (patch) | |
| tree | e3d3269ed5bb1fa08bcf4d6a229976defbda43b9 /view/theme/dispy/nav.tpl | |
| parent | 0f2a34c23b2da277af88bbd36c1871f3c58e6420 (diff) | |
| parent | e894775a39920edc0e438364c818357ab809bace (diff) | |
| download | volse-hubzilla-f86e909a82c372ff01222431a7084b4cc47a6e81.tar.gz volse-hubzilla-f86e909a82c372ff01222431a7084b4cc47a6e81.tar.bz2 volse-hubzilla-f86e909a82c372ff01222431a7084b4cc47a6e81.zip | |
Merge remote-tracking branch 'friendica/master'
Diffstat (limited to 'view/theme/dispy/nav.tpl')
| -rw-r--r-- | view/theme/dispy/nav.tpl | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 589d68352..e38b2bbe2 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/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')" @@ -125,6 +119,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> |