diff options
| -rw-r--r-- | templates/web/default/admin/body_edit.html | 19 | ||||
| -rw-r--r-- | templates/web/zurich/admin/body.html | 2 | ||||
| -rw-r--r-- | web/js/map-wmts-zurich.js | 6 |
3 files changed, 18 insertions, 9 deletions
diff --git a/templates/web/default/admin/body_edit.html b/templates/web/default/admin/body_edit.html index 1fde716c9..1eeff9ab5 100644 --- a/templates/web/default/admin/body_edit.html +++ b/templates/web/default/admin/body_edit.html @@ -27,12 +27,19 @@ <input type="text" name="email" value="[% contact.email | html %]" size="30"> <p> - <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> - <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> - <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> - <label class="inline" for="deleted">[% loc('Deleted') %]</label> - <input type="checkbox" name="non_public" value="1" id="non_public"[% ' checked' IF contact.non_public %]> - <label class="inline" for="non_public">[% loc('Private') %]</label> + [% IF c.cobrand.moniker != 'zurich' %] + <input type="checkbox" name="confirmed" value="1" id="confirmed"[% ' checked' IF contact.confirmed %]> + <label class="inline" for="confirmed">[% loc('Confirmed' ) %]</label> + [% ELSE %] + <input type="hidden" name="confirmed" value="1"> + [% END %] + <input type="checkbox" name="deleted" value="1" id="deleted"[% ' checked' IF contact.deleted %]> + <label class="inline" for="deleted">[% loc('Deleted') %]</label> + [% IF c.cobrand.moniker != 'zurich' %] + <input type="checkbox" name="non_public" value="1" id="non_public"[% ' checked' IF contact.non_public %]> + <label class="inline" for="non_public">[% loc('Private') %]</label> + [% END %] + </p> <p><strong>[% loc('Note:') %] </strong><textarea name="note" rows="3" cols="40">[% contact.note | html %]</textarea> diff --git a/templates/web/zurich/admin/body.html b/templates/web/zurich/admin/body.html index dd1b0b844..764ad9bd8 100644 --- a/templates/web/zurich/admin/body.html +++ b/templates/web/zurich/admin/body.html @@ -7,7 +7,7 @@ </p> [% END %] -[% IF admin_type == 'super' AND body.parent AND body.bodies # A division %] +[% IF admin_type == 'super' AND body.parent AND NOT body.parent.parent # A division %] <table cellspacing="0" cellpadding="2" border="1"> <tr> <th>[% loc('Category') %]</th> diff --git a/web/js/map-wmts-zurich.js b/web/js/map-wmts-zurich.js index f7e1fbf05..f296a12d9 100644 --- a/web/js/map-wmts-zurich.js +++ b/web/js/map-wmts-zurich.js @@ -28,9 +28,11 @@ $(function(){ fixmystreet.controls = [ new OpenLayers.Control.Attribution(), new OpenLayers.Control.ArgParser(), - fixmystreet.nav_control, - new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) + fixmystreet.nav_control ]; + if ( fixmystreet.page != 'report' || !$('html').hasClass('mobile') ) { + fixmystreet.controls.push( new OpenLayers.Control.PanZoomFMS({id: 'fms_pan_zoom' }) ); + } fixmystreet.map_type = OpenLayers.Layer.WMTS; |