diff --git a/themes/bootstrap/views/articles/_article.html.erb b/themes/bootstrap/views/articles/_article.html.erb index 3d0fea39bd..0a7e20c828 100644 --- a/themes/bootstrap/views/articles/_article.html.erb +++ b/themes/bootstrap/views/articles/_article.html.erb @@ -1,8 +1,11 @@ -
- - <%= render 'articles/protected_article_content', { :article => article } %> - <%= render 'articles/meta', article: article %> +
+

<%= (controller.controller_name == 'redirect') ? article.title : link_to_permalink(article,article.title) %>

+
+ <%= render 'articles/protected_article_content', { :article => article } %> + <%= render 'articles/meta', article: article %> +
+
<%= render 'articles/comment_counter', article: article %>
-
+ diff --git a/themes/bootstrap/views/articles/_meta.html.erb b/themes/bootstrap/views/articles/_meta.html.erb index 6078ca4fc4..82f687fee2 100644 --- a/themes/bootstrap/views/articles/_meta.html.erb +++ b/themes/bootstrap/views/articles/_meta.html.erb @@ -2,6 +2,7 @@

<%= _("Published on") %> <%= display_date_and_time(article.published_at) %> + <%= _("by") %> <%= article.user.nickname %> <%= category_links(article, _("under")) unless article.categories.empty? %>. <%= tag_links(article) unless article.tags.empty? %>

diff --git a/themes/bootstrap/views/articles/index.html.erb b/themes/bootstrap/views/articles/index.html.erb index 5460593201..6db8c91601 100644 --- a/themes/bootstrap/views/articles/index.html.erb +++ b/themes/bootstrap/views/articles/index.html.erb @@ -1,4 +1,6 @@ -<%= render @articles %> +
+ <%= render @articles %> +
<%= paginate(@articles)%>
diff --git a/themes/bootstrap/views/categories/_article.html.erb b/themes/bootstrap/views/categories/_article.html.erb index d5ef6b1d72..008fa45717 100644 --- a/themes/bootstrap/views/categories/_article.html.erb +++ b/themes/bootstrap/views/categories/_article.html.erb @@ -1,8 +1,10 @@ -
-

<%= link_to_permalink(article, article.title) %>

- <%= render 'articles/protected_article_content', { :article => article } %> - <%= render 'articles/meta', article: article %> +
+

<%= link_to_permalink(article, article.title) %>

+
+ <%= render 'articles/protected_article_content', { :article => article } %> + <%= render 'articles/meta', article: article %> +
<%= render 'articles/comment_counter', article: article %>
-
+ diff --git a/themes/bootstrap/views/categories/show.html.erb b/themes/bootstrap/views/categories/show.html.erb index 610436ff4a..9edeeb62f7 100644 --- a/themes/bootstrap/views/categories/show.html.erb +++ b/themes/bootstrap/views/categories/show.html.erb @@ -1,5 +1,7 @@

<%= link_to @grouping.name, @grouping.permalink_url %>

-<%= render :partial => 'article', :collection => @articles %> +
+ <%= render :partial => 'article', :collection => @articles %> +
<%= paginate @articles, { :previous_label => _('Previous'), :next_label => _('Next') } %>
diff --git a/themes/bootstrap/views/tags/_article.html.erb b/themes/bootstrap/views/tags/_article.html.erb index 2006ed8af3..d887db81bf 100644 --- a/themes/bootstrap/views/tags/_article.html.erb +++ b/themes/bootstrap/views/tags/_article.html.erb @@ -1,8 +1,10 @@ -
- - <%= render 'articles/protected_article_content', { :article => article } %> - <%= render 'articles/meta', article: article %> +
+

<%= link_to_permalink(article,article.title) %>

+
+ <%= render 'articles/protected_article_content', { :article => article } %> + <%= render 'articles/meta', article: article %> +
<%= render 'articles/comment_counter', article: article %>
-
+ diff --git a/themes/bootstrap/views/tags/show.html.erb b/themes/bootstrap/views/tags/show.html.erb index d084b96a2c..67a83866d2 100644 --- a/themes/bootstrap/views/tags/show.html.erb +++ b/themes/bootstrap/views/tags/show.html.erb @@ -1,4 +1,7 @@ -<%= render :partial => 'article', :collection => @articles %> +
+ <%= render :partial => 'article', :collection => @articles %> +
+
<%= paginate @articles, { :previous_label => _('Previous'), :next_label => _('Next') } %>
\ No newline at end of file