From 394b063b8cb38787699c52253b85f8b2bad3ed9c Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Sun, 16 May 2021 13:25:29 +0200 Subject: [PATCH 1/9] Fixes for caliblur theme --- cps/static/css/caliBlur.css | 40 ++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/cps/static/css/caliBlur.css b/cps/static/css/caliBlur.css index e2f8445d..f479f07f 100644 --- a/cps/static/css/caliBlur.css +++ b/cps/static/css/caliBlur.css @@ -1498,7 +1498,7 @@ body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form } #books > .cover > a:hover, #books_rand > .cover > a:hover, .book.isotope-item > .cover > a:hover, body > div.container-fluid > div.row-fluid > div.col-sm-10 > div.discover > form > div.col-sm-12 > div.col-sm-12 > div.col-sm-2 > a:hover { - outline: solid var(--color-secondary); + /* outline: solid var(--color-secondary); */ font-size: 50px; -o-transition: outline 0s; transition: outline 0s; @@ -3133,7 +3133,7 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div. float: left } -#add-to-shelf, #btnGroupDrop1, #read-in-browser, #sendbtn, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type, .book-meta .btn-toolbar > .btn-group > .btn-warning, .btn-toolbar > .btn-group > #btnGroupDrop2, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 { +#add-to-shelf, #btnGroupDrop1, #readbtn, #sendbtn, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type, .book-meta .btn-toolbar > .btn-group > .btn-warning, .btn-toolbar > .btn-group > #btnGroupDrop2, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 { background: 0 0; color: transparent; width: 50px; @@ -3142,20 +3142,16 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div. overflow: hidden; padding: 0 } -#readbtn { - height: 100%; - padding: 16px; -} #add-to-shelf > span.caret, #btnGroupDrop1 > span.caret, #read-in-browser > span.caret, .btn-toolbar > .btn-group > #btnGroupDrop2 > span.caret, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.caret { padding-bottom: 5px } -#add-to-shelf > span, #btnGroupDrop1 > span, #read-in-browser > span, #sendbtn > span, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type > span, .book-meta .btn-toolbar > .btn-group > .btn-warning > span, .btn-toolbar > .btn-group > #btnGroupDrop2 > span, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span { +#add-to-shelf > span, #btnGroupDrop1 > span, #readbtn > span, #sendbtn > span, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type > span, .book-meta .btn-toolbar > .btn-group > .btn-warning > span, .btn-toolbar > .btn-group > #btnGroupDrop2 > span, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span { color: hsla(0, 0%, 100%, .7) } -#add-to-shelf:hover span, #btnGroupDrop1:hover > span, #read-in-browser:hover > span, #sendbtn:hover > span, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type:hover > span, .book-meta .btn-toolbar > .btn-group > .btn-warning:hover > span, .btn-toolbar > .btn-group > #btnGroupDrop2:hover > span, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2:hover > span { +#add-to-shelf:hover span, #btnGroupDrop1:hover > span, #readbtn:hover > span, #sendbtn:hover > span, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type:hover > span, .book-meta .btn-toolbar > .btn-group > .btn-warning:hover > span, .btn-toolbar > .btn-group > #btnGroupDrop2:hover > span, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2:hover > span { color: #fff } @@ -3165,13 +3161,13 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] > div. font-size: 18px } -#sendbtn > span, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type > span, .book-meta .btn-toolbar > .btn-group > .btn-warning > span.glyphicon-edit { +#sendbtn > span, #readbtn > span, .book-meta .btn-toolbar > .btn-group > .btn-group:nth-child(1) > a:first-of-type > span, .book-meta .btn-toolbar > .btn-group > .btn-warning > span.glyphicon-edit { font-size: 16px; line-height: 54px; width: 100% } -#read-in-browser > span.glyphicon-eye-open:before, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.glyphicon-eye-open:before { +#readbtn > span.glyphicon-book:before, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.glyphicon-book:before { content: "\e352"; font-family: Glyphicons Regular, serif; font-size: 18px; @@ -3294,7 +3290,9 @@ div.btn-group[role=group][aria-label="Download, send to Kindle, reading"] .dropd -ms-transform-origin: center top; transform-origin: center top; border: 0; - left: 0 !important + left: 0 !important; + max-height: 80%; + overflow-y: auto; } .dropdown-menu > li > a { @@ -5163,11 +5161,11 @@ body.login > div.navbar.navbar-default.navbar-static-top > div > div.navbar-head right: 5px } -#read-in-browser[aria-expanded=true], #shelf-actions > .btn-group.open, .downloadBtn.open, .profileDrop[aria-expanded=true] { +#shelf-actions > .btn-group.open, .downloadBtn.open, .profileDrop[aria-expanded=true] { pointer-events: none } -#btnGroupDrop1[aria-expanded=true] > span, #read-in-browser[aria-expanded=true] > span, #shelf-actions > .btn-group.open > #add-to-shelf > span { +#btnGroupDrop1[aria-expanded=true] > span, #shelf-actions > .btn-group.open > #add-to-shelf > span { color: #fff } @@ -7484,14 +7482,14 @@ body.edituser.admin > div.container-fluid > div.row-fluid > div.col-sm-10 > div. margin-left: 8px } -#read-in-browser > span.caret, .btn-toolbar > .btn-group > #btnGroupDrop2 > span.caret, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.caret { +.btn-toolbar > .btn-group > #btnGroupDrop2 > span.caret, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.caret { position: absolute; margin-left: 0; left: 33px; top: 28px } -#read-in-browser > span.glyphicon-eye-open:before, .btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.glyphicon-eye-open:before { +.btn-toolbar > .btn-group > .btn-group > #btnGroupDrop2 > span.glyphicon-eye-open:before { margin-left: 8px } @@ -7892,7 +7890,7 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic } } -#sendbtn2 { +#sendbtn2, #read-in-browser { background: 0 0; color: transparent; width: 50px; @@ -7902,15 +7900,15 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic padding: 0 } -#sendbtn2 > span { +#sendbtn2 > span, #read-in-browser > span { color: hsla(0, 0%, 100%, .7) } -#sendbtn2 > span.glyphicon-send:before { +#sendbtn2 > span.glyphicon-send:before, #read-in-browser > span.glyphicon-book:before { margin-left: 8px } -#sendbtn2 > span.caret { +#sendbtn2> span.caret, #read-in-browser > span.caret { position: absolute; margin-left: 0; left: 33px; @@ -7918,11 +7916,11 @@ body.mailset > div.container-fluid > div > div.col-sm-10 > div.discover .glyphic padding-bottom: 5px } -#sendbtn2:focus span, #sendbtn2:hover span { +#sendbtn2:focus span, #sendbtn2:hover span, #read-in-browser:focus span, #read-in-browser:hover span { color: #fff } -#sendbtn2[aria-expanded=true] { +#sendbtn2[aria-expanded=true], #read-in-browser[aria-expanded=true] { pointer-events: none } From a0449b50c8e5cf087db85ce486c8be4a9b871086 Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Mon, 17 May 2021 17:54:43 +0200 Subject: [PATCH 2/9] Downgrade flask -> to slow during reboot --- requirements.txt | 2 +- test/Calibre-Web TestSummary_Linux.html | 1453 +++++++++++++++-------- 2 files changed, 973 insertions(+), 482 deletions(-) diff --git a/requirements.txt b/requirements.txt index b29d3b99..ed464d7d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Flask-Babel>=0.11.1,<2.1.0 Flask-Login>=0.3.2,<0.5.1 Flask-Principal>=0.3.2,<0.5.1 backports_abc>=0.4 -Flask>=1.0.2,<2.1.0 +Flask>=1.0.2,<2.0.0 iso-639>=0.4.5,<0.5.0 PyPDF3>=1.0.0,<1.0.4 pytz>=2016.10 diff --git a/test/Calibre-Web TestSummary_Linux.html b/test/Calibre-Web TestSummary_Linux.html index bb999140..9eab3f4d 100644 --- a/test/Calibre-Web TestSummary_Linux.html +++ b/test/Calibre-Web TestSummary_Linux.html @@ -37,20 +37,20 @@
-

Start Time: 2021-04-27 20:06:09

+

Start Time: 2021-05-16 21:15:08

-

Stop Time: 2021-04-27 23:04:55

+

Stop Time: 2021-05-17 00:22:56

-

Duration: 2h 24 min

+

Duration: 2h 32 min

@@ -669,12 +669,12 @@ - + TestEditAdditionalBooks 13 - 12 - 0 - 0 + 5 + 1 + 6 1 Detail @@ -683,11 +683,31 @@ - +
TestEditAdditionalBooks - test_change_upload_formats
- PASS + +
+ ERROR +
+ + + + @@ -701,11 +721,31 @@ - +
TestEditAdditionalBooks - test_delete_role
- PASS + +
+ FAIL +
+ + + + @@ -746,38 +786,138 @@ - +
TestEditAdditionalBooks - test_title_sort
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_edit_role
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_metadata_cbr
- PASS + +
+ ERROR +
+ + + + - +
TestEditAdditionalBooks - test_upload_metadata_cbt
- PASS + +
+ ERROR +
+ + + + @@ -808,31 +948,111 @@ - +
TestEditAdditionalBooks - test_writeonly_path
- PASS + +
+ ERROR +
+ + + + - - TestEditBooks - 33 - 31 + + _ErrorHolder + 1 0 0 - 2 + 1 + 0 - Detail + Detail - + + +
tearDownClass (test_edit_additional_books)
+ + +
+ ERROR +
+ + + + + + + + + + + TestEditBooks + 35 + 33 + 0 + 1 + 1 + + Detail + + + + + +
TestEditBooks - test_download_book
@@ -841,7 +1061,7 @@ - +
TestEditBooks - test_edit_author
@@ -850,7 +1070,7 @@ - +
TestEditBooks - test_edit_category
@@ -859,7 +1079,7 @@ - +
TestEditBooks - test_edit_comments
@@ -868,7 +1088,7 @@ - +
TestEditBooks - test_edit_custom_bool
@@ -877,7 +1097,7 @@ - +
TestEditBooks - test_edit_custom_categories
@@ -886,7 +1106,25 @@ - + + +
TestEditBooks - test_edit_custom_comment
+ + PASS + + + + + + +
TestEditBooks - test_edit_custom_date
+ + PASS + + + + +
TestEditBooks - test_edit_custom_float
@@ -895,7 +1133,7 @@ - +
TestEditBooks - test_edit_custom_int
@@ -904,7 +1142,7 @@ - +
TestEditBooks - test_edit_custom_rating
@@ -913,7 +1151,7 @@ - +
TestEditBooks - test_edit_custom_single_select
@@ -922,7 +1160,7 @@ - +
TestEditBooks - test_edit_custom_text
@@ -931,7 +1169,7 @@ - +
TestEditBooks - test_edit_language
@@ -940,7 +1178,7 @@ - +
TestEditBooks - test_edit_publisher
@@ -949,33 +1187,16 @@ - +
TestEditBooks - test_edit_publishing_date
- -
- SKIP -
- - - - + PASS - +
TestEditBooks - test_edit_rating
@@ -984,7 +1205,7 @@ - +
TestEditBooks - test_edit_series
@@ -993,7 +1214,7 @@ - +
TestEditBooks - test_edit_title
@@ -1002,19 +1223,19 @@ - +
TestEditBooks - test_rename_uppercase_lowercase
- SKIP + SKIP
-