diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index c019500..b95509f 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -308,7 +308,7 @@ module ApplicationHelper
def link_to_category(category, full = true)
return _('Uncategorized product') unless category
- name = full ? category.full_name : category.name
+ name = full ? category.full_name(' → ') : category.name
link_to name, :controller => 'search', :action => 'category_index', :category_path => category.path.split('/')
end
diff --git a/app/views/content_viewer/_comment.rhtml b/app/views/content_viewer/_comment.rhtml
index 3b3250c..de0d8f0 100644
--- a/app/views/content_viewer/_comment.rhtml
+++ b/app/views/content_viewer/_comment.rhtml
@@ -1,4 +1,4 @@
-<%= tag('a', :name => comment.anchor) %>
+<%= content_tag('a', '', :name => comment.anchor) %>
<% if logged_in? && (user == @page.profile || user == comment.author) %>
<% button_bar(:style => 'float: right; margin-top: 0;') do %>
diff --git a/app/views/search/_category.rhtml b/app/views/search/_category.rhtml
index ae00189..187a1f8 100644
--- a/app/views/search/_category.rhtml
+++ b/app/views/search/_category.rhtml
@@ -1,24 +1,54 @@
-
<%= _('Recent articles') %>
-
- <%= render :partial => 'article', :collection => @recent_articles %>
-
-
<%= _('Recent Comments') %>
-
+
+
<%= _('Recent articles') %>
+
+
+ <%= render :partial => 'article', :collection => @recent_articles %>
+
+
+
+
+
-
<%= _('Most commented articles') %>
-
diff --git a/app/views/search/category_index.rhtml b/app/views/search/category_index.rhtml
index 25465d1..f028729 100644
--- a/app/views/search/category_index.rhtml
+++ b/app/views/search/category_index.rhtml
@@ -12,18 +12,17 @@
<%= _('Sub-categories') %>
-
<% if @category.children.empty? %>
<%= _('No sub-categories') %>
<% else %>
<% @category.children.each do |c| %>
- - <%= link_to_category(c) %>
+ - <%= link_to_category c, false %>
<% end %>
<% end %>
-
+
diff --git a/public/designs/themes/default/stylesheets/common.css b/public/designs/themes/default/stylesheets/common.css
index bf2026c..e9ea6e9 100644
--- a/public/designs/themes/default/stylesheets/common.css
+++ b/public/designs/themes/default/stylesheets/common.css
@@ -35,21 +35,6 @@ body.category2 a:visited { color: #8A6 }
a:hover, a:active { color: #08F }
body.category2 a:hover { color: #5C0 }
-/* List of Category Item */
-
-.category_itens ul a {
- text-decoration: none;
-}
-
-.category_itens .item_meta {
- font-size: 12px;
- padding: 0px 0px 5px 0px;
-}
-
-.category_itens .cat_item_update {
- color: #999;
-}
-
/* file manager (big) style */
div.file-manager {
diff --git a/public/designs/themes/default/stylesheets/controller_search.css b/public/designs/themes/default/stylesheets/controller_search.css
index 4926c1d..ec39bac 100644
--- a/public/designs/themes/default/stylesheets/controller_search.css
+++ b/public/designs/themes/default/stylesheets/controller_search.css
@@ -1,5 +1,8 @@
+.category-innerbox,
.search-results-innerbox {
+ padding: 10px 0px 10px 10px;
+ overflow: auto;
border: none;
background: #B8CFE7;
-moz-border-radius: 15px;
@@ -30,3 +33,100 @@
color: #729FCF;
}
+.item_meta {
+ font-size: 10px;
+ padding: 0px 0px 5px 0px;
+}
+
+/* * * Category Page * * * * * * * * * * * * */
+
+.category_itens ul a {
+ text-decoration: none;
+}
+
+#view-category h2 {
+ font-size: 16px;
+ line-height: 20px;
+ margin: 0px;
+ padding: 20px 0px 0px 20px;
+}
+
+#most-commented h2 {
+ font-size: 14px;
+}
+
+#category-recent-articles {
+ width: 53%;
+ float: left;
+}
+
+#category-comments {
+ margin-left: 55%;
+}
+
+#content #category-comments ul,
+#content #category-comments li {
+ margin: 0px;
+ padding: 0px;
+ list-style: none;
+ color: #888;
+}
+
+.category-innerbox {
+ height: 170px;
+}
+#category-recent-articles .category-innerbox {
+ height: 400px;
+}
+
+body.category1 .category-innerbox {
+ background: #FDD79E;
+}
+body.category2 .category-innerbox {
+ background: #C4F099;
+}
+body.category3 .category-innerbox {
+ background: #D6BFD3;
+}
+body.category4 .category-innerbox {
+ background: #F79494;
+}
+
+#content #category-recent-articles ul,
+#content #category-recent-articles li {
+ margin: 0px;
+ padding: 0px;
+ list-style: none;
+ color: #888;
+}
+
+#category-childs {
+ clear: both;
+}
+
+#category-childs ul {
+ margin: 0px;
+ padding: 0px 0px 0px 20px;
+}
+
+#category-childs li {
+ margin: 0px;
+ padding: 0px;
+ float: left;
+ width: 33%;
+ font-size: 12px;
+}
+
+#category-childs a {
+ font-weight: bold;
+ text-decoration: none;
+}
+
+/* * * Comments on Category Page * * * * * * */
+
+#view-category .comment-picture {
+ width: 20px;
+ height: 20px;
+ margin: -2px 5px 0px 0px;
+}
+
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 0f6fb62..e01c959 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -256,16 +256,6 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content
text-decoration: underline;
}
-#category-childs h4,
-#category-childs ul {
- margin: 0px;
-}
-
-#category-childs a {
- font-weight: bold;
- text-decoration: none;
-}
-
#cat-no-child {
color: #AAA;
}
--
libgit2 0.21.2
<%= _('Recent articles') %>
-- <%= render :partial => 'article', :collection => @recent_articles %> -
-<%= _('Recent Comments') %>
--<% @recent_comments.each do |comment| %> --
- <%= link_to(comment.title, comment.url) %>
-
- <%= _('by %{author} on "%{article}"') % {
- :comment => link_to(comment.title, comment.url),
- :article => link_to(comment.article.title, comment.article.url),
- :author => comment.author_name } %>
-
-
-<% end %>
-
+<%= _('Recent articles') %>
++ <%= render :partial => 'article', :collection => @recent_articles %> +
+<%= _('Recent Comments') %>
++ <% @recent_comments.each do |comment| %> +-
+ <% if comment.author %>
+ <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
+ :class => 'comment-picture',
+ :style => 'background-image:url(%s)' % profile_icon(comment.author, :icon)
+ %>
+ <% else %>
+ <%# unauthenticated user: display gravatar icon %>
+ <%= content_tag 'span', ' ',
+ :class => 'comment-picture',
+ :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
+ %>
+ <% end %>
+ <%= link_to(comment.title, comment.url) %>
+
+ <%= _('by %{author} on "%{article}"') % {
+ :comment => link_to(comment.title, comment.url),
+ :article => link_to(comment.article.title, comment.article.url),
+ :author => comment.author_name } %>
+
+
+ <% end %>
+
+<%= _('Most commented articles') %>
++ <%= render :partial => 'article', :collection => @most_commented_articles %> +
+<%= _('Most commented articles') %>
-- <%= render :partial => 'article', :collection => @most_commented_articles %> -
diff --git a/app/views/search/category_index.rhtml b/app/views/search/category_index.rhtml index 25465d1..f028729 100644 --- a/app/views/search/category_index.rhtml +++ b/app/views/search/category_index.rhtml @@ -12,18 +12,17 @@<%= _('Sub-categories') %>
- <% if @category.children.empty? %> <%= _('No sub-categories') %> <% else %><% @category.children.each do |c| %> -- <%= link_to_category(c) %>
+ - <%= link_to_category c, false %>
<% end %>
<% end %> -