Merge pull request #41 from joewiz/new-templating

line-o · web-flow · commit fbc2a9438a9c · 2021-06-07T16:18:42.000+02:00
Switch to the new templating module
diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,10 @@
         <project.build.source>1.8</project.build.source>
         <project.build.target>1.8</project.build.target>
 
-        <exist.version>5.3.0</exist.version>
+        <exist.version>5.3.0-SNAPSHOT</exist.version>
+        <markdown.version>0.6</markdown.version>
+        <shared-resources.version>0.9.1</shared-resources.version>
+        <templating.version>1.0.2</templating.version>
 
         <package-name>http://exist-db.org/apps/fundocs</package-name>
 	    <package-abbrev>fundocs</package-abbrev>  <!-- override the default which is artifactId :-/ -->
diff --git a/src/main/xar-resources/error-page.html b/src/main/xar-resources/error-page.html
@@ -3,7 +3,4 @@
     <h1>An error has occurred</h1>
     <p>An error has been generated by the application.</p>
     <pre class="error templates:error-description"/>
-    <div class="source-links">
-        <p>View source: <a href="login.html" class="templates:load-source">this page</a>.</p>
-    </div>
 </div>
diff --git a/src/main/xar-resources/modules/app.xql b/src/main/xar-resources/modules/app.xql
@@ -4,9 +4,10 @@ module namespace app="http://exist-db.org/xquery/app";
 
 declare namespace xqdoc="http://www.xqdoc.org/1.0";
 
-import module namespace templates="http://exist-db.org/xquery/templates";
 import module namespace config="http://exist-db.org/xquery/apps/config" at "config.xqm";
 
+import module namespace templates="http://exist-db.org/xquery/html-templating";
+
 declare variable $app:MD_MODULE_URI := "http://exist-db.org/xquery/markdown";
 
 declare variable $app:MD_HAS_MODULE :=
diff --git a/src/main/xar-resources/modules/config.xqm b/src/main/xar-resources/modules/config.xqm
@@ -6,7 +6,7 @@ xquery version "3.0";
  :)
 module namespace config="http://exist-db.org/xquery/apps/config";
 
-import module namespace templates="http://exist-db.org/xquery/templates";
+import module namespace templates="http://exist-db.org/xquery/html-templating";
 
 declare namespace repo="http://exist-db.org/xquery/repo";
 declare namespace expath="http://expath.org/ns/pkg";
diff --git a/src/main/xar-resources/modules/view.xql b/src/main/xar-resources/modules/view.xql
@@ -1,9 +1,11 @@
 xquery version "3.0";
 
-import module namespace templates="http://exist-db.org/xquery/templates";
 import module namespace app="http://exist-db.org/xquery/app" at "app.xql";
 import module namespace config="http://exist-db.org/xquery/apps/config" at "config.xqm";
+
 import module namespace site="http://exist-db.org/apps/site-utils";
+import module namespace templates="http://exist-db.org/xquery/html-templating";
+import module namespace lib="http://exist-db.org/xquery/html-templating/lib";
 
 declare option exist:serialize "method=html5 media-type=text/html";
 
diff --git a/src/main/xar-resources/templates/page.html b/src/main/xar-resources/templates/page.html
@@ -1,12 +1,12 @@
-<html>
+<html data-template="lib:resolve-apps" data-template-abbrev="dashboard, eXide, fundocs, exist-documentation, demo">
     <head>
         <title data-template="config:app-title">App Title</title>
         <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
         <meta data-template="config:app-meta"/>
         <link rel="shortcut icon" href="$shared/resources/images/exist_icon_16x16.ico"/>
         <link rel="stylesheet" type="text/css" href="resources/css/fundocs.css"/>
     </head>
-    <body id="grey-top" class="site:expand-links?base=http://exist-db.org/">
+    <body id="grey-top" data-template="lib:parse-params" data-template-start="\{">
         <div class="grey-bot">
             <div class="container" id="main-container">
                 <div class="row">
diff --git a/xar-assembly.xml b/xar-assembly.xml
@@ -14,8 +14,9 @@
   <category id="apps">Applications</category>
   <category id="doc">Documentation</category>
   <dependency processor="http://exist-db.org" semver-min="${exist.version}"/>
-  <dependency package="http://exist-db.org/apps/shared" semver-min="0.4.0"/>
-  <dependency package="http://exist-db.org/apps/markdown" semver-min="0.5"/>
+  <dependency package="http://exist-db.org/apps/shared" semver-min="${shared-resources.version}"/>
+  <dependency package="http://exist-db.org/apps/markdown" semver-min="${markdown.version}"/>
+  <dependency package="http://exist-db.org/html-templating" semver-min="${templating.version}"/>
   <prepare>pre-install.xql</prepare>
   <changelog>
     <change version="1.1.2">
