From 2ad4c5eba017bca7ef8970aa8e31c4cba6127079 Mon Sep 17 00:00:00 2001 From: j <0x006A@0x2620.org> Date: Mon, 13 Sep 2010 17:45:06 +0200 Subject: [PATCH] move site into pandora.json --- pandora/templates/index.html | 1 - pandora/templates/pandora.json | 3 +++ pandora/templates/site.js | 9 --------- 3 files changed, 3 insertions(+), 10 deletions(-) delete mode 100644 pandora/templates/site.js diff --git a/pandora/templates/index.html b/pandora/templates/index.html index d491379d4..8dcb64bea 100644 --- a/pandora/templates/index.html +++ b/pandora/templates/index.html @@ -10,7 +10,6 @@ - diff --git a/pandora/templates/pandora.json b/pandora/templates/pandora.json index 7c400e805..dfadac5cf 100644 --- a/pandora/templates/pandora.json +++ b/pandora/templates/pandora.json @@ -1,4 +1,7 @@ { + "name": "{{settings.SITENAME}}", + "id": "{{settings.SITEID}}", + "url": "{{settings.URL}}", "findKeys": [ {"id": "all", "title": "All"}, {"id": "title", "title": "Title", "autocomplete": true}, diff --git a/pandora/templates/site.js b/pandora/templates/site.js deleted file mode 100644 index 37575bcaf..000000000 --- a/pandora/templates/site.js +++ /dev/null @@ -1,9 +0,0 @@ -var site = {}; -site.url = "{{settings.URL}}"; -site.name = "{{settings.SITENAME}}"; -site.id = "{{settings.SITEID}}"; - -site.pages = {}; -{% for page in pages %} -site.pages['{{page.name}}'] = '{{page.body|escapejs}}'; -{% endfor %}