7 files changed, 21 insertions, 11 deletions
diff --git a/app/views/general/_advanced_search_tips.rhtml b/app/views/general/_advanced_search_tips.rhtml
index 520cce89b..914abc1af 100644
--- a/app/views/general/_advanced_search_tips.rhtml
+++ b/app/views/general/_advanced_search_tips.rhtml
@@ -13,7 +13,7 @@
     <li><%= _('<strong><code>request:</code></strong> to restrict to a specific request, typing the title as in the URL.')%>
     <li><%= _('<strong><code>filetype:pdf</code></strong> to find all responses with PDF attachments. Or try these: <code>{{list_of_file_extensions}}</code>', :list_of_file_extensions => IncomingMessage.get_all_file_extensions)%></li>
     <li><%= _('Type <strong><code>01/01/2008..14/01/2008</code></strong> to only show things that happened in the first two weeks of January.')%></li>
-    <li><%= _('<strong><code>tag:charity</code></strong> to find all public bodies or requests with a given tag. You can include multiple tags, 
+    <li><%= _('<strong><code>tag:charity</code></strong> to find all public authorities or requests with a given tag. You can include multiple tags, 
     and tag values, e.g. <code>tag:openlylocal AND tag:financial_transaction:335633</code>. Note that by default any of the tags
     can be present, you have to put <code>AND</code> explicitly if you only want results them all present.')%></li>
     <li><%= _('Read about <a href="{{advanced_search_url}}">advanced search operators</a>, such as proximity and wildcards.', :advanced_search_url => "http://www.xapian.org/docs/queryparser.html") %></li>
diff --git a/app/views/general/_footer.rhtml b/app/views/general/_footer.rhtml
index efcd8f96b..ab5ab2c47 100644
--- a/app/views/general/_footer.rhtml
+++ b/app/views/general/_footer.rhtml
@@ -1,6 +1,6 @@
 <div id="footer">
     <%= link_to _("Contact {{site_name}}", :site_name => site_name), help_contact_url %>
-| <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>"><%= _("Follow us on twitter") %></a>
+| <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="https://twitter.com/<%= Configuration::twitter_username %>"><%= _("Follow us on twitter") %></a>
 <%= render :partial => 'general/credits' %>
 </div>
 <div class="after-footer">&nbsp;</div>
diff --git a/app/views/general/_frontpage_search_examples.es.rhtml b/app/views/general/_frontpage_search_examples.es.rhtml
deleted file mode 100644
index 63c7c3c1e..000000000
--- a/app/views/general/_frontpage_search_examples.es.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-por ejemplo <a href="/es/search/El%20Geraldine%20Quango">El Geraldine Quango</a>, <a href="/search/fancy%20dog">Fancy Dog</a>.
diff --git a/app/views/general/_frontpage_search_examples.rhtml b/app/views/general/_frontpage_search_examples.rhtml
deleted file mode 100644
index 359a132e2..000000000
--- a/app/views/general/_frontpage_search_examples.rhtml
+++ /dev/null
@@ -1 +0,0 @@
-for example <a href="/search/Geraldine%20Quango">Geraldine Quango</a> or <a href="/search/fancy%20dog">Fancy Dog</a>.
diff --git a/app/views/general/_stylesheet_includes.rhtml b/app/views/general/_stylesheet_includes.rhtml
index 2ffa5dadf..7a03680f8 100644
--- a/app/views/general/_stylesheet_includes.rhtml
+++ b/app/views/general/_stylesheet_includes.rhtml
@@ -16,6 +16,6 @@
         <![endif]-->
         <!-- the following method for customising CSS is deprecated; see `doc/THEMES.md` for detail -->
         <%= stylesheet_link_tag 'custom', :title => "Main", :rel => "stylesheet"  %>
-        <% if force_registration_on_new_request %>
+        <% if Configuration::force_registration_on_new_request %>
         <%= stylesheet_link_tag 'jquery.fancybox-1.3.4', :rel => "stylesheet"  %>
         <% end %>
diff --git a/app/views/general/advanced_search.rhtml b/app/views/general/advanced_search.rhtml
deleted file mode 100644
index e69de29bb..000000000
--- a/app/views/general/advanced_search.rhtml
+++ /dev/null
diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml
index 38133e7ab..e2d74a5e2 100644
--- a/app/views/general/frontpage.rhtml
+++ b/app/views/general/frontpage.rhtml
@@ -40,7 +40,7 @@
         <ul>
             <% for popular_body in @popular_bodies %>
                 <li><%=public_body_link(popular_body)%>
-                 <%= n_('%d request', '%d requests', popular_body.info_requests.count) % popular_body.info_requests.count %>
+                 <%= n_('%d request', '%d requests', popular_body.info_requests_count) % popular_body.info_requests_count %>
                 </li>
             <% end%>
         </ul>
@@ -51,20 +51,32 @@
     <% end %>
 
     <div id="examples_1">
-      <h3><%= _("What information has been released?") %></h3>
-       <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:", 
+      <h3>
+        <% if @request_events_all_successful %>
+          <%= _("What information has been released?") %>
+        <% else %>
+          <%= _("What information has been requested?") %>
+        <% end %>
+      </h3>
+       <%= _("{{site_name}} users have made {{number_of_requests}} requests, including:",
         :site_name => site_name, :number_of_requests => InfoRequest.count) %>
         <ul>
           <% for event in @request_events %>
             <li>
                <%= public_body_link(event.info_request.public_body) %> <%= _('answered a request about') %>
-               <%=link_to h(event.info_request.title), request_url(event.info_request)%> 
-               <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %> 
+               <%=link_to h(event.info_request.title), request_url(event.info_request)%>
+               <%= _('{{length_of_time}} ago', :length_of_time => time_ago_in_words(event.described_at)) %>
                <p class="excerpt" onclick="document.location.href='<%=request_url(event.info_request)%>'"><%= excerpt(event.search_text_main(true), "", 200) %></p>
               </li>
           <% end %>
         </ul>
-        <p><strong><%=link_to _('More successful requests...'), request_list_successful_url %></strong></p>
+        <p><strong>
+          <% if @request_events_all_successful %>
+            <%=link_to _('More successful requests...'), request_list_successful_url %>
+          <% else %>
+            <%=link_to _('More requests...'), request_list_all_url %>
+          <% end %>
+        </strong></p>
     </div>
 </div>