From b1014d1b2bb2d17180bdd613b3873891f82b17f1 Mon Sep 17 00:00:00 2001
From: tworrall <tlw72@cornell.edu>
Date: Wed, 12 Jun 2013 10:31:00 -0400
Subject: [PATCH] vivo-66: add a link on menu ordering that returns the user to
 page management

---
 .../freemarker/body/individual/individual-menu.ftl          | 6 +++++-
 .../templates/freemarker/body/pagemanagement/pageList.ftl   | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
index 617ad600d..039e59d17 100644
--- a/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
+++ b/webapp/web/templates/freemarker/body/individual/individual-menu.ftl
@@ -31,6 +31,10 @@
             <input type="hidden" name="editForm" value="edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.ManagePageGenerator" role="input">
        		<input type="hidden" name="addMenuItem" value="true" />
        	<input id="submit" value="Add new menu page" role="button" type="submit" >
+       	<#if verbosePropertySwitch.url?contains("pageManagement")>
+       	    <span class="or"> ${i18n().or} </span>
+       	    <a  style="margin-left:7px" href="${urls.base}/pageList" title="Return to Profile Page">Return to Page Management</a>
+       	</#if>
         
         </form>
             <br />
@@ -60,4 +64,4 @@
     ${scripts.add('<script type="text/javascript" src="${urls.base}/js/individual/menuManagement.js"></script>')}
 <#else>
     <p id="error-alert">${i18n().display_has_element_error}</p>
-</#if>
\ No newline at end of file
+</#if>
diff --git a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
index 30959e9bd..72a8b52b9 100644
--- a/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
+++ b/webapp/web/templates/freemarker/body/pagemanagement/pageList.ftl
@@ -70,7 +70,7 @@
  	<input id="submit" value="${i18n().add_page}" role="button" type="submit" >
   </form>
   <br />
- <p style="margin-top:10px">${i18n().use_capitalized} <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true" title="">${i18n().menu_orering}</a> ${i18n().to_order_menu_items}</p>
+ <p style="margin-top:10px">${i18n().use_capitalized} <a id="menuMgmtLink" href="${urls.base}/individual?uri=http%3A%2F%2Fvitro.mannlib.cornell.edu%2Fontologies%2Fdisplay%2F1.1%23DefaultMenu&switchToDisplayModel=true&previous=pageManagement" title="">${i18n().menu_orering}</a> ${i18n().to_order_menu_items}</p>
 </section>
 
 <script>