diff options
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/comment_item.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/nav.tpl | 69 | ||||
| -rw-r--r-- | view/tpl/smarty3/comment_item.tpl | 1 | ||||
| -rw-r--r-- | view/tpl/smarty3/nav.tpl | 69 |
4 files changed, 70 insertions, 70 deletions
diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index cc7153ebb..a9a71cc8e 100644 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -10,7 +10,6 @@ <input type="hidden" name="return" value="$return_path" /> <input type="hidden" name="jsreload" value="$jsreload" /> <input type="hidden" name="preview" id="comment-preview-inp-$id" value="0" /> - <input type="hidden" name="post_id_random" value="$rand_num" /> <div class="comment-edit-photo" id="comment-edit-photo-$id" > <a class="comment-edit-photo-link" href="$mylink" title="$mytitle"><img class="my-comment-photo" src="$myphoto" alt="$mytitle" title="$mytitle" /></a> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index e98621aa4..7ae68203c 100644 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -4,6 +4,29 @@ </header> <nav> <ul> + + {{ if $userinfo }} + <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a> + {{ if $localuser }} + <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> + {{ endfor }} + {{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }} + {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} + {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} + {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} + + {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} + + {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} + + </ul> + {{ endif }} + </li> + {{ endif }} + + {{ if $nav.lock }} <li id="nav-rmagic-link" class="nav-menu-icon" > <a class="icon $nav.lock.2" href="$nav.lock.0" title="$nav.lock.3" >$nav.lock.1</a> @@ -13,7 +36,7 @@ {{ if $nav.network }} <li id="nav-network-link" class="nav-menu $sel.network"> - <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="icon network">$nav.network.1</span></a> + <a class="$nav.network.2" href="$nav.network.0" title="$nav.network.3" ><span class="network">$nav.network.1</span></a> <span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span> <ul id="nav-network-menu" class="menu-popup notify-menus" rel="network"> <li id="nav-network-see-all"><a href="$nav.network.all.0">$nav.network.all.1</a></li> @@ -25,7 +48,7 @@ {{ if $nav.home }} <li id="nav-home-link" class="nav-menu $sel.home"> - <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="icon home">$nav.home.1</span></a> + <a class="$nav.home.2" href="$nav.home.0" title="$nav.home.3" ><span class="home">$nav.home.1</span></a> <span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span> <ul id="nav-home-menu" class="menu-popup notify-menus" rel="home"> <li id="nav-home-see-all"><a href="$nav.home.all.0">$nav.home.all.1</a></li> @@ -37,7 +60,7 @@ {{ if $nav.messages }} <li id="nav-mail-link" class="nav-menu $sel.messages"> - <a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="icon mail">$nav.messages.1</span></a> + <a class="$nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" ><span class="mail">$nav.messages.1</span></a> <span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span> <ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages"> <li id="nav-messages-see-all"><a href="$nav.messages.all.0">$nav.messages.all.1</a></li> @@ -49,7 +72,7 @@ {{ if $nav.all_events }} <li id="nav-all_events-link" class="nav-menu $sel.all_events"> - <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="icon events">$nav.all_events.1</span></a> + <a class="$nav.all_events.2" href="$nav.all_events.0" title="$nav.all_events.3" ><span class="events">$nav.all_events.1</span></a> <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events"> <li id="nav-all_events-see-all"><a href="$nav.all_events.all.0">$nav.all_events.all.1</a></li> @@ -61,7 +84,7 @@ {{ if $nav.intros }} <li id="nav-intros-link" class="nav-menu $sel.intros"> - <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="icon introductions">$nav.intros.1</span></a> + <a class="$nav.intros.2" href="$nav.intros.0" title="$nav.intros.3" ><span class="introductions">$nav.intros.1</span></a> <span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span> <ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros"> <li id="nav-intros-see-all"><a href="$nav.intros.all.0">$nav.intros.all.1</a></li> @@ -72,7 +95,7 @@ {{ if $nav.notifications }} <li id="nav-notify-linkmenu" class="nav-menu fakelink"> - <a href="$nav.notifications.0" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a> + <a href="$nav.notifications.0" title="$nav.notifications.1"><span class="notify">$nav.notifications.1</span></a> <span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span> <ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify"> <li id="nav-notify-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li> @@ -81,38 +104,16 @@ </ul> </li> {{ endif }} + + {{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} + {{ if $nav.alogout }}<li id=nav-alogout-link" class="nav-menu $nav-alogout.2"><a href="$nav.alogout.0" title="$nav.alogout.3" >$nav.alogout.1</a></li>{{ endif }} - {{ if $nav.settings }} - <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">$nav.settings.1</span></a> - <ul id="nav-site-menu" class="menu-popup"> - {{ if $nav.settings }}<li><a class="$nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a></li>{{ endif }} - {{ if $nav.directory }}<li><a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3">$nav.directory.1</a></li>{{ endif }} - - {{ if $nav.admin }}<li><a class="$nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a></li>{{ endif }} - - </ul> + {{ if $nav.directory }} + <li id="nav-directory-link" class="nav-menu $sel.directory"> + <a class="$nav.directory.2" href="$nav.directory.0" title="$nav.directory.3">$nav.directory.1</a> </li> {{ endif }} - {{ if $userinfo }} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="$userinfo.name"><img src="$userinfo.icon" alt="$userinfo.name"></a> - {{ if $localuser }} - <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> - {{ endfor }} - {{ if $nav.profiles }}<li><a class="$nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3">$nav.profiles.1</a></li>{{ endif }} - {{ if $nav.manage }}<li><a class="$nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a></li>{{ endif }} - {{ if $nav.contacts }}<li><a class="$nav.contacts.2" href="$nav.contacts.0" title="$nav.contacts.3" >$nav.contacts.1</a></li>{{ endif }} - {{ if $nav.logout }}<li><a class="menu-sep $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a></li>{{ endif }} - - </ul> - {{ endif }} - </li> - {{ endif }} - - {{ if $nav.login }}<li id="nav-login-link" class="nav-menu $nav.login.2"><a href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a><li>{{ endif }} - {{ if $nav.alogout }}<li id=nav-alogout-link" class="nav-menu $nav-alogout.2"><a href="$nav.alogout.0" title="$nav.alogout.3" >$nav.alogout.1</a></li>{{ endif }} {{ if $nav.help }} <li id="nav-help-link" class="nav-menu $sel.help"> <a class="$nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a> diff --git a/view/tpl/smarty3/comment_item.tpl b/view/tpl/smarty3/comment_item.tpl index cde6466f0..d15009d7f 100644 --- a/view/tpl/smarty3/comment_item.tpl +++ b/view/tpl/smarty3/comment_item.tpl @@ -15,7 +15,6 @@ <input type="hidden" name="return" value="{{$return_path}}" /> <input type="hidden" name="jsreload" value="{{$jsreload}}" /> <input type="hidden" name="preview" id="comment-preview-inp-{{$id}}" value="0" /> - <input type="hidden" name="post_id_random" value="{{$rand_num}}" /> <div class="comment-edit-photo" id="comment-edit-photo-{{$id}}" > <a class="comment-edit-photo-link" href="{{$mylink}}" title="{{$mytitle}}"><img class="my-comment-photo" src="{{$myphoto}}" alt="{{$mytitle}}" title="{{$mytitle}}" /></a> diff --git a/view/tpl/smarty3/nav.tpl b/view/tpl/smarty3/nav.tpl index 261607e5b..aa0fd4715 100644 --- a/view/tpl/smarty3/nav.tpl +++ b/view/tpl/smarty3/nav.tpl @@ -9,6 +9,29 @@ </header> <nav> <ul> + + {{if $userinfo}} + <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a> + {{if $localuser}} + <ul id="nav-user-menu" class="menu-popup"> + {{foreach $nav.usermenu as $usermenu}} + <li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li> + {{/foreach}} + {{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}} + {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}} + {{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}} + {{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}} + + {{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}} + + {{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}} + + </ul> + {{/if}} + </li> + {{/if}} + + {{if $nav.lock}} <li id="nav-rmagic-link" class="nav-menu-icon" > <a class="icon {{$nav.lock.2}}" href="{{$nav.lock.0}}" title="{{$nav.lock.3}}" >{{$nav.lock.1}}</a> @@ -18,7 +41,7 @@ {{if $nav.network}} <li id="nav-network-link" class="nav-menu {{$sel.network}}"> - <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><span class="icon network">{{$nav.network.1}}</span></a> + <a class="{{$nav.network.2}}" href="{{$nav.network.0}}" title="{{$nav.network.3}}" ><span class="network">{{$nav.network.1}}</span></a> <span id="net-update" class="nav-notify fakelink" rel="#nav-network-menu"></span> <ul id="nav-network-menu" class="menu-popup notify-menus" rel="network"> <li id="nav-network-see-all"><a href="{{$nav.network.all.0}}">{{$nav.network.all.1}}</a></li> @@ -30,7 +53,7 @@ {{if $nav.home}} <li id="nav-home-link" class="nav-menu {{$sel.home}}"> - <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><span class="icon home">{{$nav.home.1}}</span></a> + <a class="{{$nav.home.2}}" href="{{$nav.home.0}}" title="{{$nav.home.3}}" ><span class="home">{{$nav.home.1}}</span></a> <span id="home-update" class="nav-notify fakelink" rel="#nav-home-menu"></span> <ul id="nav-home-menu" class="menu-popup notify-menus" rel="home"> <li id="nav-home-see-all"><a href="{{$nav.home.all.0}}">{{$nav.home.all.1}}</a></li> @@ -42,7 +65,7 @@ {{if $nav.messages}} <li id="nav-mail-link" class="nav-menu {{$sel.messages}}"> - <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><span class="icon mail">{{$nav.messages.1}}</span></a> + <a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" ><span class="mail">{{$nav.messages.1}}</span></a> <span id="mail-update" class="nav-notify fakelink" rel="#nav-messages-menu"></span> <ul id="nav-messages-menu" class="menu-popup notify-menus" rel="messages"> <li id="nav-messages-see-all"><a href="{{$nav.messages.all.0}}">{{$nav.messages.all.1}}</a></li> @@ -54,7 +77,7 @@ {{if $nav.all_events}} <li id="nav-all_events-link" class="nav-menu {{$sel.all_events}}"> - <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="icon events">{{$nav.all_events.1}}</span></a> + <a class="{{$nav.all_events.2}}" href="{{$nav.all_events.0}}" title="{{$nav.all_events.3}}" ><span class="events">{{$nav.all_events.1}}</span></a> <span id="all_events-update" class="nav-notify fakelink" rel="#nav-all_events-menu"></span> <ul id="nav-all_events-menu" class="menu-popup notify-menus" rel="all_events"> <li id="nav-all_events-see-all"><a href="{{$nav.all_events.all.0}}">{{$nav.all_events.all.1}}</a></li> @@ -66,7 +89,7 @@ {{if $nav.intros}} <li id="nav-intros-link" class="nav-menu {{$sel.intros}}"> - <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><span class="icon introductions">{{$nav.intros.1}}</span></a> + <a class="{{$nav.intros.2}}" href="{{$nav.intros.0}}" title="{{$nav.intros.3}}" ><span class="introductions">{{$nav.intros.1}}</span></a> <span id="intro-update" class="nav-notify fakelink" rel="#nav-intros-menu"></span> <ul id="nav-intros-menu" class="menu-popup notify-menus" rel="intros"> <li id="nav-intros-see-all"><a href="{{$nav.intros.all.0}}">{{$nav.intros.all.1}}</a></li> @@ -77,7 +100,7 @@ {{if $nav.notifications}} <li id="nav-notify-linkmenu" class="nav-menu fakelink"> - <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><span class="icon s22 notify">{{$nav.notifications.1}}</span></a> + <a href="{{$nav.notifications.0}}" title="{{$nav.notifications.1}}"><span class="notify">{{$nav.notifications.1}}</span></a> <span id="notify-update" class="nav-notify fakelink" rel="#nav-notify-menu"></span> <ul id="nav-notify-menu" class="menu-popup notify-menus" rel="notify"> <li id="nav-notify-see-all"><a href="{{$nav.notifications.all.0}}">{{$nav.notifications.all.1}}</a></li> @@ -86,38 +109,16 @@ </ul> </li> {{/if}} + + {{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} + {{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} - {{if $nav.settings}} - <li id="nav-site-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-site-menu"><span class="icon s22 gear">{{$nav.settings.1}}</span></a> - <ul id="nav-site-menu" class="menu-popup"> - {{if $nav.settings}}<li><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}} - {{if $nav.directory}}<li><a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a></li>{{/if}} - - {{if $nav.admin}}<li><a class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a></li>{{/if}} - - </ul> + {{if $nav.directory}} + <li id="nav-directory-link" class="nav-menu {{$sel.directory}}"> + <a class="{{$nav.directory.2}}" href="{{$nav.directory.0}}" title="{{$nav.directory.3}}">{{$nav.directory.1}}</a> </li> {{/if}} - {{if $userinfo}} - <li id="nav-user-linkmenu" class="nav-menu-icon"><a href="#" rel="#nav-user-menu" title="{{$userinfo.name}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"></a> - {{if $localuser}} - <ul id="nav-user-menu" class="menu-popup"> - {{foreach $nav.usermenu as $usermenu}} - <li><a class="{{$usermenu.2}}" href="{{$usermenu.0}}" title="{{$usermenu.3}}">{{$usermenu.1}}</a></li> - {{/foreach}} - {{if $nav.profiles}}<li><a class="{{$nav.profiles.2}}" href="{{$nav.profiles.0}}" title="{{$nav.profiles.3}}">{{$nav.profiles.1}}</a></li>{{/if}} - {{if $nav.manage}}<li><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}} - {{if $nav.contacts}}<li><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}} - {{if $nav.logout}}<li><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}} - - </ul> - {{/if}} - </li> - {{/if}} - - {{if $nav.login}}<li id="nav-login-link" class="nav-menu {{$nav.login.2}}"><a href="{{$nav.login.0}}" title="{{$nav.login.3}}" >{{$nav.login.1}}</a><li>{{/if}} - {{if $nav.alogout}}<li id=nav-alogout-link" class="nav-menu {{$nav}}-alogout.2"><a href="{{$nav.alogout.0}}" title="{{$nav.alogout.3}}" >{{$nav.alogout.1}}</a></li>{{/if}} {{if $nav.help}} <li id="nav-help-link" class="nav-menu {{$sel.help}}"> <a class="{{$nav.help.2}}" target="friendika-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" >{{$nav.help.1}}</a> |