Merge pull request #2818 from roed314/color_settings

Color settings

Development.md

@@ -30,13 +30,14 @@ The idea is to extend "homepage.html" and replace the content block:
 CSS
 ---
 The css should be kept in the .css files in lmfdb/templates/ and loaded into
-homepage.html.  Preferably, new css should be added to one of the already existing .css files.  There are two .css files:
+homepage.html.  Preferably, new css should be added to:
  * style.css - contains the majority of the css, for exmaple, for the
    properties and sidebar variables.
- * color.css - contains all color definitions and templates.  Always use a
-   color defined in color.css, preferably one of the col_main's.  If you
-   feel the need to use a color not defined here, please add it to this file.
-   This helps keep the colors organized into a particular themes.
+
+The colors are defined in `lmfdb.utils.color`, and are available in
+Jinja as `color.header_background` for example.  Please use the colors
+defined there rather than specific colors so that the user can change
+the color theme.
 
 Code Organization / Blueprints
 ------------------------------

lmfdb/app.py

@@ -416,11 +416,30 @@ def robots_txt():
 def humans_txt():
     return render_template("acknowledgment.html", title="Acknowledgments")
 
+@app.context_processor
+def add_colors():
+    from lmfdb.utils.color import all_color_schemes
+    color = request.args.get('color')
+    if color and color.isdigit():
+        color = int(color)
+    if color not in all_color_schemes:
+        color = None
+    if color is None:
+        from flask_login import current_user
+        userid = current_user.get_id()
+        if userid is not None:
+            from lmfdb.users.pwdmanager import userdb
+            color = userdb.lookup(userid).get('color_scheme')
+        if color not in all_color_schemes:
+            color = None
+        if color is None:
+            from lmfdb.utils.config import Configuration
+            color = Configuration().get_color()
+    return dict(color=all_color_schemes[color].dict())
+
 @app.route("/style.css")
 def css():
-    from lmfdb.utils.config import Configuration
-    color = Configuration().get_color()
-    response = make_response(render_template("style.css", color_template=color))
+    response = make_response(render_template("style.css"))
     response.headers['Content-type'] = 'text/css'
     # don't cache css file, if in debug mode.
     if current_app.debug:

lmfdb/belyi/templates/belyi_galmap.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <style>

lmfdb/characters/templates/CharacterGroupTable.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <style type="text/css">

lmfdb/characters/templates/CharacterTable.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <style type="text/css">

lmfdb/characters/templates/Charpage.html

@@ -1,6 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
-
 {% block content %}
 
 <style>

lmfdb/characters/templates/ConductorList.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <style type="text/css">

lmfdb/characters/templates/ModulusList.html

@@ -1,6 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
-
 {% block content %}
 
 <style type="text/css">

lmfdb/characters/templates/OrderList.html

@@ -1,6 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
-
 {% block content %}
 
 <style type="text/css">

lmfdb/characters/templates/character_search.html

@@ -1,6 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
-
 {% block content %}
 
 <style type="text/css">

lmfdb/elliptic_curves/templates/ec-isoclass.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 {{ place_code('class') }}

lmfdb/genus2_curves/templates/g2c_curve.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 <style>
 <div.ratpts>span { white-space: nowrap; font-family: serif; }

lmfdb/hecke_algebras/templates/hecke_algebras-index.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content %}
 {% if BETA %}
 <div>

lmfdb/inventory_app/templates/inv_style.css

@@ -1,7 +1,4 @@
 
-{% import 'color.css' as color %}
-
-
 .inventory_form  { display: table;}
 .inventory_row   { display: table-row; }
 .inventory_row > label{

lmfdb/knowledge/templates/knowl-edit.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content %}
 
   {% if lock %}

lmfdb/knowledge/templates/knowl-index.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content -%}
 <style type="text/css">
 a.curcat {

lmfdb/lattice/templates/lattice-index.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content %}
 <div>
 {{ KNOWL_INC('dq.lattice.extent') }}

lmfdb/lfunctions/templates/Lfunction.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <script>

lmfdb/modlmf/templates/modlmf-index.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content %}
 <div>
 {{ KNOWL_INC('dq.modlmf.extent') }}

lmfdb/rep_galois_modl/templates/rep_galois_modl-index.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content %}
 <div>
 {{ KNOWL_INC('dq.rep_galois_modl.extent') }}

lmfdb/sato_tate_groups/templates/st_browse.html

@@ -1,5 +1,4 @@
 {% extends "homepage.html" %}
-{% import 'color.css' as color %}
 {% block content %}
 <div>
 {{ KNOWL_INC('dq.st.extent') }}

lmfdb/siegel_modular_forms/templates/ModularForm_GSp4_Q_Sp4Zj.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <p>Below are the dimensions of spaces of {{KNOWL("mf.siegel.vector_valued",title="vector valued Siegel modular forms")}} with full {{KNOWL("group.sp2gr",title="$\mathrm{Sp}(4, \mathbb{Z})$")}} level structure.</p>

lmfdb/static/markitup.css

@@ -2,7 +2,6 @@
 // markItUp! Universal MarkUp Engine, JQuery plugin
 // By Jay Salvat - http://markitup.jaysalvat.com/
 // ------------------------------------------------------------------*/
-{% import 'color.css' as color %}
 .markItUp * {
 	margin:0px; padding:0px;
 	outline:none;
@@ -145,4 +144,4 @@
 .wiki .markItUpEditor,
 .dotclear .markItUpEditor {
 	background-image:url(images/bg-editor-wiki.png);
-}
+}

lmfdb/templates/acknowledgment.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 <style>
   #contribs { overflow: hidden; }

lmfdb/templates/base.html

@@ -9,7 +9,7 @@
     {% else %}
       <title>LMFDB{% if title %} - {{ title|striptags }}{% endif %}  </title>
     {% endif %}
-    <link href="{{ url_for('css') }}" rel="stylesheet" type="text/css" /> 
+    <link id="style_css" href="{{ url_for('css') }}" rel="stylesheet" type="text/css" /> 
 
     <!-- jQuery -->
     <script type="text/javascript"

lmfdb/templates/citation.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <div>

lmfdb/templates/citations.html

@@ -1,5 +1,4 @@
 {% extends 'homepage.html' %}
-{% import 'color.css' as color %}
 {% block content %}
 
 <p>