From 59c187dcf22e605cffa5c3c1424da4e414cf3b4f Mon Sep 17 00:00:00 2001 From: gered Date: Mon, 29 Jul 2013 18:32:27 -0400 Subject: [PATCH] update to use selmer instead of clabango --- .gitignore | 2 ++ project.clj | 4 +-- src/blarg/views/layout.clj | 5 ++- src/blarg/views/tags.clj | 19 ---------- src/blarg/views/templates/base.html | 2 +- src/blarg/views/templates/files/list.html | 4 +-- src/blarg/views/templates/posts/list.html | 4 +-- src/blarg/views/viewfilters.clj | 42 +++++++++++------------ 8 files changed, 32 insertions(+), 50 deletions(-) delete mode 100644 src/blarg/views/tags.clj diff --git a/.gitignore b/.gitignore index 4397179..acf5709 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,5 @@ pom.xml /.env /*.log /.settings +/.idea +/*.iml \ No newline at end of file diff --git a/project.clj b/project.clj index 50969ac..783afe7 100644 --- a/project.clj +++ b/project.clj @@ -5,7 +5,7 @@ [lib-noir "0.6.0"] [compojure "1.1.5"] [ring-server "0.2.8"] - [clabango "0.5"] + [selmer "0.2.1"] [com.taoensso/timbre "1.6.0"] [com.postspectacular/rotor "0.1.0"] [com.taoensso/tower "1.5.1"] @@ -26,4 +26,4 @@ :auto-reload? false}} :dev {:dependencies [[ring-mock "0.1.3"] [ring/ring-devel "1.1.8"]]}} - :min-lein-version "2.0.0") \ No newline at end of file + :min-lein-version "2.0.0") diff --git a/src/blarg/views/layout.clj b/src/blarg/views/layout.clj index bfa7e88..f015e69 100644 --- a/src/blarg/views/layout.clj +++ b/src/blarg/views/layout.clj @@ -1,9 +1,8 @@ (ns blarg.views.layout (:use noir.request) - (:require [clabango.parser :as parser] + (:require [selmer.parser :as parser] [noir.session :as session] - [blarg.views.viewfilters] - [blarg.views.tags])) + [blarg.views.viewfilters])) (def template-path "blarg/views/templates/") diff --git a/src/blarg/views/tags.clj b/src/blarg/views/tags.clj deleted file mode 100644 index d66bb72..0000000 --- a/src/blarg/views/tags.clj +++ /dev/null @@ -1,19 +0,0 @@ -(ns blarg.views.tags - (:use [clabango.tags]) - (:require [clabango.filters :refer [context-lookup]])) - -(deftemplatetag "ifempty" "endifempty" [[if-node & nodes] context] - (let [args (:args if-node) - body-nodes (butlast nodes) - [flip decision] (cond (= 1 (count args)) - [empty? (first args)] - - (and (= 2 (count args)) - (= "not" (first args))) - [not-empty (second args)] - - :default (throw (Exception. (str "Syntax error: " - if-node))))] - {:nodes (if (flip (context-lookup context decision)) - (take-while #(not= "else" (:tag-name %)) body-nodes) - (rest (drop-while #(not= "else" (:tag-name %)) body-nodes)))})) \ No newline at end of file diff --git a/src/blarg/views/templates/base.html b/src/blarg/views/templates/base.html index d54d2e1..5f8f123 100644 --- a/src/blarg/views/templates/base.html +++ b/src/blarg/views/templates/base.html @@ -3,7 +3,7 @@ - blarg.ca{{html-title|default:}} + blarg.ca{{html-title|default:""}} diff --git a/src/blarg/views/templates/files/list.html b/src/blarg/views/templates/files/list.html index 937ce6f..46ab0dc 100644 --- a/src/blarg/views/templates/files/list.html +++ b/src/blarg/views/templates/files/list.html @@ -32,7 +32,7 @@
- {% ifempty not files %} + {% if files %} @@ -67,7 +67,7 @@
{% else %}

No files found.

- {% endifempty %} + {% endif %}