Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
great progress on making pages agnostic about vhosts
  • Loading branch information
jchris committed Aug 13, 2010
1 parent a55524e commit 4ab3c51
Show file tree
Hide file tree
Showing 11 changed files with 25 additions and 25 deletions.
10 changes: 5 additions & 5 deletions _attachments/script/myloader.js
Expand Up @@ -10,9 +10,9 @@ couchapp_load([
"/_utils/script/json2.js",
"/_utils/script/jquery.js",
"/_utils/script/jquery.couch.js",
"/vendor/couchapp/jquery.couch.app.js",
"/vendor/couchapp/jquery.couch.app.util.js",
"/vendor/couchapp/jquery.mustache.js",
"/vendor/couchapp/jquery.pathbinder.js",
"/vendor/couchapp/jquery.evently.js"
"../vendor/couchapp/jquery.couch.app.js",
"../vendor/couchapp/jquery.couch.app.util.js",
"../vendor/couchapp/jquery.mustache.js",
"../vendor/couchapp/jquery.pathbinder.js",
"../vendor/couchapp/jquery.evently.js"
]);
6 changes: 3 additions & 3 deletions evently/profile/loggedOut/all.html
@@ -1,5 +1,5 @@
<p class="menu">
<a href="/page/index">Home</a>
<a href="/pages/recent">Changes</a>
<a href="/pages/comments">Comments</a>
<a href="../page/index">Home</a>
<a href="../pages/recent">Changes</a>
<a href="../pages/comments">Comments</a>
</p>
6 changes: 3 additions & 3 deletions evently/profile/loggedOut/mustache.html
@@ -1,5 +1,5 @@
<p class="menu">
<a href="/page/index">Home</a>
<a href="/pages/recent">Changes</a>
<a href="/pages/comments">Comments</a>
<a href="../page/index">Home</a>
<a href="../pages/recent">Changes</a>
<a href="../pages/comments">Comments</a>
</p>
6 changes: 3 additions & 3 deletions evently/profile/profileReady/all.html
Expand Up @@ -2,8 +2,8 @@
{{#gravatar_url}}<img src="{{gravatar_url}}"/>{{/gravatar_url}}
</div>
<p class="menu">
<a href="/page/index">Home</a>
<a href="/pages/recent">Changes</a>
<a href="/pages/comments">Comments</a>
<a href="../page/index">Home</a>
<a href="../pages/recent">Changes</a>
<a href="../pages/comments">Comments</a>
</p>
<div style="clear:left;"></div>
6 changes: 3 additions & 3 deletions evently/profile/profileReady/mustache.html
Expand Up @@ -5,8 +5,8 @@
<a href="#/edit">Edit</a>
<a href="#/history">History</a>
<a href="#/upload">Upload File</a>
<a href="/page/index">Home</a>
<a href="/pages/recent">Changes</a>
<a href="/pages/comments">Comments</a>
<a href="../page/index">Home</a>
<a href="../pages/recent">Changes</a>
<a href="../pages/comments">Comments</a>
</p>
<div style="clear:left;"></div>
1 change: 0 additions & 1 deletion lists/pages.js
Expand Up @@ -10,7 +10,6 @@ function() {
};
provides("html", function() {
while (row = getRow()) {
log(row)
data.pages.push({
title : row.value.title,
id : row.id,
Expand Down
2 changes: 1 addition & 1 deletion shows/page.js
Expand Up @@ -5,7 +5,7 @@ function(doc, req) {
data = {
docid : JSON.stringify(req.id),
id : req.id,
path : "/page/"+req.id,
path : "../page/"+req.id,
site_title : this.couchapp.name
};
if (doc) {
Expand Down
1 change: 1 addition & 0 deletions shows/redirect.js
@@ -1,4 +1,5 @@
function() {
var redirect = require("vendor/couchapp/lib/redirect");
// todo make this work in both modes
return redirect.permanent("/page/index");
}
2 changes: 1 addition & 1 deletion templates/page.html
Expand Up @@ -13,7 +13,7 @@
</div>
{{/has_atts}}
</body>
<script src="/script/myloader.js"></script>
<script src="../script/myloader.js"></script>
<script src="/_utils/script/base64.js"></script>
<script src="/_utils/script/jquery.form.js"></script>
<script type="text/javascript" charset="utf-8">
Expand Down
4 changes: 2 additions & 2 deletions templates/pages.html
@@ -1,11 +1,11 @@
{{>header}}
<ul>
{{#pages}}
<li><a href="/page/{{id}}">{{title}}</a> by {{by}} <span class="date">{{at}}</span></li>
<li><a href="../page/{{id}}">{{title}}</a> by {{by}} <span class="date">{{at}}</span></li>
{{/pages}}
</ul>
</body>
<script src="/script/myloader.js"></script>
<script src="../script/myloader.js"></script>
<script src="/_utils/script/base64.js"></script>
<script type="text/javascript" charset="utf-8">
$.couch.app(function(app) {
Expand Down
6 changes: 3 additions & 3 deletions templates/partials/header.html
Expand Up @@ -2,12 +2,12 @@
<html>
<head>
<title>{{title}} - {{site_title}}</title>
<link rel="stylesheet" href="/style/base-min.css" type="text/css">
<link rel="stylesheet" href="/style/main.css" type="text/css">
<link rel="stylesheet" href="../style/base-min.css" type="text/css">
<link rel="stylesheet" href="../style/main.css" type="text/css">
</head>
<body>
<div id="header">
<div id="account"></div>
<h1><strong><a href="/page/index">{{site_title}}</a>:</strong> <a href="{{path}}">{{title}}</a></h1>
<h1><strong><a href="../page/index">{{site_title}}</a>:</strong> <a href="{{path}}">{{title}}</a></h1>
</div>
<div id="profile"></div>

0 comments on commit 4ab3c51

Please sign in to comment.