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

switch from clj-jtwig to clj-pebble

Browse source
This commit is contained in:
Gered 2014-11-15 12:50:35 -05:00
parent 6786c91428
commit e4c14463bb
6 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/leiningen/new/yawt/project.clj
View file

@ -14,7 +14,7 @@
{{#webapp}}
[org.clojure/clojurescript "0.0-2371"]
[weasel "0.4.2"]
[clj-jtwig "0.5.1"]
[clj-pebble "0.2.0"]
[secretary "1.2.1"]
[reagent "0.4.3"]
[cljs-ajax "0.3.3"]

2
src/leiningen/new/yawt/resources/views/error.html
View file

@ -1,5 +1,5 @@
{{=<% %>=}}
{% extends "base.html" %}
{% extends "views/base.html" %}
{% block title %}Error :: {% endblock %}

2
src/leiningen/new/yawt/resources/views/index.html
View file

@ -1,5 +1,5 @@
{{=<% %>=}}
{% extends "base.html" %}
{% extends "views/base.html" %}
{% block head_scripts %}
{% if isDev %}

2
src/leiningen/new/yawt/resources/views/notfound.html
View file

@ -1,5 +1,5 @@
{{=<% %>=}}
{% extends "base.html" %}
{% extends "views/base.html" %}
{% block title %}Not Found :: {% endblock %}

9
src/leiningen/new/yawt/src/root_ns/core.clj
View file

@ -8,8 +8,8 @@
[ring.server.standalone :refer [serve]]
[ring.middleware.file :refer [wrap-file]]
{{#webapp}}
[clj-jtwig.core :as jtwig]
[clj-jtwig.web.middleware :refer [wrap-servlet-context-path]]
[clj-pebble.core :as pebble]
[clj-pebble.web.middleware :refer [wrap-servlet-context-path]]
{{/webapp}}
[edn-config.core :refer [env]]
[prone.middleware :as prone]
@ -47,9 +47,8 @@
{{#webapp}}
(when (env :dev)
(log :info "Running in :dev environment.")
(log :info "Disabling Jtwig template caching.")
(jtwig/set-options! :cache-compiled-templates false)
(jtwig/set-options! :check-for-minified-web-resources false))
(pebble/set-options! :cache false
:check-for-minified-web-resources false))
{{/webapp}}
{{#webservice}}
(when (env :dev)

6
src/leiningen/new/yawt/src/root_ns/views_webapp.clj
View file

@ -1,7 +1,7 @@
(ns {{root-ns}}.views
(:require [clojure.string :as str]
[clj-jtwig.core :as jtwig]
[clj-jtwig.web.middleware :refer [*servlet-context-path*]]
[clj-pebble.core :as pebble]
[clj-pebble.web.middleware :refer [*servlet-context-path*]]
[ring.util.response :as response]
[compojure.response :refer [Renderable]]
[edn-config.core :refer [env]]))
@ -9,7 +9,7 @@
(def template-path "views/")
(defn- render-template [request template params]
(jtwig/render-resource
(pebble/render-resource
(str template-path template)
(assoc params
:isDev (env :dev)