...
@@ -63,7 +63,7 @@ $(document).on("change", "input[type=\"checkbox\"][data-control]", function () {
});
});
-// Generic control/related handler to show/hide fields based on a select' value
+// Generic control/related handler to show/hide fields based on a 'select' value
$(document).on("change", "select[data-control]", function() {
var $this = $(this);
var name = $this.data("control");
@@ -79,7 +79,7 @@ $(document).on("change", "select[data-control]", function() {
}
});
-// Generic control/related handler to show/hide fields based on a select' value
+// Generic control/related handler to show/hide fields based on a 'select' value
// this one is made to show all values if select value is not 0
$(document).on("change", "select[data-controlall]", function() {
var $this = $(this);
@@ -130,8 +130,13 @@ $(".container-fluid").bind('drop', function (e) {
}
});
if (dt.files.length) {
- $("#btn-upload")[0].files = dt.files;
- $("#form-upload").submit();
+ if($("#btn-upload-format").length) {
+ $("#btn-upload-format")[0].files = dt.files;
+ $("#form-upload-format").submit();
+ } else {
+ $("#btn-upload")[0].files = dt.files;
+ $("#form-upload").submit();
+ }
}
}
});
@@ -140,12 +145,25 @@ $("#btn-upload").change(function() {
$("#form-upload").submit();
});
+$("#btn-upload-format").change(function() {
+ $("#form-upload-format").submit();
+});
+
+
$("#form-upload").uploadprogress({
- redirect_url: getPath() + "/", //"{{ url_for('web.index')}}",
- uploadedMsg: $("#form-upload").data("message"), //"{{_('Upload done, processing, please wait...')}}",
- modalTitle: $("#form-upload").data("title"), //"{{_('Uploading...')}}",
- modalFooter: $("#form-upload").data("footer"), //"{{_('Close')}}",
- modalTitleFailed: $("#form-upload").data("failed") //"{{_('Error')}}"
+ redirect_url: getPath() + "/",
+ uploadedMsg: $("#form-upload").data("message"),
+ modalTitle: $("#form-upload").data("title"),
+ modalFooter: $("#form-upload").data("footer"),
+ modalTitleFailed: $("#form-upload").data("failed")
+});
+
+$("#form-upload-format").uploadprogress({
+ redirect_url: getPath() + "/",
+ uploadedMsg: $("#form-upload-format").data("message"),
+ modalTitle: $("#form-upload-format").data("title"),
+ modalFooter: $("#form-upload-format").data("footer"),
+ modalTitleFailed: $("#form-upload-format").data("failed")
});
$(document).ready(function() {
@@ -604,6 +622,7 @@ $(function() {
});
$("#toggle_order_shelf").click(function() {
+ $("#toggle_order_shelf").toggleClass("dummy");
$("#new").toggleClass("disabled");
$("#old").toggleClass("disabled");
$("#asc").toggleClass("disabled");
@@ -612,9 +631,20 @@ $(function() {
$("#auth_za").toggleClass("disabled");
$("#pub_new").toggleClass("disabled");
$("#pub_old").toggleClass("disabled");
+ $("#shelf_new").toggleClass("disabled");
+ $("#shelf_old").toggleClass("disabled");
var alternative_text = $("#toggle_order_shelf").data('alt-text');
+ var status = $("#toggle_order_shelf").hasClass("dummy") ? "on" : "off";
$("#toggle_order_shelf").data('alt-text', $("#toggle_order_shelf").html());
$("#toggle_order_shelf").html(alternative_text);
+
+ $.ajax({
+ method:"post",
+ contentType: "application/json; charset=utf-8",
+ dataType: "json",
+ url: getPath() + "/ajax/view",
+ data: "{\"shelf\": {\"man\": \"" + status + "\"}}",
+ });
});
$("#btndeluser").click(function() {
@@ -696,20 +726,20 @@ $(function() {
url: getPath() + "/ajax/simulatedbchange",
data: {config_calibre_dir: $("#config_calibre_dir").val(), csrf_token: $("input[name='csrf_token']").val()},
success: function success(data) {
- if ( data.change ) {
- if ( data.valid ) {
+ if ( !data.valid ) {
+ $("#InvalidDialog").modal('show');
+ }
+ else{
+ if ( data.change ) {
confirmDialog(
"db_submit",
"GeneralChangeModal",
0,
changeDbSettings
);
- }
- else {
- $("#InvalidDialog").modal('show');
- }
- } else {
+ } else {
changeDbSettings();
+ }
}
}
});
diff --git a/cps/static/js/reading/epub-progress.js b/cps/static/js/reading/epub-progress.js
deleted file mode 100644
index b8fc11d0..00000000
--- a/cps/static/js/reading/epub-progress.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * waits until queue is finished, meaning the book is done loading
- * @param callback
- */
-function qFinished(callback){
- let timeout=setInterval(()=>{
- if(reader.rendition.q.running===undefined)
- clearInterval(timeout);
- callback();
- },300
- )
-}
-
-function calculateProgress(){
- let data=reader.rendition.location.end;
- return Math.round(epub.locations.percentageFromCfi(data.cfi)*100);
-}
-
-// register new event emitter locationchange that fires on urlchange
-// source: https://stackoverflow.com/a/52809105/21941129
-(() => {
- let oldPushState = history.pushState;
- history.pushState = function pushState() {
- let ret = oldPushState.apply(this, arguments);
- window.dispatchEvent(new Event('locationchange'));
- return ret;
- };
-
- let oldReplaceState = history.replaceState;
- history.replaceState = function replaceState() {
- let ret = oldReplaceState.apply(this, arguments);
- window.dispatchEvent(new Event('locationchange'));
- return ret;
- };
-
- window.addEventListener('popstate', () => {
- window.dispatchEvent(new Event('locationchange'));
- });
-})();
-
-window.addEventListener('locationchange',()=>{
- let newPos=calculateProgress();
- progressDiv.textContent=newPos+"%";
-});
-
-var epub=ePub(calibre.bookUrl)
-
-let progressDiv=document.getElementById("progress");
-
-qFinished(()=>{
- epub.locations.generate().then(()=> {
- window.dispatchEvent(new Event('locationchange'))
-});
-})
diff --git a/cps/static/js/reading/epub.js b/cps/static/js/reading/epub.js
index a552da05..8d299ce8 100644
--- a/cps/static/js/reading/epub.js
+++ b/cps/static/js/reading/epub.js
@@ -52,6 +52,32 @@ var reader;
}
});
+ // Update progress percentage
+ let progressDiv = document.getElementById("progress");
+ reader.book.ready.then((()=>{
+ let locations_key = reader.book.key()+'-locations';
+ let stored_locations = localStorage.getItem(locations_key);
+ let make_locations, save_locations;
+ if (stored_locations) {
+ make_locations = Promise.resolve(reader.book.locations.load(stored_locations));
+ // No-op because locations are already saved
+ save_locations = ()=>{};
+ } else {
+ make_locations = reader.book.locations.generate();
+ save_locations = ()=>{
+ localStorage.setItem(locations_key, reader.book.locations.save());
+ };
+ }
+ make_locations.then(()=>{
+ reader.rendition.on('relocated', (location)=>{
+ let percentage = Math.round(location.end.percentage*100);
+ progressDiv.textContent=percentage+"%";
+ });
+ reader.rendition.reportLocation();
+ progressDiv.style.visibility = "visible";
+ }).then(save_locations);
+ }));
+
/**
* @param {string} action - Add or remove bookmark
* @param {string|int} location - Location or zero
diff --git a/cps/static/js/reading/locationchange-polyfill.js b/cps/static/js/reading/locationchange-polyfill.js
new file mode 100644
index 00000000..4845ea84
--- /dev/null
+++ b/cps/static/js/reading/locationchange-polyfill.js
@@ -0,0 +1,21 @@
+// register new event emitter locationchange that fires on urlchange
+// source: https://stackoverflow.com/a/52809105/21941129
+(() => {
+ let oldPushState = history.pushState;
+ history.pushState = function pushState() {
+ let ret = oldPushState.apply(this, arguments);
+ window.dispatchEvent(new Event('locationchange'));
+ return ret;
+ };
+
+ let oldReplaceState = history.replaceState;
+ history.replaceState = function replaceState() {
+ let ret = oldReplaceState.apply(this, arguments);
+ window.dispatchEvent(new Event('locationchange'));
+ return ret;
+ };
+
+ window.addEventListener('popstate', () => {
+ window.dispatchEvent(new Event('locationchange'));
+ });
+})();
diff --git a/cps/static/js/table.js b/cps/static/js/table.js
index 36361c3c..7f210eb1 100644
--- a/cps/static/js/table.js
+++ b/cps/static/js/table.js
@@ -685,6 +685,17 @@ function ratingFormatter(value, row) {
return (value/2);
}
+function seriesIndexFormatter(value, row) {
+ if (!value) {
+ return value;
+ }
+ formated_value = Number(value).toFixed(2);
+ if (formated_value.endsWith(".00")) {
+ formated_value = parseInt(formated_value).toString();
+ }
+ return formated_value;
+}
+
/* Do some hiding disabling after user list is loaded */
function loadSuccess() {
@@ -849,6 +860,7 @@ function BookCheckboxChange(checkbox, userId, field) {
},
success: handleListServerResponse
});
+ console.log("test");
}
diff --git a/setup.py b/cps/string_helper.py
similarity index 50%
rename from setup.py
rename to cps/string_helper.py
index 8dcbee25..d263dd2f 100644
--- a/setup.py
+++ b/cps/string_helper.py
@@ -1,8 +1,7 @@
-#!/usr/bin/env python
# -*- coding: utf-8 -*-
# This file is part of the Calibre-Web (https://github.com/janeczku/calibre-web)
-# Copyright (C) 2019 decentral1se
+# Copyright (C) 2024 OzzieIsaacs
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -16,28 +15,9 @@
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see {{entry.Books.series[0].name}} - ({{entry.Books.series_index|formatseriesindex}}) + ({{entry.Books.series_index|formatfloat(2)}})
{% endif %} {% if entry.Books.ratings.__len__() > 0 %} @@ -124,7 +122,7 @@ {{entry.series[0].name}} - ({{entry.series_index|formatseriesindex}}) + ({{entry.series_index|formatfloat(2)}}) {% endif %}
diff --git a/cps/templates/basic_detail.html b/cps/templates/basic_detail.html
new file mode 100644
index 00000000..1996497b
--- /dev/null
+++ b/cps/templates/basic_detail.html
@@ -0,0 +1,81 @@
+{% extends "basic_layout.html" %}
+
+{% block body %}
+{{instance}} | {{title}}
+
+
+
+
+
+
+
{% endif %}
+{% if current_user.role_upload() and g.allow_upload %}
+
+
+
+{% endblock %}
diff --git a/cps/templates/basic_index.html b/cps/templates/basic_index.html
new file mode 100644
index 00000000..ae88087f
--- /dev/null
+++ b/cps/templates/basic_index.html
@@ -0,0 +1,32 @@
+{% extends "basic_layout.html" %}
+{% block body %}
+
+{{ entry.title }}
+
+ {% for author in entry.ordered_authors %}
+
+
+{{ author.name.replace("|",",") }}
+ {% endfor %} +
+  }} "{{ entry.title }}")
+
+
+{% if current_user.role_download() %}
+ {% if entry.data|length %}
+
+
+ {% endif %}
+{% endif %}
+
+Download
+ {% for format in entry.data %} ++ + {{ format.format }} ({{ format.uncompressed_size|filesizeformat }}) +
+ {% endfor %} +Details
+ +{% if entry.series|length > 0 %} +{{ _("Book %(index)s of %(range)s", index=entry.series_index | formatfloat(2), range=(entry.series[0].name)|safe) }}
+{% endif %} + +{% if entry.languages|length > 0 %} +
+
+{% endif %}
+
+{% if entry.identifiers|length > 0 %}
+ + + {{_('Language')}}: {% for language in entry.languages %}{{language.language_name}}{% if not loop.last %}, {% endif %}{% endfor %} + +
+
+
+{% endif %}
+
+{% if entry.publishers|length > 0 %}
+ + + {% for identifier in entry.identifiers %} +
{{ identifier.format_type() }}: {{ identifier|escape }}
+ {% endfor %} + +
+
+{% endif %}
+
+{% if (entry.pubdate|string)[:10] != '0101-01-01' %}
+ + {{ _('Publisher') }}: + {{ entry.publishers[0].name }} + +
+
+
+{% endif %}
+
+{% if entry.comments|length > 0 and entry.comments[0].text|length > 0 %}
+ {{ _('Published') }}: {{ entry.pubdate|formatdate }}
+
+
+{% endif %}
+{{ _('Description:') }}
+ {{ entry.comments[0].text|safe }} +
+
+
+{% if entries|length < 1 %}
+
+ {% if pagination.has_prev %}
+ « {{_('Previous')}}
+ {% endif %}
+
+
+ {% if pagination.has_next %}
+ {{_('Next')}} »
+ {% endif %}
+
+{{_('No Results Found')}}
+{% endif %} + +{% for entry in entries %} + {% if entry.Books.authors %} + {% set author = entry.Books.authors[0].name.replace('|',',')|shortentitle(30) %} + {% else %} + {% set author = '' %} + {% endif %} + +{{ author }} - {{entry.Books.title|shortentitle}}
+ +{% endfor %} + +{% endblock %} diff --git a/cps/templates/basic_layout.html b/cps/templates/basic_layout.html new file mode 100644 index 00000000..b3000be8 --- /dev/null +++ b/cps/templates/basic_layout.html @@ -0,0 +1,47 @@ + + + + +
+
+
+ {% if current_user.is_authenticated or g.allow_anonymous %}
+
+
+ {% endif %}
+
+
+ {% block body %}
+ {% endblock %}
+
+
+
+
diff --git a/cps/templates/book_edit.html b/cps/templates/book_edit.html
index 57fe701c..615b40c2 100644
--- a/cps/templates/book_edit.html
+++ b/cps/templates/book_edit.html
@@ -47,42 +47,37 @@
+
+{% endif %}
+