From b3eac1c0a05920ef1f5ed41c28650fa816632a44 Mon Sep 17 00:00:00 2001 From: Steven Day Date: Thu, 31 Mar 2016 12:44:19 +0100 Subject: Update templates to match new ENABLE_ANNOTATIONS setting Alaveteli has added a feature to turn off annotations and some of the views use this to hide certain bits of text, so this makes the theme do the same. --- lib/views/help/officers.html.erb | 9 ++++--- lib/views/help/requesting.html.erb | 49 +++++++++++++++++++++----------------- 2 files changed, 33 insertions(+), 25 deletions(-) (limited to 'lib') diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb index 0a7d208..6f87a47 100644 --- a/lib/views/help/officers.html.erb +++ b/lib/views/help/officers.html.erb @@ -217,9 +217,12 @@ responses to requests. Please contact us if we've missed one. For technical reasons we don't always remove them from attachments, such as certain PDFs.

If you need to know what an address was that we've removed, please get in touch with us. Occasionally, an email address -forms an important part of a response and we will post it up in an obscured -form in an annotation. + href="<%= help_contact_path %>">get in touch with us. + <% if AlaveteliConfiguration::enable_annotations %> + Occasionally, an email address forms an important part of a response + and we will post it up in an obscured form in an annotation. + <% end %> +

diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index 28e55fd..583481b 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -48,11 +48,11 @@ organisations:

@@ -91,9 +91,12 @@ Information is a powerful tool. Although you may not use this site to run your campaign, we encourage you to use it to get the information you need. We also encourage to run your campaign elsewhere - one effective and very easy way is to <%= link_to 'start your own blog', -"http://wordpress.com/"%>. You are welcome to link to your campaign -from this site in an annotation to your request (you can make -annotations after submitting the request). +"http://wordpress.com/"%>. +<% if AlaveteliConfiguration::enable_annotations %> + You are welcome to link to your campaign from this site in an + annotation to your request (you can make annotations after submitting + the request). +<% end %>

@@ -151,9 +154,9 @@ are breaking the law.

checking that they received the request. It was sent to them by email.
  • If they have not received it, the problem is most likely due to - "spam filters". Refer the authority to the measures in the answer - 'I can see a request on <%= site_name %>, but we never got it by email!' - in the FOI officers section of this help. + "spam filters". Refer the authority to the measures in the answer + 'I can see a request on <%= site_name %>, but we never got it by email!' + in the FOI officers section of this help.
  • If you're still having no luck, then you can ask for an internal review, and then complain to the Information Commissioner about the authority. @@ -168,7 +171,7 @@ then read our page 'Unhappy about the response you got?<
    It says I can't re-use the information I got!#
    -

    Authorities often add legal boilerplate about the +

    Authorities often add legal boilerplate about the "Re-Use of Public Sector Information Regulations 2005", which at first glance implies you may not be able do anything with the information. @@ -192,7 +195,7 @@ pages on the Information Commissioner's website.

    the process is very similar. There are differences around time limits for compliance. See the Scottish -Information Commissioner's guidance for details.

    +Information Commissioner's guidance for details.

    Can I request information about myself? #
    @@ -230,7 +233,7 @@ you manage FOI requests in secret, then contact us.

    Some public authorities, such as South East Water, don't come under the Freedom of Information Act, but do come under another law called -the Environmental Information Regulations (EIR). +the Environmental Information Regulations (EIR).

    It's a very similar law, so you make a request @@ -243,7 +246,7 @@ means. It is quite broad.

    You can, of course, request environmental information from other authorities. Just make a Freedom of Information (FOI) request as normal. The authority has a duty to work out if the Environmental Information Regulations -(EIR) is the more appropriate legislation to reply under. +(EIR) is the more appropriate legislation to reply under.

    @@ -266,18 +269,20 @@ responses actually came from the authority. If this really matters to you, you can always make the same request again via <%= site_name %>. -
    How do you moderate request annotations? #
    +<% if AlaveteliConfiguration::enable_annotations %> +
    How do you moderate request annotations? #
    -
    -

    Annotations on <%= site_name %> are to help -people get the information they want, or to give them pointers to places they -can go to help them act on it. We reserve the right to remove anything else. -

    -

    Endless, political discussions are not allowed. -Post a link to a suitable forum or campaign site elsewhere.

    -
    +
    +

    Annotations on <%= site_name %> are to help + people get the information they want, or to give them pointers to places they + can go to help them act on it. We reserve the right to remove anything else. +

    +

    Endless, political discussions are not allowed. + Post a link to a suitable forum or campaign site elsewhere.

    +
    - + +<% end %>

    Next, read about your privacy --> -- cgit v1.2.3 From cec2832b8c6350fa1afd725ab60ae89b48a40b6d Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 24 Nov 2016 09:52:30 +0000 Subject: Add text on request closure. --- lib/views/help/officers.html.erb | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib') diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb index 5a0418f..f0ebdb7 100644 --- a/lib/views/help/officers.html.erb +++ b/lib/views/help/officers.html.erb @@ -187,6 +187,15 @@ requests, and for good public relations, we'd advise you not to do that.

    +
    My response to an old request on <%= site_name %> has been bounced!#
    +
    After six months of inactivity, <%= site_name %> limits who can respond to a request to stop + spammers targeting old requests. At that point, the request can only be responded to by someone who's + from the authority. After twelve months, the request is closed to responses from anyone. If you need an + old request to be re-opened so that you can respond to it, please + contact us. +
    + +

    If you haven't already, read the introduction --> -- cgit v1.2.3 From a26a2d5bddb3cba85cbddfc7475e2706f20e34ac Mon Sep 17 00:00:00 2001 From: lizconlan Date: Fri, 2 Dec 2016 17:45:14 +0000 Subject: Update model patch example to include the default_letter param override --- lib/model_patches.rb | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/model_patches.rb b/lib/model_patches.rb index 7f3b4de..b0c906f 100644 --- a/lib/model_patches.rb +++ b/lib/model_patches.rb @@ -10,6 +10,10 @@ Rails.configuration.to_prepare do # OutgoingMessage.class_eval do # # Add intro paragraph to new request template # def default_letter + # # this line allows the default_letter text added by this + # # method to be replaced by the value supplied by the API + # # e.g. http://demo.alaveteli.org/new/tgq?default_letter=this+is+a+test + # return @default_letter if @default_letter # return nil if self.message_type == 'followup' # "If you uncomment this line, this text will appear as default text in every message" # end -- cgit v1.2.3 From b8920199aa25ef883ec4213729486f01539e2823 Mon Sep 17 00:00:00 2001 From: lizconlan Date: Mon, 28 Nov 2016 11:32:08 +0000 Subject: Add request reporting sections to the help/about page --- lib/views/help/about.html.erb | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/views/help/about.html.erb b/lib/views/help/about.html.erb index 36120f1..9f7d7d5 100644 --- a/lib/views/help/about.html.erb +++ b/lib/views/help/about.html.erb @@ -32,6 +32,34 @@ it must be kept confidential. +

    What if I see a request I feel to be inappropriate? #
    +
    +

    + Requests for personal information and vexatious requests are not considered valid for FOI purposes (read more). +

    + +

    + If you believe a request is not suitable, you can report it for attention by the site administrators. +

    +
    + +
    Why won't it let me report some requests? #
    +
    +

    + If a request has already been reported to the site administrators, you + can't report it a second time - this is to prevent the administrators + being notified multiple times about the same issue before they've had + a chance to conduct a review. +

    + +

    + Where a request has been previously reported but an administrator has + chosen not to hide it from public view, you can use the form in the + sidebar of the request page to contact the administrators if you still + think it should be hidden. +

    +
    +
    Who makes <%= site_name %> ? #
    <%= site_name %> runs on Alaveteli, which was created and run by mySociety, and was initially funded by the JRSST Charitable Trust. mySociety is a project of the @@ -49,4 +77,4 @@

    Next, read about making requests -->

    - \ No newline at end of file + -- cgit v1.2.3 From 2cddd013490c9b8f36f9439905195b0909518f98 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 14 Dec 2016 11:29:14 +0000 Subject: Fix unclosed
    tag - Added a closing slash - Fixed indentation --- lib/views/help/requesting.html.erb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index b901eb7..1ef5b68 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -279,7 +279,7 @@

    Endless, political discussions are not allowed. Post a link to a suitable forum or campaign site elsewhere.

    -
    +
    <% end %> -- cgit v1.2.3 From 8103ae191028283bed39430888775e5059957bf9 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 14 Dec 2016 11:33:18 +0000 Subject: Fix incorrect conflict resolution Missed including the
    in the conditional when resolving a merge conflict. --- lib/views/help/requesting.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index 1ef5b68..f85e817 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -269,9 +269,9 @@ you can always make the same request again via <%= site_name %>. -
    How do you moderate request annotations? #
    - <% if AlaveteliConfiguration::enable_annotations %> +
    How do you moderate request annotations? #
    +

    Annotations on <%= site_name %> are to help people get the information they want, or to give them pointers to places they -- cgit v1.2.3 From 64f2f360ec9c27aa9c7545d8ab4678c0af3eaa6c Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Thu, 19 Jan 2017 11:37:48 +0000 Subject: Add encoding line to Ruby files Fixes https://github.com/mysociety/alavetelitheme/issues/69. --- lib/alavetelitheme.rb | 1 + lib/config/custom-routes.rb | 1 + lib/controller_patches.rb | 1 + lib/customstates.rb | 1 + lib/model_patches.rb | 1 + lib/patch_mailer_paths.rb | 1 + lib/tasks/alavetelitheme_tasks.rake | 1 + 7 files changed, 7 insertions(+) (limited to 'lib') diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index c245617..668d92a 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- theme_name = File.split(File.expand_path("../..", __FILE__))[1] theme_name.gsub!('-', '_') THEME_NAME = theme_name diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb index 6d4cda4..98fccf7 100644 --- a/lib/config/custom-routes.rb +++ b/lib/config/custom-routes.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Here you can override or add to the pages in the core website Rails.application.routes.draw do diff --git a/lib/controller_patches.rb b/lib/controller_patches.rb index 5c48e70..6d796b0 100644 --- a/lib/controller_patches.rb +++ b/lib/controller_patches.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # Doing so in init/environment.rb wouldn't work in development, since diff --git a/lib/customstates.rb b/lib/customstates.rb index d801c92..323a105 100644 --- a/lib/customstates.rb +++ b/lib/customstates.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # See `http://alaveteli.org/docs/customising/themes/#customising-the-request-states` # for more explanation of this file diff --git a/lib/model_patches.rb b/lib/model_patches.rb index b0c906f..d223e36 100644 --- a/lib/model_patches.rb +++ b/lib/model_patches.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # Doing so in init/environment.rb wouldn't work in development, since diff --git a/lib/patch_mailer_paths.rb b/lib/patch_mailer_paths.rb index 99da10a..4533be0 100644 --- a/lib/patch_mailer_paths.rb +++ b/lib/patch_mailer_paths.rb @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # Add a callback - to be executed before each request in development, # and at startup in production - to patch existing app classes. # See http://stackoverflow.com/questions/7072758/plugin-not-reloading-in-development-mode diff --git a/lib/tasks/alavetelitheme_tasks.rake b/lib/tasks/alavetelitheme_tasks.rake index 1f1925b..3744d04 100644 --- a/lib/tasks/alavetelitheme_tasks.rake +++ b/lib/tasks/alavetelitheme_tasks.rake @@ -1,3 +1,4 @@ +# -*- encoding : utf-8 -*- # desc "Explaining what the task does" # task :alavetelitheme do # # Task goes here -- cgit v1.2.3 From ed5bc5dd15ad7722d97b1c3164a670298d2501e0 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 22 Mar 2017 13:32:37 +0000 Subject: Move assets to app/assets Latest version of assets:precompile task requires path to match app/assets: https://github.com/rails/sprockets-rails/blob/v2.3.3/lib/sprockets/railtie.rb#L60-L62 --- lib/alavetelitheme.rb | 1 + 1 file changed, 1 insertion(+) (limited to 'lib') diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index 668d92a..0658142 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -39,6 +39,7 @@ $alaveteli_route_extensions << 'custom-routes.rb' ['stylesheets', 'images', 'javascripts'].each do |asset_type| theme_asset_path = File.join(File.dirname(__FILE__), '..', + 'app', 'assets', asset_type) Rails.application.config.assets.paths.unshift theme_asset_path -- cgit v1.2.3 From 0dee8c3bd06dd8779500667018185fab6dcee04e Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 22 Mar 2017 13:33:57 +0000 Subject: Remove deprecated disable_with button option Now a subkey of the :data option --- lib/views/help/contact.html.erb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/views/help/contact.html.erb b/lib/views/help/contact.html.erb index 5f467fe..2072d0c 100644 --- a/lib/views/help/contact.html.erb +++ b/lib/views/help/contact.html.erb @@ -93,8 +93,8 @@

    <%= hidden_field_tag(:submitted_contact_form, 1) %> - <%= submit_tag "Send message to the charity", :disable_with => "Sending..." %> + <%= submit_tag "Send message to the charity", :data => { :disable_with => "Sending..." } %> <-- we run this site, not the Government!
    -<% end %> \ No newline at end of file +<% end %> -- cgit v1.2.3 From f025f5c05852c6a847349c47ebbd2f1182181182 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 14 Sep 2017 17:20:30 +0100 Subject: Add extra theme assets to the asset path The new version of Sprockets for Rails 4.2 only adds assets from the base path so we need to add this ourselves. https://github.com/rails/sprockets-rails/blob/v3.2.0/lib/sprockets/railtie.rb#L84-L87 --- lib/alavetelitheme.rb | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'lib') diff --git a/lib/alavetelitheme.rb b/lib/alavetelitheme.rb index 0658142..c472d34 100644 --- a/lib/alavetelitheme.rb +++ b/lib/alavetelitheme.rb @@ -45,6 +45,20 @@ $alaveteli_route_extensions << 'custom-routes.rb' Rails.application.config.assets.paths.unshift theme_asset_path end +# Append individual theme assets to the asset path +theme_asset_path = File.join(File.dirname(__FILE__), + '..', + 'app', + 'assets') +theme_asset_path = Pathname.new(theme_asset_path).cleanpath.to_s + +LOOSE_THEME_ASSETS = lambda do |logical_path, filename| + filename.start_with?(theme_asset_path) && + !['.js', '.css', ''].include?(File.extname(logical_path)) +end + +Rails.application.config.assets.precompile.unshift(LOOSE_THEME_ASSETS) + # Tell FastGettext about the theme's translations: look in the theme's # locale-theme directory for a translation in the first place, and if # it isn't found, look in the Alaveteli locale directory next: -- cgit v1.2.3 From b258236ee3f3ebf191a33994235bed8f84a6c291 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Thu, 21 Sep 2017 16:15:27 +0100 Subject: Use HTTP methods for custom routes --- lib/config/custom-routes.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/config/custom-routes.rb b/lib/config/custom-routes.rb index 98fccf7..efbf95e 100644 --- a/lib/config/custom-routes.rb +++ b/lib/config/custom-routes.rb @@ -3,7 +3,7 @@ Rails.application.routes.draw do # brand new controller example - # match '/mycontroller' => 'general#mycontroller' + # get '/mycontroller' => 'general#mycontroller' # Additional help page example - # match '/help/help_out' => 'help#help_out' + # get '/help/help_out' => 'help#help_out' end -- cgit v1.2.3 From 043970acf94b7f1e8cfbde7c2bfd6ebafb8096c0 Mon Sep 17 00:00:00 2001 From: Louise Crow Date: Fri, 22 Sep 2017 16:46:19 +0100 Subject: Remove obsolete partial No longer needed after core commit d80e0ec0bc2bf81a0714cd44750da46faad44c06 --- lib/views/general/_orglink.html.erb | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lib/views/general/_orglink.html.erb (limited to 'lib') diff --git a/lib/views/general/_orglink.html.erb b/lib/views/general/_orglink.html.erb deleted file mode 100644 index b22d123..0000000 --- a/lib/views/general/_orglink.html.erb +++ /dev/null @@ -1 +0,0 @@ -<%= link_to image_tag('old-logo.png', :alt => 'Alaveteli logo'), frontpage_url, :id=>'logo' %> -- cgit v1.2.3