diff options
| -rwxr-xr-x | perllib/FixMyStreet/App/Controller/FakeMapit.pm | 10 | ||||
| -rw-r--r-- | templates/web/fixmybarangay/around/tabbed_lists.html | 14 | ||||
| -rwxr-xr-x | templates/web/fixmystreet/around/display_location.html | 18 | ||||
| -rw-r--r-- | templates/web/fixmystreet/around/tabbed_lists.html | 14 | ||||
| -rw-r--r-- | templates/web/fixmystreet/report/display.html | 2 |
5 files changed, 36 insertions, 22 deletions
diff --git a/perllib/FixMyStreet/App/Controller/FakeMapit.pm b/perllib/FixMyStreet/App/Controller/FakeMapit.pm index 57c2e7c27..bc46df712 100755 --- a/perllib/FixMyStreet/App/Controller/FakeMapit.pm +++ b/perllib/FixMyStreet/App/Controller/FakeMapit.pm @@ -12,13 +12,13 @@ FixMyStreet::App::Controller::FakeMapit - Catalyst Controller A controller to fake mapit when we don't have it. If you set MAPIT_URL to .../fakemapit/ it should all just work, with a mapit that assumes the whole -world is one area, with ID 0 and name "Default Area". +world is one area, with ID 161 and name "Default Area". =head1 METHODS =cut -my $area = { "name" => "Default Area", "type" => "ZZZ", "id" => 0 }; +my $area = { "name" => "Default Area", "type" => "ZZZ", "id" => 161 }; sub output : Private { my ( $self, $c, $data ) = @_; @@ -29,7 +29,7 @@ sub output : Private { sub point : Local { my ( $self, $c ) = @_; - $c->detach( 'output', [ { 0 => $area } ] ); + $c->detach( 'output', [ { 161 => $area } ] ); } sub area : Local { @@ -39,10 +39,10 @@ sub area : Local { sub areas : Local { my ( $self, $c ) = @_; - $c->detach( 'output', [ { 0 => $area } ] ); + $c->detach( 'output', [ { 161 => $area } ] ); } -sub children : Path('area/0/children') : Args(0) { +sub children : Path('area/161/children') : Args(0) { my ( $self, $c ) = @_; $c->detach( 'output', [ {} ] ); } diff --git a/templates/web/fixmybarangay/around/tabbed_lists.html b/templates/web/fixmybarangay/around/tabbed_lists.html new file mode 100644 index 000000000..c35f5a7a0 --- /dev/null +++ b/templates/web/fixmybarangay/around/tabbed_lists.html @@ -0,0 +1,14 @@ +<menu id="problems-nav" class="tab-nav"> + <ul> + <li><a href="#current">Problems on the map</a></li> + <li><a href="#message_manager">Problems via text</a></li> + </ul> +</menu> + +<ul id="current" class="issue-list-a tab"> + [% INCLUDE "around/on_map_list_items.html" %] +</ul> + +<ul id="message_manager" class="issue-list-a tab"> + <li><p>Message Manager texts listed here</p></li> +</ul> diff --git a/templates/web/fixmystreet/around/display_location.html b/templates/web/fixmystreet/around/display_location.html index 08dd36574..6a5b0e2d2 100755 --- a/templates/web/fixmystreet/around/display_location.html +++ b/templates/web/fixmystreet/around/display_location.html @@ -35,7 +35,7 @@ bodyclass => 'mappage', robots => 'noindex,nofollow'; - allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.belongs_to_council); + allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council); %] [% IF allow_creation %] @@ -93,21 +93,7 @@ </div> <section class="full-width"> - [%# TODO For Cebu, factor this bit out to a new template, for message manager tab %] - <menu id="problems-nav" class="tab-nav"> - <ul> - <li><a href="#current">[% loc('Problems on the map') %]</a></li> - <li><a href="#current_near">[% loc( 'Problems nearby' ) %]</a></li> - </ul> - </menu> - - <ul id="current" class="issue-list-a tab"> - [% INCLUDE "around/on_map_list_items.html" %] - </ul> - - <ul id="current_near" class="issue-list-a tab"> - [% INCLUDE "around/around_map_list_items.html" %] - </ul> + [% INCLUDE "around/tabbed_lists.html" %] </section> </div> diff --git a/templates/web/fixmystreet/around/tabbed_lists.html b/templates/web/fixmystreet/around/tabbed_lists.html new file mode 100644 index 000000000..77c5a521b --- /dev/null +++ b/templates/web/fixmystreet/around/tabbed_lists.html @@ -0,0 +1,14 @@ +<menu id="problems-nav" class="tab-nav"> + <ul> + <li><a href="#current">[% loc('Problems on the map') %]</a></li> + <li><a href="#current_near">[% loc( 'Problems nearby' ) %]</a></li> + </ul> +</menu> + +<ul id="current" class="issue-list-a tab"> + [% INCLUDE "around/on_map_list_items.html" %] +</ul> + +<ul id="current_near" class="issue-list-a tab"> + [% INCLUDE "around/around_map_list_items.html" %] +</ul> diff --git a/templates/web/fixmystreet/report/display.html b/templates/web/fixmystreet/report/display.html index d1ff2d4dc..784c92a48 100644 --- a/templates/web/fixmystreet/report/display.html +++ b/templates/web/fixmystreet/report/display.html @@ -8,7 +8,7 @@ robots = 'index, nofollow' bodyclass = 'mappage' - allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.belongs_to_council); + allow_creation = !c.cobrand.only_authed_can_create || (c.user && c.user.from_council); %] [% map_html %] |