From 4029b76d9e4fac604b6dbb7a2b74b62601039260 Mon Sep 17 00:00:00 2001
From: Henry Oswald <henry.oswald@sharelatex.com>
Date: Mon, 6 Jun 2016 16:11:26 +0100
Subject: [PATCH] - make system messages default tab in admin panel - add
 manage site tab to dropdown

---
 services/web/app/views/admin/index.jade   | 33 ++++++++++++-----------
 services/web/app/views/layout/navbar.jade |  2 ++
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/services/web/app/views/admin/index.jade b/services/web/app/views/admin/index.jade
index d28d88c929..0fa9017cc1 100644
--- a/services/web/app/views/admin/index.jade
+++ b/services/web/app/views/admin/index.jade
@@ -9,6 +9,22 @@ block content
 						.page-header
 							h1 Admin Panel
 						tabset(ng-cloak)
+							tab(heading="System Messages")
+								each message in systemMessages 
+									.alert.alert-info.row-spaced !{message.content}
+								hr
+								form(enctype='multipart/form-data', method='post', action='/admin/messages')
+									input(name="_csrf", type="hidden", value=csrfToken)
+									.form-group
+										label(for="content")
+										input.form-control(name="content", type="text", placeholder="Message...", required)
+									button.btn.btn-primary(type="submit") Post Message
+								hr
+								form(enctype='multipart/form-data', method='post', action='/admin/messages/clear')
+									input(name="_csrf", type="hidden", value=csrfToken)
+									button.btn.btn-danger(type="submit") Clear all messages
+
+
 							tab(heading="Open Sockets")
 								.row-spaced
 									ul
@@ -17,7 +33,7 @@ block content
 												ul
 													-each agent in agents
 														li #{agent}
-														
+
 							tab(heading="Close Editor")
 								.row-spaced
 									form(enctype='multipart/form-data', method='post',action='/admin/closeEditor')
@@ -66,19 +82,6 @@ block content
 										.form-group
 											button.btn-primary.btn(type='submit') Poll
 										
-							tab(heading="System Messages")
-								each message in systemMessages 
-									.alert.alert-info.row-spaced !{message.content}
-								hr
-								form(enctype='multipart/form-data', method='post', action='/admin/messages')
-									input(name="_csrf", type="hidden", value=csrfToken)
-									.form-group
-										label(for="content")
-										input.form-control(name="content", type="text", placeholder="Message...", required)
-									button.btn.btn-primary(type="submit") Post Message
-								hr
-								form(enctype='multipart/form-data', method='post', action='/admin/messages/clear')
-									input(name="_csrf", type="hidden", value=csrfToken)
-									button.btn.btn-danger(type="submit") Clear all messages
+
 
 
diff --git a/services/web/app/views/layout/navbar.jade b/services/web/app/views/layout/navbar.jade
index 89ff4e1dc2..a65fd72fc1 100644
--- a/services/web/app/views/layout/navbar.jade
+++ b/services/web/app/views/layout/navbar.jade
@@ -17,6 +17,8 @@ nav.navbar.navbar-default
 							| Admin
 							b.caret
 						ul.dropdown-menu
+							li
+								a(href="/admin") Manage Site
 							li
 								a(href="/admin/user") Manage Users