summaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authortbuehlmann <tobias.buehlmann@gmx.de>2013-02-03 09:30:16 +0100
committertbuehlmann <tobias.buehlmann@gmx.de>2013-02-03 09:30:16 +0100
commit98bfd0502409f5b41975aae224d05296c0ea173b (patch)
tree1856d0948df659875a6d07626ea074065df74bfe /views
parent03c619322017a60c27b516a925a75c2c5dc8c2dd (diff)
Several things.
- Using Slim instead of Haml. - Having a before filter for having flash functionality. - Using Bundler.
Diffstat (limited to 'views')
-rw-r--r--views/index.haml16
-rw-r--r--views/index.slim15
-rw-r--r--views/layout.haml9
-rw-r--r--views/layout.slim8
4 files changed, 23 insertions, 25 deletions
diff --git a/views/index.haml b/views/index.haml
deleted file mode 100644
index b9d78e7..0000000
--- a/views/index.haml
+++ /dev/null
@@ -1,16 +0,0 @@
-%h1 Sinatra File Upload
-
-- if @flash
- = @flash
-
-%form{:action => '/upload', :method => 'post', :enctype => 'multipart/form-data'}
- %p<
- %input{:type => 'file', :name => 'file'}
- %p<
- %input{:type => 'submit', :value => 'Upload'}
-
-%h3 Files
-%ul
- - @files.each do |file|
- %li= "<a href='files/#{file}'>#{file}</a>"
-
diff --git a/views/index.slim b/views/index.slim
new file mode 100644
index 0000000..270f91f
--- /dev/null
+++ b/views/index.slim
@@ -0,0 +1,15 @@
+h1 Sinatra File Upload
+
+- if @flash
+ = @flash
+
+form action='/upload' method='post' enctype='multipart/form-data'
+ p
+ input type='file' name='file'
+ p
+ input type='submit' value='Upload'
+h3 Files
+ul
+ - @files.each do |file|
+ li
+ a href='files/#{file}' #{file}
diff --git a/views/layout.haml b/views/layout.haml
deleted file mode 100644
index d8eb52c..0000000
--- a/views/layout.haml
+++ /dev/null
@@ -1,9 +0,0 @@
-!!!
-%html{:xmlns => 'http://www.w3.org/1999/xhtml'}
- %head
- %title Sinatra File Upload
- %link{:rel => 'stylesheet', :type => 'text/css', :href => 'css/style.css'}
- %meta{:content => 'text/html; charset=utf-8', :'http-equiv' => 'Content-Type'}
- %body
- = yield
-
diff --git a/views/layout.slim b/views/layout.slim
new file mode 100644
index 0000000..0d4d1f1
--- /dev/null
+++ b/views/layout.slim
@@ -0,0 +1,8 @@
+doctype
+html xmlns='http://www.w3.org/1999/xhtml'
+ head
+ title Sinatra File Upload
+ link rel='stylesheet' type='text/css' href='css/style.css'
+ meta content='text/html; charset=utf-8' http-equiv='Content-Type'
+ body
+ == yield