Merge branch 'master' into Develop

# Conflicts:
#	cps/templates/layout.html
#	cps/web.py
#	readme.md
pull/823/head
Ozzieisaacs 6 years ago
commit 37007dafee

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -1,126 +1,40 @@
/*! normalize.css v1.0.1 | MIT License | git.io/normalize */ /*! normalize.css v8.0.1 | MIT License | github.com/necolas/normalize.css */
/* ========================================================================== /* Document
HTML5 display definitions
========================================================================== */ ========================================================================== */
/* /**
* Corrects `block` display not defined in IE 6/7/8/9 and Firefox 3. * 1. Correct the line height in all browsers.
*/ * 2. Prevent adjustments of font size after orientation changes in iOS.
article,
aside,
details,
figcaption,
figure,
footer,
header,
hgroup,
nav,
section,
summary {
display: block;
}
/*
* Corrects `inline-block` display not defined in IE 6/7/8/9 and Firefox 3.
*/
audio,
canvas,
video {
display: inline-block;
*display: inline;
*zoom: 1;
}
/*
* Prevents modern browsers from displaying `audio` without controls.
* Remove excess height in iOS 5 devices.
*/
audio:not([controls]) {
display: none;
height: 0;
}
/*
* Addresses styling for `hidden` attribute not present in IE 7/8/9, Firefox 3,
* and Safari 4.
* Known issue: no IE 6 support.
*/
[hidden] {
display: none;
}
/* ==========================================================================
Base
========================================================================== */
/*
* 1. Corrects text resizing oddly in IE 6/7 when body `font-size` is set using
* `em` units.
* 2. Prevents iOS text size adjust after orientation change, without disabling
* user zoom.
*/ */
html { html {
font-size: 100%; /* 1 */ line-height: 1.15; /* 1 */
-webkit-text-size-adjust: 100%; /* 2 */ -webkit-text-size-adjust: 100%; /* 2 */
-ms-text-size-adjust: 100%; /* 2 */
} }
/* /* Sections
* Addresses `font-family` inconsistency between `textarea` and other form ========================================================================== */
* elements.
*/
html,
button,
input,
select,
textarea {
font-family: sans-serif;
}
/* /**
* Addresses margins handled incorrectly in IE 6/7. * Remove the margin in all browsers.
*/ */
body { body {
margin: 0; margin: 0;
} }
/* ========================================================================== /**
Links * Render the `main` element consistently in IE.
========================================================================== */
/*
* Addresses `outline` inconsistency between Chrome and other browsers.
*/
a:focus {
outline: thin dotted;
}
/*
* Improves readability when focused and also mouse hovered in all browsers.
*/ */
a:active, main {
a:hover { display: block;
outline: 0;
} }
/* ========================================================================== /**
Typography * Correct the font size and margin on `h1` elements within `section` and
========================================================================== */ * `article` contexts in Chrome, Firefox, and Safari.
/*
* Addresses font sizes and margins set differently in IE 6/7.
* Addresses font sizes within `section` and `article` in Firefox 4+, Safari 5,
* and Chrome.
*/ */
h1 { h1 {
@ -128,129 +42,84 @@ h1 {
margin: 0.67em 0; margin: 0.67em 0;
} }
h2 { /* Grouping content
font-size: 1.5em; ========================================================================== */
margin: 0.83em 0;
}
h3 {
font-size: 1.17em;
margin: 1em 0;
}
h4 {
font-size: 1em;
margin: 1.33em 0;
}
h5 {
font-size: 0.83em;
margin: 1.67em 0;
}
h6 {
font-size: 0.75em;
margin: 2.33em 0;
}
/* /**
* Addresses styling not present in IE 7/8/9, Safari 5, and Chrome. * 1. Add the correct box sizing in Firefox.
* 2. Show the overflow in Edge and IE.
*/ */
abbr[title] { hr {
border-bottom: 1px dotted; box-sizing: content-box; /* 1 */
height: 0; /* 1 */
overflow: visible; /* 2 */
} }
/* /**
* Addresses style set to `bolder` in Firefox 3+, Safari 4/5, and Chrome. * 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/ */
b, pre {
strong { font-family: monospace, monospace; /* 1 */
font-weight: bold; font-size: 1em; /* 2 */
} }
blockquote { /* Text-level semantics
margin: 1em 40px; ========================================================================== */
}
/* /**
* Addresses styling not present in Safari 5 and Chrome. * Remove the gray background on active links in IE 10.
*/ */
dfn { a {
font-style: italic; background-color: transparent;
} }
/* /**
* Addresses styling not present in IE 6/7/8/9. * 1. Remove the bottom border in Chrome 57-
* 2. Add the correct text decoration in Chrome, Edge, IE, Opera, and Safari.
*/ */
mark { abbr[title] {
background: #ff0; border-bottom: none; /* 1 */
color: #000; text-decoration: underline; /* 2 */
text-decoration: underline dotted; /* 2 */
} }
/* /**
* Addresses margins set differently in IE 6/7. * Add the correct font weight in Chrome, Edge, and Safari.
*/ */
p, b,
pre { strong {
margin: 1em 0; font-weight: bolder;
} }
/* /**
* Corrects font family set oddly in IE 6, Safari 4/5, and Chrome. * 1. Correct the inheritance and scaling of font size in all browsers.
* 2. Correct the odd `em` font sizing in all browsers.
*/ */
code, code,
kbd, kbd,
pre,
samp { samp {
font-family: monospace, serif; font-family: monospace, monospace; /* 1 */
_font-family: 'courier new', monospace; font-size: 1em; /* 2 */
font-size: 1em;
}
/*
* Improves readability of pre-formatted text in all browsers.
*/
pre {
white-space: pre;
white-space: pre-wrap;
word-wrap: break-word;
} }
/* /**
* Addresses CSS quotes not supported in IE 6/7. * Add the correct font size in all browsers.
*/
q {
quotes: none;
}
/*
* Addresses `quotes` property not supported in Safari 4.
*/
q:before,
q:after {
content: '';
content: none;
}
/*
* Addresses inconsistent and variable font size in all browsers.
*/ */
small { small {
font-size: 80%; font-size: 80%;
} }
/* /**
* Prevents `sub` and `sup` affecting `line-height` in all browsers. * Prevent `sub` and `sup` elements from affecting the line height in
* all browsers.
*/ */
sub, sub,
@ -261,245 +130,220 @@ sup {
vertical-align: baseline; vertical-align: baseline;
} }
sup {
top: -0.5em;
}
sub { sub {
bottom: -0.25em; bottom: -0.25em;
} }
/* ========================================================================== sup {
Lists top: -0.5em;
}
/* Embedded content
========================================================================== */ ========================================================================== */
/* /**
* Addresses margins set differently in IE 6/7. * Remove the border on images inside links in IE 10.
*/ */
dl, img {
menu, border-style: none;
ol,
ul {
margin: 1em 0;
} }
dd { /* Forms
margin: 0 0 0 40px; ========================================================================== */
}
/* /**
* Addresses paddings set differently in IE 6/7. * 1. Change the font styles in all browsers.
* 2. Remove the margin in Firefox and Safari.
*/ */
menu, button,
ol, input,
ul { optgroup,
padding: 0 0 0 40px; select,
textarea {
font-family: inherit; /* 1 */
font-size: 100%; /* 1 */
line-height: 1.15; /* 1 */
margin: 0; /* 2 */
} }
/* /**
* Corrects list images handled incorrectly in IE 7. * Show the overflow in IE.
* 1. Show the overflow in Edge.
*/ */
nav ul, button,
nav ol { input { /* 1 */
list-style: none; overflow: visible;
list-style-image: none;
} }
/* ========================================================================== /**
Embedded content * Remove the inheritance of text transform in Edge, Firefox, and IE.
========================================================================== */ * 1. Remove the inheritance of text transform in Firefox.
/*
* 1. Removes border when inside `a` element in IE 6/7/8/9 and Firefox 3.
* 2. Improves image quality when scaled in IE 7.
*/ */
img { button,
border: 0; /* 1 */ select { /* 1 */
-ms-interpolation-mode: bicubic; /* 2 */ text-transform: none;
} }
/* /**
* Corrects overflow displayed oddly in IE 9. * Correct the inability to style clickable types in iOS and Safari.
*/ */
svg:not(:root) { button,
overflow: hidden; [type="button"],
[type="reset"],
[type="submit"] {
-webkit-appearance: button;
} }
/* ========================================================================== /**
Figures * Remove the inner border and padding in Firefox.
========================================================================== */
/*
* Addresses margin not present in IE 6/7/8/9, Safari 5, and Opera 11.
*/ */
figure { button::-moz-focus-inner,
margin: 0; [type="button"]::-moz-focus-inner,
[type="reset"]::-moz-focus-inner,
[type="submit"]::-moz-focus-inner {
border-style: none;
padding: 0;
} }
/* ========================================================================== /**
Forms * Restore the focus styles unset by the previous rule.
========================================================================== */
/*
* Corrects margin displayed oddly in IE 6/7.
*/ */
form { button:-moz-focusring,
margin: 0; [type="button"]:-moz-focusring,
[type="reset"]:-moz-focusring,
[type="submit"]:-moz-focusring {
outline: 1px dotted ButtonText;
} }
/* /**
* Define consistent border, margin, and padding. * Correct the padding in Firefox.
*/ */
fieldset { fieldset {
border: 1px solid #c0c0c0; padding: 0.35em 0.75em 0.625em;
margin: 0 2px;
padding: 0.35em 0.625em 0.75em;
} }
/* /**
* 1. Corrects color not being inherited in IE 6/7/8/9. * 1. Correct the text wrapping in Edge and IE.
* 2. Corrects text not wrapping in Firefox 3. * 2. Correct the color inheritance from `fieldset` elements in IE.
* 3. Corrects alignment displayed oddly in IE 6/7. * 3. Remove the padding so developers are not caught out when they zero out
* `fieldset` elements in all browsers.
*/ */
legend { legend {
border: 0; /* 1 */ box-sizing: border-box; /* 1 */
padding: 0; color: inherit; /* 2 */
white-space: normal; /* 2 */ display: table; /* 1 */
*margin-left: -7px; /* 3 */ max-width: 100%; /* 1 */
padding: 0; /* 3 */
white-space: normal; /* 1 */
} }
/* /**
* 1. Corrects font size not being inherited in all browsers. * Add the correct vertical alignment in Chrome, Firefox, and Opera.
* 2. Addresses margins set differently in IE 6/7, Firefox 3+, Safari 5,
* and Chrome.
* 3. Improves appearance and consistency in all browsers.
*/ */
button, progress {
input, vertical-align: baseline;
select,
textarea {
font-size: 100%; /* 1 */
margin: 0; /* 2 */
vertical-align: baseline; /* 3 */
*vertical-align: middle; /* 3 */
} }
/* /**
* Addresses Firefox 3+ setting `line-height` on `input` using `!important` in * Remove the default vertical scrollbar in IE 10+.
* the UA stylesheet.
*/ */
button, textarea {
input { overflow: auto;
line-height: normal;
} }
/* /**
* 1. Avoid the WebKit bug in Android 4.0.* where (2) destroys native `audio` * 1. Add the correct box sizing in IE 10.
* and `video` controls. * 2. Remove the padding in IE 10.
* 2. Corrects inability to style clickable `input` types in iOS.
* 3. Improves usability and consistency of cursor style between image-type
* `input` and others.
* 4. Removes inner spacing in IE 7 without affecting normal text inputs.
* Known issue: inner spacing remains in IE 6.
*/ */
button, [type="checkbox"],
html input[type="button"], /* 1 */ [type="radio"] {
input[type="reset"], box-sizing: border-box; /* 1 */
input[type="submit"] { padding: 0; /* 2 */
-webkit-appearance: button; /* 2 */
cursor: pointer; /* 3 */
*overflow: visible; /* 4 */
} }
/* /**
* Re-set default cursor for disabled elements. * Correct the cursor style of increment and decrement buttons in Chrome.
*/ */
button[disabled], [type="number"]::-webkit-inner-spin-button,
input[disabled] { [type="number"]::-webkit-outer-spin-button {
cursor: default; height: auto;
} }
/* /**
* 1. Addresses box sizing set to content-box in IE 8/9. * 1. Correct the odd appearance in Chrome and Safari.
* 2. Removes excess padding in IE 8/9. * 2. Correct the outline style in Safari.
* 3. Removes excess padding in IE 7.
* Known issue: excess padding remains in IE 6.
*/ */
input[type="checkbox"], [type="search"] {
input[type="radio"] { -webkit-appearance: textfield; /* 1 */
box-sizing: border-box; /* 1 */ outline-offset: -2px; /* 2 */
padding: 0; /* 2 */
*height: 13px; /* 3 */
*width: 13px; /* 3 */
} }
/* /**
* 1. Addresses `appearance` set to `searchfield` in Safari 5 and Chrome. * Remove the inner padding in Chrome and Safari on macOS.
* 2. Addresses `box-sizing` set to `border-box` in Safari 5 and Chrome
* (include `-moz` to future-proof).
*/ */
/*
input[type="search"] { [type="search"]::-webkit-search-decoration {
-webkit-appearance: textfield; -webkit-appearance: none;
-moz-box-sizing: content-box;
-webkit-box-sizing: content-box;
box-sizing: content-box;
} }
*/
/* /**
* Removes inner padding and search cancel button in Safari 5 and Chrome * 1. Correct the inability to style clickable types in iOS and Safari.
* on OS X. * 2. Change font properties to `inherit` in Safari.
*/ */
/* input[type="search"]::-webkit-search-cancel-button, ::-webkit-file-upload-button {
input[type="search"]::-webkit-search-decoration { -webkit-appearance: button; /* 1 */
-webkit-appearance: none; font: inherit; /* 2 */
} */ }
/* Interactive
========================================================================== */
/* /*
* Removes inner padding and border in Firefox 3+. * Add the correct display in Edge, IE 10+, and Firefox.
*/ */
button::-moz-focus-inner, details {
input::-moz-focus-inner { display: block;
border: 0;
padding: 0;
} }
/* /*
* 1. Removes default vertical scrollbar in IE 6/7/8/9. * Add the correct display in all browsers.
* 2. Improves readability and alignment in all browsers.
*/ */
textarea { summary {
overflow: auto; /* 1 */ display: list-item;
vertical-align: top; /* 2 */
} }
/* ========================================================================== /* Misc
Tables
========================================================================== */ ========================================================================== */
/* /**
* Remove most spacing between table cells. * Add the correct display in IE 10+.
*/ */
table { template {
border-collapse: collapse; display: none;
border-spacing: 0; }
/**
* Add the correct display in IE 10.
*/
[hidden] {
display: none;
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

@ -7,6 +7,8 @@
<meta name="description" content=""> <meta name="description" content="">
<meta name="viewport" content="width=device-width, user-scalable=no"> <meta name="viewport" content="width=device-width, user-scalable=no">
<meta name="apple-mobile-web-app-capable" content="yes"> <meta name="apple-mobile-web-app-capable" content="yes">
<link rel="apple-touch-icon" sizes="140x140" href="{{ url_for('static', filename='favicon.ico') }}">
<link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='css/libs/normalize.css') }}">
<link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}"> <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">

@ -71,7 +71,12 @@ MATURE_CONTENT = 2048
SIDEBAR_PUBLISHER = 4096 SIDEBAR_PUBLISHER = 4096
DEFAULT_PASS = "admin123" DEFAULT_PASS = "admin123"
try:
DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083)) DEFAULT_PORT = int(os.environ.get("CALIBRE_PORT", 8083))
except ValueError:
print ('Environmentvariable CALIBRE_PORT is set to an invalid value: ' +
os.environ.get("CALIBRE_PORT", 8083) + ', faling back to default (8083)')
DEFAULT_PORT = 8083
UPDATE_STABLE = 0 UPDATE_STABLE = 0
AUTO_UPDATE_STABLE = 1 AUTO_UPDATE_STABLE = 1

@ -48,7 +48,7 @@ Please note that running the above install command can fail on some versions of
Python 2.7+, python 3.x+ Python 2.7+, python 3.x+
Optionally, to enable on-the-fly conversion from one ebook format to another when using the send-to-kindle feature, or during editing ob ebooks metadata: Optionally, to enable on-the-fly conversion from one ebook format to another when using the send-to-kindle feature, or during editing of ebooks metadata:
[Download and install](https://calibre-ebook.com/download) the Calibre desktop program for your platform and enter the folder including programm name (normally /opt/calibre/ebook-convert, or c:\prgogram 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 programm name (normally /opt/calibre/ebook-convert, or c:\prgogram files\calibre\ebook-convert.exe) in the field "calibre's converter tool" on the setup page.

Loading…
Cancel
Save