Download as
Browse Code »

Commit e96af6dfedb2c334e1703dad42ca379132489f44

Authored by Antonio Terceiro
1 parent 59117175
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Adding RSS feed link besides the blog description.

Showing 2 changed files with 14 additions and 1 deletions   Show diff stats
app/views/content_viewer/blog_page.rhtml
  Diff comments   View file @e96af6d
1 <%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %> 1 <%= content_tag('em', _('(external feed was not loaded yet)'), :id => 'external-feed-info', :class => 'metadata') if article.blog? && article.external_feed && article.external_feed.enabled && article.external_feed.fetched_at.nil? %>
2 2
3 -<div><%= article.body %></div> 3 +<div>
  4 + <%= link_to(image_tag('icons-mime/rss-feed.png'), article.feed.url, :class => 'blog-feed-link') if article.blog? && article.feed %>
  5 + <div class='blog-description'>
  6 + <%= article.body %>
  7 + </div>
  8 +</div>
4 <hr class="pre-posts"/> 9 <hr class="pre-posts"/>
5 <div class="blog-posts"> 10 <div class="blog-posts">
6 <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %> 11 <%= (children.compact.empty? ? content_tag('em', _('(no posts)')) : list_posts(user, children)) %>
public/stylesheets/application.css
  Diff comments   View file @e96af6d
@@ -1190,6 +1190,14 @@ a.comment-picture { @@ -1190,6 +1190,14 @@ a.comment-picture {
1190 font-size: small; 1190 font-size: small;
1191 } 1191 }
1192 1192
  1193 +.blog-feed-link {
  1194 + float: right;
  1195 +}
  1196 +
  1197 +.blog-description {
  1198 + margin-right: 30px;
  1199 +}
  1200 +
1193 1201
1194 1202
1195 a.button, a.button:visited, 1203 a.button, a.button:visited,