diff options
Diffstat (limited to 'app')
34 files changed, 128 insertions, 32 deletions
diff --git a/app/assets/images/status/classification.png b/app/assets/images/status/classification.png Binary files differnew file mode 100644 index 000000000..dcf4009f3 --- /dev/null +++ b/app/assets/images/status/classification.png diff --git a/app/assets/images/status/classification@2x.png b/app/assets/images/status/classification@2x.png Binary files differnew file mode 100644 index 000000000..dcf4009f3 --- /dev/null +++ b/app/assets/images/status/classification@2x.png diff --git a/app/assets/images/status/delayed.png b/app/assets/images/status/delayed.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/app/assets/images/status/delayed.png diff --git a/app/assets/images/status/delayed@2x.png b/app/assets/images/status/delayed@2x.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/app/assets/images/status/delayed@2x.png diff --git a/app/assets/images/status/delivery_error.png b/app/assets/images/status/delivery_error.png Binary files differnew file mode 100644 index 000000000..5865dd1e1 --- /dev/null +++ b/app/assets/images/status/delivery_error.png diff --git a/app/assets/images/status/delivery_error@2x.png b/app/assets/images/status/delivery_error@2x.png Binary files differnew file mode 100644 index 000000000..5865dd1e1 --- /dev/null +++ b/app/assets/images/status/delivery_error@2x.png diff --git a/app/assets/images/status/notheld.png b/app/assets/images/status/notheld.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/app/assets/images/status/notheld.png diff --git a/app/assets/images/status/notheld@2x.png b/app/assets/images/status/notheld@2x.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/app/assets/images/status/notheld@2x.png diff --git a/app/assets/images/status/overdue.png b/app/assets/images/status/overdue.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/app/assets/images/status/overdue.png diff --git a/app/assets/images/status/overdue@2x.png b/app/assets/images/status/overdue@2x.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/app/assets/images/status/overdue@2x.png diff --git a/app/assets/images/status/partiallysuccessful.png b/app/assets/images/status/partiallysuccessful.png Binary files differnew file mode 100644 index 000000000..2ff49770a --- /dev/null +++ b/app/assets/images/status/partiallysuccessful.png diff --git a/app/assets/images/status/partiallysuccessful@2x.png b/app/assets/images/status/partiallysuccessful@2x.png Binary files differnew file mode 100644 index 000000000..2ff49770a --- /dev/null +++ b/app/assets/images/status/partiallysuccessful@2x.png diff --git a/app/assets/images/status/postal.png b/app/assets/images/status/postal.png Binary files differnew file mode 100644 index 000000000..00df771ac --- /dev/null +++ b/app/assets/images/status/postal.png diff --git a/app/assets/images/status/postal@2x.png b/app/assets/images/status/postal@2x.png Binary files differnew file mode 100644 index 000000000..00df771ac --- /dev/null +++ b/app/assets/images/status/postal@2x.png diff --git a/app/assets/images/status/refused.png b/app/assets/images/status/refused.png Binary files differnew file mode 100644 index 000000000..1f768af5e --- /dev/null +++ b/app/assets/images/status/refused.png diff --git a/app/assets/images/status/refused@2x.png b/app/assets/images/status/refused@2x.png Binary files differnew file mode 100644 index 000000000..1f768af5e --- /dev/null +++ b/app/assets/images/status/refused@2x.png diff --git a/app/assets/images/status/reported.png b/app/assets/images/status/reported.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/app/assets/images/status/reported.png diff --git a/app/assets/images/status/reported@2x.png b/app/assets/images/status/reported@2x.png Binary files differnew file mode 100644 index 000000000..9d20ac2e7 --- /dev/null +++ b/app/assets/images/status/reported@2x.png diff --git a/app/assets/images/status/review.png b/app/assets/images/status/review.png Binary files differnew file mode 100644 index 000000000..639f72797 --- /dev/null +++ b/app/assets/images/status/review.png diff --git a/app/assets/images/status/review@2x.png b/app/assets/images/status/review@2x.png Binary files differnew file mode 100644 index 000000000..639f72797 --- /dev/null +++ b/app/assets/images/status/review@2x.png diff --git a/app/assets/images/status/successful.png b/app/assets/images/status/successful.png Binary files differnew file mode 100644 index 000000000..2ff49770a --- /dev/null +++ b/app/assets/images/status/successful.png diff --git a/app/assets/images/status/successful@2x.png b/app/assets/images/status/successful@2x.png Binary files differnew file mode 100644 index 000000000..2ff49770a --- /dev/null +++ b/app/assets/images/status/successful@2x.png diff --git a/app/assets/images/status/unusual.png b/app/assets/images/status/unusual.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/app/assets/images/status/unusual.png diff --git a/app/assets/images/status/unusual@2x.png b/app/assets/images/status/unusual@2x.png Binary files differnew file mode 100644 index 000000000..637fed8d9 --- /dev/null +++ b/app/assets/images/status/unusual@2x.png diff --git a/app/assets/images/status/waiting.png b/app/assets/images/status/waiting.png Binary files differnew file mode 100644 index 000000000..dcf4009f3 --- /dev/null +++ b/app/assets/images/status/waiting.png diff --git a/app/assets/images/status/waiting@2x.png b/app/assets/images/status/waiting@2x.png Binary files differnew file mode 100644 index 000000000..dcf4009f3 --- /dev/null +++ b/app/assets/images/status/waiting@2x.png diff --git a/app/assets/images/status/withdrawn.png b/app/assets/images/status/withdrawn.png Binary files differnew file mode 100644 index 000000000..d56aa213f --- /dev/null +++ b/app/assets/images/status/withdrawn.png diff --git a/app/assets/images/status/withdrawn@2x.png b/app/assets/images/status/withdrawn@2x.png Binary files differnew file mode 100644 index 000000000..d56aa213f --- /dev/null +++ b/app/assets/images/status/withdrawn@2x.png diff --git a/app/assets/stylesheets/responsive/_footer_layout.scss b/app/assets/stylesheets/responsive/_footer_layout.scss index 2b0c956fa..55b6839c2 100644 --- a/app/assets/stylesheets/responsive/_footer_layout.scss +++ b/app/assets/stylesheets/responsive/_footer_layout.scss @@ -45,6 +45,10 @@ img { display: inherit; + @include lte-ie7 { + display: block; + } } + } } diff --git a/app/assets/stylesheets/responsive/_lists_style.scss b/app/assets/stylesheets/responsive/_lists_style.scss index 762901a5f..9f18718f5 100644 --- a/app/assets/stylesheets/responsive/_lists_style.scss +++ b/app/assets/stylesheets/responsive/_lists_style.scss @@ -48,51 +48,135 @@ } } +$status-success: #69952F; +$status-failure: #C1272D; +$status-pending: #A68C2E; + /* Status lines and icons */ -.icon_waiting_response,.icon_waiting_classification,.icon_waiting_clarification { - background-image:image-url('status-pending.png'); - color:#A68C2E; +.icon_waiting_classification { + background-image:image-url('status/classification.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/classification@2x.png'); + } +} + +.icon_waiting_response,.icon_waiting_clarification { + background-image:image-url('status/waiting.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/waiting@2x.png'); + } +} + +.icon_attention_requested { + background-image:image-url('status/reported.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/reported@2x.png'); + } +} + +.icon_not_held { + background-image:image-url('status/notheld.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/notheld@2x.png'); + } +} + +.icon_successful { + background-image:image-url('status/successful.png'); + color: $status-success; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/successful@2x.png'); + } } +.icon_partially_successful { + background-image:image-url('status/partiallysuccessful.png'); + color: $status-success; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/partiallysuccessful@2x.png'); + } +} -.icon_not_held, .icon_attention_requested { - background-image:image-url('status-not-held.png'); - color:#A68C2E; +.icon_requires_admin { + background-image:image-url('status/unusual.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/unusual@2x.png'); + } } -.icon_successful,.icon_partially_successful { - background-image:image-url('status-complete.png'); - color:#69952F; +.icon_waiting_response_overdue { + background-image:image-url('status/delayed.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/delayed@2x.png'); + } } -.icon_requires_admin,.icon_waiting_response_overdue,.icon_waiting_response_very_overdue { - background-image:image-url('status-overdue.png'); - color:#C1272D; +.icon_waiting_response_very_overdue{ + background-image:image-url('status/overdue.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/overdue@2x.png'); + } } .icon_gone_postal { - background-image:image-url('status-gone-postal.png'); - color:#A68C2E; + background-image:image-url('status/postal.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/postal@2x.png'); + } } .icon_error_message { - background-image:image-url('status-error.png'); - color:#C1272D; + background-image:image-url('status/delivery_error.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/delivery_error@2x.png'); + } } .icon_internal_review { - background-image:image-url('status-internal-review.png'); - color:#A68C2E; + background-image:image-url('status/review.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/review@2x.png'); + } } .icon_user_withdrawn { - background-image:image-url('status-withdrawn.png'); - color:#A68C2E; + background-image:image-url('status/withdrawn.png'); + color: $status-pending; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/withdrawn@2x.png'); + } } .icon_failed,.icon_rejected { - background-image:image-url('status-denied.png'); - color:#C1272D; + background-image:image-url('status/refused.png'); + color: $status-failure; + background-size: 22px 22px; + @media (-webkit-min-device-pixel-ratio: 1.5), (min-resolution: 144dpi) { + background-image:image-url('status/refused@2x.png'); + } } #public_body_list { diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb index 6db145348..124db8d4a 100644 --- a/app/models/incoming_message.rb +++ b/app/models/incoming_message.rb @@ -834,14 +834,15 @@ class IncomingMessage < ActiveRecord::Base def fully_destroy ActiveRecord::Base.transaction do - for o in self.outgoing_message_followups - o.incoming_message_followup = nil - o.save! + outgoing_message_followups.each do |outgoing_message_followup| + outgoing_message_followup.incoming_message_followup = nil + outgoing_message_followup.save! + end + info_request_events.each do |info_request_event| + info_request_event.track_things_sent_emails.each { |a| a.destroy } + info_request_event.user_info_request_sent_alerts.each { |a| a.destroy } + info_request_event.destroy end - info_request_event = InfoRequestEvent.find_by_incoming_message_id(self.id) - info_request_event.track_things_sent_emails.each { |a| a.destroy } - info_request_event.user_info_request_sent_alerts.each { |a| a.destroy } - info_request_event.destroy self.raw_email.destroy_file_representation! self.destroy end diff --git a/app/views/general/_frontpage_new_request.html.erb b/app/views/general/_frontpage_new_request.html.erb index 499b60eb5..5b987b320 100644 --- a/app/views/general/_frontpage_new_request.html.erb +++ b/app/views/general/_frontpage_new_request.html.erb @@ -4,4 +4,4 @@ Information<br/> request</strong>") %> </h1> -<a class="link_button_green_large" href="<%= select_authority_path %>"><%= _("Start now »") %></a> +<a class="link_button_green_large" href="<%= select_authority_path %>"><%= _("Make a request »") %></a> diff --git a/app/views/public_body/_list_sidebar_extra.html.erb b/app/views/public_body/_list_sidebar_extra.html.erb index 290593d6a..6e683d7a1 100644 --- a/app/views/public_body/_list_sidebar_extra.html.erb +++ b/app/views/public_body/_list_sidebar_extra.html.erb @@ -1,3 +1,8 @@ +<% if AlaveteliConfiguration::public_body_statistics_page %> + <p> + <%= link_to _('Public authority statistics'), public_bodies_statistics_path %> + </p> +<% end %> <p> <%= link_to _('Are we missing a public authority?'), help_requesting_path + '#missing_body' %> </p> diff --git a/app/views/public_body/statistics.html.erb b/app/views/public_body/statistics.html.erb index d935a9e47..0e7e7424e 100644 --- a/app/views/public_body/statistics.html.erb +++ b/app/views/public_body/statistics.html.erb @@ -1,6 +1,6 @@ <% @title = _("Public Body Statistics") %> <div id="main_content"> - <h1>Public Body Statistics</h1> + <h1><%= @title %></h1> <p><%= _("This page of public body statistics is currently \ experimental, so there are some caveats that should be borne \ @@ -33,6 +33,8 @@ requests to the authority through this site, rather than, \ say, all requests that have been made to the public body by \ any means.") %></li> + <li><%= _("Unclassified or hidden requests are not counted.") %></li> + </ul> <p><%= _("These graphs were partly inspired by \ @@ -47,7 +49,7 @@ are due to him.") %></p> <table border=0> <thead> <tr> - <th>Public Body</th> + <th><%= _('Public Body') %></th> <th><%= graph_data['y_axis'] %></th> </tr> </thead> |
