1 files changed, 54 insertions, 47 deletions
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index f5bd66ebd..834676f82 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -1,56 +1,63 @@
-<% @title = "#{site_name} blog and tweets" %>
+<% @title = _("{{site_name}} blog and tweets", :site_name => site_name) %>
 
-<h1><%=@title %></h1>
-   <img src="/images/twitter.png" alt="twitter icon" valign="middle"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>">Follow us on twitter</a>&nbsp;
-   <img src="/images/rss.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>">Subscribe to blog</a>
 <% if !@twitter_user.empty? %>
-<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'
+<div id="right_column">
+  <div class="act_link">
+    <h2><%= _("Stay up to date") %></h2>
+    <img src="/images/twitter-16.png" alt="twitter icon"  class="twitter-icon"> <a href="http://www.twitter.com/<%= MySociety::Config.get('TWITTER_USERNAME') %>"><%= _("Follow us on twitter") %></a><br/><br/>
+    <img src="/images/feed-16.png" alt="RSS icon" valign="middle"> <a href="<%= MySociety::Config.get('BLOG_FEED') %>"><%= _("Subscribe to blog") %></a>
+  </div>
+  <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'
+      }
     },
-    tweets: {
-      background: '#ffffff',
-      color: '#000000',
-      links: '#0b004a'
+    features: {
+      scrollbar: false,
+      loop: false,
+      live: false,
+      hashtags: true,
+      timestamp: true,
+      avatars: true,
+      behavior: 'all'
     }
-  },
-  features: {
-    scrollbar: false,
-    loop: false,
-    live: false,
-    hashtags: true,
-    timestamp: true,
-    avatars: true,
-    behavior: 'all'
-  }
-}).render().setUser('<%=@twitter_user %>').start();
-</script>
-
+  }).render().setUser('<%=@twitter_user %>').start();
+  </script>
+  </div>
 </div>
 <% end %>
 
-<div id="blog">
-  <% for item in @blog_items: %>
-    <div class="blog_post">
-        <h2><a href="<%=item['link']%>"><%=h item['title'] %></a></h2>
-        <p class="subtitle">Posted on <%= simple_date(Time.parse(item['pubDate'][0])) %> by <%=h item['creator'] %></p>
-        <div><%= item['encoded'] %></div>
-        <p><em>
-            <a href="<%=item['comments'][0]%>"><%=item['comments'][1]%> comments</a>
-        </em>
-        </p>
-    </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>
+          <p><em>
+              <a href="<%=item['comments'][0]%>"><%= _("{{number_of_comments}} comments", :number_of_comments=>item['comments'][1]) %></a>
+          </em>
+          </p>
+      </div>
+    <% end   %>
+  </div>
 </div>