Commit 94592b74 authored by Ozzieisaacs's avatar Ozzieisaacs

Merge branch 'master' into Develop

parents 89223760 eef2112e
...@@ -54,9 +54,7 @@ Optionally, to enable on-the-fly conversion from one ebook format to another whe ...@@ -54,9 +54,7 @@ Optionally, to enable on-the-fly conversion from one ebook format to another whe
[Download and install](https://calibre-ebook.com/download) the Calibre desktop program for your platform and enter the folder including program name (normally /opt/calibre/ebook-convert, or C:\Program Files\calibre\ebook-convert.exe) in the field "calibre's converter tool" on the setup page. [Download and install](https://calibre-ebook.com/download) the Calibre desktop program for your platform and enter the folder including program name (normally /opt/calibre/ebook-convert, or C:\Program Files\calibre\ebook-convert.exe) in the field "calibre's converter tool" on the setup page.
\*** DEPRECATED \*** Support will be removed in future releases [Download](https://github.com/geek1011/kepubify/releases/tag/v3.1.2) Kepubify tool for your platform and place the binary starting with `kepubify` in Linux: `\opt\kepubify` Windows: `C:\Program Files\kepubify`.
[Download](http://www.amazon.com/gp/feature.html?docId=1000765211) Amazon's KindleGen tool for your platform and place the binary named `kindlegen` in the `vendor` folder.
## Docker Images ## Docker Images
......
...@@ -128,7 +128,7 @@ def selected_roles(dictionary): ...@@ -128,7 +128,7 @@ def selected_roles(dictionary):
BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, ' BookMeta = namedtuple('BookMeta', 'file_path, extension, title, author, cover, description, tags, series, '
'series_id, languages') 'series_id, languages')
STABLE_VERSION = {'version': '0.6.8 Beta'} STABLE_VERSION = {'version': '0.6.9 Beta'}
NIGHTLY_VERSION = {} NIGHTLY_VERSION = {}
NIGHTLY_VERSION[0] = '$Format:%H$' NIGHTLY_VERSION[0] = '$Format:%H$'
......
...@@ -308,6 +308,7 @@ def delete_shelf(shelf_id): ...@@ -308,6 +308,7 @@ def delete_shelf(shelf_id):
@shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1}) @shelf.route("/shelf/<int:shelf_id>", defaults={'shelf_type': 1})
@shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>") @shelf.route("/shelf/<int:shelf_id>/<int:shelf_type>")
@login_required
def show_shelf(shelf_type, shelf_id): def show_shelf(shelf_type, shelf_id):
shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first() shelf = ub.session.query(ub.Shelf).filter(ub.Shelf.id == shelf_id).first()
......
...@@ -133,8 +133,9 @@ a { color: #45b29d; } ...@@ -133,8 +133,9 @@ a { color: #45b29d; }
} }
.container-fluid .book .meta .rating { margin-top: 5px; } .container-fluid .book .meta .rating { margin-top: 5px; }
.rating .glyphicon-star { color: #999; } .rating .glyphicon-star-empty { color: #444; }
.rating .glyphicon-star.good { color: #45b29d; } .rating .glyphicon-star.good { color: #444; }
.rating-clear .glyphicon-remove { color: #333 }
.container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider { display: none; } .container-fluid .author .author-hidden, .container-fluid .author .author-hidden-divider { display: none; }
......
...@@ -76,7 +76,7 @@ ...@@ -76,7 +76,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -119,7 +119,7 @@ ...@@ -119,7 +119,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
...@@ -105,7 +105,7 @@ ...@@ -105,7 +105,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
...@@ -40,7 +40,7 @@ ...@@ -40,7 +40,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
...@@ -39,7 +39,7 @@ ...@@ -39,7 +39,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
...@@ -49,7 +49,7 @@ ...@@ -49,7 +49,7 @@
<span class="glyphicon glyphicon-star good"></span> <span class="glyphicon glyphicon-star good"></span>
{% if loop.last and loop.index < 5 %} {% if loop.last and loop.index < 5 %}
{% for numer in range(5 - loop.index) %} {% for numer in range(5 - loop.index) %}
<span class="glyphicon glyphicon-star"></span> <span class="glyphicon glyphicon-star-empty"></span>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
{% endfor %} {% endfor %}
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
...@@ -36,17 +36,17 @@ ...@@ -36,17 +36,17 @@
<div class="col-xs-12 col-sm-6"> <div class="col-xs-12 col-sm-6">
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;"> <div class="col-xs-6 col-md-6 col-sm-offset-3" style="margin-top:50px;">
<p class='text-justify attribute'><strong>Start Time: </strong>2020-05-29 07:01:47</p> <p class='text-justify attribute'><strong>Start Time: </strong>2020-06-02 21:06:42</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3"> <div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Stop Time: </strong>2020-05-29 08:01:43</p> <p class='text-justify attribute'><strong>Stop Time: </strong>2020-06-02 22:07:54</p>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-xs-6 col-md-6 col-sm-offset-3"> <div class="col-xs-6 col-md-6 col-sm-offset-3">
<p class='text-justify attribute'><strong>Duration: </strong>50:44 min</p> <p class='text-justify attribute'><strong>Duration: </strong>51:46 min</p>
</div> </div>
</div> </div>
</div> </div>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment