f/yenu
1
0
Fork 0
Code Issues 6 Pull requests Projects Releases 1 Packages 1 Wiki Activity

Bump versions and fix the issues

Browse source
This commit is contained in:
Aaron Fischer 2018-03-22 00:33:26 +01:00 committed by Aaron Fischer
parent ae573ccfb1
commit 9a6d6ad5b2
No known key found for this signature in database
GPG key ID: A62EFAEA293B99D7
6 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/templates/detail.html
View file

@ -2,7 +2,7 @@
{% block content %} {% block content %}
<div class="btn-group pull-right clearfix" role="group"> <div class="btn-group float-right clearfix" role="group">
{% if next-image %} {% if next-image %}
<a class="btn btn-secondary" href="/show/{{ next-image.id }}" id="next-image"> <a class="btn btn-secondary" href="/show/{{ next-image.id }}" id="next-image">
{% else %} {% else %}
@ -28,7 +28,7 @@
</a> </a>
</div> </div>
<div class="pull-left clearfix"> <div class="float-left clearfix">
<h1>{{ image.title }}</h1> <h1>{{ image.title }}</h1>
<div id="image-tags"> <div id="image-tags">
{% for tag in tags %} {% for tag in tags %}
@ -47,7 +47,7 @@
<div id="detail-attributes"> <div id="detail-attributes">
{% ifequal identity ":creator" %} {% ifequal identity ":creator" %}
<div class="btn-group pull-right clearfix" role="group"> <div class="btn-group float-right clearfix" role="group">
<a class="btn btn-primary btn-sm" href="/edit/{{ image.id }}"> <a class="btn btn-primary btn-sm" href="/edit/{{ image.id }}">
<span class="fa fa-pencil"></span> <span class="fa fa-pencil"></span>
Bearbeiten Bearbeiten

4
resources/templates/layout.html
View file

@ -9,9 +9,9 @@
{% endif %} {% endif %}
</head> </head>
<body> <body>
<nav class="navbar navbar-toggleable-md bg-inverse navbar-inverse"> <nav class="navbar navbar-expand-lg navbar-toggleable-md bg-dark navbar-dark">
{% if identity %} {% if identity %}
<button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation"> <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span> <span class="navbar-toggler-icon"></span>
</button> </button>
{% endif %} {% endif %}

16
src/clj/yenu/core.clj
View file

@ -47,14 +47,12 @@
(log/info component "started")) (log/info component "started"))
(.addShutdownHook (Runtime/getRuntime) (Thread. stop-app))) (.addShutdownHook (Runtime/getRuntime) (Thread. stop-app)))
(defn -main [& args] (defn setup-prerequisites []
(cond
(some #{"migrate" "rollback"} args)
(do
(mount/start #'yenu.config/env)
(image/create-needed-folders) (image/create-needed-folders)
(migrations/migrate args (select-keys env [:database-url])) (migrations/migrate ["migrate"] (select-keys env [:database-url])))
(System/exit 0))
:else (defn -main [& args]
(start-app args))) (mount/start #'yenu.config/env)
(setup-prerequisites)
(start-app args))

1
src/clj/yenu/db/core.clj
View file

@ -10,3 +10,4 @@
(conman/bind-connection *db* "sql/queries.sql") (conman/bind-connection *db* "sql/queries.sql")

2
src/clj/yenu/layout.clj
View file

@ -22,7 +22,7 @@
(filter/add-filter! :parse-date #(time/to-time-zone (time-format/parse %) (time/default-time-zone))) (filter/add-filter! :parse-date #(time/to-time-zone (time-format/parse %) (time/default-time-zone)))
(defn footer [] (defn footer []
(if (= (:count (db/get-image-count) 0)) (if (= (:count (db/get-image-count)) 0)
(clojure.string/join ", " (:authors env)) (clojure.string/join ", " (:authors env))
(let [first-year (subs (:created_at (db/get-first-year)) 0 4) (let [first-year (subs (:created_at (db/get-first-year)) 0 4)
recent-year (subs (:created_at (db/get-recent-year)) 0 4) recent-year (subs (:created_at (db/get-recent-year)) 0 4)

2
src/clj/yenu/routes/core.clj
View file

@ -30,7 +30,7 @@
(if (< num 2) (if (< num 2)
"" ""
(h/html (h/html
[:nav.pull-right.clearfix {:aria-label "Page navigation"} [:nav.float-right.clearfix {:aria-label "Page navigation"}
[:ul.pagination.hidden-sm-down [:ul.pagination.hidden-sm-down
(page (dec current) (= current 1) "disabled" (h/html [:span.fa.fa-arrow-left] " Zurück")) (page (dec current) (= current 1) "disabled" (h/html [:span.fa.fa-arrow-left] " Zurück"))
(cond (cond