diff options
| author | Louise Crow <louise.crow@gmail.com> | 2013-12-09 11:47:03 +0000 |
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2013-12-09 11:47:03 +0000 |
| commit | c244abd91fe2df48d9c99cd127cf61dc012dc914 (patch) | |
| tree | 22c376b6911b7be4683c525a11e60138497b0c9f | |
| parent | d326bb5d3d19c60d440b19edaa989578c160542e (diff) | |
| parent | 7c92fb67028c0371b796cd26edabe9a905d47561 (diff) | |
Merge branch 'feature/overridable-act-on' into rails-3-develop
| -rw-r--r-- | app/views/request/_act.html.erb | 15 | ||||
| -rw-r--r-- | app/views/request/_sidebar.html.erb | 17 |
2 files changed, 16 insertions, 16 deletions
diff --git a/app/views/request/_act.html.erb b/app/views/request/_act.html.erb new file mode 100644 index 000000000..1199cb4a2 --- /dev/null +++ b/app/views/request/_act.html.erb @@ -0,0 +1,15 @@ +<h2><%= _("Act on what you've learnt") %></h2> + +<div class="act_link"> + <% tweet_link = "https://twitter.com/share?" + {:url => request.url, :via => AlaveteliConfiguration::twitter_username, :text => "'#{@info_request.title}'", :related => _('alaveteli_foi:The software that runs {{site_name}}', :site_name => site_name)}.to_query %> + <% link_to tweet_link do %> + <%= image_tag "twitter-16.png", :alt => "twitter icon" %> + <% end %> + <%= link_to _("Tweet this request"), tweet_link %> +</div> +<div class="act_link"> + <%= link_to "http://wordpress.com/" do %> + <%= image_tag "wordpress.png", :class => "rss" %> + <% end %> + <%= link_to _("Start your own blog"), "http://wordpress.com/"%> +</div> diff --git a/app/views/request/_sidebar.html.erb b/app/views/request/_sidebar.html.erb index 8400cd6ac..0f7965ffa 100644 --- a/app/views/request/_sidebar.html.erb +++ b/app/views/request/_sidebar.html.erb @@ -33,22 +33,7 @@ <%= link_to _("Report this request"), new_request_report_path(:request_id => @info_request.url_title) %> <% end %> <% end %> - <h2><%= _("Act on what you've learnt") %></h2> - - <div class="act_link"> - <% tweet_link = "https://twitter.com/share?" + {:url => request.url, :via => AlaveteliConfiguration::twitter_username, :text => "'#{@info_request.title}'", :related => _('alaveteli_foi:The software that runs {{site_name}}', :site_name => site_name)}.to_query %> - <% link_to tweet_link do %> - <%= image_tag "twitter-16.png", :alt => "twitter icon" %> - <% end %> - <%= link_to _("Tweet this request"), tweet_link %> - </div> - <div class="act_link"> - <%= link_to "http://wordpress.com/" do %> - <%= image_tag "wordpress.png", :class => "rss" %> - <% end %> - <%= link_to _("Start your own blog"), "http://wordpress.com/"%> - </div> - + <%= render :partial => 'request/act' %> <%= render :partial => 'request/next_actions' %> <% cache_if_caching_fragments(@similar_cache_key, :expires_in => 1.day) do %> |