Working on model switching. Change editRequestDispatch to stop it from always forwarding if there was a display model edit parameter. Chagned URLs for menu edit controllers. Added non-page data getters. Added SPARQL data getter.

webapp/web/WEB-INF/web.xml

@@ -215,7 +215,7 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>MenuManagementController</servlet-name>
-    <url-pattern>/editDisplayModel</url-pattern>
+    <url-pattern>/menuManagementController</url-pattern>
   </servlet-mapping>
 
   <servlet>
@@ -224,7 +224,7 @@
   </servlet>
   <servlet-mapping>
     <servlet-name>MenuManagementEdit</servlet-name>
-    <url-pattern>/processEditDisplayModel</url-pattern>
+    <url-pattern>/menuManagementEdit</url-pattern>
   </servlet-mapping>
 
   <servlet>

webapp/web/templates/freemarker/body/displayEdit/displayConfig.ftl

@@ -0,0 +1,22 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<div>
+    <h2>Display Admin and configuration</h2>
+    
+    <#if errorMessage??>
+        <div id="errorAlert">
+            <img src="../images/iconAlert.png" alert="Error alert icon" height="31" width="32">
+            <p>${errorMessage}</p>
+        </div>
+    </#if>
+    
+    <#if message??>
+        <p>${message}</p>
+    </#if>
+    
+    
+    <ul>
+    <li> Some link to a display config and amdin page </li>
+    </ul>
+    
+</div>

webapp/web/templates/freemarker/body/individual/individual-menu.ftl

@@ -6,6 +6,8 @@
 
 <#assign hasElement = propertyGroups.pullProperty("${namespaces.display}hasElement")!>
 
+<#assign addNewMenuItemUrl = "${urls.base}/menuManagementController?cmd=add" >
+
 <#if hasElement?has_content>
     <script type="text/javascript">
         var menuItemData = [];
@@ -22,9 +24,8 @@
     
     <#-- Link to add a new menu item -->
     <#if editable>
-        <#assign addUrl = hasElement.addUrl>
-        <#if addUrl?has_content>
-            <p><a class="add-hasElement green button" href="${addUrl}" title="Add new menu item">Add menu item</a></p>
+        <#if addNewMenuItemUrl?has_content>
+            <p><a class="add-hasElement green button" href="${addNewMenuItemUrl}" title="Add new menu item">Add menu item</a></p>
             
             <p class="note">Refresh page after reordering menu items</p>
         </#if>

webapp/web/templates/freemarker/body/menupage/emptyPage.ftl

@@ -0,0 +1,6 @@
+<div>
+<p>This page is not yet configured.</p> 
+
+<p>Implement a <a href="${urls.base}/display?uri=${page.pageUri?url}&switchToDisplayModel=1">link</a> to configure this page if the user has permission.</p>
+
+</div> 

webapp/web/templates/freemarker/body/menupage/page-classgroup.ftl

@@ -0,0 +1,17 @@
+<#-- $This file is distributed under the terms of the license in /doc/license.txt$ -->
+
+<#include "menupage-checkForData.ftl">
+
+<#if !noData>
+    <section id="menupage-intro" role="region">
+        <h2>${page.title}</h2>
+    </section>
+    
+    <#include "menupage-browse.ftl">
+    
+    ${stylesheets.add('<link rel="stylesheet" href="${urls.base}/css/menupage/menupage.css" />')}
+    
+    <#include "menupage-scripts.ftl">
+<#else>
+    ${noDataNotification}
+</#if>

webapp/web/templates/freemarker/body/partials/individual/propStatement-hasElement.ftl

@@ -6,7 +6,7 @@
      is also used to generate the property statement during a deletion.  
  -->
 
-${statement.linkText}
+${statement.linkText} (Add URLs to Menu Controllers here?)
 
 <script type="text/javascript">
     menuItemData.push({