From ad40a2b5a67df5d9cac7051c34f1a3f7467e56dd Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Fri, 17 Feb 2017 18:22:08 +0100 Subject: [PATCH 1/5] Bugfix parsing publishing date with milliseconds (#114) --- cps/web.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/web.py b/cps/web.py index 1c16f6ae..c119de05 100755 --- a/cps/web.py +++ b/cps/web.py @@ -283,7 +283,7 @@ def mimetype_filter(val): @app.template_filter('formatdate') def formatdate(val): conformed_timestamp = re.sub(r"[:]|([-](?!((\d{2}[:]\d{2})|(\d{4}))$))", '', val) - formatdate = datetime.datetime.strptime(conformed_timestamp[:-5], "%Y%m%d %H%M%S") + formatdate = datetime.datetime.strptime(conformed_timestamp[:15], "%Y%m%d %H%M%S") return format_date(formatdate, format='medium',locale=get_locale()) From 075c4c58e7adf174b2ba7347186c8260534b10fd Mon Sep 17 00:00:00 2001 From: Ozzie Isaacs Date: Fri, 17 Feb 2017 22:54:14 +0100 Subject: [PATCH 2/5] Revert os.rename to os.renames --- cps/helper.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cps/helper.py b/cps/helper.py index f9251147..00ec9553 100755 --- a/cps/helper.py +++ b/cps/helper.py @@ -263,7 +263,7 @@ def update_dir_stucture(book_id, calibrepath): if authordir != new_authordir: new_author_path = os.path.join(os.path.join(calibrepath, new_authordir), os.path.basename(path)) - os.rename(path, new_author_path) + os.renames(path, new_author_path) book.path = new_authordir + '/' + book.path.split('/')[1] db.session.commit() From e71264961233888fe90ec1acc25de01a1836d50d Mon Sep 17 00:00:00 2001 From: OzzieIsaacs Date: Sat, 18 Feb 2017 10:38:16 +0100 Subject: [PATCH 3/5] Improvement for #83, higher contrast of hamburger menu Improvement for #84, search is excluded from mobile view --- cps/static/css/style.css | 2 ++ cps/templates/layout.html | 24 +++++++++++++----------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cps/static/css/style.css b/cps/static/css/style.css index 071980b3..5e6ea314 100644 --- a/cps/static/css/style.css +++ b/cps/static/css/style.css @@ -36,6 +36,8 @@ span.glyphicon.glyphicon-tags {padding-right: 5px;color: #999;vertical-align: te -moz-box-shadow: 0 5px 8px -6px #777; box-shadow: 0 5px 8px -6px #777; } +.navbar-default .navbar-toggle .icon-bar {background-color: #000;} +.navbar-default .navbar-toggle {border-color: #000;} .btn-file {position: relative; overflow: hidden;} .btn-file input[type=file] {position: absolute; top: 0; right: 0; min-width: 100%; min-height: 100%; font-size: 100px; text-align: right; filter: alpha(opacity=0); opacity: 0; outline: none; background: white; cursor: inherit; display: block;} diff --git a/cps/templates/layout.html b/cps/templates/layout.html index 7e63b93b..71bd7941 100644 --- a/cps/templates/layout.html +++ b/cps/templates/layout.html @@ -52,17 +52,19 @@ Calibre Web + {% if g.user.is_authenticated or g.user.is_anonymous() %} + + {% endif %}