From e959ffb6059e3548bba0e7264f6742c38aafd737 Mon Sep 17 00:00:00 2001
From: briancaruso <briancaruso@43c2fc9b-1942-4403-87b2-35b4218f7473>
Date: Wed, 29 Feb 2012 19:53:57 +0000
Subject: [PATCH] Adding entry to robots.txt, adding pageList to menu.n3

---
 productMods/WEB-INF/ontologies/app/menu.n3 | 35 ++++++++++++++++++----
 productMods/robots.txt                     |  3 +-
 themes/wilma/templates/identity.ftl        |  5 ++++
 3 files changed, 36 insertions(+), 7 deletions(-)

diff --git a/productMods/WEB-INF/ontologies/app/menu.n3 b/productMods/WEB-INF/ontologies/app/menu.n3
index 8acc8a52..c9d9c0d7 100644
--- a/productMods/WEB-INF/ontologies/app/menu.n3
+++ b/productMods/WEB-INF/ontologies/app/menu.n3
@@ -50,11 +50,8 @@ display:EventsMenuItem
     a display:NavigationElement ;
     display:menuPosition 5;
     display:linkText "Events";
-    display:toPage display:Events .
-
-########## Pages ############
-#Instead of type, now using dataGetter which uses an object that specifies information for data getter
-
+    display:toPage display:Events .        
+    
 display:Home 
     a display:HomePage ;    
     a display:Page ;
@@ -95,6 +92,8 @@ display:Research
     display:urlMapping "/research" ;
     display:hasDataGetter display:researchDataGetter .
 
+
+    
 #The data getter objects used above
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#peopleDataGetter>
       a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.ClassGroupPageData>;
@@ -117,4 +116,28 @@ display:Research
               <http://vivoweb.org/ontology#vitroClassGroupevents> .
               
 <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#homeDataGetter>
-      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.BrowseDataGetter> .
\ No newline at end of file
+      a <java:edu.cornell.mannlib.vitro.webapp.utils.pageDataGetter.BrowseDataGetter> .
+      
+      
+## display model pages ###
+
+display:pageListPage
+    a display:Page ;              
+    display:title "Pages" ;
+    display:urlMapping "/pageList" ;
+    display:requiresBodyTemplate "page-pageList.ftl" ;   
+    display:hasDataGetter display:pageListData .
+
+display:pageListData
+    a <java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>;
+    display:queryModel <vitro:contextDisplayModel> ;                        
+    display:saveToVar "pages" ;
+     
+    display:query """
+    PREFIX display: <http://vitro.mannlib.cornell.edu/ontologies/display/1.1#> 
+    SELECT ?pageUri ?title ?urlMapping      
+    WHERE { 
+        ?pageUri a display:Page .
+        OPTIONAL{ ?pageUri display:urlMapping ?urlMapping }
+        OPTIONAL{ ?pageUri display:title  ?title }  
+     } """ .                    
\ No newline at end of file
diff --git a/productMods/robots.txt b/productMods/robots.txt
index c7a52f8f..1acf58e1 100644
--- a/productMods/robots.txt
+++ b/productMods/robots.txt
@@ -22,4 +22,5 @@ Disallow: /visualizationfm/
 Disallow: /visualization/
 Disallow: /vis/
 Disallow: /visualizationAjax/
-Disallow: /visualizationData/
\ No newline at end of file
+Disallow: /visualizationData/
+Disallow: /qrcode
diff --git a/themes/wilma/templates/identity.ftl b/themes/wilma/templates/identity.ftl
index 6a35a520..3fc7332a 100644
--- a/themes/wilma/templates/identity.ftl
+++ b/themes/wilma/templates/identity.ftl
@@ -11,6 +11,9 @@
         <ul id="header-nav" role="list">
             <li role="listitem"><a href="${urls.index}" title="index">Index</a></li>
             <#if user.loggedIn>
+                <#if (page??) && (page.URLToEditPage??) >
+                   <li role="listitem"><a href="${page.URLToEditPage}" title="edit page">Edit Page</a></li>
+                </#if>
                 <#if user.hasSiteAdminAccess>
                     <li role="listitem"><a href="${urls.siteAdmin}" title="site admin">Site Admin</a></li>
                 </#if>
@@ -29,6 +32,8 @@
                             </li>
                          </ul>
                      </li>
+                     
+
                 
                 ${scripts.add('<script type="text/javascript" src="${urls.base}/js/userMenu/userMenuUtils.js"></script>')}