aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Somerville <matthew@mysociety.org>2015-02-25 13:33:45 +0000
committerMatthew Somerville <matthew@mysociety.org>2015-02-25 14:53:11 +0000
commit74714d5fc74f850f5939a8cd5fd7a9797c6445d5 (patch)
tree0d9124a26b173dd6a0104e769d08648a04b2320e
parentb9e69350b32925f1e2e6197c899c354dfa39a9d5 (diff)
Add links from admin config page to MapIt.
Fixes #1022. And include new SECURE_PROXY_SSL_HEADER variable.
-rw-r--r--templates/web/base/admin/config_page.html15
1 files changed, 13 insertions, 2 deletions
diff --git a/templates/web/base/admin/config_page.html b/templates/web/base/admin/config_page.html
index 211d41f31..7c9b5e317 100644
--- a/templates/web/base/admin/config_page.html
+++ b/templates/web/base/admin/config_page.html
@@ -37,6 +37,7 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
[% INCLUDE subsection heading="URLs" %]
[% INCLUDE with_cobrand value="BASE_URL" cob=c.cobrand.base_url %]
[% INCLUDE with_cobrand value="ADMIN_BASE_URL" cob=c.cobrand.admin_base_url %]
+[% INCLUDE just_value value="SECURE_PROXY_SSL_HEADER" %]
[% INCLUDE subsection heading="Display" %]
<tr>
@@ -84,10 +85,20 @@ running version <strong>[% git_version || 'unknown' %]</strong>.
cob = discob %]
[% INCLUDE subsection heading="MapIt" %]
-[% INCLUDE just_value value="MAPIT_URL" %]
+[% INCLUDE just_value value="MAPIT_URL"
+ conf = "<a href='" _ c.config.MAPIT_URL _ "'>" _ c.config.MAPIT_URL _ "</a>" %]
[% INCLUDE with_cobrand value="MAPIT_TYPES"
cob = c.cobrand.area_types %]
-[% INCLUDE just_value value="MAPIT_ID_WHITELIST" %]
+<tr>
+ <td>MAPIT_ID_WHITELIST</td>
+ <td colspan=2>
+ [% FOR id IN c.config.MAPIT_ID_WHITELIST %]
+ <a href="[% c.config.MAPIT_URL %][%
+ '/' UNLESS c.config.MAPIT_URL.search('/$')
+ %]area/[% id %].html">[% id %]</a>[% ',' UNLESS loop.last %]
+ [% END %]
+ </td>
+</tr>
[% INCLUDE just_value value="MAPIT_GENERATION" %]
[% INCLUDE with_cobrand value="MAPIT_TYPES_CHILDREN"
cob = c.cobrand.area_types_children %]