From 144a071d85cb43b4d83a1b9c8fafb8bdb1e951bf Mon Sep 17 00:00:00 2001 From: Josha von Gizycki Date: Tue, 18 Sep 2018 12:11:11 +0200 Subject: [PATCH] utf-8 shenanigans --- src/wanijo/framework/view.clj | 11 ++++++++--- src/wanijo/schema/view.clj | 5 ++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/wanijo/framework/view.clj b/src/wanijo/framework/view.clj index 752a02e..53068ce 100644 --- a/src/wanijo/framework/view.clj +++ b/src/wanijo/framework/view.clj @@ -1,6 +1,7 @@ (ns wanijo.framework.view (:require [hiccup.page :refer [html5 include-css include-js]] + [hiccup.form :as hform] [wanijo.framework.routing :refer [path]])) (defn btnlink @@ -11,6 +12,10 @@ [:button {:class clss} caption]])) +(defn delete-btn [] + (hform/submit-button {:class "delete-btn"} + "☒ Delete!")) + (defn layout! [& {:keys [content title session] :or {content [] @@ -39,7 +44,7 @@ (when authed? [:section.header-content (btnlink (path :schema-overview) - "Schemas" + "▤ Schemas" "header-content__link") (btnlink (path :auth-logout) "Logout!" @@ -47,11 +52,11 @@ [:nav (when authed? [:section.schemas - [:h2 "Created Schemas"] + [:h2 "▤ Created Schemas"] [:ul (for [schema (:created-schemas session)] [:li (:name schema)])] - [:h2 "Other Schemas"] + [:h2 "▤ Other Schemas"] [:ul (for [schema (:other-schemas session)] [:li (:name schema)])]])] diff --git a/src/wanijo/schema/view.clj b/src/wanijo/schema/view.clj index b5ae050..3fca735 100644 --- a/src/wanijo/schema/view.clj +++ b/src/wanijo/schema/view.clj @@ -62,7 +62,6 @@ (hform/submit-button "Create"))]))) (defn show-schema! [schema attrs access-form req] - (println access-form) (view/layout! :session (:session req) :content @@ -73,7 +72,7 @@ (form/render-widgets form schema req) (hform/hidden-field "uuid" (:uuid schema)) (hform/submit-button "Edit")) - [:h2 "Assign to users"] + [:h3 "Assign to users"] (hform/form-to [:post (path :schema-assign)] (form/render-widgets access-form schema req) (hform/hidden-field "uuid" (:uuid schema)) @@ -100,4 +99,4 @@ (hform/form-to {:class "inline"} [:delete (path :schema-delete schema)] (anti-forgery-field) - (hform/submit-button {:class "delete-btn"} "Delete!"))])) + (view/delete-btn))]))