# HG changeset patch
# User Jens-Uwe Grooss <j.-u.grooss@fz-juelich.de>
# Date 1580802425 -3600
# Node ID 53622e770eca0ddac6470976de40f795e7ceba01
# Parent  cdd6167a71de9162575b8b278fe7c671d97ca60a
duplication if html template ozoneloss_uvi / graph removed
updated english translation

diff -r cdd6167a71de -r 53622e770eca eskp.py
--- a/eskp.py	Mon Feb 03 23:07:26 2020 +0100
+++ b/eskp.py	Tue Feb 04 08:47:05 2020 +0100
@@ -309,7 +309,7 @@
 def ozoneloss_uvi():
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvi.rst")
     content = get_content(filename)
-    htmlfile = os.path.join("templates", get_locale(), "html", "ozoneloss_uvi_form.html")
+    htmlfile = os.path.join("templates", get_locale(), "html", "ozoneloss_uvi_form_start.html")
     html_content = get_html_content(htmlfile)
     htmlfile = os.path.join("templates", get_locale(), "html", "uvi_table.html")
     html_table = get_html_content(htmlfile)
@@ -317,11 +317,10 @@
     lat = 50.
     o3offset = 50.
     figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, o3offset)
-    button_text = _("Graph anzeigen")
 
     return render_template('ozoneloss_uvi.html', act="ozoneloss/uvi", content=content, figname=figname,
                            alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion"),
-                                 html_content=html_content, html_table=html_table, button_text=button_text)
+                                 html_content=html_content, html_table=html_table)
 
 
 @app.route("/ozoneloss/uvi_graph", methods=['POST'])
@@ -337,21 +336,20 @@
     o3offsetstr = request.form['Dobson-Unit']
 
     latstr2 = latstr.replace(u'\xb0', '')
-
     if latstr2.endswith(u'N'):
         latstr2 = latstr2.replace(u'N', '')
         lat = float(latstr2)
     if latstr2.endswith(u'S'):
         latstr2 = latstr2.replace(u'S', '')
         lat = -float(latstr2)
+        
+    html_content = html_content.replace('{{latstr}}', latstr)
+    html_content = html_content.replace('{{o3offsetstr}}', o3offsetstr)
+    figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr))
 
-    figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr))
-    button_text = _("Graph anzeigen")
-
-    return render_template('graph.html', act="ozoneloss_uvi_graph", content=content, figname=figname,
+    return render_template('ozoneloss_uvi.html', act="ozoneloss_uvi_graph", content=content, figname=figname,
                            alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion"),
-                           o3offsetstr=o3offsetstr, latstr=latstr, html_content=html_content,
-                           html_table=html_table, button_text=button_text)
+                           html_content=html_content, html_table=html_table)
 
 @app.route("/ozoneloss/decadal")
 def ozoneloss_decadal():
diff -r cdd6167a71de -r 53622e770eca templates/de/html/ozoneloss_uvi_form.html
--- a/templates/de/html/ozoneloss_uvi_form.html	Mon Feb 03 23:07:26 2020 +0100
+++ b/templates/de/html/ozoneloss_uvi_form.html	Tue Feb 04 08:47:05 2020 +0100
@@ -3,18 +3,20 @@
   <tr> <h4>
     <p> UV-Index für
     <select name="Dobson-Unit" size="1" font-size="14"  border-color="gray">
+      <option>{{o3offsetstr}}</option>
       <option>25</option>
-      <option selected>50</option>
+      <option>50</option>
       <option>75</option>
       <option>100</option>
       <option>125</option>
     </select>
     DU zusätzlichen Ozonverlust bei der Breite
     <select name="Gradzahl" size="1" font-size="14"  border-color="gray">
+      <option>{{latstr}}</option>
       <option>80° N</option>
       <option>70° N</option>
       <option>60° N</option>
-      <option selected> 50° N</option>
+      <option>50° N</option>
       <option>50° S</option>
       <option>60° S</option>
       <option>70° S</option>
diff -r cdd6167a71de -r 53622e770eca templates/de/html/ozoneloss_uvi_form_start.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/de/html/ozoneloss_uvi_form_start.html	Tue Feb 04 08:47:05 2020 +0100
@@ -0,0 +1,29 @@
+<form method="post" action="/ozoneloss/uvi_graph">
+<table border="0" width="100%">
+  <tr> <h4>
+    <p> UV-Index für
+    <select name="Dobson-Unit" size="1" font-size="14"  border-color="gray">
+      <option>25</option>
+      <option selected>50</option>
+      <option>75</option>
+      <option>100</option>
+      <option>125</option>
+    </select>
+    DU zusätzlichen Ozonverlust bei der Breite
+    <select name="Gradzahl" size="1" font-size="14"  border-color="gray">
+      <option>80° N</option>
+      <option>70° N</option>
+      <option>60° N</option>
+      <option selected> 50° N</option>
+      <option>50° S</option>
+      <option>60° S</option>
+      <option>70° S</option>
+      <option>80° S</option>
+    </select>
+    : &nbsp;&nbsp;&nbsp;
+    <input type="submit" value="Graph anzeigen" font-color="black" font-size="16" border-color="gray"/>
+    </p>
+    </h4>		 
+</tr>
+</table>
+</form>
diff -r cdd6167a71de -r 53622e770eca templates/en/html/ozoneloss_uvi_form.html
--- a/templates/en/html/ozoneloss_uvi_form.html	Mon Feb 03 23:07:26 2020 +0100
+++ b/templates/en/html/ozoneloss_uvi_form.html	Tue Feb 04 08:47:05 2020 +0100
@@ -3,18 +3,20 @@
   <tr> <h4>
     <p> UV index for
     <select name="Dobson-Unit" size="1" font-size="14"  border-color="gray">
+      <option>{{o3offsetstr}}</option>
       <option>25</option>
-      <option selected>50</option>
+      <option>50</option>
       <option>75</option>
       <option>100</option>
       <option>125</option>
     </select>
     DU additional ozone loss at latitude
     <select name="Gradzahl" size="1" font-size="14"  border-color="gray">
+      <option>{{latstr}}</option>
       <option>80° N</option>
       <option>70° N</option>
       <option>60° N</option>
-      <option selected> 50° N</option>
+      <option>50° N</option>
       <option>50° S</option>
       <option>60° S</option>
       <option>70° S</option>
diff -r cdd6167a71de -r 53622e770eca templates/en/html/ozoneloss_uvi_form_start.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/en/html/ozoneloss_uvi_form_start.html	Tue Feb 04 08:47:05 2020 +0100
@@ -0,0 +1,29 @@
+<form method="post" action="/ozoneloss/uvi_graph">
+<table border="0" width="100%">
+  <tr> <h4>
+    <p> UV index for
+    <select name="Dobson-Unit" size="1" font-size="14"  border-color="gray">
+      <option>25</option>
+      <option selected>50</option>
+      <option>75</option>
+      <option>100</option>
+      <option>125</option>
+    </select>
+    DU additional ozone loss at latitude
+    <select name="Gradzahl" size="1" font-size="14"  border-color="gray">
+      <option>80° N</option>
+      <option>70° N</option>
+      <option>60° N</option>
+      <option selected> 50° N</option>
+      <option>50° S</option>
+      <option>60° S</option>
+      <option>70° S</option>
+      <option>80° S</option>
+    </select>
+    : &nbsp;&nbsp;&nbsp;
+    <input type="submit" value="Show figure" font-color="black" font-size="16" border-color="gray"/>
+    </p>
+    </h4>		 
+</tr>
+</table>
+</form>
diff -r cdd6167a71de -r 53622e770eca templates/graph.html
--- a/templates/graph.html	Mon Feb 03 23:07:26 2020 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,79 +0,0 @@
-{% extends "theme.html" %}
-<head>
-}
-label{
-font-size: 18;
-}
-
-font-family {
-Timed New Roman, sans-serif;
-}
-
-select {
-font-size:14;
-border-color: gray;
-}
-
-input{
-font-color: black;
-font-size: 16;
-border-color: gray;
-}
-
-</head>
-{% block body %}
-<div class="container">
-<div class="col-lg-12">
-<div class="row">
-{{ content|safe }}
-</div>
-
-<br>
-
-<form method="post" action="/ozoneloss/uvi_graph">
-<table border="0" width="100%">
-  <tr> <h4>
-    <p> UV-Index für
-    <select name="Dobson-Unit" size="1" font-size="14"  border-color="gray">
-      <option>{{o3offsetstr}}</option>
-      <option>25</option>
-      <option>50</option>
-      <option>75</option>
-      <option>100</option>
-    </select>
-    DU zusätzlichen Ozonverlust bei der Breite
-    <select name="Gradzahl" size="1" font-size="14"  border-color="gray">
-      <option>{{latstr}}</option>
-      <option>80° N</option>
-      <option>70° N</option>
-      <option>60° N</option>
-      <option>50° N</option>
-      <option>50° S</option>
-      <option>60° S</option>
-      <option>70° S</option>
-      <option>80° S</option>
-    </select>
-    : &nbsp;&nbsp;&nbsp;
-    <input type="submit" value="{{button_text}}" font-color="black" font-size="16" border-color="gray"/>
-    </p>
-    </h4>		 
-</tr>
-</table>
-</form>
-<br>
-<img src="/static/images/uvindex/{{figname}}" border="6">
-<br>
-{{ html_table|safe }}
-<br>
-<br>
-
-<div class="row">
-{{ content_explanation|safe }}
-{{ modal_info|safe }}
-</div>
-
-</div>
-
-</div>
-
-{% endblock %}
diff -r cdd6167a71de -r 53622e770eca translations/de/LC_MESSAGES/messages.mo
Binary file translations/de/LC_MESSAGES/messages.mo has changed
diff -r cdd6167a71de -r 53622e770eca translations/de/LC_MESSAGES/messages.po
--- a/translations/de/LC_MESSAGES/messages.po	Mon Feb 03 23:07:26 2020 +0100
+++ b/translations/de/LC_MESSAGES/messages.po	Tue Feb 04 08:47:05 2020 +0100
@@ -124,6 +124,3 @@
 #: eskp.py:376
 msgid "This information is not available!"
 msgstr "Diese Information steht nicht zur Verfügung"
-
-msgid "Graph anzeigen"
-msgstr "Graph anzeigen"
diff -r cdd6167a71de -r 53622e770eca translations/en/LC_MESSAGES/messages.mo
Binary file translations/en/LC_MESSAGES/messages.mo has changed
diff -r cdd6167a71de -r 53622e770eca translations/en/LC_MESSAGES/messages.po
--- a/translations/en/LC_MESSAGES/messages.po	Mon Feb 03 23:07:26 2020 +0100
+++ b/translations/en/LC_MESSAGES/messages.po	Tue Feb 04 08:47:05 2020 +0100
@@ -79,6 +79,3 @@
 #: eskp.py:376
 msgid "This information is not available!"
 msgstr "This information is not available!"
-
-msgid "Graph anzeigen"
-msgstr "Show figure"