From c0b7aaf6c2e28dba04a9de79d3be5e113e73e238 Mon Sep 17 00:00:00 2001
From: Mike McKay <mfmckay@wustl.edu>
Date: Tue, 31 May 2016 18:57:13 -0500
Subject: [PATCH] XNAT-4296 Made Administer menu ordering consistent.
---
src/main/webapp/WEB-INF/tags/page/includes/header.tag | 2 +-
src/main/webapp/WEB-INF/tags/page/xnat.tag | 2 +-
src/main/webapp/WEB-INF/tags/spawner/layout.tag | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/webapp/WEB-INF/tags/page/includes/header.tag b/src/main/webapp/WEB-INF/tags/page/includes/header.tag
index e9930dc9..c1548b9c 100644
--- a/src/main/webapp/WEB-INF/tags/page/includes/header.tag
+++ b/src/main/webapp/WEB-INF/tags/page/includes/header.tag
@@ -50,11 +50,11 @@
<li id="nav-admin" class="dropdown">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Admin <b class="caret"></b></a>
<ul class="dropdown-menu" role="menu">
+ <li><a href="#">Site Administration</a></li>
<li><a href="#">Users</a></li>
<li><a href="#">Data Types</a></li>
<li><a href="#">Pipelines</a></li>
<li><a href="#">Email</a></li>
- <li><a href="#">Configuration</a></li>
<li class="divider"></li>
<li><a href="#">More...</a></li>
</ul>
diff --git a/src/main/webapp/WEB-INF/tags/page/xnat.tag b/src/main/webapp/WEB-INF/tags/page/xnat.tag
index 79d5a1a7..6e244cb3 100644
--- a/src/main/webapp/WEB-INF/tags/page/xnat.tag
+++ b/src/main/webapp/WEB-INF/tags/page/xnat.tag
@@ -307,12 +307,12 @@ ${bodyTop}
<li class="more"><a href="#adminbox">Administer</a>
<ul>
<!-- Sequence: 10 -->
+ <li><a href="${SITE_ROOT}/page/admin/">Site Administration</a></li>
<li><a href="${SITE_ROOT}/app/template/XDATScreen_admin.vm">Users</a></li>
<li><a href="${SITE_ROOT}/app/template/XDATScreen_groups.vm">Groups</a></li>
<li><a href="${SITE_ROOT}/app/template/XDATScreen_dataTypes.vm">Data Types</a></li>
<li><a href="${SITE_ROOT}/app/template/XDATScreen_email.vm">Email</a></li>
<li><a href="${SITE_ROOT}/app/template/XDATScreen_manage_pipeline.vm">Pipelines</a></li>
- <li><a href="${SITE_ROOT}/page/admin/">Configuration</a></li>
<li><a href="${SITE_ROOT}/app/template/Scripts.vm">Automation</a></li>
<li><a href="${SITE_ROOT}/app/template/XDATScreen_admin_options.vm">More...</a></li>
</ul>
diff --git a/src/main/webapp/WEB-INF/tags/spawner/layout.tag b/src/main/webapp/WEB-INF/tags/spawner/layout.tag
index b7875977..ec8399e4 100644
--- a/src/main/webapp/WEB-INF/tags/spawner/layout.tag
+++ b/src/main/webapp/WEB-INF/tags/spawner/layout.tag
@@ -346,12 +346,12 @@
<li><a href="#adminbox">Administer</a>
<ul>
<!-- Sequence: 10 -->
+ <li><a href="/app/template/Configuration.vm">Site Administration</a></li>
<li><a href="/app/template/XDATScreen_admin.vm">Users</a></li>
<li><a href="/app/template/XDATScreen_groups.vm">Groups</a></li>
<li><a href="/app/template/XDATScreen_dataTypes.vm">Data Types</a></li>
<li><a href="/app/template/XDATScreen_email.vm">Email</a></li>
<li><a href="/app/template/XDATScreen_manage_pipeline.vm">Pipelines</a></li>
- <li><a href="/app/template/Configuration.vm">Configuration</a></li>
<li><a href="/app/template/Scripts.vm">Automation</a></li>
<li><a href="/app/template/XDATScreen_admin_options.vm">More...</a></li>
</ul>
--
GitLab