aboutsummaryrefslogtreecommitdiffstats
path: root/app/views/general/blog.rhtml
diff options
context:
space:
mode:
authorDavid Cabo <david@calibea.com>2011-10-13 00:31:56 +0200
committerDavid Cabo <david@calibea.com>2011-10-13 00:31:56 +0200
commit6b19c36f114624d7e53be8edc9ee490ecd20d0b0 (patch)
tree7741c3655fe5e3cbc90dd20a4626ac7acc1bf6b0 /app/views/general/blog.rhtml
parent6800b9ff3fc77aa441afbdb0b0196afbdd87d8b4 (diff)
parente13127a8ebc8bf8379d92f778af5a2bb6931d80c (diff)
Merge branch 'release/0.4' into develop
Diffstat (limited to 'app/views/general/blog.rhtml')
-rw-r--r--app/views/general/blog.rhtml4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/general/blog.rhtml b/app/views/general/blog.rhtml
index 834676f82..98636a653 100644
--- a/app/views/general/blog.rhtml
+++ b/app/views/general/blog.rhtml
@@ -4,8 +4,8 @@
<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>
+ <img src="/images/twitter-16.png" alt="twitter icon" class="twitter-icon"> <a href="http://www.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>
<div id="twitter">
<script src="http://widgets.twimg.com/j/2/widget.js"></script>