diff --git a/project.clj b/project.clj index c5aa785..7d7efc3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject yenu "0.1.0-SNAPSHOT" +(defproject yenu "1.0.1" :description "yenu -- The image sharing tool for friends" :url "https://yenu.de/" diff --git a/resources/templates/detail.html b/resources/templates/detail.html index 07d4fbe..a0d492e 100644 --- a/resources/templates/detail.html +++ b/resources/templates/detail.html @@ -6,25 +6,25 @@ {% if next-image %} {% else %} - - {% endif %} - - Neuer - + + {% endif %} + + Neuer + - - - Gallerie - + + + Gallerie + - {% if prev-image %} - - {% else %} - - {% endif %} - Älter - - + {% if prev-image %} + + {% else %} + + {% endif %} + Älter + +
@@ -38,13 +38,11 @@
-
-
+ -
{% ifequal identity ":creator" %} {% endifequal %} -

{{ image.created_at|parse-date|date:"dd-MM-yyyy HH:mm" }} Uhr

+

{{ image.created_at|parse-date|date:"dd.MM.yyyy, HH:mm" }} Uhr

{% if image.description|length > 0 %}
-
+

© 2013 - {% now yyyy %} Aaron & Beatrice Fischer

diff --git a/resources/templates/login.html b/resources/templates/login.html index 4ef0ae3..7ff6d69 100644 --- a/resources/templates/login.html +++ b/resources/templates/login.html @@ -1,7 +1,6 @@ {% extends "layout.html" %} {% block content %} -
diff --git a/src/clj/yenu/layout.clj b/src/clj/yenu/layout.clj index cb8c8cb..1db77be 100644 --- a/src/clj/yenu/layout.clj +++ b/src/clj/yenu/layout.clj @@ -5,7 +5,8 @@ [ring.util.anti-forgery :refer [anti-forgery-field]] [yenu.helpers.images :as image-helper] [ring.middleware.anti-forgery :refer [*anti-forgery-token*]] - [clj-time.format :as time-format]) + [clj-time.format :as time-format] + [clj-time.core :as time]) (:use [markdown.core])) (declare ^:dynamic *identity*) @@ -15,7 +16,7 @@ (filter/add-filter! :inc inc) (filter/add-filter! :dec dec) (filter/add-filter! :markdown-to-html md-to-html-string) -(filter/add-filter! :parse-date time-format/parse) +(filter/add-filter! :parse-date #(time/to-time-zone (time-format/parse %) (time/default-time-zone))) (defn render "renders the HTML template located relative to resources/templates"