ActionItem260: melhorias na apresentação dos recortes

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1683 3f533792-8f58-4932-b0fe-aaf55b0a4547

ActionItem260: melhorias na apresentação dos recortes
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1683 3f533792-8f58-4932-b0fe-aaf55b0a4547
AurelioAHeckert
1 parent fda8b25d
Showing 7 changed files with 156 additions and 52 deletions Show diff stats
app/helpers/application_helper.rb
app/views/content_viewer/_comment.rhtml
app/views/search/_category.rhtml
app/views/search/category_index.rhtml
public/designs/themes/default/stylesheets/common.css
public/designs/themes/default/stylesheets/controller_search.css
public/stylesheets/common.css
@@ -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(' &rarr; ') : category.name
     link_to name, :controller => 'search', :action => 'category_index', :category_path => category.path.split('/')
   end
-<%= tag('a', :name => comment.anchor) %>
+<%= content_tag('a', '', :name => comment.anchor) %>
 <div class="article-comment<%= ' comment-from-owner' if ( comment.author && (@page.profile.name == comment.author.name) ) %> comment-logged-<%= comment.author ? 'in' : 'out' %>">
   <% if logged_in? && (user == @page.profile || user == comment.author) %>
     <% button_bar(:style => 'float: right; margin-top: 0;') do %>
-<h2><%= _('Recent articles') %></h2>
-<ul class="recent_on_cat recent_articles">
-  <%= render :partial => 'article', :collection => @recent_articles %>
-</ul>
-<h2><%= _('Recent Comments') %></h2>
-<ul class="recent_on_cat recent_comments">
-<% @recent_comments.each do |comment| %>
-  <li>
-    <strong><%= link_to(comment.title, comment.url) %></strong>
-    <div class="item_meta">
-      <%= _('by %{author} on "%{article}"') % {
-                :comment => link_to(comment.title, comment.url),
-                :article => link_to(comment.article.title, comment.article.url),
-                :author => comment.author_name } %>
-    </div>
-  </li>
-<% end %>
-</ul>
+<div id="category-recent-articles">
+  <h2><%= _('Recent articles') %></h2>
+  <div class="category-innerbox">
+    <ul class="recent_on_cat recent_articles">
+      <%= render :partial => 'article', :collection => @recent_articles %>
+    </ul>
+  </div><!-- end class="category-innerbox" -->
+</div><!-- end id="category-recent-articles" -->
+
+<div id="category-comments">
+
+<div id="category-recent-comments">
+  <h2><%= _('Recent Comments') %></h2>
+  <div class="category-innerbox">
+    <ul class="recent_on_cat recent_comments">
+    <% @recent_comments.each do |comment| %>
+      <li>
+        <% 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', '&nbsp;',
+              :class => 'comment-picture',
+              :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
+          %>
+        <% end %>
+        <strong><%= link_to(comment.title, comment.url) %></strong>
+        <div class="item_meta">
+          <%= _('by %{author} on "%{article}"') % {
+                    :comment => link_to(comment.title, comment.url),
+                    :article => link_to(comment.article.title, comment.article.url),
+                    :author => comment.author_name } %>
+        </div>
+      </li>
+    <% end %>
+    </ul>
+  </div><!-- end class="category-innerbox" -->
+</div><!-- end id="category-recent-articles" -->
+
+<div id="most-commented">
+  <h2><%= _('Most commented articles') %></h2>
+  <div class="category-innerbox">
+    <ul class="most_commented">
+      <%= render :partial => 'article', :collection => @most_commented_articles %>
+    </ul>
+  </div><!-- end class="category-innerbox" -->
+</div><!-- end id="most-commented" -->
+
+</div><!-- end id="category-comments" -->
-<h2><%= _('Most commented articles') %></h2>
-<ul class="most_commented">
-  <%= render :partial => 'article', :collection => @most_commented_articles %>
-</ul>
@@ -12,18 +12,17 @@
   <div id="category-childs">
     <h2> <%= _('Sub-categories')  %> </h2>
-
     <% if @category.children.empty? %>
       <strong id="cat-no-child"><%= _('No sub-categories') %></strong>
     <% else %>
       <ul>
         <% @category.children.each do |c| %>
-          <li> <%= link_to_category(c) %> </li>
+          <li> <%= link_to_category c, false %> </li>
         <% end %>
       </ul>
     <% end %>
-
   </div><!-- end id="child-categories" -->
+<br style="clear:both" />
 </div><!-- end id="view-category" -->
@@ -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 {
+.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;
+}
+
@@ -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;
 }
	@@ -308,7 +308,7 @@ module ApplicationHelper		@@ -308,7 +308,7 @@ module ApplicationHelper
308		308
309	def link_to_category(category, full = true)	309	def link_to_category(category, full = true)
310	return _('Uncategorized product') unless category	310	return _('Uncategorized product') unless category
311	- name = full ? category.full_name : category.name	311	+ name = full ? category.full_name(' → ') : category.name
312	link_to name, :controller => 'search', :action => 'category_index', :category_path => category.path.split('/')	312	link_to name, :controller => 'search', :action => 'category_index', :category_path => category.path.split('/')
313	end	313	end
314		314
1	-<%= tag('a', :name => comment.anchor) %>	1	+<%= content_tag('a', '', :name => comment.anchor) %>
2	<div class="article-comment<%= ' comment-from-owner' if ( comment.author && (@page.profile.name == comment.author.name) ) %> comment-logged-<%= comment.author ? 'in' : 'out' %>">	2	<div class="article-comment<%= ' comment-from-owner' if ( comment.author && (@page.profile.name == comment.author.name) ) %> comment-logged-<%= comment.author ? 'in' : 'out' %>">
3	<% if logged_in? && (user == @page.profile \|\| user == comment.author) %>	3	<% if logged_in? && (user == @page.profile \|\| user == comment.author) %>
4	<% button_bar(:style => 'float: right; margin-top: 0;') do %>	4	<% button_bar(:style => 'float: right; margin-top: 0;') do %>
1	-<h2><%= _('Recent articles') %></h2>
2	-<ul class="recent_on_cat recent_articles">
3	- <%= render :partial => 'article', :collection => @recent_articles %>
4	-</ul>
5		1
6	-<h2><%= _('Recent Comments') %></h2>
7	-<ul class="recent_on_cat recent_comments">
8	-<% @recent_comments.each do \|comment\| %>
9	- <li>
10	- <strong><%= link_to(comment.title, comment.url) %></strong>
11	- <div class="item_meta">
12	- <%= _('by %{author} on "%{article}"') % {
13	- :comment => link_to(comment.title, comment.url),
14	- :article => link_to(comment.article.title, comment.article.url),
15	- :author => comment.author_name } %>
16	- </div>
17	- </li>
18	-<% end %>
19	-</ul>	2	+<div id="category-recent-articles">
		3	+ <h2><%= _('Recent articles') %></h2>
		4	+ <div class="category-innerbox">
		5	+ <ul class="recent_on_cat recent_articles">
		6	+ <%= render :partial => 'article', :collection => @recent_articles %>
		7	+ </ul>
		8	+ </div><!-- end class="category-innerbox" -->
		9	+</div><!-- end id="category-recent-articles" -->
		10	+
		11	+<div id="category-comments">
		12	+
		13	+<div id="category-recent-comments">
		14	+ <h2><%= _('Recent Comments') %></h2>
		15	+ <div class="category-innerbox">
		16	+ <ul class="recent_on_cat recent_comments">
		17	+ <% @recent_comments.each do \|comment\| %>
		18	+ <li>
		19	+ <% if comment.author %>
		20	+ <%= link_to content_tag( 'span', comment.author.name() ), comment.author.url,
		21	+ :class => 'comment-picture',
		22	+ :style => 'background-image:url(%s)' % profile_icon(comment.author, :icon)
		23	+ %>
		24	+ <% else %>
		25	+ <%# unauthenticated user: display gravatar icon %>
		26	+ <%= content_tag 'span', ' ',
		27	+ :class => 'comment-picture',
		28	+ :style => 'background-image:url(%s)' % str_gravatar_url_for( comment.email, :size => 20 )
		29	+ %>
		30	+ <% end %>
		31	+ <strong><%= link_to(comment.title, comment.url) %></strong>
		32	+ <div class="item_meta">
		33	+ <%= _('by %{author} on "%{article}"') % {
		34	+ :comment => link_to(comment.title, comment.url),
		35	+ :article => link_to(comment.article.title, comment.article.url),
		36	+ :author => comment.author_name } %>
		37	+ </div>
		38	+ </li>
		39	+ <% end %>
		40	+ </ul>
		41	+ </div><!-- end class="category-innerbox" -->
		42	+</div><!-- end id="category-recent-articles" -->
		43	+
		44	+<div id="most-commented">
		45	+ <h2><%= _('Most commented articles') %></h2>
		46	+ <div class="category-innerbox">
		47	+ <ul class="most_commented">
		48	+ <%= render :partial => 'article', :collection => @most_commented_articles %>
		49	+ </ul>
		50	+ </div><!-- end class="category-innerbox" -->
		51	+</div><!-- end id="most-commented" -->
		52	+
		53	+</div><!-- end id="category-comments" -->
20		54
21	-<h2><%= _('Most commented articles') %></h2>
22	-<ul class="most_commented">
23	- <%= render :partial => 'article', :collection => @most_commented_articles %>
24	-</ul>
	@@ -35,21 +35,6 @@ body.category2 a:visited { color: #8A6 }		@@ -35,21 +35,6 @@ body.category2 a:visited { color: #8A6 }
35	a:hover, a:active { color: #08F }	35	a:hover, a:active { color: #08F }
36	body.category2 a:hover { color: #5C0 }	36	body.category2 a:hover { color: #5C0 }
37		37
38	-/* List of Category Item */
39	-
40	-.category_itens ul a {
41	- text-decoration: none;
42	-}
43	-
44	-.category_itens .item_meta {
45	- font-size: 12px;
46	- padding: 0px 0px 5px 0px;
47	-}
48	-
49	-.category_itens .cat_item_update {
50	- color: #999;
51	-}
52	-
53	/* file manager (big) style */	38	/* file manager (big) style */
54		39
55	div.file-manager {	40	div.file-manager {
1		1
		2	+.category-innerbox,
2	.search-results-innerbox {	3	.search-results-innerbox {
		4	+ padding: 10px 0px 10px 10px;
		5	+ overflow: auto;
3	border: none;	6	border: none;
4	background: #B8CFE7;	7	background: #B8CFE7;
5	-moz-border-radius: 15px;	8	-moz-border-radius: 15px;
	@@ -30,3 +33,100 @@		@@ -30,3 +33,100 @@
30	color: #729FCF;	33	color: #729FCF;
31	}	34	}
32		35
		36	+.item_meta {
		37	+ font-size: 10px;
		38	+ padding: 0px 0px 5px 0px;
		39	+}
		40	+
		41	+/* * * Category Page * * * * * * * * * * * * */
		42	+
		43	+.category_itens ul a {
		44	+ text-decoration: none;
		45	+}
		46	+
		47	+#view-category h2 {
		48	+ font-size: 16px;
		49	+ line-height: 20px;
		50	+ margin: 0px;
		51	+ padding: 20px 0px 0px 20px;
		52	+}
		53	+
		54	+#most-commented h2 {
		55	+ font-size: 14px;
		56	+}
		57	+
		58	+#category-recent-articles {
		59	+ width: 53%;
		60	+ float: left;
		61	+}
		62	+
		63	+#category-comments {
		64	+ margin-left: 55%;
		65	+}
		66	+
		67	+#content #category-comments ul,
		68	+#content #category-comments li {
		69	+ margin: 0px;
		70	+ padding: 0px;
		71	+ list-style: none;
		72	+ color: #888;
		73	+}
		74	+
		75	+.category-innerbox {
		76	+ height: 170px;
		77	+}
		78	+#category-recent-articles .category-innerbox {
		79	+ height: 400px;
		80	+}
		81	+
		82	+body.category1 .category-innerbox {
		83	+ background: #FDD79E;
		84	+}
		85	+body.category2 .category-innerbox {
		86	+ background: #C4F099;
		87	+}
		88	+body.category3 .category-innerbox {
		89	+ background: #D6BFD3;
		90	+}
		91	+body.category4 .category-innerbox {
		92	+ background: #F79494;
		93	+}
		94	+
		95	+#content #category-recent-articles ul,
		96	+#content #category-recent-articles li {
		97	+ margin: 0px;
		98	+ padding: 0px;
		99	+ list-style: none;
		100	+ color: #888;
		101	+}
		102	+
		103	+#category-childs {
		104	+ clear: both;
		105	+}
		106	+
		107	+#category-childs ul {
		108	+ margin: 0px;
		109	+ padding: 0px 0px 0px 20px;
		110	+}
		111	+
		112	+#category-childs li {
		113	+ margin: 0px;
		114	+ padding: 0px;
		115	+ float: left;
		116	+ width: 33%;
		117	+ font-size: 12px;
		118	+}
		119	+
		120	+#category-childs a {
		121	+ font-weight: bold;
		122	+ text-decoration: none;
		123	+}
		124	+
		125	+/* * * Comments on Category Page * * * * * * */
		126	+
		127	+#view-category .comment-picture {
		128	+ width: 20px;
		129	+ height: 20px;
		130	+ margin: -2px 5px 0px 0px;
		131	+}
		132	+
	@@ -256,16 +256,6 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content		@@ -256,16 +256,6 @@ body.category4 #content h4, body.category4 #content h5, body.category4 #content
256	text-decoration: underline;	256	text-decoration: underline;
257	}	257	}
258		258
259	-#category-childs h4,
260	-#category-childs ul {
261	- margin: 0px;
262	-}
263	-
264	-#category-childs a {
265	- font-weight: bold;
266	- text-decoration: none;
267	-}
268	-
269	#cat-no-child {	259	#cat-no-child {
270	color: #AAA;	260	color: #AAA;
271	}	261	}