Skip to content

Commit 81bdeb0

Browse files
line-oline-o
authored
Merge pull request #56 from joewiz/new-templating
Switch to new templating library
2 parents aba5466 + dab28a1 commit 81bdeb0

File tree

4 files changed

+26
-24
lines changed

4 files changed

+26
-24
lines changed

‎expath-pkg.xml.tmpl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@
44
<dependency processor="http://exist-db.org" semver-min="5.0.0"/>
55
<dependency package="http://exist-db.org/xquery/semver-xq" semver-min="2.2.1"/>
66
<dependency package="http://exist-db.org/apps/shared" semver-min="0.9.1"/>
7+
<dependency package="http://exist-db.org/html-templating" semver-min="1.0.2"/>
78
</package>

‎modules/app.xqm‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ xquery version "3.1";
66

77
module namespace app="http://exist-db.org/xquery/app";
88

9-
import module namespace templates="http://exist-db.org/xquery/templates";
10-
119
import module namespace config="http://exist-db.org/xquery/apps/config" at "config.xqm";
1210
import module namespace scanrepo="http://exist-db.org/xquery/admin/scanrepo" at "scan.xqm";
1311
import module namespace versions="http://exist-db.org/apps/public-repo/versions" at "versions.xqm";
1412

13+
import module namespace templates="http://exist-db.org/xquery/html-templating";
14+
1515
declare namespace request="http://exist-db.org/xquery/request";
1616
declare namespace response="http://exist-db.org/xquery/response";
1717
declare namespace xmldb="http://exist-db.org/xquery/xmldb";
@@ -26,7 +26,7 @@ declare namespace xmldb="http://exist-db.org/xquery/xmldb";
2626
:)
2727
declare
2828
%templates:wrap
29-
function app:base-url ($node as node(), $model as map(*), $base-url as xs:string) as attribute(href) {
29+
function app:base-url($node as node(), $model as map(*), $base-url as xs:string) as attribute(href) {
3030
attribute href { $base-url || "/" }
3131
};
3232

‎modules/view.xq‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
xquery version "3.1";
22

3-
import module namespace templates="http://exist-db.org/xquery/templates";
4-
53
import module namespace app="http://exist-db.org/xquery/app" at "app.xqm";
64
import module namespace config="http://exist-db.org/xquery/apps/config" at "config.xqm";
75

6+
import module namespace templates="http://exist-db.org/xquery/html-templating";
7+
import module namespace lib="http://exist-db.org/xquery/html-templating/lib";
8+
89
declare namespace output="http://www.w3.org/2010/xslt-xquery-serialization";
910

1011
declare option output:method "html";

‎templates/page.html‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<html>
3-
<head class="templates:expand-links">
2+
<html data-template="lib:resolve-apps" data-template-abbrev="dashboard, eXide, fundocs, exist-documentation, demo, monex">
3+
<head>
44
<title>eXist-db Public App Repository</title>
55
<base data-template="app:base-url" />
6-
<link rel="shortcut icon" href="$shared/resources/images/exist_icon_16x16.ico"/>
7-
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
8-
<link rel="stylesheet" type="text/css" href="resources/css/jquery.fileupload.css"/>
9-
<link rel="stylesheet" type="text/css" href="resources/css/packageManager.css"/>
6+
<link rel="shortcut icon" href="$shared/resources/images/exist_icon_16x16.ico" />
7+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
8+
<link rel="stylesheet" type="text/css" href="resources/css/jquery.fileupload.css "/>
9+
<link rel="stylesheet" type="text/css" href="resources/css/packageManager.css" />
1010
<link rel="alternate" type="application/atom+xml" href="feed.xml" title="eXist-db Public Package Repository"/>
11-
<script type="text/javascript" src="$shared/resources/scripts/jquery/jquery-1.7.1.min.js"/>
12-
<script type="text/javascript" src="$shared/resources/scripts/bootstrap-3.0.3.min.js"/>
13-
<script type="text/javascript" src="resources/scripts/repo.js"/>
11+
<script type="text/javascript" src="$shared/resources/scripts/jquery/jquery-1.7.1.min.js"></script>
12+
<script type="text/javascript" src="$shared/resources/scripts/bootstrap-3.0.3.min.js"></script>
13+
<script type="text/javascript" src="resources/scripts/repo.js"></script>
1414
</head>
15-
<body id="grey-top" data-template="site:expand-links" data-template-base="https://exist-db.org/">
15+
<body id="grey-top" data-template="lib:parse-params" data-template-start="\{">
1616
<div class="grey-bot">
1717
<div class="container" id="main-container">
1818
<div class="row">
@@ -21,12 +21,12 @@
2121
</div>
2222
</div>
2323
<div class="row">
24-
<nav class="navbar navbar-default" role="navigation" data-template="site:expand-links">
24+
<nav class="navbar navbar-default" role="navigation">
2525
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
2626
<span class="sr-only">Toggle navigation</span>
27-
<span class="icon-bar"/>
28-
<span class="icon-bar"/>
29-
<span class="icon-bar"/>
27+
<span class="icon-bar"></span>
28+
<span class="icon-bar"></span>
29+
<span class="icon-bar"></span>
3030
</button>
3131
<div class="navbar-collapse collapse" id="navbar-collapse-1">
3232
<ul class="nav navbar-nav">
@@ -83,13 +83,13 @@
8383
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation</a>
8484
<ul class="dropdown-menu">
8585
<li>
86-
<a href="{doc}/documentation.xml">Documentation</a>
86+
<a href="{exist-documentation}/documentation.xml">Documentation</a>
8787
</li>
8888
<li>
8989
<a href="{fundocs}/index.html">XQuery Functions</a>
9090
</li>
9191
<li>
92-
<a href="{doc}/getting-help.xml">Get Support</a>
92+
<a href="{exist-documentation}/getting-help.xml">Get Support</a>
9393
</li>
9494
<li>
9595
<a href="https://atomic.exist-db.org">News / Wiki</a>
@@ -138,7 +138,7 @@
138138
</nav>
139139
</div>
140140
<div id="container-body" class="row">
141-
<div class="col-md-12" id="content"/>
141+
<div class="col-md-12" id="content"></div>
142142
</div>
143143
</div>
144144
</div>
@@ -149,7 +149,7 @@
149149
<a href="https://exist-db.org">eXist-db.org</a>
150150
</li>
151151
<li>
152-
<a href="{doc}/documentation.xml">Documentation</a>
152+
<a href="{exist-documentation}/documentation.xml">Documentation</a>
153153
</li>
154154
<li>
155155
<a href="{demo}/index.html">Demo</a>
@@ -158,7 +158,7 @@
158158
<a href="/status">Status</a>
159159
</li>
160160
<li>
161-
<a href="{doc}/legal.xml">Legal</a>
161+
<a href="{exist-documentation}/legal.xml">Legal</a>
162162
</li>
163163
</ul>
164164
<div id="copyright" class="hidden-xs">

0 commit comments

Comments
 (0)