From 576b0037ff8ebac99cb1633bc27c12381dab2ef4 Mon Sep 17 00:00:00 2001
From: Victoria Wang <violasongoo@gmail.com>
Date: Thu, 14 Aug 2014 22:00:31 -0700
Subject: [PATCH] Added html/image for folder support

---
 .../assets/css/_project-sass/_project-Main.scss  |   7 +++++++
 public/assets/css/neo.css                        |   8 ++++++++
 public/assets/img/folder.png                     | Bin 0 -> 2044 bytes
 views/dashboard.erb                              |  10 ++++++++--
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 public/assets/img/folder.png

diff --git a/public/assets/css/_project-sass/_project-Main.scss b/public/assets/css/_project-sass/_project-Main.scss
index 962a9db2..23d8017c 100644
--- a/public/assets/css/_project-sass/_project-Main.scss
+++ b/public/assets/css/_project-sass/_project-Main.scss
@@ -301,6 +301,13 @@
   margin-left: auto;
   margin-right: auto;
 }
+.folder-icon {
+  background: url(../img/folder.png) no-repeat 0px 0px;
+  width: 95px;
+  height: 65px;
+  display: block;
+  padding-top: 35px;
+}
 .overlay a {
   color: white;
   text-decoration: none;
diff --git a/public/assets/css/neo.css b/public/assets/css/neo.css
index b4f9fc3a..828be8d9 100644
--- a/public/assets/css/neo.css
+++ b/public/assets/css/neo.css
@@ -1545,6 +1545,14 @@ a {
   margin-left: auto;
   margin-right: auto; }
 
+.folder-icon {
+  background: url(../img/folder.png) no-repeat 0px 0px;
+  width: 95px;
+  height: 65px;
+  display: block;
+  padding-top: 35px;
+  font-size: 14px; }
+
 .overlay a {
   color: white;
   text-decoration: none;
diff --git a/public/assets/img/folder.png b/public/assets/img/folder.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f76ab0e0f53560198c2932563c2541198d168ee
GIT binary patch
literal 2044
zcmcIlYfw{16uuNt9?b{}h(Ps{(u$AdCYM0S6L|)#AWCYfiX<dAkV0}}a!Dd02yHE>
zfJLQ59*#ARR$43;go+^efT=LifdLIFI9LS*MPU#f5PJg(>U7#)?#%AlJ@b9%oc+$u
zY<6S>k6`0s0{{RaEHr36Ze#K3Z#4&BtM_Ra<HkZ25XQH{N2--L3qM;cLcdl4fbD$K
zG;6z^Hi0`GvEXPdP>BdJDJlo~QW*l!A(#PCy*AAkbl?Ct6CeteU>czk0sO^i90G<&
zm52saCaS=|D6hiK5OX}4y$Kf`zJ@76Wn`fVM%Ky{0NYQi5Q-8J42(nKrE(4t1VJJw
z6?2GRd52TN6@f^CG&DttM5RRVMJb6QhM4HbwP9<SI9Y~ZLQpG9lB<|n4sj|b6W^QM
z5D}b$V2K>!bWPFWkzgRIL_ivuN)l1LXdump4AWr--Df2jCB(qhLOBT2L6}0p7nn(<
zGHF!2n5jYJ+TfP06ib-vgF;^C#7`Vz0){D=5Twy)$Qmy)s*H!I3<d+Dzz__Ra0E%U
zO^yk*B)RI-=^$_71R*MsQmUAe)f874hbChjBGHs+X1u<fP%)E8u6ivVE+eEBDj+JE
z0?kCmiEP}-oN5@V<fCX3_g`AVHZk7;&1RkDBSAt8;ldQE7l}eA!M=P7gGupX(tI|)
z#h(VfM-NBEQpvVAbQ+1`OQL%7DKsY4XO{jJ=rx@UnS^*tm?_mwcY4nc{*Pc{(TrY-
zWM$G+Tf`y=NkU|Z98=+%QQy@}EMiJfrA&x%r7~eW0x9J2Y-rZ`pY=^wjXw+gSwb`K
z@=fV8t^6RHS=~QK`01b@GD(P~AsztCeZzwM`P$+~#dT==D(9xdBQZ8Iec>_6hOC2T
z2Q9O!%*_|L24rSCQY#u_8w{N}83vGQ77!ZRU={jg9ylkcgHQ7uZEg`9-Z2TTZo6gN
z+I<*Ps?_@S{l|yuG-qNnjCQZ2l-xg7HC2=+yLex$+L!>zV9p`G26n;`5wI?0Z;q-2
z+3>XPhpVONcu~9`IR!+=O67I8b_~0&DpX(YuX)~m;JQ@PQlEamG$$izXmc$=K*)A?
zdb*?|Wli7O-M5*op2mTgYU(~h&v|RX!VYcEXJbVwH;>(0&$(Six*UMfgrUnN?Jp+@
zu1AOUx7gLmlcRkaG;PuClq6+#QD<eo-qT@e+wf(Ip)4mOeIS8$D6s26jpD&@3^3N7
zw>aOr##WaX;n}JuX5R(QHJ{?T(dlP8?lc+>n&p2-w6II;YYE|1F^gB{S?t8LI-dby
zM991lpXT1$;Ku0Uhx{lz(s=P1hyKC!z@YZJgHx`NxTj>Obo0dLyo#U2y*&RXUoKCs
z_^T1q3D}cc9=G={uqPN_KFjLuw>!4o@kNu%x;AH)N0*buhO<X)T|H&HPNvUi^*DNW
zIi3EbpnGw0*D$fn-)7IsEeXb>5u4O$-~K)l(`Y~!4yN)Ht>_}$tWk2y9vAdBxv+Z3
zzf@XgFz(kb9XEsf@?Pb3pDJtYkTkXLm~<OV|A=*-Bi5V-EqJL#R_oGim!8+<V-*vf
zCn9Ptjlak}(OwW0&U^AKpheKf$}H)D_geo{f-X>}wcIHjvN{>&V|+olV9;1LPpE}l
zqQOvYb#Lvmcosu9a@W(v$LrS)@Z-#j%2=n7yj^o+JLlHlwExX++%G+K#Te3S>z-A8
z;E_AH+_6&oh0&hx>(O7d>=MMgvFpl`z4WLn$93PsPbD_29(ZD7WG$t5p1MB#8$Hs;
zii>OQWA~5)_$%(+-_8>B-MkdViMdfee9a+jnMhsF(ev$xuVh;6Y|YQL2@AgN{dZLZ
zhImN0R@rylcLEJty8?h8)%E3L&d#ydM!j|Wj|@m3=I83hN9H0Uww2FIP9cL?XO};)
n;FmR#Pm;O&Bh%nNuT7ds^a5Gh1$_bj5d&et5kchvg3NyabgRzi

literal 0
HcmV?d00001

diff --git a/views/dashboard.erb b/views/dashboard.erb
index a96cf24b..50df31bc 100644
--- a/views/dashboard.erb
+++ b/views/dashboard.erb
@@ -88,10 +88,10 @@
     </div>
   </div>
   <div class="header">
-    <div class="breadcrumbs">My Files</div> <!-- Should be Home when Folders are implemented -->
+    <div class="breadcrumbs">Home</div>
     <div class="actions">
       <a href="/site_files/new_page" class="btn-Action new-Page"><span>New Page</span></a>
-      <!--<a href="" class="btn-Action new-Folder"><span>New Folder</span></a>-->
+      <a href="" class="btn-Action new-Folder"><span>New Folder</span></a>
       <a href="#" class="btn-Action upload" onclick="clickUploadFiles(); return false"><span>Upload</span></a>
     </div>
   </div>
@@ -112,6 +112,12 @@
                 <img src="<%= current_site.thumbnail_url(file.filename, '105x63') %>" style="">
                 <div class="overlay"></div>
               </div>
+            <!-- if folder
+              <div class="html-thumbnail folder fileimagehover">
+                <div class="folder-icon"></div>
+                <div class="overlay"></div>
+              </div> 
+            -->
             <% else %>
               <div class="html-thumbnail misc fileimagehover">
                 <div class="misc-icon"><%= file.ext %></div>