diff options
| author | Louise Crow <louise@mysociety.org> | 2010-02-08 09:55:58 +0000 |
|---|---|---|
| committer | Louise Crow <louise@mysociety.org> | 2010-02-08 09:55:58 +0000 |
| commit | 4ecad0916cd6e973f4b6a1d59b3e3a479411da55 (patch) | |
| tree | e8363e99e534889d300d6b6e7e4efcf6931cbbc1 | |
| parent | a0907db5ab6abe16505fa40d0796c0bc415d1d42 (diff) | |
| parent | fdf6e233229728ee89c08c20e0b7b65ab7a5dc7c (diff) | |
Merge branch 'cities_release_1'
| -rw-r--r-- | perllib/Cobrand.pm | 2 | ||||
| -rw-r--r-- | perllib/Page.pm | 4 | ||||
| -rwxr-xr-x | web/index.cgi | 3 |
3 files changed, 6 insertions, 3 deletions
diff --git a/perllib/Cobrand.pm b/perllib/Cobrand.pm index 4433858bb..3fc88d9dc 100644 --- a/perllib/Cobrand.pm +++ b/perllib/Cobrand.pm @@ -90,6 +90,8 @@ my %fns = ( 'root_path_js' => { default => "'var root_path = \"\";'" }, # Return the title to be used in page heads. 'site_title' => { default => "''" }, + # Return the license information + 'license_info' => { default => 'undef' }, # Return the maximum number of items to be given in the list of reports on the map 'on_map_list_limit' => { default => 'undef' }, # Return a boolean indicating whether the cobrand allows photo uploads diff --git a/perllib/Page.pm b/perllib/Page.pm index 7272b2a70..e569bd6d5 100644 --- a/perllib/Page.pm +++ b/perllib/Page.pm @@ -478,9 +478,11 @@ EOF } $out .= compass($q, $x, $y); my $copyright = _('Crown copyright. All rights reserved. Ministry of Justice'); + my $license_info = Cobrand::license_info($cobrand); + $license_info = "100037819 2008" unless $license_info; $out .= <<EOF; </div> - <p id="copyright">© $copyright 100037819 2008</p> + <p id="copyright">© $copyright $license_info</p> $params{post} EOF $out .= '</div>'; diff --git a/web/index.cgi b/web/index.cgi index d8b22f881..d4141c1f5 100755 --- a/web/index.cgi +++ b/web/index.cgi @@ -832,7 +832,7 @@ sub display_location { $all_link = NewURL($q, -retain=>1, no_pins=>undef, all_pins=>1); $all_text = _('Include stale reports'); $interval = '6 months'; - } + } my ($pins, $on_map, $around_map, $dist) = Page::map_pins($q, $x, $y, $x, $y, $interval); if ($input{no_pins}) { $hide_link = NewURL($q, -retain=>1, no_pins=>undef); @@ -843,7 +843,6 @@ sub display_location { $hide_text = _('Hide pins'); } my $map_links = "<p id='sub_map_links'><a id='hide_pins_link' href='$hide_link'>$hide_text</a> | <a id='all_pins_link' href='$all_link'>$all_text</a></p> <input type='hidden' id='all_pins' name='all_pins' value='$input_h{all_pins}'>"; - my $on_list = ''; foreach (@$on_map) { my $report_url = NewURL($q, -retain => 1, -url => '/report/' . $_->{id}, pc => undef, x => undef, 'y' => undef); |