diff options
| -rw-r--r-- | perllib/FixMyStreet/App/Controller/Auth.pm | 2 | ||||
| -rw-r--r-- | templates/web/base/auth/general.html | 2 | ||||
| -rw-r--r-- | templates/web/borsetshire/around/postcode_form.html | 26 | ||||
| -rw-r--r-- | templates/web/borsetshire/auth/_general_top.html | 27 | ||||
| -rw-r--r-- | templates/web/borsetshire/footer_extra_js.html | 5 | ||||
| -rw-r--r-- | web/cobrands/borsetshire/google_maps_style.js | 1 | ||||
| -rw-r--r-- | web/cobrands/borsetshire/js.js | 9 |
7 files changed, 71 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Auth.pm b/perllib/FixMyStreet/App/Controller/Auth.pm index 4efa7abb8..83fb0554c 100644 --- a/perllib/FixMyStreet/App/Controller/Auth.pm +++ b/perllib/FixMyStreet/App/Controller/Auth.pm @@ -33,7 +33,7 @@ sub general : Path : Args(0) { my ( $self, $c ) = @_; $c->detach( 'redirect_on_signin', [ $c->get_param('r') ] ) - if $c->user && $c->get_param('r'); + if $c->req->method eq 'GET' && $c->user && $c->get_param('r'); # all done unless we have a form posted to us return unless $c->req->method eq 'POST'; diff --git a/templates/web/base/auth/general.html b/templates/web/base/auth/general.html index 41ff3a2e1..2a8bea402 100644 --- a/templates/web/base/auth/general.html +++ b/templates/web/base/auth/general.html @@ -2,6 +2,8 @@ <h1>[% loc('Sign in') %]</h1> +[% TRY %][% INCLUDE 'auth/_general_top.html' %][% CATCH file %][% END %] + [% IF oauth_need_email %] <p class="form-error">[% loc('We need your email address, please give it below.') %]</p> [% END %] diff --git a/templates/web/borsetshire/around/postcode_form.html b/templates/web/borsetshire/around/postcode_form.html new file mode 100644 index 000000000..bb4accf26 --- /dev/null +++ b/templates/web/borsetshire/around/postcode_form.html @@ -0,0 +1,26 @@ +<div id="front-main"> + <div id="front-main-container"> + [% INCLUDE 'around/intro.html' %] + + [% + question = c.cobrand.enter_postcode_text || loc('Enter a nearby street name and area'); + %] + + <form action="[% c.uri_for('/around') %]" method="get" name="postcodeForm" id="postcodeForm"> + <label for="pc">[% question %]:</label> + <div> + <input type="hidden" name="pc" value="[% c.cobrand.problems.first.postcode | html %]"> + <input type="text" name="_pc" value="[% pc | html %]" id="pc" size="10" maxlength="200" placeholder="[% tprintf(loc('e.g. ‘%s’ or ‘%s’'), c.cobrand.example_places) %]"> + <input type="submit" value="[% loc('Go') %]" id="sub"> + </div> + + [% IF partial_token %] + <input type="hidden" name="partial" value="[% partial_token.token %]"> + [% END %] + + [% IF c.user_exists AND c.user.categories.size %] + <input type="hidden" name="filter_category" value="[% c.user.categories.join(",") | html %]"> + [% END %] + </form> + </div> +</div> diff --git a/templates/web/borsetshire/auth/_general_top.html b/templates/web/borsetshire/auth/_general_top.html new file mode 100644 index 000000000..efff99018 --- /dev/null +++ b/templates/web/borsetshire/auth/_general_top.html @@ -0,0 +1,27 @@ +<p>The following users exist, all with password <kbd>password</kbd>:</p> +<style> +#demo-user-list dt { + padding: 0 0.5em; +} +#demo-user-list dd { + color: #666; + font-size: 87.5%; + padding: 0 0.5em; +} +.js #demo-user-list dt:hover { + background-color: #faebac; + cursor: pointer; +} +</style> + +<dl id='demo-user-list'> + <dt>inspector@example.org</dt> + <dd>an inspector, who can shortlist and inspect reports.</dd> + <dt>cs@example.org</dt> + <dd>a customer service rep, who can create reports as the council or another user, and moderate reports.</dd> + <dt>super@example.org</dt> + <dd>a council super user, who can do all the above, plus also edit users, templates, priorities, and more.</dd> + <dt>user@example.org</dt> + <dd>a normal user, who has created the example reports on the site.</dd> +</dl> + diff --git a/templates/web/borsetshire/footer_extra_js.html b/templates/web/borsetshire/footer_extra_js.html new file mode 100644 index 000000000..3e443af71 --- /dev/null +++ b/templates/web/borsetshire/footer_extra_js.html @@ -0,0 +1,5 @@ +[% scripts.push( + version('/cobrands/fixmystreet-uk-councils/js.js'), + version('/cobrands/borsetshire/google_maps_style.js'), + version('/cobrands/borsetshire/js.js'), +) %] diff --git a/web/cobrands/borsetshire/google_maps_style.js b/web/cobrands/borsetshire/google_maps_style.js new file mode 100644 index 000000000..b443109c5 --- /dev/null +++ b/web/cobrands/borsetshire/google_maps_style.js @@ -0,0 +1 @@ +var fixmystreet_google_maps_custom_style=[{"featureType":"all","elementType":"labels.text.fill","stylers":[{"color":"#000000"}]},{"featureType":"all","elementType":"labels.text.stroke","stylers":[{"visibility":"on"},{"color":"#ffffff"},{"weight":"4"}]},{"featureType":"all","elementType":"labels.icon","stylers":[{"visibility":"on"},{"saturation":"-100"}]},{"featureType":"administrative","elementType":"geometry.fill","stylers":[{"color":"#ffffff"},{"lightness":20},{"visibility":"on"}]},{"featureType":"administrative","elementType":"geometry.stroke","stylers":[{"color":"#000000"},{"lightness":17},{"weight":1.2}]},{"featureType":"administrative.locality","elementType":"all","stylers":[{"visibility":"on"}]},{"featureType":"administrative.neighborhood","elementType":"all","stylers":[{"visibility":"on"}]},{"featureType":"administrative.land_parcel","elementType":"all","stylers":[{"visibility":"on"},{"lightness":"80"}]},{"featureType":"landscape","elementType":"all","stylers":[{"visibility":"simplified"}]},{"featureType":"landscape","elementType":"geometry","stylers":[{"lightness":20},{"color":"#ffffff"}]},{"featureType":"landscape.natural.landcover","elementType":"all","stylers":[{"visibility":"on"}]},{"featureType":"landscape.natural.terrain","elementType":"all","stylers":[{"visibility":"off"}]},{"featureType":"poi","elementType":"geometry","stylers":[{"color":"#d7e8a8"},{"lightness":21},{"visibility":"on"}]},{"featureType":"poi.park","elementType":"geometry.fill","stylers":[{"color":"#d7e8a8"}]},{"featureType":"poi.sports_complex","elementType":"geometry.fill","stylers":[{"color":"#d7e8a8"}]},{"featureType":"road.highway","elementType":"geometry.fill","stylers":[{"color":"#fed41c"},{"visibility":"on"},{"weight":"3.00"}]},{"featureType":"road.highway","elementType":"geometry.stroke","stylers":[{"color":"#fed41c"},{"gamma":"0.6"}]},{"featureType":"road.highway.controlled_access","elementType":"geometry","stylers":[{"visibility":"on"},{"color":"#fed41c"},{"weight":"4.00"}]},{"featureType":"road.highway.controlled_access","elementType":"geometry.stroke","stylers":[{"weight":"1"},{"gamma":"0.6"}]},{"featureType":"road.arterial","elementType":"geometry","stylers":[{"color":"#aeaeae"},{"lightness":18},{"visibility":"on"}]},{"featureType":"road.arterial","elementType":"geometry.stroke","stylers":[{"color":"#b6b6b6"}]},{"featureType":"road.local","elementType":"all","stylers":[{"visibility":"on"},{"color":"#656565"}]},{"featureType":"road.local","elementType":"geometry","stylers":[{"color":"#c6c6c6"},{"lightness":16}]},{"featureType":"road.local","elementType":"geometry.stroke","stylers":[{"color":"#b1b1b1"},{"visibility":"on"}]},{"featureType":"road.local","elementType":"labels.text.stroke","stylers":[{"visibility":"on"},{"color":"#ffffff"}]},{"featureType":"transit","elementType":"geometry","stylers":[{"color":"#bdbdbd"},{"lightness":19},{"visibility":"on"}]},{"featureType":"transit.station.airport","elementType":"geometry.fill","stylers":[{"color":"#dddddd"}]},{"featureType":"water","elementType":"geometry","stylers":[{"color":"#95d4ff"},{"lightness":17},{"visibility":"on"}]}]; diff --git a/web/cobrands/borsetshire/js.js b/web/cobrands/borsetshire/js.js new file mode 100644 index 000000000..b612c3a8b --- /dev/null +++ b/web/cobrands/borsetshire/js.js @@ -0,0 +1,9 @@ +(function(){ + $('#demo-user-list dt').click(function(){ + var form = document.forms.general_auth; + form.email.value = $(this).text(); + form.password_sign_in.value = 'password'; + form.r.value = 'admin'; + form.submit(); + }); +})(); |