Skip to content

Switch to the new templating module #41

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
line-o merged 8 commits into from
Jun 7, 2021
Merged

Switch to the new templating module #41

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b6fb8db
Allow development on 5.3.0-SNAPSHOT
joewiz Jun 4, 2021
000e1f4
Move dependency versions into pom.xml
joewiz Jun 4, 2021
e4e009a
Add dependency on templating v1.0.0
joewiz Jun 4, 2021
f078872
Switch module imports to new templating library
joewiz Jun 4, 2021
65f05d6
Remove call to templates:load-source
joewiz Jun 4, 2021
033ee4c
Replace deprecated site:expand-links with lib:resolve-apps and lib:pa…
wolfgangmm Jun 5, 2021
29ecca5
Requires templating 1.0.1
wolfgangmm Jun 5, 2021
102b746
[performance] Require templating v1.0.2
joewiz Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :-/ -->
Expand Down
3 changes: 0 additions & 3 deletions src/main/xar-resources/error-page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
3 changes: 2 additions & 1 deletion src/main/xar-resources/modules/app.xql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 :=
Expand Down
2 changes: 1 addition & 1 deletion src/main/xar-resources/modules/config.xqm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
4 changes: 3 additions & 1 deletion src/main/xar-resources/modules/view.xql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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";

Expand Down
4 changes: 2 additions & 2 deletions src/main/xar-resources/templates/page.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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">
Expand Down
5 changes: 3 additions & 2 deletions xar-assembly.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down