user01/calibre-web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into Develop

Browse Source 
# Conflicts:
#	cps/book_formats.py
#	cps/helper.py
#	cps/web.py
This commit is contained in:
Ozzieisaacs
2019-04-20 18:32:46 +02:00
parent 05da2ae3c7 f1a65a2aeb
commit 2de4bfdcf2
13 changed files with 266 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cps/templates/book_edit.html
+3 -3
View File
@@ -90,7 +90,7 @@
<div class="form-group" aria-label="Upload cover from local drive">
<label class="btn btn-primary btn-file" for="btn-upload-cover">{{ _('Upload Cover from local drive') }}</label>
<div class="upload-cover-input-text" id="upload-cover"></div>
<input id="btn-upload-cover" name="btn-upload-cover" type="file">
<input id="btn-upload-cover" name="btn-upload-cover" type="file" accept=".jpg, .jpeg, .png, .webp">
</div>
<div class="form-group">
<label for="pubdate">{{_('Publishing date')}}</label>
@@ -223,8 +223,8 @@
</div>
<div class="modal-body">
<div class="text-center padded-bottom">
<input type="checkbox" id="show-douban" class="pill" data-control="douban" checked>
<label for="show-douban">Douban <span class="glyphicon glyphicon-ok"></span></label>
<!--input type="checkbox" id="show-douban" class="pill" data-control="douban" checked>
<label for="show-douban">Douban <span class="glyphicon glyphicon-ok"></span></label-->
<input type="checkbox" id="show-google" class="pill" data-control="google" checked>
<label for="show-google">Google <span class="glyphicon glyphicon-ok"></span></label>