Cache incoming message display bubbles in fragment files.

Clear the cache when a censor rule is changed - the only other thing
that will affect one is renaming of a body. Need to think about that.

4 files changed, 32 insertions, 13 deletions

diff --git a/app/views/help/about.rhtml b/app/views/help/about.rhtml
index ff4d6a0ae..d0942320f 100644
--- a/app/views/help/about.rhtml
+++ b/app/views/help/about.rhtml
@@ -148,20 +148,36 @@ unwittingly, in a request, please <a href="/help/contact">contact us</a>
 immediately so we can remove it.</p>
 </dd>
 
-<dt id="focussed">Why should I keep my request focussed?<a href="#focussed">#</a> </dt>
+<dt id="focussed">Why must I keep my request focussed?<a href="#focussed">#</a> </dt>
 
 <dd>
-<p>Firstly, WhatDoTheyKnow is not a place to run a campaign. If you make
-allegations about any individual, we will have to remove your request. This not
-only avoids problems with libel law, but it also makes it more likely your request will
-be answered quietly "under the wire".  If you want confrontation, please <%=
-link_to 'start your own blog', "http://wordpress.com/"%>.  </p>
-
-<p>Secondly, there is a limit on the amount an authority needs to spend answering
-each request. If you ask for lots of information, the limit might be exceeded, and
-you might get nothing. If requests are very complicated, you can often simplify
-them by limiting the time period.
+
+<p>WhatDoTheyKnow's focus is entirely on Freedom of Information. This
+makes the site clearer, and easier to understand. Please do not add arguments
+about your cause to your request, or include statements which could
+defame others. We may have to remove them in order to avoid problems with libel
+law (it's a pain). 
+</p>
+
+<p>We encourage you to run your campaign elsewhere. If you don't have one
+already, you might like to <%= link_to 'start your own blog', "http://wordpress.com/"%>.
+Please do add links to your campaign in annotations on your requests.
+</p>
+
+<p>Succinct messages are easier for authorities to read, meaning
+you get a quicker response. If you add extraneous, campaigning points
+not strictly necessary to your request, then it may be more likely that you
+will cause your request to go up the management chain, rather than just be
+answered in a straightforward way by a junior officer.
 </p>
+
+<p>Finally, there is a limit on the amount an authority needs to spend
+answering each request. If you ask for lots of information, the limit might be
+exceeded, and you might get nothing. If requests are very complicated, you can
+often simplify them by limiting the time period.
+</p>
+
+
 </dd>
 
 <dt id="private_requests">I'd like to keep my request secret! (At least until I publish my story) <a href="#private_requests">#</a> </dt>
diff --git a/app/views/request/_after_actions.rhtml b/app/views/request/_after_actions.rhtml
index 54eb20332..882e2c0b8 100644
--- a/app/views/request/_after_actions.rhtml
+++ b/app/views/request/_after_actions.rhtml
@@ -24,7 +24,9 @@
           <% if @last_response.nil? %>
               <%= link_to "Send follow up to " + RequestMailer.name_for_followup(@info_request, @last_response), show_response_no_followup_url(:id => @info_request.id, :incoming_message_id => nil) + "#followup" %> 
           <% else %>
+              <% cache (:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => @last_response.id, :only_path => true, :template => "_after_actions", :section => "reply_to_link") do %>
               <%= link_to "Reply to " + RequestMailer.name_for_followup(@info_request, @last_response), show_response_url(:id => @info_request.id, :incoming_message_id => @last_response.id) + "#followup" %> 
+              <% end %>
           <% end %>
       </li>
       <% if !@old_unclassified %>
diff --git a/app/views/request/_correspondence.rhtml b/app/views/request/_correspondence.rhtml
index ce467321f..1b5ce3f49 100644
--- a/app/views/request/_correspondence.rhtml
+++ b/app/views/request/_correspondence.rhtml
@@ -25,6 +25,7 @@ end
 if not incoming_message.nil?
 %>
     <div class="correspondence" id="incoming-<%=incoming_message.id.to_s%>">
+        <% cache (:controller => "request", :action => "show_response", :id => @info_request.id, :incoming_message_id => incoming_message.id, :only_path => true, :template => "_correspondence", :section => "incoming_message_bubble") do %>
         <h2>
             <% if !incoming_message.safe_mail_from.nil? && incoming_message.safe_mail_from.strip != @info_request.public_body.name.strip %>
                 <%=h incoming_message.safe_mail_from %><br>
@@ -36,6 +37,7 @@ if not incoming_message.nil?
         </h2>
 
         <%= render :partial => 'bubble', :locals => { :incoming_message => incoming_message, :body => incoming_message.get_body_for_html_display(@collapse_quotes), :attachments => incoming_message.get_attachments_for_display }  %>
+        <% end %>
 
         <p class="event_actions">
             <% if !@user.nil? && @user.admin_page_links? %>
diff --git a/app/views/request/new.rhtml b/app/views/request/new.rhtml
index 1eaeb53e3..e3a2bd317 100644
--- a/app/views/request/new.rhtml
+++ b/app/views/request/new.rhtml
@@ -50,8 +50,7 @@
     </li>
     <li>Write your request in <strong>simple, precise language</strong>.</li>
     <li>Ask for <strong>specific</strong> documents or information, this site is not suitable for general enquiries.</li>
-    <li>Keep it <strong>focussed</strong>. Keep the cost down, and avoid making accusations
-    (<a href="/help/about/#focussed">why?</a>).</li>
+    <li>Keep it <strong>focussed</strong>, you'll be more likely to get what you want (<a href="/help/about/#focussed">why?</a>).</li>
     <li>This site is <strong>public</strong>. Everything you type and any response will be published.</li>
     </ul>