diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:26:22 -0500 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-03-06 18:26:22 -0500 |
| commit | a33ca0a7318cf727b5c605c381e4c6f20463ad3e (patch) | |
| tree | d9e51a0d8667cad5fcf3fc22cde9b7080ecb12a7 /view/theme/diabook/nav.tpl | |
| parent | 94d4cad701ab6b618afb288c88165c0ec17ae238 (diff) | |
| parent | 1fae778421253b713c166f3e4d329997a9e214a3 (diff) | |
| download | volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.gz volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.tar.bz2 volse-hubzilla-a33ca0a7318cf727b5c605c381e4c6f20463ad3e.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
search should be ok, but a little extra security won't hurt
messages-menu translation, add scroll-to-top and theme-bug-report in theme
Fixed...merged with mainline THEN added beards.
added beard smileys
doc/Account-Basics.md
doc/Account-Basics.md
a
doc/Remove-Account.md
doc/Making-Friends.md
doc/Bugs-and-Issues.md
doc/Account-Basics.md
* master:
Diffstat (limited to 'view/theme/diabook/nav.tpl')
| -rw-r--r-- | view/theme/diabook/nav.tpl | 19 |
1 files changed, 6 insertions, 13 deletions
diff --git a/view/theme/diabook/nav.tpl b/view/theme/diabook/nav.tpl index 1f2f64f6a..3a36e7daa 100644 --- a/view/theme/diabook/nav.tpl +++ b/view/theme/diabook/nav.tpl @@ -25,7 +25,7 @@ <span class="icon contacts">$nav.contacts.1</span></a> <span id="intro-update" class="nav-notify"></span> <ul id="nav-contacts-menu" class="menu-popup"> - <li id="nav-contacts-see-intro"><a href="$nav.notifications.0">Kontaktanfragen</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" class="nav-notify"></span></li> <li id="nav-contacts-all"><a href="contacts">$nav.contacts.1</a></li> </ul> </li> @@ -38,9 +38,9 @@ <span id="mail-update" class="nav-notify"></span> <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-inbox"><a href="$nav.messages.0">Eingang</a></li> - <li id="nav-messages-outbox"><a href="message/sent">Ausgang</a></li> - <li id="nav-messages-new"><a href="message/new">Neue Nachricht</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.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> </li> {{ endif }} @@ -138,18 +138,11 @@ </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; left: 25px;">$langselector</div> -<div style="position: fixed; bottom: 7px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="images/bug-x.gif" title="Fehlerreport für das Theme diaBook erstellen"></a></div> +<div style="position: fixed; bottom: 25px; left: 5px;"><a href="http://pad.toktan.org/p/diabook" target="blank" ><img src="view/theme/diabook/icons/ftdevs.gif" title="Fehlerreport für das Theme diaBook erstellen"/></a></div> -<a class="$nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> - - - -<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> - {# {{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }} |