diff options
-rw-r--r-- | t/app/controller/admin.t | 12 | ||||
-rw-r--r-- | templates/web/default/admin/body.html | 2 | ||||
-rw-r--r-- | templates/web/default/admin/list_updates.html | 2 | ||||
-rw-r--r-- | templates/web/default/admin/problem_row.html | 2 | ||||
-rw-r--r-- | templates/web/default/admin/report_edit.html | 2 | ||||
-rw-r--r-- | templates/web/default/admin/timeline.html | 6 | ||||
-rw-r--r-- | templates/web/default/admin/update_edit.html | 2 | ||||
-rw-r--r-- | web/cobrands/sass/_layout.scss | 4 | ||||
-rw-r--r-- | web/i/external-link.png (renamed from web/cobrands/fixmystreet/images/external-link.png) | bin | 192 -> 192 bytes |
9 files changed, 16 insertions, 16 deletions
diff --git a/t/app/controller/admin.t b/t/app/controller/admin.t index a48e2e919..4970821a8 100644 --- a/t/app/controller/admin.t +++ b/t/app/controller/admin.t @@ -1040,19 +1040,19 @@ subtest 'report search' => sub { $mech->content_contains( $report->title ); my $r_id = $report->id; - $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} ); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} ); $mech->get_ok('/admin/reports?search=' . $report->external_id); - $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} ); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} ); $mech->get_ok('/admin/reports?search=ref:' . $report->external_id); - $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} ); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} ); $mech->get_ok('/admin/reports?search=' . $report->user->email); my $u_id = $update->id; - $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} ); - $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id#update_$u_id">$u_id</a>} ); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} ); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id#update_$u_id"[^>]*>$u_id</a>} ); $update->state('hidden'); $update->update; @@ -1070,7 +1070,7 @@ subtest 'report search' => sub { $report->update; $mech->get_ok('/admin/reports?search=' . $report->user->email); - $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id">$r_id</a>} ); + $mech->content_like( qr{href="http://[^/]*[^.]/report/$r_id"[^>]*>$r_id</a>} ); }; subtest 'search abuse' => sub { diff --git a/templates/web/default/admin/body.html b/templates/web/default/admin/body.html index 58780a66f..b207d18ca 100644 --- a/templates/web/default/admin/body.html +++ b/templates/web/default/admin/body.html @@ -11,7 +11,7 @@ <a href="[% c.uri_for_email( '/around', { pc => example_pc } ) %]" class="admin-offsite-link">[% tprintf( loc('Example postcode %s'), example_pc ) | html %]</a> | [% END %] [% IF c.cobrand.moniker == 'emptyhomes' %] - <a href="[% c.uri_for( 'reports', search => 'body:' _ body_id ) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | + <a href="[% c.uri_for( 'reports', search => 'body:' _ body_id ) %]">[% loc('List all reported problems' ) %]</a> | [% ELSE %] <a href="[% c.uri_for_email( '/reports/' _ body_id ) %]" class="admin-offsite-link">[% loc('List all reported problems' ) %]</a> | [% END %] diff --git a/templates/web/default/admin/list_updates.html b/templates/web/default/admin/list_updates.html index dbf679702..c0d609540 100644 --- a/templates/web/default/admin/list_updates.html +++ b/templates/web/default/admin/list_updates.html @@ -26,7 +26,7 @@ uri = c.uri_for_email( '/report', update.problem.id ); END; %] - <a href="[% uri %]#update_[% update.id %]">[% update.id %]</a> + <a href="[% uri %]#update_[% update.id %]" class="admin-offsite-link">[% update.id %]</a> [%- ELSE %] [%- update.id %] [%- END -%]</td> diff --git a/templates/web/default/admin/problem_row.html b/templates/web/default/admin/problem_row.html index 6dc4de188..2413a6062 100644 --- a/templates/web/default/admin/problem_row.html +++ b/templates/web/default/admin/problem_row.html @@ -9,7 +9,7 @@ uri = c.uri_for_email( '/report', problem.id ); END; %] - <a href="[% uri %]">[% problem.id %]</a> + <a href="[% uri %]" class="admin-offsite-link">[% problem.id %]</a> [%- ELSE %] [%- problem.id %] [%- END -%]</td> diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html index f3307658d..db9ca7317 100644 --- a/templates/web/default/admin/report_edit.html +++ b/templates/web/default/admin/report_edit.html @@ -15,7 +15,7 @@ uri = c.uri_for_email( '/report', problem.id ); END; %] -<li><a href="[% uri %]">[% loc('View report on site' )%]</a></li> +<li><a href="[% uri %]" class="admin-offsite-link">[% loc('View report on site' )%]</a></li> <li><label for='title'>[% loc('Subject:') %]</label> <input size=60 type='text' id='title' name='title' value='[% problem.title | html %]'></li> <li><label for='detail'>[% loc('Details:') %]</label> <textarea name='detail' id='detail' cols=60 rows=10>[% problem.detail | html %]</textarea></li> diff --git a/templates/web/default/admin/timeline.html b/templates/web/default/admin/timeline.html index 2e4c3b771..6bf350a58 100644 --- a/templates/web/default/admin/timeline.html +++ b/templates/web/default/admin/timeline.html @@ -21,16 +21,16 @@ [% CASE 'problemCreated' %] [%- tprintf(loc('Problem %d created'), item.obj.id) %]; [% PROCESS problem_name problem=item.obj -%] [% CASE 'problemConfirmed' %] - [%- tprintf( loc('Problem %s confirmed'), '<a href="' _ c.uri_for_email( '/report', item.obj.id ) _ '">' _ item.obj.id _ '</a>') %]; [% PROCESS problem_name problem=item.obj -%] + [%- tprintf( loc('Problem %s confirmed'), '<a href="' _ c.uri_for_email( '/report', item.obj.id ) _ '" class="admin-offsite-link">' _ item.obj.id _ '</a>') %]; [% PROCESS problem_name problem=item.obj -%] [% CASE 'problemSent' %] - [% tprintf(loc("Problem %s sent to council %s"), '<a href="' _ c.uri_for_email( '/report', item.obj.id ) _ '">' _ item.obj.id _ '</a>', item.obj.bodies_str ) %] + [% tprintf(loc("Problem %s sent to council %s"), '<a href="' _ c.uri_for_email( '/report', item.obj.id ) _ '" class="admin-offsite-link">' _ item.obj.id _ '</a>', item.obj.bodies_str ) %] [% CASE 'quesSent' %] [% tprintf(loc("Questionnaire %d sent for problem %d"), item.obj.id, item.obj.problem_id ) %] [% CASE 'quesAnswered' %] [% tprintf(loc("Questionnaire %d answered for problem %d, %s to %s"), item.obj.id, item.obj.problem_id, item.obj.old_state, item.obj.new_state ) %] [% CASE 'update' %] [% name = ( item.obj.name || 'anonymous' ) | html %] - [% tprintf(loc("Update %s created for problem %d; by %s"), "<a href='" _ c.uri_for_email( '/report', item.obj.problem_id ) _ "#update_" _ item.obj.id _ "'>" _ item.obj.id _ "</a>", item.obj.problem_id, name) %] <[% item.obj.user.email | html %]> + [% tprintf(loc("Update %s created for problem %d; by %s"), "<a href='" _ c.uri_for_email( '/report', item.obj.problem_id ) _ "#update_" _ item.obj.id _ "' class='admin-offsite-link'>" _ item.obj.id _ "</a>", item.obj.problem_id, name) %] <[% item.obj.user.email | html %]> [% CASE 'alertSub' %] [% tprintf(loc("Alert %d created for %s, type %s, parameters %s / %s"), item.obj.id, item.obj.user.email, item.obj.alert_type.ref, item.obj.parameter, item.obj.parameter2) | html %] [% CASE 'alertDel' %] diff --git a/templates/web/default/admin/update_edit.html b/templates/web/default/admin/update_edit.html index f2029c63f..0f69a78fa 100644 --- a/templates/web/default/admin/update_edit.html +++ b/templates/web/default/admin/update_edit.html @@ -15,7 +15,7 @@ uri = c.uri_for_email( '/report', update.problem_id ); END; %] -<li><a href="[% uri %]#update_[% update.id %]">[% loc('View report on site' )%]</a></li> +<li><a href="[% uri %]#update_[% update.id %]" class="admin-offsite-link">[% loc('View report on site' )%]</a></li> <li><label for='detail'>[% loc('Text:') %]</label> <textarea name='text' id='text' cols=60 rows=10>[% update.text | html %]</textarea></li> diff --git a/web/cobrands/sass/_layout.scss b/web/cobrands/sass/_layout.scss index 80fec955f..9ebe149cc 100644 --- a/web/cobrands/sass/_layout.scss +++ b/web/cobrands/sass/_layout.scss @@ -1119,8 +1119,8 @@ $button_bg_col: #a1a1a1; // also search bar (tables) } } .admin-offsite-link { - padding-right:12px; - background-image:url(/cobrands/fixmystreet/images/external-link.png); + padding-right: 12px; + background-image: url(../../i/external-link.png); background-position: right top; background-repeat: no-repeat; } diff --git a/web/cobrands/fixmystreet/images/external-link.png b/web/i/external-link.png Binary files differindex 8e8ba74bf..8e8ba74bf 100644 --- a/web/cobrands/fixmystreet/images/external-link.png +++ b/web/i/external-link.png |