Adding bigger icons when displaying folders

Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>

Adding bigger icons when displaying folders
Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
André Guedes · Rodrigo Souto
1 parent bbcc0618
Showing 5 changed files with 13 additions and 10 deletions Show diff stats
app/helpers/folder_helper.rb
app/presenters/image.rb
lib/short_filename.rb
public/images/icons-app/image-loading-bigicon.png
public/stylesheets/application.css
@@ -42,15 +42,15 @@ module FolderHelper
   def icon_for_article(article, size = 'icon')
     article = FilePresenter.for article
-    icon = article.respond_to?(:icon_name) ?
-             article.icon_name :
-             article.class.icon_name(article)
-    if (icon =~ /\//)
-      icon
+    if article.respond_to?(:sized_icon)
+      article.sized_icon(size)
     else
-      klasses = 'icon ' + [icon].flatten.map{|name| 'icon-'+name}.join(' ')
+      icon = article.respond_to?(:icon_name) ?
+              article.icon_name :
+              article.class.icon_name(article)
+      klasses = "#{size} " + [icon].flatten.map{|name| "#{size}-"+name}.join(' ')
       if article.kind_of?(UploadedFile) || article.kind_of?(FilePresenter)
-        klasses += ' icon-upload-file'
+        klasses += " #{size}-upload-file"
       end
       klasses
     end
@@ -4,6 +4,10 @@ class FilePresenter::Image &lt; FilePresenter
     f.image? ? 10 : nil
   end
+  def sized_icon(size)
+    public_filename size
+  end
+
   def icon_name
     public_filename :icon
   end
@@ -9,7 +9,7 @@ module ShortFilename
   def short_filename_upper_ext(filename, limit_chars = 43)
     extname = File.extname(filename)
     display_name = shrink(File.basename(filename, extname), extname, limit_chars)
-    return display_name + " - " + extname.upcase.delete(".") if not extname.empty? else display_name
+     return extname.present? ? (display_name + ' - ' + extname.upcase.delete(".")) : display_name
   end
   def shrink(filename, extname, limit_chars)
@@ -3910,7 +3910,6 @@ table.cms-articles .icon:hover {
 div.folder-description {
   padding-bottom: 15px;
-  border-bottom: 1px solid #CCCCCC;
 }
 .list-item h2{
@@ -3919,7 +3918,7 @@ div.folder-description {
 }
 .item-info{
-  border-bottom: 1px solid #ccc;
+  border-top: 1px solid #ccc;
   line-height: 25px;
   padding:25px 20px;
 }
	@@ -9,7 +9,7 @@ module ShortFilename		@@ -9,7 +9,7 @@ module ShortFilename
9	def short_filename_upper_ext(filename, limit_chars = 43)	9	def short_filename_upper_ext(filename, limit_chars = 43)
10	extname = File.extname(filename)	10	extname = File.extname(filename)
11	display_name = shrink(File.basename(filename, extname), extname, limit_chars)	11	display_name = shrink(File.basename(filename, extname), extname, limit_chars)
12	- return display_name + " - " + extname.upcase.delete(".") if not extname.empty? else display_name	12	+ return extname.present? ? (display_name + ' - ' + extname.upcase.delete(".")) : display_name
13	end	13	end
14		14
15	def shrink(filename, extname, limit_chars)	15	def shrink(filename, extname, limit_chars)