Merge remote-tracking branch 'upstream/master' into origin/norway3origin/norway3norway3

1 files changed, 17 insertions, 12 deletions

diff --git a/lib/views/help/requesting.html.erb b/lib/views/help/requesting.html.erb
index ca6bff7..f85e817 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>
@@ -266,20 +269,22 @@
       you can always make the same request again via <%= site_name %>.
     </dd>
 
-    <dt id="moderation">How do you moderate request annotations? <a href="#moderation">#</a> </dt>
+    <% if AlaveteliConfiguration::enable_annotations %>
+      <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>
       <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> --&gt;
 
     <div id="hash_link_padding"></div>
-</div>
\ No newline at end of file
+</div>