6 files changed, 91 insertions, 103 deletions
diff --git a/app/views/general/_frontpage_bodies_list.rhtml b/app/views/general/_frontpage_bodies_list.rhtml
new file mode 100644
index 000000000..503b38953
--- /dev/null
+++ b/app/views/general/_frontpage_bodies_list.rhtml
@@ -0,0 +1,17 @@
+<% if @popular_bodies.size > 0 %>
+  <div id="examples_0">
+    <h3><%= _("Who can I request information from?") %></h3>
+    <%= _("{{site_name}} covers requests to {{number_of_authorities}} authorities, including:",
+        :site_name => site_name, :number_of_authorities => PublicBody.visible.count) %>
+    <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 %>
+            </li>
+        <% end%>
+    </ul>
+    <p><strong>
+        <%= link_to _('Browse all authorities...'), list_public_bodies_default %>
+    </strong></p>
+  </div>
+<% end %>
diff --git a/app/views/general/_frontpage_new_request.rhtml b/app/views/general/_frontpage_new_request.rhtml
new file mode 100644
index 000000000..fd4225069
--- /dev/null
+++ b/app/views/general/_frontpage_new_request.rhtml
@@ -0,0 +1,7 @@
+<h1>
+  <%= _("Make a new<br/>
+  <strong>Freedom <span>of</span><br/>
+  Information<br/>
+  request</strong>") %>
+</h1>
+<a class="link_button_green_large" href="/select_authority"><%= _("Start now &raquo;") %></a>
diff --git a/app/views/general/_frontpage_requests_list.rhtml b/app/views/general/_frontpage_requests_list.rhtml
new file mode 100644
index 000000000..3b0efb65e
--- /dev/null
+++ b/app/views/general/_frontpage_requests_list.rhtml
@@ -0,0 +1,35 @@
+<div id="examples_1">
+  <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.visible.count) %>
+    <ul>
+      <% for event in @request_events %>
+        <li>
+          <% if @request_events_all_successful %>
+            <%= _("{{public_body_link}} answered a request about",
+                :public_body_link => public_body_link(event.info_request.public_body)) %>
+          <% else %>
+            <%= _("{{public_body_link}} was sent a request about",
+                :public_body_link => public_body_link(event.info_request.public_body)) %>
+          <% end %>
+
+           <%=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>
+      <% 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>
diff --git a/app/views/general/_frontpage_search_box.rhtml b/app/views/general/_frontpage_search_box.rhtml
new file mode 100644
index 000000000..6de4eae98
--- /dev/null
+++ b/app/views/general/_frontpage_search_box.rhtml
@@ -0,0 +1,12 @@
+<h2>
+  <%= _("Search over<br/>
+  <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>
+  <strong>{{number_of_authorities}} authorities</strong>",
+  :number_of_requests => InfoRequest.visible.count, :number_of_authorities => PublicBody.visible.count) %>
+</h2>
+<form id="search_form" method="post" action="/search">
+  <div>
+    <input id="query" type="text" size="30" name="query">
+    <input type="submit" value="<%= _('Search') %>">
+  </div>
+</form>
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index a80f167d8..5258e9bbd 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -7,53 +7,34 @@
     <img src="/images/twitter-16.png" alt="twitter icon"  class="twitter-icon"> <a href="https://twitter.com/<%= @twitter_user %>"><%= _("Follow us on twitter") %></a><br/><br/>
     <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= @feed_url %>"><%= _("Subscribe to blog") %></a>
   </div>
+  <% if Configuration::twitter_widget_id %>
   <div id="twitter">
-  <script src="http://widgets.twimg.com/j/2/widget.js"></script>
-  <script type="text/javascript">
-  new TWTR.Widget({
-    version: 2,
-    type: 'profile',
-    rpp: 15,
-    interval: 6000,
-    width: 'auto',
-    height: 500,
-    theme: {
-      shell: {
-        background: '#eaeaea',
-        color: '#000000'
-      },
-      tweets: {
-        background: '#ffffff',
-        color: '#000000',
-        links: '#0b004a'
-      }
-    },
-    features: {
-      scrollbar: false,
-      loop: false,
-      live: false,
-      hashtags: true,
-      timestamp: true,
-      avatars: true,
-      behavior: 'all'
-    }
-  }).render().setUser('<%=@twitter_user %>').start();
-  </script>
+    <a class="twitter-timeline" data-dnt=true href="https://twitter.com/<%= Configuration::twitter_username %>" data-widget-id="<%= Configuration::twitter_widget_id %>">Tweets by @<%= Configuration::twitter_username %></a>
+    <script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
   </div>
+  <% end %>
 </div>
 <% end %>
 
 <div id="left_column">
   <h1><%=@title %></h1>
- 
+
   <div id="blog">
     <% for item in @blog_items: %>
       <div class="blog_post">
           <h2 id="<%= Time.parse(item['pubDate'][0]).to_i %>"><a href="<%=item['link']%>"><%=h item['title'] %></a></h2>
           <p class="subtitle"><%= _("Posted on {{date}} by {{author}}", :date=>simple_date(Time.parse(item['pubDate'][0])), :author=>item['creator']) %></p>
-          <div><%= item['encoded'] %></div>
+          <div>
+            <% if item['encoded'] %>
+              <%= item['encoded'] %>
+            <% elsif item['description'] %>
+              <%= item['description'] %>
+            <% end %>
+          </div>
           <p><em>
+            <% if item['comments'] %>
               <a href="<%=item['comments'][0]%>"><%= _("{{number_of_comments}} comments", :number_of_comments=>item['comments'][1]) %></a>
+            <% end %>
           </em>
           </p>
       </div>
diff --git a/app/views/general/frontpage.rhtml b/app/views/general/frontpage.rhtml
index e2d74a5e2..acc7f4095 100644
--- a/app/views/general/frontpage.rhtml
+++ b/app/views/general/frontpage.rhtml
@@ -1,28 +1,11 @@
 <% view_cache :ttl => 5.minutes.to_i, :tag => I18n.locale do %>
   <div id="frontpage_splash">
     <div id="left_column">
-      <h1>
-        <%= _("Make a new<br/>
-        <strong>Freedom <span>of</span><br/>
-        Information<br/>
-        request</strong>") %>
-      </h1>
-      <a class="link_button_green_large" href="/select_authority"><%= _("Start now &raquo;") %></a>
+      <%= render :partial => "frontpage_new_request" %>
     </div>
     <div id="right_column">
       <div id="frontpage_search_box">
-        <h2>
-          <%= _("Search over<br/>
-          <strong>{{number_of_requests}} requests</strong> <span>and</span><br/>
-          <strong>{{number_of_authorities}} authorities</strong>",
-          :number_of_requests => InfoRequest.count, :number_of_authorities => PublicBody.count) %>
-        </h2>
-        <% form_tag({:action => "search_redirect"}, {:id => "search_form"}) do %>
-        <div>
-          <%= text_field_tag 'query', params[:query], { :size => 30 } %>
-          <%= submit_tag _('Search') %>
-        </div>
-        <% end %>
+        <%= render :partial => "frontpage_search_box" %>
       </div>
       <div id="frontpage_right_to_know">
         <%= render :partial => 'frontpage_intro_sentence'  %>
@@ -30,55 +13,8 @@
     </div>
     <div style="clear:both"></div>
   </div>
-
-<div id="frontpage_examples">
-    <% if @popular_bodies.size > 0 %>
-      <div id="examples_0">
-        <h3><%= _("Who can I request information from?") %></h3>
-        <%= _("{{site_name}} covers requests to {{number_of_authorities}} authorities, including:",
-            :site_name => site_name, :number_of_authorities => PublicBody.count) %>
-        <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 %>
-                </li>
-            <% end%>
-        </ul>
-        <p><strong>
-            <%= link_to _('Browse all authorities...'), list_public_bodies_default %>
-        </strong></p>
-      </div>
-    <% end %>
-
-    <div id="examples_1">
-      <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)) %>
-               <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>
-          <% 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>
-
-
+  <div id="frontpage_examples">
+      <%= render :partial => "frontpage_bodies_list" %>
+      <%= render :partial => "frontpage_requests_list" %>
+  </div>
 <% end %>