From b49fa908dde6cfdb453296b5f62d6957001ba53b Mon Sep 17 00:00:00 2001
From: André Bernardes <andrebsguedes@gmail.com>
Date: Wed, 27 May 2015 11:53:23 -0300
Subject: [PATCH] Adding bigger icons when displaying folders

---
 app/helpers/folder_helper.rb                      | 14 +++++++-------
 app/presenters/image.rb                           |  4 ++++
 lib/short_filename.rb                             |  2 +-
 public/images/icons-app/image-loading-bigicon.png | Bin 0 -> 3314 bytes
 public/stylesheets/application.css                |  3 +--
 5 files changed, 13 insertions(+), 10 deletions(-)
 create mode 100644 public/images/icons-app/image-loading-bigicon.png

diff --git a/app/helpers/folder_helper.rb b/app/helpers/folder_helper.rb
index b67242b..7911870 100644
--- a/app/helpers/folder_helper.rb
+++ b/app/helpers/folder_helper.rb
@@ -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
diff --git a/app/presenters/image.rb b/app/presenters/image.rb
index 5dee7b9..6394d86 100644
--- a/app/presenters/image.rb
+++ b/app/presenters/image.rb
@@ -4,6 +4,10 @@ class FilePresenter::Image < FilePresenter
     f.image? ? 10 : nil
   end
 
+  def sized_icon(size)
+    public_filename size
+  end
+
   def icon_name
     public_filename :icon
   end
diff --git a/lib/short_filename.rb b/lib/short_filename.rb
index 716bda0..f34e6b1 100644
--- a/lib/short_filename.rb
+++ b/lib/short_filename.rb
@@ -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)
diff --git a/public/images/icons-app/image-loading-bigicon.png b/public/images/icons-app/image-loading-bigicon.png
new file mode 100644
index 0000000..bb1b25c
Binary files /dev/null and b/public/images/icons-app/image-loading-bigicon.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 4d0764f..9c0117b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -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;
 }
--
libgit2 0.21.2