From 3387a42dd282b51d941477d35981ea2e63d8edc8 Mon Sep 17 00:00:00 2001 From: gered Date: Sun, 28 Sep 2014 15:21:37 -0400 Subject: [PATCH] have all webapp html templates extend from base.html --- src/leiningen/new/yawt.clj | 1 + .../new/yawt/resources/views/base.html | 18 ++----- .../new/yawt/resources/views/error.html | 49 +++++-------------- .../new/yawt/resources/views/index.html | 25 ++++++++++ .../new/yawt/resources/views/notfound.html | 43 ++++------------ .../new/yawt/src/root_ns/routes_webapp.clj | 2 +- 6 files changed, 51 insertions(+), 87 deletions(-) create mode 100644 src/leiningen/new/yawt/resources/views/index.html diff --git a/src/leiningen/new/yawt.clj b/src/leiningen/new/yawt.clj index d99aae7..d44e282 100644 --- a/src/leiningen/new/yawt.clj +++ b/src/leiningen/new/yawt.clj @@ -46,6 +46,7 @@ ["resources/public/vendor/js/react.js" (render "resources/public/vendor/js/react.js" data)] ["resources/public/vendor/js/react.min.js" (render "resources/public/vendor/js/react.min.js" data)] ["resources/views/base.html" (render "resources/views/base.html" data)] + ["resources/views/index.html" (render "resources/views/index.html" data)] ["resources/views/error.html" (render "resources/views/error.html" data)] ["resources/views/notfound.html" (render "resources/views/notfound.html" data)] ["src-cljs/{{path}}/client/main.cljs" (render "src-cljs/root_ns/client/main.cljs" data)] diff --git a/src/leiningen/new/yawt/resources/views/base.html b/src/leiningen/new/yawt/resources/views/base.html index f5aa705..469f7cc 100644 --- a/src/leiningen/new/yawt/resources/views/base.html +++ b/src/leiningen/new/yawt/resources/views/base.html @@ -8,7 +8,7 @@ - <%name%> + {% block title %}{% endblock %}<%name%> {{ stylesheet('/vendor/css/bootstrap.min.css') }} {{ stylesheet('/css/screen.css') }} @@ -20,15 +20,8 @@ {{ javascript('/vendor/js/es5-sham.min.js') }} {{ javascript('/vendor/js/bootstrap.min.js') }} - {% if isDev %} - {{ javascript('/vendor/js/react.js') }} - {% else %} - {{ javascript('/vendor/js/react.min.js') }} - {% endif %} - {% if isDev %} - - {% endif %} + {% block head_scripts %}{% endblock %} -{% endif %} +{% block body_scripts %}{% endblock %} diff --git a/src/leiningen/new/yawt/resources/views/error.html b/src/leiningen/new/yawt/resources/views/error.html index 1d5d988..fcdd028 100644 --- a/src/leiningen/new/yawt/resources/views/error.html +++ b/src/leiningen/new/yawt/resources/views/error.html @@ -1,45 +1,20 @@ {{=<% %>=}} - - - - - - - - - - Error :: <%name%> +{% extends "base.html" %} - {{ stylesheet('/vendor/css/bootstrap.min.css') }} - {{ stylesheet('/css/screen.css') }} +{% block title %}Error :: {% endblock %} - - - {{ javascript('/vendor/js/jquery-2.1.1.min.js') }} - {{ javascript('/vendor/js/es5-shim.min.js') }} - {{ javascript('/vendor/js/es5-sham.min.js') }} - - {{ javascript('/vendor/js/bootstrap.min.js') }} +{% block content %} +
+
+

Server Error

+
- - - +

Your request could not be processed due to a server error.

-
-
-

Server Error

-
- -

Your request could not be processed due to a server error.

- - {% if stacktrace %} + {% if stacktrace %} 
{{ stacktrace }}
- {% endif %} -
- - - + {% endif %} +
+{% endblock %} diff --git a/src/leiningen/new/yawt/resources/views/index.html b/src/leiningen/new/yawt/resources/views/index.html new file mode 100644 index 0000000..fd19dcd --- /dev/null +++ b/src/leiningen/new/yawt/resources/views/index.html @@ -0,0 +1,25 @@ +{{=<% %>=}} +{% extends "base.html" %} + +{% block head_scripts %} + {% if isDev %} + {{ javascript('/vendor/js/react.js') }} + {% else %} + {{ javascript('/vendor/js/react.min.js') }} + {% endif %} + + {% if isDev %} + + {% endif %} +{% endblock %} + +{% block body_scripts %} + {{ javascript('/cljs/main.js') }} + {% if isDev %} + + {% endif %} +{% endblock %} + +{% block content %} +
+{% endblock %} diff --git a/src/leiningen/new/yawt/resources/views/notfound.html b/src/leiningen/new/yawt/resources/views/notfound.html index 410b9f1..3336b4b 100644 --- a/src/leiningen/new/yawt/resources/views/notfound.html +++ b/src/leiningen/new/yawt/resources/views/notfound.html @@ -1,39 +1,14 @@ {{=<% %>=}} - - - - - - - - - - Not Found :: <%name%> +{% extends "base.html" %} - {{ stylesheet('/vendor/css/bootstrap.min.css') }} - {{ stylesheet('/css/screen.css') }} +{% block title %}Not Found :: {% endblock %} - - - {{ javascript('/vendor/js/jquery-2.1.1.min.js') }} - {{ javascript('/vendor/js/es5-shim.min.js') }} - {{ javascript('/vendor/js/es5-sham.min.js') }} - - {{ javascript('/vendor/js/bootstrap.min.js') }} +{% block content %} +
+
+

Not Found

+
- - - - -
-
-

Not Found

+

The page or resource you requested could not be found.

- -

The page or resource you requested could not be found.

-
- - - +{% endblock %} diff --git a/src/leiningen/new/yawt/src/root_ns/routes_webapp.clj b/src/leiningen/new/yawt/src/root_ns/routes_webapp.clj index f6baaeb..bf28838 100644 --- a/src/leiningen/new/yawt/src/root_ns/routes_webapp.clj +++ b/src/leiningen/new/yawt/src/root_ns/routes_webapp.clj @@ -5,7 +5,7 @@ (defroutes main-public-routes - (GET "/" [] (views/render "base.html"))) + (GET "/" [] (views/render "index.html"))) (defroutes api-routes (context "/api" []