From 236680aab992d2e063fb3506494808cdd3c34005 Mon Sep 17 00:00:00 2001
From: Maarten Engelen <maarten@iridia.nl>
Date: Sun, 7 Aug 2016 17:18:36 +0200
Subject: [PATCH] Add file deletion functionality

Adds route for file deletion
Add styles and images for this
---
 lib/gollum/app.rb                              |  13 +++++++++++++
 lib/gollum/public/gollum/css/_styles.css       |  17 ++++++++++++++++-
 .../public/gollum/images/fileview/trashcan.png | Bin 0 -> 1522 bytes
 3 files changed, 29 insertions(+), 1 deletion(-)
 create mode 100644 lib/gollum/public/gollum/images/fileview/trashcan.png

diff --git a/lib/gollum/app.rb b/lib/gollum/app.rb
index 9e060f8d..8acf7605 100644
--- a/lib/gollum/app.rb
+++ b/lib/gollum/app.rb
@@ -221,6 +221,19 @@ module Precious
       end
     end
 
+    post '/deleteFile/*' do
+      forbid unless @allow_editing
+      wiki = wiki_new
+      filepath = params[:splat].first
+      unless filepath.nil?
+        commit           = commit_message
+        commit[:message] = "Deleted #{filepath}"
+        wiki.delete_file(filepath, commit)
+      end
+
+      redirect to('/fileview')
+    end
+
     post '/rename/*' do
       wikip = wiki_page(params[:splat].first)
       halt 500 if wikip.nil?
diff --git a/lib/gollum/public/gollum/css/_styles.css b/lib/gollum/public/gollum/css/_styles.css
index c058fa2b..a9d79f56 100644
--- a/lib/gollum/public/gollum/css/_styles.css
+++ b/lib/gollum/public/gollum/css/_styles.css
@@ -85,6 +85,22 @@ ol.tree
         margin-right: 7px;
         vertical-align: text-top;
       }
+      li.file form
+      {
+          vertical-align:middle;
+          display: inline-block;
+      }
+        li.file form button
+        {
+          vertical-align:middle;
+          height: 20px;
+          padding-left: 36px;
+          padding-right: 10px;
+          border: 0px solid #000000;
+          background: url("../images/fileview/trashcan.png") no-repeat 16px center;
+          cursor: pointer;
+        }
+      }
       li.file a[href *= '.pdf'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
       li.file a[href *= '.html'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
       li.file a[href $= '.css'] span.icon { background: url(../images/fileview/document.png) 0 0 no-repeat; }
@@ -125,4 +141,3 @@ ol.tree
   }
     li input:checked + ol > li { display: block; margin: 0 0 0.125em;  /* 2px */}
     li input:checked + ol > li:last-child { margin: 0 0 0.063em; /* 1px */ }
-
diff --git a/lib/gollum/public/gollum/images/fileview/trashcan.png b/lib/gollum/public/gollum/images/fileview/trashcan.png
new file mode 100644
index 0000000000000000000000000000000000000000..1749e6e2b739e5c79321827da4dc65b9f83d6048
GIT binary patch
literal 1522
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0WW
zg+Z8+Vb&Z81_l<T%#etZ2wxwo<osN{#FYG`RK1Ga0-$OJ2Ac{iATu|$BvGLvHz%*y
zs=`(YtilS&1_|pcDS(xfWZNo5_y#CA=NF|anChA687SFtDJUq|6s4qD1-ZCEwF7y!
zN*N_31y=g{<>lpi<;HsXMd|v6mX?<K21fcuM!G;1y2X`wC5aWfdBw^QLty5(q!uR^
zWfqiV=I1GZ%uP(nFD<cEQUX~72M~9bWTqi($}5I?3+O?8kc_^eo`F6#ZK)NRIJALe
zaB53QhWo0Zv?vGcr<7#<)ST4Z)Vz{npgu#a)&av7t`WtN6^R89%fNvM@tY0E<yJwd
z#rZj<pdbj%%Pg@ovH^PtT^JD}5M9psxdlb3#l=8vcBW7*$YSW~BM{cunZxWr7DU(J
zUz7>-X(Gs7c7{+3kj2o|M`E)8SrADBDCn&MGAmMZB3v?o0Sfkop_z?7Rta>C&iOg{
zMZpD$$*CZRfwdqBp{oX46N$?jBnc#qDalsFrAb+-$t6g!1&lLr+ILD!*GCez(Z{OV
z2AC48eDhN>(<)sOOH%EO3=GY54J>pG%tH*#tPCuyER1dR(bOQh03_pFl$uzQUlfv`
zpJNC1MJ|Y|V5|p>Z*+O6RvUd#E<(yxkSq%p1?E{hE}%|W{<q^&Ui9e;usF%|ba4!^
z5bT|NTFWg^<oNl*v!w?be5SewsIg5-dGJZZNbOXF<m{O<41z_N`5!3m`ys-m9K=@i
z^GDzP`nj9Ssy7^76`%cf>-F6CoBijhF45?cyQ6Kuu3NygyK>(Ch5yC4WDdy695l2!
z5T|8auFkml2J;2(<r`Sj6(U<gXR!NzJYr)0B4`RvX~$AY-K6MuQau%Q$DB^`PVlG?
zi`w?sF6P<oa7JsUKEpSv5p2D``QCou6^eZ#Uec^r!p>)TY_FM7kJT%&l6~4Y8p3C^
zd1f4tiaEd@qb->`b*bvw1)X0w#S=Kx5@gyO#c!|*9i4T9W#5XD#<1yXD>hHijsKB#
zL#>ce^<TJCPK?9Jdx|V7T2(!{M_KE<y{>4+7Bcb&vA>_R=_&WwTQ=NlljeTlF<#)m
zjdRxl_Zh9?FB&db=mjJ@|8J7(>dH7TKgn+P8^;&T-Uc57a}RdUITX=e$B}$1ty0H#
g!&zmk^))y7pIRTYT<W}D3sew$y85}Sb4q9e06lm0i2wiq

literal 0
HcmV?d00001