From 671bf5cf8dc46a6d19f2f26cb2ff91cedcb937a8 Mon Sep 17 00:00:00 2001
From: OzzieIsaacs <ozzie.fernandez.isaacs@gmail.com>
Date: Mon, 2 Apr 2018 10:09:19 +0200
Subject: [PATCH] Integrated #454 (css is loaded remote)

---
 cps/templates/layout.html                   |   4 +++-
 cps/templates/user_edit.html                |   8 ++++++++
 cps/translations/de/LC_MESSAGES/messages.mo | Bin 305092 -> 305094 bytes
 cps/translations/de/LC_MESSAGES/messages.po |  10 +++++-----
 cps/ub.py                                   |  10 ++++++++++
 cps/web.py                                  |   3 +++
 messages.pot                                |   2 +-
 7 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/cps/templates/layout.html b/cps/templates/layout.html
index 16fb3f9a..5e9f092f 100644
--- a/cps/templates/layout.html
+++ b/cps/templates/layout.html
@@ -12,7 +12,9 @@
     <link rel="shortcut icon" href="{{ url_for('static', filename='favicon.ico') }}">
     <link href="{{ url_for('static', filename='css/libs/bootstrap.min.css') }}" rel="stylesheet" media="screen">
     <link href="{{ url_for('static', filename='css/style.css') }}" rel="stylesheet" media="screen">
-
+    {% if g.user.get_theme == 1 %}
+       <link href="https://rawgit.com/leram84/layer.Cake/dev/CSS/caliBlur-Demo.css" rel="stylesheet" media="screen">
+    {% endif %}
     <!-- HTML5 Shim and Respond.js IE8 support of HTML5 elements and media queries -->
     <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
     <!--[if lt IE 9]>
diff --git a/cps/templates/user_edit.html b/cps/templates/user_edit.html
index c60bda55..9a44cfcc 100644
--- a/cps/templates/user_edit.html
+++ b/cps/templates/user_edit.html
@@ -31,6 +31,14 @@
             {% endfor %}
         </select>
     </div>
+    <div class="form-group">
+    <label for="theme">{{_('Theme')}}</label>
+        <select name="theme" id="theme" class="form-control">
+            <option value="0" {% if content.get_theme == 0 %}selected{% endif %}>{{ _("Standard Theme") }}</option>
+            <option value="1" {% if content.get_theme == 1 %}selected{% endif %}>{{ _("caliBlur! Dark Theme (Beta)") }}</option>
+        </select>
+    </div>
+
     <div class="form-group">
       <label for="default_language">{{_('Show books with language')}}</label>
         <select name="default_language" id="default_language" class="form-control">
diff --git a/cps/translations/de/LC_MESSAGES/messages.mo b/cps/translations/de/LC_MESSAGES/messages.mo
index 4165a73e6786cb52d2c9d716031bf64bf426591d..c9f1914ccbb1dd59044f3eede4f2c86c313d8bf3 100644
GIT binary patch
delta 285
zcmX?dUg+3)p@uDtUpDayGcYh*a%W)x(a*LsZf1P#R4)%?Z(PR0zzw7?0%=wteHTcp
z1L?;=S{q1nFK1!k1k&a}8l>J4NHYWJL?A5-q*H;kCXj9h(riF_EtK8@q(SEG2GT4*
z`XG>IPzX*<EK1H$$WE;+&o64v{>HdH`x_HqAiI%*fu)tPX?ue^^YjLHmLPSH)S|@F
z;`GF%)Re@M(p-hI{5%G9v82r6?LXaFbR0Q7@{==i5>rz1w(E7WG|S36WtNnrDx_ql
b0xir0vhp&MGfEWlQcD%Us-~Y?#_|mS3!_ml

delta 243
zcmX?hUg*eqp@uDtUpDcIFfcG&a%W)>0@Ba7Gj3*l?Nl!dWN%!?!oUrr&jV>zAblH1
zs{`qWKw29}b1r9L-~`g9Kw2J1+XHE4ARP~+LHd({v?h>l1k!9kdNq{Z1f)Uc?F7;+
zKzcurW>5%DO)N^zP{>ZLEYB}$&;G`^J^LFIUm&}of}y3Ak$HQAJM;7gcb1^(9&eb;
zwsUx}$U06>)M6IjZqvz9Dl1!%lbTqZs*sYOr(U8^l$utQTAZO!l98%VkeHr2{lYSq
FZvev>KqmkI

diff --git a/cps/translations/de/LC_MESSAGES/messages.po b/cps/translations/de/LC_MESSAGES/messages.po
index 01f6b846..ffe67ddd 100644
--- a/cps/translations/de/LC_MESSAGES/messages.po
+++ b/cps/translations/de/LC_MESSAGES/messages.po
@@ -21,7 +21,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Calibre-web\n"
 "Report-Msgid-Bugs-To: https://github.com/janeczku/calibre-web\n"
-"POT-Creation-Date: 2018-04-01 19:27+0200\n"
+"POT-Creation-Date: 2018-04-02 09:35+0200\n"
 "PO-Revision-Date: 2016-07-12 19:54+0200\n"
 "Last-Translator: Ozzie Isaacs\n"
 "Language: de\n"
@@ -1166,11 +1166,11 @@ msgstr "Registrieren"
 
 #: cps/templates/layout.html:103
 msgid "Uploading..."
-msgstr ""
+msgstr "Hochladen..."
 
 #: cps/templates/layout.html:104
 msgid "please don't refresh the page"
-msgstr ""
+msgstr "Bitte die Seite nicht neu laden"
 
 #: cps/templates/layout.html:115
 msgid "Browse"
@@ -1317,11 +1317,11 @@ msgstr "Ergebnisse für:"
 
 #: cps/templates/search_form.html:20
 msgid "Publishing date from"
-msgstr ""
+msgstr "Herausgabedatum von"
 
 #: cps/templates/search_form.html:27
 msgid "Publishing date to"
-msgstr ""
+msgstr "Herausgabedatum bis"
 
 #: cps/templates/search_form.html:44
 msgid "Exclude Tags"
diff --git a/cps/ub.py b/cps/ub.py
index 4b1ab75d..53b23811 100644
--- a/cps/ub.py
+++ b/cps/ub.py
@@ -105,6 +105,10 @@ class UserBase:
     def is_anonymous(self):
         return False
 
+    @property
+    def get_theme(self):
+        return self.theme
+
     def get_id(self):
         return str(self.id)
 
@@ -165,6 +169,7 @@ class User(UserBase, Base):
     sidebar_view = Column(Integer, default=1)
     default_language = Column(String(3), default="all")
     mature_content = Column(Boolean, default=True)
+    theme = Column(Integer, default=0)
 
 
 # Class for anonymous user is derived from User base and complets overrides methods and properties for the
@@ -598,6 +603,11 @@ def migrate_Database():
     except exc.OperationalError:
         conn = engine.connect()
         conn.execute("ALTER TABLE user ADD column `mature_content` INTEGER DEFAULT 1")
+    try:
+        session.query(exists().where(User.theme)).scalar()
+    except exc.OperationalError:
+        conn = engine.connect()
+        conn.execute("ALTER TABLE user ADD column `theme` INTEGER DEFAULT 0")
     if session.query(User).filter(User.role.op('&')(ROLE_ANONYMOUS) == ROLE_ANONYMOUS).first() is None:
         create_anonymous_user()
     try:
diff --git a/cps/web.py b/cps/web.py
index 2fe8509b..f69e3855 100755
--- a/cps/web.py
+++ b/cps/web.py
@@ -2446,6 +2446,7 @@ def profile():
             content.sidebar_view += ub.DETAIL_RANDOM
 
         content.mature_content = "show_mature_content" in to_save
+        content.theme = int(to_save["theme"])
 
         try:
             ub.session.commit()
@@ -2723,6 +2724,7 @@ def new_user():
         content.email = to_save["email"]
         content.default_language = to_save["default_language"]
         content.mature_content = "show_mature_content" in to_save
+        content.theme = int(to_save["theme"])
         if "locale" in to_save:
             content.locale = to_save["locale"]
         content.sidebar_view = 0
@@ -2931,6 +2933,7 @@ def edit_user(user_id):
                 content.sidebar_view -= ub.DETAIL_RANDOM
 
             content.mature_content = "show_mature_content" in to_save
+            content.theme = int(to_save["theme"])
 
             if "default_language" in to_save:
                 content.default_language = to_save["default_language"]
diff --git a/messages.pot b/messages.pot
index da7c7c9d..db1c90c3 100644
--- a/messages.pot
+++ b/messages.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2018-04-01 19:27+0200\n"
+"POT-Creation-Date: 2018-04-02 09:35+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"