diff options
| -rw-r--r-- | lib/views/help/officers.html.erb | 13 | ||||
| -rw-r--r-- | lib/views/help/requesting.html.erb | 27 | 
2 files changed, 24 insertions, 16 deletions
diff --git a/lib/views/help/officers.html.erb b/lib/views/help/officers.html.erb index f0ebdb7..f6be968 100644 --- a/lib/views/help/officers.html.erb +++ b/lib/views/help/officers.html.erb @@ -170,10 +170,13 @@          responses to requests.  Please <a href="<%= help_contact_path %>">contact us</a> if we've          missed one.          For technical reasons we don't always remove them from attachments, such as certain PDFs.</p> -      <p>If you need to know what an address was that we've removed, please <a -        href="<%= help_contact_path %>">get in touch with us</a>. Occasionally, an email address -        forms an important part of a response and we will post it up in an obscured -        form in an annotation. +    <p>If you need to know what an address was that we've removed, please <a +      href="<%= help_contact_path %>">get in touch with us</a>. +      <% 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 %> +    </p>      </dd>      <dt id="copyright"><a id="commercial"></a>What is your policy on copyright of documents?<a href="#copyright">#</a> </dt> @@ -202,4 +205,4 @@      <br><strong>Otherwise</strong>, the <a href="<%= help_credits_path %>">credits</a> or the <a href="<%= help_api_path %>">programmers API</a> -->      <div id="hash_link_padding"></div> -</div>
\ No newline at end of file +</div> diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb index ca6bff7..b901eb7 100644 --- a/lib/views/help/requesting.html.erb +++ b/lib/views/help/requesting.html.erb @@ -91,9 +91,12 @@          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 %>        </p>      </dd> @@ -268,18 +271,20 @@      <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt> -    <dd> -      <p>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. -      </p> -      <p>Endless, political discussions are not allowed. -        Post a link to a suitable forum or campaign site elsewhere.</p> +    <% if AlaveteliConfiguration::enable_annotations %>        <dd> +        <p>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. +        </p> +        <p>Endless, political discussions are not allowed. +          Post a link to a suitable forum or campaign site elsewhere.</p> +        <dd> +    <% end %>    </dl>    <p><strong>Next</strong>, read about <a href="<%= help_privacy_path %>">your privacy</a> -->      <div id="hash_link_padding"></div> -</div>
\ No newline at end of file +</div>  | 
