Skip to content

Commit b7f6308

Browse files
joewizjoewiz
committed
Restore packages.html’s path to resources
Previously the controller offered the same resource whether accessed at / or from /public. This commit approaches this problem by adding a 2nd template with the appropriate relative paths to the unique resources.
1 parent cfd94af commit b7f6308

File tree

3 files changed

+179
-10
lines changed

3 files changed

+179
-10
lines changed

‎packages.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<div data-template="templates:surround" data-template-with="templates/page.html" data-template-at="container-body">
2+
<div data-template="templates:surround" data-template-with="templates/page-inner.html" data-template-at="container-body">
33
<div class="row">
44
<div class="col-md-12">
55
<h1>Public Application Repository</h1>

‎templates/page-inner.html‎

Lines changed: 169 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,169 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<html>
3+
<head class="templates:expand-links">
4+
<title>eXist-db Public App Repository</title>
5+
<link rel="shortcut icon" href="$shared/resources/images/exist_icon_16x16.ico"/>
6+
<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
7+
<link rel="stylesheet" type="text/css" href="../resources/css/jquery.fileupload.css"/>
8+
<link rel="stylesheet" type="text/css" href="../resources/css/packageManager.css"/>
9+
<link rel="alternate" type="application/atom+xml" href="../feed.xml" title="eXist-db Public Package Repository"/>
10+
<script type="text/javascript" src="$shared/resources/scripts/jquery/jquery-1.7.1.min.js"/>
11+
<script type="text/javascript" src="$shared/resources/scripts/bootstrap-3.0.3.min.js"/>
12+
<script type="text/javascript" src="../resources/scripts/repo.js"/>
13+
</head>
14+
<body id="grey-top" data-template="site:expand-links" data-template-base="https://exist-db.org/">
15+
<div class="grey-bot">
16+
<div class="container" id="main-container">
17+
<div class="row">
18+
<div class="col-md-12" id="header">
19+
<a href="/" id="logo">eXistDB</a>
20+
</div>
21+
</div>
22+
<div class="row">
23+
<nav class="navbar navbar-default" role="navigation" data-template="site:expand-links">
24+
<button type="button" class="navbar-toggle" data-toggle="collapse" data-target="#navbar-collapse-1">
25+
<span class="sr-only">Toggle navigation</span>
26+
<span class="icon-bar"/>
27+
<span class="icon-bar"/>
28+
<span class="icon-bar"/>
29+
</button>
30+
<div class="navbar-collapse collapse" id="navbar-collapse-1">
31+
<ul class="nav navbar-nav">
32+
<li class="dropdown" id="about">
33+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Home</a>
34+
<ul class="dropdown-menu">
35+
<li>
36+
<a href="{dashboard}/index.html">Dashboard</a>
37+
</li>
38+
<li>
39+
<a href="https://exist-db.org">eXist-db.org</a>
40+
</li>
41+
</ul>
42+
</li>
43+
<li class="dropdown" id="demo">
44+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Demo</a>
45+
<ul class="dropdown-menu">
46+
<li>
47+
<a href="{demo}/index.html">Overview</a>
48+
</li>
49+
<li>
50+
<a href="{demo}/examples/basic/basics.html">Basic XQuery Examples</a>
51+
</li>
52+
<li>
53+
<a href="{demo}/examples/basic/xquery3.html">XQuery 3.0 Examples</a>
54+
</li>
55+
<li>
56+
<a href="{demo}/examples/web/index.html">Web Examples</a>
57+
</li>
58+
<li>
59+
<a href="{demo}/examples/urlrewriting/index.html">URL Rewriting</a>
60+
</li>
61+
<li>
62+
<a href="{demo}/examples/special/index.html">Special Features</a>
63+
</li>
64+
<li>
65+
<a href="{demo}/examples/templating/templates.html">Templating</a>
66+
</li>
67+
<li>
68+
<a href="{demo}/cex-demo.html">Content Extraction</a>
69+
</li>
70+
<li>
71+
<a href="{demo}/examples/tests/test.html">Unit Testing</a>
72+
</li>
73+
<li>
74+
<a href="{demo}/examples/xforms/">XForms and RestXQ</a>
75+
</li>
76+
<li>
77+
<a href="{demo}/examples/contacts/html/home.html?browseContacts">RestXQ and AngularJS</a>
78+
</li>
79+
</ul>
80+
</li>
81+
<li class="dropdown" id="documentation">
82+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Documentation</a>
83+
<ul class="dropdown-menu">
84+
<li>
85+
<a href="{doc}/documentation.xml">Documentation</a>
86+
</li>
87+
<li>
88+
<a href="{fundocs}/index.html">XQuery Functions</a>
89+
</li>
90+
<li>
91+
<a href="{doc}/getting-help.xml">Get Support</a>
92+
</li>
93+
<li>
94+
<a href="https://atomic.exist-db.org">News / Wiki</a>
95+
</li>
96+
<li>
97+
<a href="https://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
98+
</li>
99+
</ul>
100+
</li>
101+
<li class="dropdown" id="development">
102+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Development</a>
103+
<ul class="dropdown-menu">
104+
<li>
105+
<a href="{eXide}/index.html">eXide</a>
106+
</li>
107+
<li>
108+
<a href="https://exist-db.org/api/index.html">Javadocs</a>
109+
</li>
110+
<li>
111+
<a href="https://sourceforge.net/p/exist/bugs/">Bug Tracker</a>
112+
</li>
113+
<li>
114+
<a href="https://sourceforge.net/p/exist/code/">Subversion</a>
115+
</li>
116+
<li>
117+
<a href="https://sourceforge.net/p/exist/patches/">Submit Patches</a>
118+
</li>
119+
</ul>
120+
</li>
121+
<li class="dropdown" id="administration">
122+
<a href="#" class="dropdown-toggle" data-toggle="dropdown">Administration</a>
123+
<ul class="dropdown-menu">
124+
<li>
125+
<a href="{dashboard}/index.html">Dashboard</a>
126+
</li>
127+
<li>
128+
<a href="/webstart/exist.jnlp">Webstart Client</a>
129+
</li>
130+
<li>
131+
<a href="{monex}">Monitoring and Profiling</a>
132+
</li>
133+
</ul>
134+
</li>
135+
</ul>
136+
</div>
137+
</nav>
138+
</div>
139+
<div id="container-body" class="row">
140+
<div class="col-md-12" id="content"/>
141+
</div>
142+
</div>
143+
</div>
144+
<div id="footer">
145+
<div class="container">
146+
<ul>
147+
<li>
148+
<a href="https://exist-db.org">eXist-db.org</a>
149+
</li>
150+
<li>
151+
<a href="{doc}/documentation.xml">Documentation</a>
152+
</li>
153+
<li>
154+
<a href="{demo}/index.html">Demo</a>
155+
</li>
156+
<li class="hidden-xs-inline">
157+
<a href="/status">Status</a>
158+
</li>
159+
<li>
160+
<a href="{doc}/legal.xml">Legal</a>
161+
</li>
162+
</ul>
163+
<div id="copyright" class="hidden-xs">
164+
<p>Copyright eXist-db Project 2014</p>
165+
</div>
166+
</div>
167+
</div>
168+
</body>
169+
</html>

‎templates/page.html‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
<script type="text/javascript" src="$shared/resources/scripts/bootstrap-3.0.3.min.js"/>
1212
<script type="text/javascript" src="resources/scripts/repo.js"/>
1313
</head>
14-
<body id="grey-top" data-template="site:expand-links" data-template-base="http://exist-db.org/">
14+
<body id="grey-top" data-template="site:expand-links" data-template-base="https://exist-db.org/">
1515
<div class="grey-bot">
1616
<div class="container" id="main-container">
1717
<div class="row">
@@ -36,7 +36,7 @@
3636
<a href="{dashboard}/index.html">Dashboard</a>
3737
</li>
3838
<li>
39-
<a href="http://exist-db.org">eXist-db.org</a>
39+
<a href="https://exist-db.org">eXist-db.org</a>
4040
</li>
4141
</ul>
4242
</li>
@@ -91,10 +91,10 @@
9191
<a href="{doc}/getting-help.xml">Get Support</a>
9292
</li>
9393
<li>
94-
<a href="http://atomic.exist-db.org">News / Wiki</a>
94+
<a href="https://atomic.exist-db.org">News / Wiki</a>
9595
</li>
9696
<li>
97-
<a href="http://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
97+
<a href="https://en.wikibooks.org/wiki/XQuery">XQuery Wikibook</a>
9898
</li>
9999
</ul>
100100
</li>
@@ -105,16 +105,16 @@
105105
<a href="{eXide}/index.html">eXide</a>
106106
</li>
107107
<li>
108-
<a href="http://exist-db.org/api/index.html">Javadocs</a>
108+
<a href="https://exist-db.org/api/index.html">Javadocs</a>
109109
</li>
110110
<li>
111-
<a href="http://sourceforge.net/p/exist/bugs/">Bug Tracker</a>
111+
<a href="https://sourceforge.net/p/exist/bugs/">Bug Tracker</a>
112112
</li>
113113
<li>
114-
<a href="http://sourceforge.net/p/exist/code/">Subversion</a>
114+
<a href="https://sourceforge.net/p/exist/code/">Subversion</a>
115115
</li>
116116
<li>
117-
<a href="http://sourceforge.net/p/exist/patches/">Submit Patches</a>
117+
<a href="https://sourceforge.net/p/exist/patches/">Submit Patches</a>
118118
</li>
119119
</ul>
120120
</li>
@@ -145,7 +145,7 @@
145145
<div class="container">
146146
<ul>
147147
<li>
148-
<a href="http://exist-db.org">eXist-db.org</a>
148+
<a href="https://exist-db.org">eXist-db.org</a>
149149
</li>
150150
<li>
151151
<a href="{doc}/documentation.xml">Documentation</a>

0 commit comments

Comments
 (0)