Converted admin to use a menu file rather than links directly in the …

…template. Closes #14.
kcl-ddh · May 8, 2017 · a810f7d · a810f7d
1 parent cb3c346
commit a810f7d
Show file tree

Hide file tree

Showing 9 changed files with 60 additions and 33 deletions.
diff --git a/webapps/ROOT/assets/menu/admin.xml b/webapps/ROOT/assets/menu/admin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<?oxygen RNGSchema="../schema/menu/menu.rng" type="xml"?>
+<root xmlns="http://www.kcl.ac.uk/artshums/depts/ddh/kiln/ns/1.0">
+  <menu label="Components">
+    <menu label="Cocoon system status" match="local-admin-system-status" />
+    <menu label="Solr">
+      <item href="/solr/" label="Admin" />
+      <item label="Index all documents" match="local-solr-index-all" />
+    </menu>
+    <menu label="Sesame">
+      <item href="/openrdf-workbench" label="Admin" />
+      <item label="Harvest all documents" match="local-rdf-havest-all-display" />
+    </menu>
+  </menu>
+  <menu label="Introspection" match="local-admin-introspection-index" />
+  <menu href="http://kiln.readthedocs.org/en/latest/" label="Documentation" />
+</root>
diff --git a/webapps/ROOT/assets/templates/admin/base.xml b/webapps/ROOT/assets/templates/admin/base.xml
@@ -5,6 +5,11 @@
   <!-- Imports the default variables. -->
   <xsl:import href="cocoon://_internal/template/xsl/stylesheets/defaults.xsl" />
 
+  <!-- Imports the menu stylesheet -->
+  <xsl:import href="cocoon://_internal/template/xsl/stylesheets/menu/menu.xsl" />
+
+  <xsl:import href="cocoon://_internal/url/reverse.xsl" />
+
   <kiln:block name="html">
     <html class="no-js">
       <kiln:block name="head">
@@ -32,39 +37,19 @@
             <nav class="top-bar">
               <ul class="title-area">
                 <li class="name">
-                  <h1><a href="{$kiln:mount-path}/admin/">Kiln Admin</a></h1>
+                  <h1><a href="{kiln:url-for-match('local-admin-home-page', (), 0)}">Kiln Admin</a></h1>
                 </li>
                 <li class="toggle-topbar menu-icon">
                   <a href="#"><span>Menu</span></a>
                 </li>
               </ul>
               <section class="top-bar-section">
                 <ul class="left">
-                  <li class="has-dropdown">
-                    <a href="#">Components</a>
-                    <ul class="dropdown">
-                      <li><a href="{$kiln:mount-path}/admin/system-status.html">Cocoon system status</a></li>
-                      <li class="has-dropdown">
-                        <a href="#">Solr</a>
-                        <ul class="dropdown">
-                          <li><a href="/solr/">Admin</a></li>
-                          <li><a href="{$kiln:mount-path}/admin/solr/index/all.html">Index all documents</a></li>
-                        </ul>
-                      </li>
-                      <li class="has-dropdown">
-                        <a href="#">Sesame</a>
-                        <ul class="dropdown">
-                          <li><a href="/openrdf-workbench/">Admin</a></li>
-                          <li><a href="{$kiln:mount-path}/admin/rdf/harvest/all.html">Harvest all documents</a></li>
-                        </ul>
-                      </li>
-                    </ul>
-                  </li>
-                  <li><a href="{$kiln:mount-path}/admin/introspection/">Introspection</a></li>
-                  <li><a href="http://kiln.readthedocs.org/en/latest/">Documentation</a></li>
+                  <xsl:apply-templates mode="main-menu"
+                                       select="/aggregation/kiln:nav" />
                 </ul>
                 <ul class="right">
-                  <li><a href="{$kiln:mount-path}/">Site Home</a></li>
+                  <li><a href="{kiln:url-for-match('local-home-page', (), 0)}">Site Home</a></li>
                 </ul>
               </section>
             </nav>

diff --git a/webapps/ROOT/assets/templates/admin/system-status.xml b/webapps/ROOT/assets/templates/admin/system-status.xml
@@ -16,7 +16,7 @@
     <kiln:block name="content">
       <div class="row">
         <div class="large-12 columns">
-          <xsl:apply-templates select="/status:statusinfo" />
+          <xsl:apply-templates select="/aggregation/status:statusinfo" />
         </div>
       </div>
     </kiln:block>

diff --git a/webapps/ROOT/kiln/sitemaps/main.xmap b/webapps/ROOT/kiln/sitemaps/main.xmap
@@ -134,6 +134,12 @@
         <map:generate type="request" />
         <map:serialize type="xml" />
       </map:match>
+
+      <!-- System status. -->
+      <map:match pattern="_internal/system-status.xml">
+        <map:generate type="status" />
+        <map:serialize type="xml" />
+      </map:match>
     </map:pipeline>
 
     <!-- Mount sub-sitemaps. -->

diff --git a/webapps/ROOT/sitemaps/admin.xmap b/webapps/ROOT/sitemaps/admin.xmap
@@ -28,14 +28,18 @@
       <map:match id="local-admin-home-page" pattern="">
         <map:aggregate element="aggregation">
           <map:part src="cocoon://_internal/dirlist/content/xml.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/index.xsl" />
         <map:serialize />
       </map:match>
 
       <!-- Show Cocoon's system status. -->
       <map:match id="local-admin-system-status" pattern="system-status.html">
-        <map:generate type="status" />
+        <map:aggregate element="aggregation">
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/system-status.html" />
+          <map:part src="cocoon://_internal/system-status.xml" />
+        </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/system-status.xsl" />
         <map:serialize />
       </map:match>
@@ -45,6 +49,7 @@
         <map:aggregate element="aggregation">
           <map:part src="cocoon://_internal/introspection/pipelines.xml" />
           <map:part src="cocoon://_internal/dirlist/assets/templates.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/introspection/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/introspection.xsl" />
         <map:serialize />
@@ -55,6 +60,7 @@
                  pattern="introspection/match/*.html">
         <map:aggregate element="aggregation">
           <map:part src="cocoon://_internal/introspection/match/{1}.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/introspection/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/introspection-match.xsl" />
         <map:serialize />
@@ -89,7 +95,10 @@
            URL. -->
       <map:match id="local-admin-introspection-match-url"
                  pattern="introspection/url/">
-        <map:generate type="request" />
+        <map:aggregate element="aggregation">
+          <map:part src="cocoon://_internal/request.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/introspection/" />
+        </map:aggregate>
         <map:transform src="../stylesheets/introspection/url-request-to-xinclude.xsl" />
         <map:transform type="xinclude" />
         <map:transform src="cocoon://_internal/template/admin/introspection-url-match.xsl" />
@@ -115,6 +124,7 @@
                assets/schema/tei/tei_all_doc.xml. #ALL means that all
                phases specified in the schema are used. -->
           <map:part src="cocoon://_internal/schematron/validate/#tei_all_doc/#ALL/{1}.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/schematron/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/schematron.xsl">
           <map:parameter name="file" value="{1}.xml" />
@@ -130,6 +140,7 @@
                  pattern="resource-check/images/**.html">
         <map:aggregate element="aggregation">
           <map:part src="cocoon:/resource-check/images/{1}.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/resource-check/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/resource_check.xsl">
           <map:parameter name="file" value="{1}.xml" />

diff --git a/webapps/ROOT/sitemaps/config.xmap b/webapps/ROOT/sitemaps/config.xmap
@@ -48,9 +48,9 @@
              the URL as per RFC 2396; eg,
              http://username:password@domain.name/ -->
         <fedora-url></fedora-url>
-        <rdf-base-uri></rdf-base-uri>
+        <rdf-base-uri>http://localhost/rdf/</rdf-base-uri>
         <sesame-server>http://localhost:9999/openrdf-sesame/</sesame-server>
-        <sesame-server-repository></sesame-server-repository>
+        <sesame-server-repository>foo</sesame-server-repository>
         <solr-server>http://localhost:9999/solr/</solr-server>
       </global-variables>
     </map:component-configurations>

diff --git a/webapps/ROOT/sitemaps/rdf.xmap b/webapps/ROOT/sitemaps/rdf.xmap
@@ -15,6 +15,7 @@
       <map:match id="local-rdf-harvest-all-display" pattern="harvest/all.html">
         <map:aggregate element="aggregation">
           <map:part src="cocoon:/harvest/all.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/rdf/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/rdf-harvest-all.xsl" />
         <map:serialize />
@@ -33,6 +34,7 @@
       <map:match id="local-rdf-harvest-display" pattern="harvest/**.html">
         <map:aggregate element="aggregation">
           <map:part src="cocoon:/harvest/{1}.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/rdf/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/rdf-harvest.xsl">
           <map:parameter name="file" value="{1}.xml" />

diff --git a/webapps/ROOT/sitemaps/solr.xmap b/webapps/ROOT/sitemaps/solr.xmap
@@ -30,6 +30,7 @@
           <map:part element="insert" src="cocoon:/add/" />
           <map:part element="optimize"
                     src="cocoon://_internal/solr/optimize" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/solr/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/solr-index-all.xsl" />
         <map:serialize />
@@ -39,6 +40,7 @@
       <map:match id="local-solr-index" pattern="index/*/**.html">
         <map:aggregate element="aggregation">
           <map:part src="cocoon://_internal/solr/index/{1}/{2}.xml" />
+          <map:part src="cocoon://_internal/menu/admin.xml?url=admin/solr/" />
         </map:aggregate>
         <map:transform src="cocoon://_internal/template/admin/solr-index.xsl">
           <map:parameter name="file" value="{2}.xml" />

diff --git a/webapps/ROOT/stylesheets/introspection/url-request-to-xinclude.xsl b/webapps/ROOT/stylesheets/introspection/url-request-to-xinclude.xsl
@@ -8,10 +8,8 @@
   <xsl:import href="../defaults.xsl" />
   <xsl:include href="cocoon://_internal/url/reverse.xsl" />
 
-  <xsl:template match="/">
-    <aggregation>
-      <xsl:apply-templates select="//request:parameter[@name='url']" />
-    </aggregation>
+  <xsl:template match="request:request">
+    <xsl:apply-templates select="request:requestParameters/request:parameter[@name='url']" />
   </xsl:template>
 
   <xsl:template match="request:parameter">
@@ -35,4 +33,10 @@
                       (substring-after($value, '/')), 1)}" />
   </xsl:template>
 
+  <xsl:template match="@*|node()">
+    <xsl:copy>
+      <xsl:apply-templates select="@*|node()" />
+    </xsl:copy>
+  </xsl:template>
+
 </xsl:stylesheet>