aboutsummaryrefslogtreecommitdiffstats
path: root/view/theme/dispy/nav.tpl
diff options
context:
space:
mode:
authorMichael Vogel <icarus@dabo.de>2012-05-16 08:24:46 +0200
committerMichael Vogel <icarus@dabo.de>2012-05-16 08:24:46 +0200
commitf2c0c40f6e488f1a8e62bda9449b28115f343cac (patch)
treeae1418141f85be49b7d8cb3d2a0e8b2a7acc4eb4 /view/theme/dispy/nav.tpl
parentf2e648d62fe7cafb9a55c7505687ea4d1c294778 (diff)
parenta65bd73bf3f4a1e6ccfcdf0a06c70a4f1f4182ce (diff)
downloadvolse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.gz
volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.tar.bz2
volse-hubzilla-f2c0c40f6e488f1a8e62bda9449b28115f343cac.zip
Merge remote branch 'upstream/master'
Diffstat (limited to 'view/theme/dispy/nav.tpl')
-rw-r--r--view/theme/dispy/nav.tpl15
1 files changed, 9 insertions, 6 deletions
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl
index 6ffd2b379..21343aea5 100644
--- a/view/theme/dispy/nav.tpl
+++ b/view/theme/dispy/nav.tpl
@@ -50,7 +50,7 @@
</ul>
<div id="user-menu">
- <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
+ <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')"
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
@@ -90,7 +90,9 @@
{{ if $userinfo }}
<ul id="nav-user-menu" class="menu-popup">
{{ for $nav.usermenu as $usermenu }}
- <li><a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a></li>
+ <li>
+ <a class="$usermenu.2" href="$usermenu.0" title="$usermenu.3">$usermenu.1</a>
+ </li>
{{ endfor }}
</ul>
{{ endif }}
@@ -121,18 +123,19 @@ $langselector
</div>
<div id="scrollup">
-<a href="#top"><img
- src="view/theme/dispy/icons/scroll_top.png"
+<a href="#top"><img src="view/theme/dispy/icons/scroll_top.png"
alt="back to top" title="Back to top" /></a>
</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" />
+ <input id="mini-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>
+ <li class="{4}">
+ <a href="{0}"><img src="{1}" height="24" width="24" alt="" />{2} <span class="notif-when">{3}</span></a>
+ </li>
</ul>