diff options
| author | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
|---|---|---|
| committer | Alexander Kampmann <programmer@nurfuerspam.de> | 2012-03-14 12:57:35 +0100 |
| commit | 70709a882594250684c954a21d186877ea6f983c (patch) | |
| tree | ee2f364e513f8fd9fa1e12da8f5cd39c36d9b403 /view/theme/dispy/nav.tpl | |
| parent | 509ed2604fe6860b83e02984f8b4a280496a22a8 (diff) | |
| parent | 42462cc1f00cd0d2e637ff3ddb62b30ae4a645c6 (diff) | |
| download | volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.gz volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.tar.bz2 volse-hubzilla-70709a882594250684c954a21d186877ea6f983c.zip | |
Merge branch 'master' of git://github.com/friendica/friendica
Conflicts:
view/de/strings.php
Diffstat (limited to 'view/theme/dispy/nav.tpl')
| -rw-r--r-- | view/theme/dispy/nav.tpl | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/view/theme/dispy/nav.tpl b/view/theme/dispy/nav.tpl index 4a030e7ae..f6e399ef5 100644 --- a/view/theme/dispy/nav.tpl +++ b/view/theme/dispy/nav.tpl @@ -1,5 +1,4 @@ <nav> -$langselector <span id="banner">$banner</span> @@ -112,11 +111,14 @@ works --> <a id="intro-update" class="nav-ajax-left" href="$nav.introductions.0"></a> {{ endif }} </div> - </div> <a href="#" class="floaterflip"></a> </nav> +<div id="lang-sel-wrap"> +$langselector +</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> |