Merge branch 'AI3158-icons-in-folder' into 'stable'

Display missed icons on folder view A small rewrite with more coherent names and context-able listing to make that thing to work. http://noosfero.org/Development/ActionItem3158

Merge branch 'AI3158-icons-in-folder' into 'stable'
Display missed icons on folder view A small rewrite with more coherent names and context-able listing to make that thing to work. http://noosfero.org/Development/ActionItem3158
Rodrigo Souto
2 parents b2ff3fa1 526c04a9
Showing 7 changed files with 71 additions and 37 deletions Show diff stats
app/helpers/folder_helper.rb
app/views/content_viewer/folder.rhtml
app/views/profile/sitemap.rhtml
app/views/shared/articles_list.rhtml
app/views/shared/content_list.rhtml
public/stylesheets/application.css
test/unit/folder_helper_test.rb
@@ -3,15 +3,17 @@ module FolderHelper
   include ShortFilename
   include ArticleHelper
-  def list_articles(articles, recursive = false)
-    if !articles.blank?
-      articles = articles.paginate(
+  def list_contents(configure={})
+    configure[:recursive] ||= false
+    configure[:list_type] ||= :folder
+    if !configure[:contents].blank?
+      configure[:contents] = configure[:contents].paginate(
         :order => "updated_at DESC",
         :per_page => 10,
         :page => params[:npage]
       )
-      render :file => 'shared/articles_list', :locals => {:articles => articles, :recursive => recursive}
+      render :file => 'shared/content_list', :locals => configure
     else
       content_tag('em', _('(empty folder)'))
     end
@@ -21,21 +23,33 @@ module FolderHelper
     articles.select {|article| article.display_to?(user)}
   end
-  def display_article_in_listing(article, recursive = false, level = 0)
-    article = FilePresenter.for article
-    article_link = if article.image?
-         link_to('&nbsp;' * (level * 4) + image_tag(icon_for_article(article)) + short_filename(article.name), article.url.merge(:view => true))
+  def display_content_in_listing(configure={})
+    recursive = configure[:recursive] || false
+    list_type = configure[:list_type] || :folder
+    level = configure[:level] || 0
+    content = FilePresenter.for configure[:content]
+    content_link = if content.image?
+         link_to('&nbsp;' * (level * 4) +
+           image_tag(icon_for_article(content)) + short_filename(content.name),
+           content.url.merge(:view => true)
+         )
        else
-         link_to('&nbsp;' * (level * 4) + short_filename(article.name), article.url.merge(:view => true), :class => icon_for_article(article))
+         link_to('&nbsp;' * (level * 4) +
+           short_filename(content.name),
+           content.url.merge(:view => true), :class => icon_for_article(content)
+         )
        end
     result = content_tag(
       'tr',
-      content_tag('td', article_link )+
-      content_tag('td', show_date(article.updated_at), :class => 'last-update'),
-      :class => 'sitemap-item'
+      content_tag('td', content_link ) +
+      content_tag('td', show_date(content.updated_at), :class => 'last-update'),
+      :class => "#{list_type}-item"
     )
     if recursive
-      result + article.children.map {|item| display_article_in_listing(item, recursive, level + 1) }.join('')
+      result + content.children.map {|item|
+        display_content_in_listing :content=>item, :recursive=>recursive,
+                                   :list_type=>list_type, :level=>level+1
+      }.join("\n")
     else
       result
     end
@@ -8,5 +8,5 @@
 <% if folder.children.empty? %>
   <em><%= _('(empty folder)') %></em>
 <% else %>
-  <%= list_articles(folder.children) %>
+  <%= list_contents(:contents=>folder.children) %>
 <% end %>
 <h1><%= _("%s: site map") % profile.name %></h1>
-<%= list_articles(available_articles(@articles, user), false) %>
+<%= list_contents :contents=>available_articles(@articles, user), :list_type=>:sitemap %>
@@ -1,14 +0,0 @@
-<table>
-
-  <tr>
-    <th><%= _('Title') %></th>
-    <th><%= _('Last update') %></th>
-  </tr>
-  <% articles.each do |article| %>
-    <% if article.display_to?(user) %>
-      <%= display_article_in_listing(article, recursive, 0) %>
-    <% end %>
-  <% end %>
-</table>
-
-<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
@@ -0,0 +1,13 @@
+<table class="<%= list_type %>-content">
+  <tr>
+    <th><%= _('Title') %></th>
+    <th><%= _('Last update') %></th>
+  </tr>
+  <% contents.each do |content| %>
+    <% if content.display_to?(user) %>
+      <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
+    <% end %>
+  <% end %>
+</table>
+
+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>
@@ -305,17 +305,19 @@ div.pending-tasks {
   -khtml-border-radius: 2px;
   border-radius: 2px;
 }
-/* sitemap and agenda */
+/* sitemap and agenda */
-.agenda-item a.icon, .sitemap-item a.icon {
+.agenda-item a.icon {
   background-image: none;
   line-height: 150%;
 }
-.agenda-item .icon:hover, .sitemap-item .icon:hover {
+
+.agenda-item:hover, .sitemap-item:hover, .sitemap-item:hover a {
   background-color: transparent;
   text-decoration: underline;
 }
+
 .agenda-item a, a:visited{
  font-weight: bold;
  color: black;
@@ -326,6 +328,14 @@ div.pending-tasks {
   text-decoration: none;
 }
+.sitemap-item a.icon {
+  background-repeat: no-repeat;
+  background-position: 0% 50%;
+  padding-left: 20px;
+  display: inline-block;
+  line-height: 16px;
+}
+
 .sitemap-item img, .agenda-item img {
   border: none;
 }
@@ -3459,7 +3469,15 @@ div.with_media_panel .formfield input[type=&quot;checkbox&quot;] {
 .pagination a:hover {
   color: #2e3436;
 }
-/* ==> @import url('folder.css'); <== */
+
+/* Folders */
+
+.folder-content .folder-item img {
+  vertical-align: middle;
+  position: relative;
+  left: -3px;
+}
+
 .image-gallery {
   text-align: center;
 }
@@ -97,14 +97,17 @@ class FolderHelperTest &lt; ActiveSupport::TestCase
     article2 = fast_create(Article, {:name => 'Article2', :parent_id => folder.id, :profile_id => profile.id, :updated_at => DateTime.now })
     self.stubs(:params).returns({:npage => nil})
-    articles = folder.children.find(:all, :order => 'updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
+    contents = folder.children.find(:all, :order => 'updated_at DESC').paginate(:per_page => 10, :page => params[:npage])
     expects(:user).returns(profile).at_least_once
+    expects(:list_type).returns(:folder).at_least_once
     expects(:recursive).returns(false).at_least_once
     expects(:pagination_links).with(anything, anything).returns('')
-    list = render 'shared/articles_list', binding
-    expects(:render).with(:file => 'shared/articles_list', :locals => { :articles => articles, :recursive => false}).returns(list)
+    list = render 'shared/content_list', binding
+    expects(:render).with(:file => 'shared/content_list',
+      :locals => { :contents => contents, :recursive => false, :list_type => :folder }
+    ).returns(list)
-    result = list_articles(folder.children)
+    result = list_contents(:contents=>contents)
     assert_tag_in_string result, :tag => 'td', :descendant => { :tag => 'a', :attributes => { :href => /.*\/folder-owner\/my-article-[0-9]*(\?|$)/ } }, :content => /Article1/
     assert_tag_in_string result, :tag => 'td', :descendant => { :tag => 'a', :attributes => { :href => /.*\/folder-owner\/my-article-[0-9]*(\?|$)/ } }, :content => /Article2/
	@@ -8,5 +8,5 @@		@@ -8,5 +8,5 @@
8	<% if folder.children.empty? %>	8	<% if folder.children.empty? %>
9	<em><%= _('(empty folder)') %></em>	9	<em><%= _('(empty folder)') %></em>
10	<% else %>	10	<% else %>
11	- <%= list_articles(folder.children) %>	11	+ <%= list_contents(:contents=>folder.children) %>
12	<% end %>	12	<% end %>
1	<h1><%= _("%s: site map") % profile.name %></h1>	1	<h1><%= _("%s: site map") % profile.name %></h1>
2		2
3	-<%= list_articles(available_articles(@articles, user), false) %>	3	+<%= list_contents :contents=>available_articles(@articles, user), :list_type=>:sitemap %>
	@@ -1,14 +0,0 @@	@@ -1,14 +0,0 @@
1	-<table>
2	-
3	- <tr>
4	- <th><%= _('Title') %></th>
5	- <th><%= _('Last update') %></th>
6	- </tr>
7	- <% articles.each do \|article\| %>
8	- <% if article.display_to?(user) %>
9	- <%= display_article_in_listing(article, recursive, 0) %>
10	- <% end %>
11	- <% end %>
12	-</table>
13	-
14	-<p><%= pagination_links(articles, {:param_name => 'npage', :page_links => true}) %></p>
@@ -0,0 +1,13 @@		@@ -0,0 +1,13 @@
	1	+<table class="<%= list_type %>-content">
	2	+ <tr>
	3	+ <th><%= _('Title') %></th>
	4	+ <th><%= _('Last update') %></th>
	5	+ </tr>
	6	+ <% contents.each do \|content\| %>
	7	+ <% if content.display_to?(user) %>
	8	+ <%= display_content_in_listing :content=>content, :list_type=>list_type, :recursive=>recursive %>
	9	+ <% end %>
	10	+ <% end %>
	11	+</table>
	12	+
	13	+<p><%= pagination_links contents, :param_name => 'npage', :page_links => true %></p>