Merge branch 'rss-icon' into noosfero

Braulio Bhavamitra
2 parents 7e2ac70a 5d003955
Showing 3 changed files with 4 additions and 4 deletions Show diff stats
app/views/content_viewer/_article_toolbar.html.erb
public/designs/icons/tango/style.css
public/stylesheets/application.css
@@ -62,7 +62,7 @@
     <% if @page.blog? and !@page.image.nil? %>
       <div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
     <% end %>
-    <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
+    <%= button_without_text(:feed, _('RSS feed'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
     <%= @plugins.dispatch(:article_header_extra_contents, @page).collect { |content| instance_exec(&content) }.join("") %>
     <%= render :partial => 'article_title', :locals => {:no_link => true} %>
     <%= article_translations(@page) %>
@@ -117,6 +117,9 @@
 .icon-reset-admin-role        { background-image: url(../../../images/icons-app/person-icon.png) }
 .icon-clock                   { background-image: url(Tango/16x16/actions/appointment.png) }
 .icon-fullscreen              { background-image: url(Tango/16x16/actions/view-fullscreen.png) }
+.icon-feed,
+.icon-newrss-feed,
+.icon-rss-feed                { background-image: url(../../../images/icons-mime/rss-feed-16.png) }
 /******************BIG ICONS************************/
 .bigicon-embed     { background-image: url(Tango/scalable/apps/utilities-terminal.svg) }
@@ -3485,9 +3485,6 @@ table.cms-articles .icon:hover {
   color: #888a85;
   font-size: smaller;
 }
-.article-types .icon-newrss-feed, #content .icon-rss-feed {
-  background-image: url(../images/icons-mime/rss-feed-16.png);
-}
 .article-types a {
   text-decoration: none;
   color: black;
	@@ -62,7 +62,7 @@		@@ -62,7 +62,7 @@
62	<% if @page.blog? and !@page.image.nil? %>	62	<% if @page.blog? and !@page.image.nil? %>
63	<div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>	63	<div class="blog-cover"><%= image_tag(@page.image.public_filename())%></div>
64	<% end %>	64	<% end %>
65	- <%= link_to(image_tag('/images/icons-mime/rss-feed.png'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>	65	+ <%= button_without_text(:feed, _('RSS feed'), @page.feed.url, :class => 'blog-feed-link') if @page.has_posts? && @page.feed %>
66	<%= @plugins.dispatch(:article_header_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>	66	<%= @plugins.dispatch(:article_header_extra_contents, @page).collect { \|content\| instance_exec(&content) }.join("") %>
67	<%= render :partial => 'article_title', :locals => {:no_link => true} %>	67	<%= render :partial => 'article_title', :locals => {:no_link => true} %>
68	<%= article_translations(@page) %>	68	<%= article_translations(@page) %>