tidying up new theme for color 2

color2_module/colors.py

@@ -62,8 +62,25 @@ def COU():
         tool_title="CHRIS - Color additives (v2)",
         nav_links=[
             ("Tool", "/color2"),
-            ("Context of Use", "/color2_module/COU"),
+            ("Instructions", "/color2_module/Instructions"),
             ("FAQ", "/color2_module/FAQ"),
+            ("CoU", "/color2_module/COU"),
+            ("About", "/color2_module/RST"),
+        ],
+        footer_text="Office of Science and Engineering Laboratories · ",
+        contact_email="david.saylor@fda.hhs.gov",
+    )
+
+@blueprint.get("/color2_module/Instructions")
+def Instructions():
+    return render_template(
+        "README.html",
+        tool_title="CHRIS - Color additives (v2)",
+        nav_links=[
+            ("Tool", "/color2"),
+            ("Instructions", "/color2_module/Instructions"),
+            ("FAQ", "/color2_module/FAQ"),
+            ("CoU", "/color2_module/COU"),
             ("About", "/color2_module/RST"),
         ],
         footer_text="Office of Science and Engineering Laboratories · ",
@@ -77,8 +94,9 @@ def FAQ():
         tool_title="CHRIS - Color additives (v2)",
         nav_links=[
             ("Tool", "/color2"),
-            ("Context of Use", "/color2_module/COU"),
+            ("Instructions", "/color2_module/Instructions"),
             ("FAQ", "/color2_module/FAQ"),
+            ("CoU", "/color2_module/COU"),
             ("About", "/color2_module/RST"),
         ],
         footer_text="Office of Science and Engineering Laboratories · ",
@@ -92,8 +110,9 @@ def RST():
         tool_title="CHRIS - Color additives (v2)",
         nav_links=[
             ("Tool", "/color2"),
-            ("Context of Use", "/color2_module/COU"),
+            ("Instructions", "/color2_module/Instructions"),
             ("FAQ", "/color2_module/FAQ"),
+            ("CoU", "/color2_module/COU"),
             ("About", "/color2_module/RST"),
         ],
         footer_text="Office of Science and Engineering Laboratories · ",
@@ -106,8 +125,9 @@ def colors():
                            tool_title="CHRIS - Color additives (v2)",
                            nav_links=[
                                ("Tool", "/color2"),
-                               ("Context of Use", "/color2_module/COU"),
+                               ("Instructions", "/color2_module/Instructions"),
                                ("FAQ", "/color2_module/FAQ"),
+                               ("CoU", "/color2_module/COU"),
                                ("About", "/color2_module/RST"),
                            ],
                            footer_text="Office of Science and Engineering Laboratories · ",
@@ -179,7 +199,19 @@ def app_post():
 
     if error > 0:
         return render_template('chemError.html', chemName=chemName, IDtype=IDtype, error=error,
-                               error_message=ERROR_CODES.get(error, 'Unknown chemical identification error'))
+                               error_message=ERROR_CODES.get(error, 'Unknown chemical identification error'),
+                               tool_title="CHRIS - Color additives (v2)",
+                               nav_links=[
+                                   ("Tool", "/color2"),
+                                   ("Instructions", "/color2_module/Instructions"),
+                                   ("FAQ", "/color2_module/FAQ"),
+                                   ("CoU", "/color2_module/COU"),
+                                   ("About", "/color2_module/RST"),
+                               ],
+                               footer_text="Office of Science and Engineering Laboratories · ",
+                               contact_email="david.saylor@fda.hhs.gov",
+                               )
+
 
     # metals/ceramics logic; only look up MP if the structural checks need it
     is_metal, is_ceramic, mp, mp_origin, mp_searched = ClassifyMaterial(cas, iupac, smiles)
@@ -195,8 +227,17 @@ def app_post():
         # if all atoms are metals -> this is a metal
         return render_template('metalError.html', show_properties=show_properties, chemName=chemName, MW=MW,
                                LogP=LogP, rho=rho, mp=mp, iupac=iupac,
-                               cas=cas, smiles=smiles, molImage=molImage)
-                               #LogP_origin=LogP_origin, rho_origin=rho_origin, mp_origin=mp_origin)
+                               cas=cas, smiles=smiles, molImage=molImage,
+                               nav_links=[
+                                   ("Tool", "/color2"),
+                                   ("Instructions", "/color2_module/Instructions"),
+                                   ("FAQ", "/color2_module/FAQ"),
+                                   ("CoU", "/color2_module/COU"),
+                                   ("About", "/color2_module/RST"),
+                               ],
+                               footer_text="Office of Science and Engineering Laboratories · ",
+                               contact_email="david.saylor@fda.hhs.gov",
+                               )
     #else:
     if is_ceramic:
         MW = 1100.

color2_module/templates/COU.html

@@ -137,8 +137,8 @@ coloring.</p></li>
 <li id="fn2"><p>21 CFR 73, Subpart D and 21 CFR 74, Subpart D identifies
 all those color additives for which a color additive petition exists for
 use of the color in a medical device application. Not all of these color
-additives are included in the CHRIS calculator. Please see the <a
-href="README.html">instructions</a> for how to use the calculator with a
+additives are included in the CHRIS calculator. Please see the
+instructions for how to use the calculator with a
 color additive other than those identified in the CHRIS calculator drop
 down menu.<a href="#fnref2" class="footnote-back"
 role="doc-backlink">↩︎</a></p></li>

color2_module/templates/README.html

@@ -1,14 +1,7 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-    <title>CHRIS-README</title>
-    <link rel="stylesheet" href="styles.css">
-    <meta charset="UTF-8">
-</head>
-
-<header>
-   <h1 style="text-align:center"><font color="#0070C0">CH</font>emical <font color="#0070C0">RIS</font>k calculator (CHRIS) - Color additives</h1>
-</header>
+{% extends "base.html" %}
+{% block content %}
 <h2 id="overview">Overview</h2>
 <p>The CHRIS - Color additives module is a tool under development within
 the Center for Devices and Radiological Health (CDRH) at the Food and
@@ -183,3 +176,5 @@ href="FAQ.html">here</a>. If your question is not already addressed or
 if you have specific issues with CHRIS, please contact Dave Saylor: <a
 href="mailto:david.saylor@fda.hhs.gov"
 class="email">david.saylor@fda.hhs.gov</a>.</p>
+
+{% endblock %}

templates/chemError.html

@@ -6,10 +6,10 @@
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='styles.css') }}">
 </head>
 
+{% extends "base.html" %}
+{% block content %}
+
 <body>
-<img src="{{ url_for('static', filename='images/FDAlogo.png') }}" style="float: left;" height="100"/>
-<img src="{{ url_for('static', filename='images/FDAgraphic.png') }}" style="float: right;" height="100"/>
-<br clear="all"/>
 
 <div style="font-size:5rem;text-align:center">&#129318;</div>
 
@@ -36,4 +36,5 @@
 </div>
 
 </body>
+{% endblock %}
 </html>

templates/metalError.html

@@ -29,9 +29,8 @@
 
 </head>
 
-<img src="{{ url_for('static',filename='images/FDAlogo.png') }}" style="float: left;" height="100"/>
-<img src="{{ url_for('static',filename='images/FDAgraphic.png') }}" style="float: right;"  height="100"/>
-<br clear="all" />
+{% extends "base.html" %}
+{% block content %}
 
 <body>
 
@@ -66,3 +65,5 @@
 
 
 </body>
+
+{% endblock %}