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(-) 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 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(-) 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(-) 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 a9dfb2ea21181266984d01810ac5c458c500e381 Mon Sep 17 00:00:00 2001 From: Gareth Rees Date: Wed, 14 Dec 2016 11:57:33 +0000 Subject: Style request page action bar --- assets/stylesheets/responsive/custom.scss | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/assets/stylesheets/responsive/custom.scss b/assets/stylesheets/responsive/custom.scss index 9161270..aa6fd1e 100644 --- a/assets/stylesheets/responsive/custom.scss +++ b/assets/stylesheets/responsive/custom.scss @@ -540,6 +540,23 @@ a.link_button_green_large { } /* Request page */ +.request-header__action-bar__actions { + .action-menu__button { + @include button-secondary(); + } + + .action-bar__follow-button { + .track__action { + @include button-primary(); + } + } + + .action-bar__follower-count { + padding: 3px; + font-size: 1.1rem; + } +} + div.correspondence { background-color: $color_white; box-shadow: 0 2px 2px transparentize($color_black, 0.8); -- cgit v1.2.3