diff options
Diffstat (limited to 'templates/web')
| -rw-r--r-- | templates/web/base/report/_inspect.html | 24 | ||||
| -rw-r--r-- | templates/web/base/report/_main.html | 8 |
2 files changed, 23 insertions, 9 deletions
diff --git a/templates/web/base/report/_inspect.html b/templates/web/base/report/_inspect.html index a4501aebd..1296a9243 100644 --- a/templates/web/base/report/_inspect.html +++ b/templates/web/base/report/_inspect.html @@ -20,10 +20,10 @@ <input type="hidden" name="latitude" value="[% problem.latitude %]"> </p> <p> - <a href="https://www.google.com/maps/dir/Current+Location/[% problem.latitude %],[% problem.longitude %]" class="btn btn-block btn--navigate">[% loc('Navigate to this problem') %]</a> + <a href="https://www.google.com/maps/dir/Current+Location/[% problem.latitude %],[% problem.longitude %]" class="btn btn--block btn--navigate">[% loc('Navigate to this problem') %]</a> </p> <p> - <a href="#" class="btn btn-block btn--geolocate" id="geolocate_link">[% loc('Set to my current location') %]</a> + <a href="#" class="btn btn--block btn--geolocate" id="geolocate_link">[% loc('Set to my current location') %]</a> </p> </div> @@ -97,8 +97,8 @@ <p> <input type="hidden" name="token" value="[% csrf_token %]"> - <a href="[% c.uri_for( '/report', problem.id ) %]" class="btn">[% loc('Cancel') %]</a> - <input type="submit" value="[% loc('Save changes') %]" name="save" /> + <a class="btn" href="[% c.uri_for( '/report', problem.id ) %]">[% loc('Cancel') %]</a> + <input class="btn" type="submit" value="[% loc('Save changes') %]" name="save" /> </p> </div> @@ -112,7 +112,7 @@ <textarea rows="2" name="public_update" id="public_update" class="form-control" required>[% public_update | html %]</textarea> </p> <p> - <input type="submit" value="[% loc('Save changes + send') %]" name="save_inspected" /> + <input class="btn" type="submit" value="[% loc('Save changes + send') %]" name="save_inspected" /> </p> [% ELSE %] <p> @@ -123,6 +123,20 @@ [% END %] </p> [% END %] + + [% IF problem.get_extra_metadata('inspected') %] + [% IF problem.whensent %] + <p>[% loc("<strong>Note:</strong> This report has been sent onwards for action. Any changes made won't be passed on.") %]</p> + [% ELSE %] + <p>[% loc("<strong>Note:</strong> This report hasn't yet been sent onwards for action. Any changes made may not be passed on.") %]</p> + [% END %] + [% END %] + + <p> + <input type="hidden" name="token" value="[% csrf_token %]"> + <a class="btn" href="[% c.uri_for( '/report', problem.id ) %]">[% loc('Cancel') %]</a> + <input class="btn btn-primary" type="submit" value="[% loc('Save changes') %]" name="save" /> + </p> </div> [% END %] diff --git a/templates/web/base/report/_main.html b/templates/web/base/report/_main.html index a85bca08f..049b24d7d 100644 --- a/templates/web/base/report/_main.html +++ b/templates/web/base/report/_main.html @@ -126,10 +126,10 @@ %] <div class="moderate-display segmented-control" role="menu"> [% IF permissions.moderate %] - <a id="moderate-report" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> + <a class="btn" id="moderate-report" role="menuitem" aria-label="[% loc('Moderate this report') %]">[% loc('Moderate') %]</a> [% END %] [% IF !hide_inspect_button AND permissions.keys.grep('report_inspect|report_edit_category|report_edit_priority').size %] - <a href="/report/[% problem.id %]/inspect" role="menuitem"> + <a class="btn" href="/report/[% problem.id %]/inspect" role="menuitem"> [%~ IF permissions.report_inspect ~%] [%~ loc('Inspect') ~%] [%~ ELSE ~%] @@ -139,9 +139,9 @@ [% END %] [% IF c.user.has_permission_to('planned_reports', problem.bodies_str_ids) %] [%~ IF c.user.is_planned_report(problem) ~%] - <label for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label> + <label class="btn" for="shortlist-report" role="menuitem" aria-label="[% loc('Remove from shortlist') %]">[% loc('Shortlisted') %]</label> [%~ ELSE ~%] - <label for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label> + <label class="btn" for="shortlist-report" role="menuitem" aria-label="[% loc('Add to shortlist') %]">[% loc('Shortlist') %]</label> [%~ END ~%] [% END %] </div> |