From ada727a5706fe0ab47d72e04d040d46789cbd85e Mon Sep 17 00:00:00 2001 From: Kyos Date: Sat, 19 Oct 2019 10:52:03 +0200 Subject: [PATCH 1/3] Adds Authors, Series and Book Cover to the shelf order view --- cps/static/css/style.css | 1 + cps/templates/shelf_order.html | 25 +++++++++++++++++++++++-- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/cps/static/css/style.css b/cps/static/css/style.css index aaa7503e..3532043f 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -64,6 +64,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te .navbar-default .navbar-toggle .icon-bar {background-color: #000;} .navbar-default .navbar-toggle {border-color: #000;} .cover { margin-bottom: 10px;} +.cover-heigh { max-height: 100px;} .btn-file {position: relative; overflow: hidden;} .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;} diff --git a/cps/templates/shelf_order.html b/cps/templates/shelf_order.html index e3340993..0fa8dc15 100644 --- a/cps/templates/shelf_order.html +++ b/cps/templates/shelf_order.html @@ -1,11 +1,32 @@ {% extends "layout.html" %} {% block body %} -
+

{{title}}

{{_('Drag \'n drop to rearrange order')}}
{% for entry in entries %} -
{{entry.title}}
+
+
+ +
+ {{entry.title}} + {% if entry.series|length > 0 %} +
+ {{entry.series_index}} - {{entry.series[0].name}} + {% endif %} +
+ {% for author in entry.authors %} + {{author.name.replace('|',',')}} + {% if not loop.last %} + & + {% endif %} + {% endfor %} +
+
+
+
{% endfor %}
From 7165826011b8456b3cd1e1c300f7c27941776de6 Mon Sep 17 00:00:00 2001 From: Kyos Date: Sat, 19 Oct 2019 10:57:48 +0200 Subject: [PATCH 2/3] Adds Authors, Series and Book Cover to the shelf order view --- cps/templates/shelf_order.html | 1 - 1 file changed, 1 deletion(-) diff --git a/cps/templates/shelf_order.html b/cps/templates/shelf_order.html index 0fa8dc15..70f74df3 100644 --- a/cps/templates/shelf_order.html +++ b/cps/templates/shelf_order.html @@ -25,7 +25,6 @@ {% endfor %}
-
{% endfor %} From c93dd32179f6334d17c2e6f708d578857a8b7795 Mon Sep 17 00:00:00 2001 From: Kyos Date: Sat, 19 Oct 2019 12:02:14 +0200 Subject: [PATCH 3/3] Fixed typo and column size for LG screens --- cps/static/css/style.css | 2 +- cps/templates/shelf_order.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 3532043f..da088021 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -64,7 +64,7 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te .navbar-default .navbar-toggle .icon-bar {background-color: #000;} .navbar-default .navbar-toggle {border-color: #000;} .cover { margin-bottom: 10px;} -.cover-heigh { max-height: 100px;} +.cover-height { max-height: 100px;} .btn-file {position: relative; overflow: hidden;} .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;} diff --git a/cps/templates/shelf_order.html b/cps/templates/shelf_order.html index 70f74df3..26fa2e35 100644 --- a/cps/templates/shelf_order.html +++ b/cps/templates/shelf_order.html @@ -7,10 +7,10 @@ {% for entry in entries %}
-