From 527201ad8984d44a39e749cbf2f6f7e98067bf98 Mon Sep 17 00:00:00 2001
From: Jaromil <jaromil@dyne.org>
Date: Sun, 14 Oct 2018 09:58:49 +0200
Subject: [PATCH] improved file upload and font

---
 .../resources/public/static/css/toaster.css   | 84 ++++++++++++++-----
 clojure_frontend/src/toaster/bulma.clj        |  2 +-
 clojure_frontend/src/toaster/views.clj        | 14 ++--
 3 files changed, 75 insertions(+), 25 deletions(-)

diff --git a/clojure_frontend/resources/public/static/css/toaster.css b/clojure_frontend/resources/public/static/css/toaster.css
index a23f24c..0c06728 100644
--- a/clojure_frontend/resources/public/static/css/toaster.css
+++ b/clojure_frontend/resources/public/static/css/toaster.css
@@ -1,8 +1,4 @@
 body {
-	/* font-family: "arial"; */
-	/* font-size: 22px; */
-	font-smooth: always;
-	-webkit-font-smoothing: antialiased;
 	/* padding-top: 65px; */
 }
 
@@ -36,24 +32,13 @@ code {
 
 h1, h2, h3, h4 { }
 
-/* p { */
-/* 	letter-spacing: 0.01rem; */
-/* 	font-style: normal; */
-/* 	line-height: 1.5; */
-/* } */
-
-/* img { */
-/* 	width: auto; */
-/* 	height: auto; */
-/* 	max-width: 100%; */
-/* 	vertical-align: middle; */
-/* 	overflow: hidden; */
-/* } */
-
 html,body {
-	font-family: 'Open Sans', serif;
+	font-family: 'Ubuntu', sans-serif;
 	font-size: 14px;
 	font-weight: 300;
+	font-smooth: always;
+	-webkit-font-smoothing: antialiased;
+
 }
 .hero.is-success {
 	background: #F2F6FA;
@@ -85,3 +70,64 @@ p {
 p.subtitle {
 	padding-top: 1rem;
 }
+
+/* inputfile js for bulma from https://jsfiddle.net/chintanbanugaria/uzva5byy/ */
+
+.inputfile {
+		width: 0.1px;
+		height: 0.1px;
+		opacity: 0;
+		overflow: hidden;
+		
+		z-index: -1;
+    margin-top:10px;
+}
+.inputfile + label {
+	 
+		/* 20px */
+		width: 50%;
+		text-overflow: ellipsis;
+		white-space: nowrap;
+		cursor: pointer;
+		display: inline-block;
+		overflow: hidden;
+		padding-left: 0.75em;
+		padding-right: 0.75em;
+		border: 1px solid #dbdbdb;
+		height: 2.285em;
+		box-shadow: inset 0 1px 2px rgba(10, 10, 10, 0.1);
+		line-height: 1.5rem;
+		border-radius: 3px;
+		padding-top: 0.3em;
+    
+		/* 10px 20px */
+}
+.no-js .inputfile + label {
+		display: none;
+}
+.inputfile:focus + label,
+.inputfile.has-focus + label {
+		border-color: #00d1b2;
+}
+.inputfile + label * {
+		/* pointer-events: none; */
+		/* in case of FastClick lib use */
+}
+.inputfile + label svg {
+		width: 1em;
+		height: 1em;
+		line-height: 1.5rem;
+		vertical-align: middle;
+		margin-top: -0.25em;
+		/* 4px */
+		margin-right: 0.25em;
+		/* 4px */		 
+}
+.inputfile-2 + label {
+		border: 1px solid #dbdbdb;
+}
+.inputfile-2:focus + label,
+.inputfile-2.has-focus + label,
+.inputfile-2 + label:hover {
+		border-color: #00d1b2;
+}
diff --git a/clojure_frontend/src/toaster/bulma.clj b/clojure_frontend/src/toaster/bulma.clj
index e5ac878..dbb5076 100644
--- a/clojure_frontend/src/toaster/bulma.clj
+++ b/clojure_frontend/src/toaster/bulma.clj
@@ -106,7 +106,7 @@
       :content "width=device-width, initial-scale=1"}]
 
     [:title title]
-    [:link {:href "https://fonts.googleapis.com/css?family=Open+Sans:300,400,700"
+    [:link {:href "https://fonts.googleapis.com/css?family=Ubuntu:300,400,700"
             :rel "stylesheet"}]
 
     ;; non-invasive js for syntax highlight of text-area
diff --git a/clojure_frontend/src/toaster/views.clj b/clojure_frontend/src/toaster/views.clj
index 00463d8..6c00d9a 100644
--- a/clojure_frontend/src/toaster/views.clj
+++ b/clojure_frontend/src/toaster/views.clj
@@ -71,19 +71,23 @@
            :enctype "multipart/form-data"}
     [:div {:class "file has-label is-fullwidth"}
      [:label {:class "file-label"}
-      [:input {:class "file-input" :name "file" :type "file"}]
+      [:input {:class "file-input inputfile inputfile-2" :id "file" :type "file"}]
+      [:label {:for "file"} [:span {:id "filename"} "Choose a Dockerfile..."]]
       [:span {:class "file-cta"}
        [:span {:class "file-icon"}
         [:i {:class "fa fa-upload"}]]
-       [:span {:class "file-label"}
-        "Docker file..."]]
-      [:span {:class "file-name"}]]]
+       [:span {:class "file-label"} "Upload"]]]]
     ;; [:fieldset {:class "fieldset-submit"}
     [:div {:class "field"}
      [:div {:class "control"}
       [:input {:class "button is-block is-info is-large is-fullwidth"
                :type "submit"
-               :name  "submit" :value "submit"}]]]]])
+               :name  "submit" :value "submit"}]]]]
+   [:script "var file = document.getElementById(\"file\");
+    file.onchange = function(){
+    if(file.files.length > 0) {
+      document.getElementById('filename').innerHTML = file.files[0].name;
+    } };"]])
 
 (defn dockerfile-upload-post [request config account]
   (let