Merge branch 'develop'

3 files changed, 42 insertions, 17 deletions

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);
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> --&gt;
 
     <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..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>