From afd751ee74ea8dfa432e63ed0065b4c2e92f754f Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 31 Mar 2019 11:17:59 +0200
Subject: [PATCH 1/4] add link to admin panel as well, but keep icon as it is
 really handy

---
 view/theme/vier/templates/nav.tpl | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index 5f62773dbb..2d73a64a10 100644
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -86,6 +86,11 @@
 					{{if $nav.manage}}<li role="menuitem"><a class="{{$nav.manage.2}}" href="{{$nav.manage.0}}" title="{{$nav.manage.3}}">{{$nav.manage.1}}</a></li>{{/if}}
 					{{if $nav.usermenu.1}}<li role="menuitem"><a class="{{$nav.usermenu.1.2}}" href="{{$nav.usermenu.1.0}}" title="{{$nav.usermenu.1.3}}">{{$nav.usermenu.1.1}}</a></li>{{/if}}
 					{{if $nav.settings}}<li role="menuitem"><a class="{{$nav.settings.2}}" href="{{$nav.settings.0}}" title="{{$nav.settings.3}}">{{$nav.settings.1}}</a></li>{{/if}}
+					{{if $nav.admin}}
+					<li role="menuitem">
+						<a accesskey="a" class="{{$nav.admin.2}}" href="{{$nav.admin.0}}" title="{{$nav.admin.3}}" >{{$nav.admin.1}}</a>
+					</li>
+					{{/if}}
 					{{if $nav.logout}}<li role="menuitem"><a class="menu-sep {{$nav.logout.2}}" href="{{$nav.logout.0}}" title="{{$nav.logout.3}}" >{{$nav.logout.1}}</a></li>{{/if}}
 				</ul>
 			</li>

From 174e71cc36a081581b1b2f970b03441353c8c960 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 31 Mar 2019 11:18:41 +0200
Subject: [PATCH 2/4] mobile view: show events and admin, but hide pm link

---
 view/theme/vier/mobile.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css
index bf79222876..3a0de3cb41 100644
--- a/view/theme/vier/mobile.css
+++ b/view/theme/vier/mobile.css
@@ -1,4 +1,4 @@
-aside, header, #nav-events-link, #nav-search-box, #nav-admin-link, #activitiy-by-date-tab, #shared-links-tab,
+aside, header, #nav-search-box, #nav-messages-linkmenu,  #activitiy-by-date-tab, #shared-links-tab,
 .wall-item-location {
   display: none;
 }

From 843b9f71c119ed071b394456ae78701819b523fe Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 31 Mar 2019 11:24:17 +0200
Subject: [PATCH 3/4] be consistent with messages and admin links as both are
 in the nav bar and the user menu

---
 view/theme/vier/mobile.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/view/theme/vier/mobile.css b/view/theme/vier/mobile.css
index 3a0de3cb41..0b7833ad4c 100644
--- a/view/theme/vier/mobile.css
+++ b/view/theme/vier/mobile.css
@@ -1,4 +1,4 @@
-aside, header, #nav-search-box, #nav-messages-linkmenu,  #activitiy-by-date-tab, #shared-links-tab,
+aside, header, #nav-search-box, #nav-admin-link, #nav-messages-linkmenu,  #activitiy-by-date-tab, #shared-links-tab,
 .wall-item-location {
   display: none;
 }

From 820e2a89f9e68d859c3d4f427bdb9f654092a5b7 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sun, 31 Mar 2019 15:20:23 +0200
Subject: [PATCH 4/4] add search to user menu as well

---
 view/theme/vier/templates/nav.tpl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/theme/vier/templates/nav.tpl b/view/theme/vier/templates/nav.tpl
index 2d73a64a10..db883433e6 100644
--- a/view/theme/vier/templates/nav.tpl
+++ b/view/theme/vier/templates/nav.tpl
@@ -80,6 +80,7 @@
 			<li role="menu" aria-haspopup="true" id="nav-user-linkmenu" class="nav-menu">
 				<a accesskey="u" title="{{$sitelocation}}"><img src="{{$userinfo.icon}}" alt="{{$userinfo.name}}"><span id="nav-user-linklabel">{{$userinfo.name}}</span><span id="intro-update" class="nav-notify"></span></a>
 				<ul id="nav-user-menu" class="menu-popup">
+					<li role="menuitem"> <a  class="{{$nav.search.2}}" href="{{$nav.search.0}}" title="{{$nav.search.3}}" >{{$nav.search.1}}</a> </li>
 					{{if $nav.introductions}}<li role="menuitem"><a class="{{$nav.introductions.2}}" href="{{$nav.introductions.0}}" title="{{$nav.introductions.3}}" >{{$nav.introductions.1}}</a><span id="intro-update-li" class="nav-notify"></span></li>{{/if}}
 					{{if $nav.contacts}}<li role="menuitem"><a class="{{$nav.contacts.2}}" href="{{$nav.contacts.0}}" title="{{$nav.contacts.3}}" >{{$nav.contacts.1}}</a></li>{{/if}}
 					{{if $nav.messages}}<li role="menuitem"><a class="{{$nav.messages.2}}" href="{{$nav.messages.0}}" title="{{$nav.messages.3}}" >{{$nav.messages.1}} <span id="mail-update-li" class="nav-notify"></span></a></li>{{/if}}