gered/blarg
Archived
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

update to use selmer instead of clabango

Browse source
This commit is contained in:
Gered 2013-07-29 18:32:27 -04:00
parent e0388eccca
commit 59c187dcf2
8 changed files with 32 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

@ -9,3 +9,5 @@ pom.xml
/.env
/*.log
/.settings
/.idea
/*.iml

4
project.clj
View file

@ -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")
:min-lein-version "2.0.0")

5
src/blarg/views/layout.clj
View file

@ -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/")

19
src/blarg/views/tags.clj
View file

@ -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)))}))

2
src/blarg/views/templates/base.html
View file

@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>blarg.ca{{html-title|default:}}</title>
<title>blarg.ca{{html-title|default:""}}</title>
<link href="{{context}}/rss" rel="alternate" title="blarg.ca" type="application/rss+xml" />
<link href="{{context}}/css/bootstrap.min.css" rel="stylesheet" type="text/css" />

4
src/blarg/views/templates/files/list.html
View file

@ -32,7 +32,7 @@
</div>
<div class="file-list-container">
{% ifempty not files %}
{% if files %}
<table class="table table-hover table-condensed">
<thead>
<tr>
@ -67,7 +67,7 @@
</table>
{% else %}
<p class="text-center">No files found.</p>
{% endifempty %}
{% endif %}
</div>
<div id="newFileModal" class="modal hide fade" tabindex="-1" role="dialog" aria-labelledby="newFileModalLabel" aria-hidden="true">

4
src/blarg/views/templates/posts/list.html
View file

@ -1,7 +1,7 @@
{% extends "blarg/views/templates/base.html" %}
{% block content %}
{% ifempty posts %}
{% if not posts %}
<div>
<p class="text-center">There are no posts.</p>
</div>
@ -26,5 +26,5 @@
{% include "blarg/views/templates/posts/publishmodal.html" %}
{% include "blarg/views/templates/posts/deletemodal.html" %}
{% endifempty %}
{% endif %}
{% endblock %}

42
src/blarg/views/viewfilters.clj
View file

@ -1,32 +1,32 @@
(ns blarg.views.viewfilters
(:use [blarg.datetime]
[blarg.routes.helpers])
(:require [clabango.filters :refer [deftemplatefilter]]
(:require [selmer.filters :refer [add-filter!]]
[markdown.core :as md]
[clj-time.core]
[clj-time.format]))
(deftemplatefilter "is_false" [node body arg]
(if body
false
true))
(add-filter!
:md-to-html
(fn [s]
(md/md-to-html-string s)))
(deftemplatefilter "default" [node body arg]
(if body
body
arg))
(add-filter!
:post-url
(fn [post]
(get-post-url post)))
(deftemplatefilter "md-to-html" [node body arg]
(md/md-to-html-string body))
(add-filter!
:to_relative
(fn [date]
(->relative-timestamp date)))
(deftemplatefilter "post-url" [node body arg]
(get-post-url body))
(add-filter!
:to_month-day
(fn [date]
(->month-day-str date)))
(deftemplatefilter "to_relative" [node body arg]
(->relative-timestamp body))
(deftemplatefilter "to_month-day" [node body arg]
(->month-day-str body))
(deftemplatefilter "to_fulltime" [node body arg]
(clj-time.local/format-local-time body :rfc822))
(add-filter!
:to_fulltime
(fn [date]
(clj-time.local/format-local-time date :rfc822)))