From d56f20dab342a0a9cb07e6671c926cc164f1cff1 Mon Sep 17 00:00:00 2001
From: Josha von Gizycki <josha.von.gizycki@triology.de>
Date: Wed, 18 Jul 2018 13:35:14 +0200
Subject: [PATCH] ui and code style tweaks

---
 resources/app/stylesheets/app.less |  8 ++++++
 src/wanijo/framework/view.clj      | 46 +++++++++++++++---------------
 src/wanijo/schema/routes.clj       |  2 +-
 src/wanijo/schema/view.clj         |  3 +-
 4 files changed, 34 insertions(+), 25 deletions(-)

diff --git a/resources/app/stylesheets/app.less b/resources/app/stylesheets/app.less
index a372224..5c49978 100644
--- a/resources/app/stylesheets/app.less
+++ b/resources/app/stylesheets/app.less
@@ -146,6 +146,14 @@ form {
     }
 }
 
+form.inline {
+    display: inline-grid;
+
+    input {
+        grid-column: 1 / span 2;
+    }
+}
+
 table {
     width: 100%;
     border-collapse: collapse;
diff --git a/src/wanijo/framework/view.clj b/src/wanijo/framework/view.clj
index c17d6a0..4e3cb9e 100644
--- a/src/wanijo/framework/view.clj
+++ b/src/wanijo/framework/view.clj
@@ -1,6 +1,6 @@
 (ns wanijo.framework.view
   (:require [hiccup.page :refer
-            [html5 include-css]]))
+             [html5 include-css]]))
 
 (defn btnlink
   ([target caption]
@@ -19,29 +19,29 @@
         authed? (some? ident)
         devmode? (:devmode session)]
     (html5
-      [:head
-       [:meta {:charset "utf-8"}]
-       [:meta {:name "viewport"
-               :content "width=device-width,initial-scale=1,shrink-to-fit=no"}]
-       [:title (str "wan ijo" (when title (str " - " title)))]
-       (include-css "/css/app.css")
-       (when devmode? (include-css "/css/devmode.css"))]
-      [:body
-       [:section.grid
-        [:header
-         [:h1.app-title "wan ijo"
-          (when authed?
-            [:small.app-title__hello
-             (str "O, " ident)])]
+     [:head
+      [:meta {:charset "utf-8"}]
+      [:meta {:name "viewport"
+              :content "width=device-width,initial-scale=1,shrink-to-fit=no"}]
+      [:title (str "wan ijo" (when title (str " - " title)))]
+      (include-css "/css/app.css")
+      (when devmode? (include-css "/css/devmode.css"))]
+     [:body
+      [:section.grid
+       [:header
+        [:h1.app-title "wan ijo"
          (when authed?
-           [:section.header-content
-            (btnlink "/schema" "Jaki ijo" "header-content__link")
-            (btnlink "/logout" "Lape!" "header-content__link")])]
-        [:nav (when authed? "nav")]
-        (vec (concat [:main] content))
-        [:aside (when authed? "aside")]
-        [:footer
-         [:small "Ilo pali e ijo"]]]])))
+           [:small.app-title__hello
+            (str "O, " ident)])]
+        (when authed?
+          [:section.header-content
+           (btnlink "/schema" "Jaki ijo" "header-content__link")
+           (btnlink "/logout" "Lape!" "header-content__link")])]
+       [:nav (when authed? "nav")]
+       (vec (concat [:main] content))
+       [:aside (when authed? "aside")]
+       [:footer
+        [:small "Ilo pali e ijo"]]]])))
 
 (defn flash-error [content]
   [:section.flash--error
diff --git a/src/wanijo/schema/routes.clj b/src/wanijo/schema/routes.clj
index decb183..7e5a39e 100644
--- a/src/wanijo/schema/routes.clj
+++ b/src/wanijo/schema/routes.clj
@@ -33,4 +33,4 @@
   (GET "/schema" [] view-schema/overview!)
   (GET "/schema/:uuid" [uuid :as req] (show-schema! uuid (:session req)))
   (POST "/schema/new" [] new!)
-  (DELETE "/schema/:uuid/delete" [uuid :as req] (delete-schema! uuid (:session req))))
+  (DELETE "/schema/:uuid" [uuid :as req] (delete-schema! uuid (:session req))))
diff --git a/src/wanijo/schema/view.clj b/src/wanijo/schema/view.clj
index cacb046..976b7cb 100644
--- a/src/wanijo/schema/view.clj
+++ b/src/wanijo/schema/view.clj
@@ -50,6 +50,7 @@
        [:li (:name attr)])]
     [:h2 "Mute pali"]
     (hform/form-to
-     [:delete (str "/schema/" (:uuid schema) "/delete")]
+     {:class "inline"}
+     [:delete (str "/schema/" (:uuid schema))]
      (anti-forgery-field)
      (hform/submit-button "Pakala!"))]))