1.1 --- a/eskp.py Mon Feb 03 23:07:26 2020 +0100
1.2 +++ b/eskp.py Tue Feb 04 08:47:05 2020 +0100
1.3 @@ -309,7 +309,7 @@
1.4 def ozoneloss_uvi():
1.5 filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvi.rst")
1.6 content = get_content(filename)
1.7 - htmlfile = os.path.join("templates", get_locale(), "html", "ozoneloss_uvi_form.html")
1.8 + htmlfile = os.path.join("templates", get_locale(), "html", "ozoneloss_uvi_form_start.html")
1.9 html_content = get_html_content(htmlfile)
1.10 htmlfile = os.path.join("templates", get_locale(), "html", "uvi_table.html")
1.11 html_table = get_html_content(htmlfile)
1.12 @@ -317,11 +317,10 @@
1.13 lat = 50.
1.14 o3offset = 50.
1.15 figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, o3offset)
1.16 - button_text = _("Graph anzeigen")
1.17
1.18 return render_template('ozoneloss_uvi.html', act="ozoneloss/uvi", content=content, figname=figname,
1.19 alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion"),
1.20 - html_content=html_content, html_table=html_table, button_text=button_text)
1.21 + html_content=html_content, html_table=html_table)
1.22
1.23
1.24 @app.route("/ozoneloss/uvi_graph", methods=['POST'])
1.25 @@ -337,21 +336,20 @@
1.26 o3offsetstr = request.form['Dobson-Unit']
1.27
1.28 latstr2 = latstr.replace(u'\xb0', '')
1.29 -
1.30 if latstr2.endswith(u'N'):
1.31 latstr2 = latstr2.replace(u'N', '')
1.32 lat = float(latstr2)
1.33 if latstr2.endswith(u'S'):
1.34 latstr2 = latstr2.replace(u'S', '')
1.35 lat = -float(latstr2)
1.36 +
1.37 + html_content = html_content.replace('{{latstr}}', latstr)
1.38 + html_content = html_content.replace('{{o3offsetstr}}', o3offsetstr)
1.39 + figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr))
1.40
1.41 - figname = "uvincr_lat%0.3i_do3%0.3i.svg" % (lat, float(o3offsetstr))
1.42 - button_text = _("Graph anzeigen")
1.43 -
1.44 - return render_template('graph.html', act="ozoneloss_uvi_graph", content=content, figname=figname,
1.45 + return render_template('ozoneloss_uvi.html', act="ozoneloss_uvi_graph", content=content, figname=figname,
1.46 alt=_(u"UV increase at {{lat}} degrees N for {{o3offset}} DU ozone depletion"),
1.47 - o3offsetstr=o3offsetstr, latstr=latstr, html_content=html_content,
1.48 - html_table=html_table, button_text=button_text)
1.49 + html_content=html_content, html_table=html_table)
1.50
1.51 @app.route("/ozoneloss/decadal")
1.52 def ozoneloss_decadal():
2.1 --- a/templates/de/html/ozoneloss_uvi_form.html Mon Feb 03 23:07:26 2020 +0100
2.2 +++ b/templates/de/html/ozoneloss_uvi_form.html Tue Feb 04 08:47:05 2020 +0100
2.3 @@ -3,18 +3,20 @@
2.4 <tr> <h4>
2.5 <p> UV-Index für
2.6 <select name="Dobson-Unit" size="1" font-size="14" border-color="gray">
2.7 + <option>{{o3offsetstr}}</option>
2.8 <option>25</option>
2.9 - <option selected>50</option>
2.10 + <option>50</option>
2.11 <option>75</option>
2.12 <option>100</option>
2.13 <option>125</option>
2.14 </select>
2.15 DU zusätzlichen Ozonverlust bei der Breite
2.16 <select name="Gradzahl" size="1" font-size="14" border-color="gray">
2.17 + <option>{{latstr}}</option>
2.18 <option>80° N</option>
2.19 <option>70° N</option>
2.20 <option>60° N</option>
2.21 - <option selected> 50° N</option>
2.22 + <option>50° N</option>
2.23 <option>50° S</option>
2.24 <option>60° S</option>
2.25 <option>70° S</option>
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/templates/de/html/ozoneloss_uvi_form_start.html Tue Feb 04 08:47:05 2020 +0100
3.3 @@ -0,0 +1,29 @@
3.4 +<form method="post" action="/ozoneloss/uvi_graph">
3.5 +<table border="0" width="100%">
3.6 + <tr> <h4>
3.7 + <p> UV-Index für
3.8 + <select name="Dobson-Unit" size="1" font-size="14" border-color="gray">
3.9 + <option>25</option>
3.10 + <option selected>50</option>
3.11 + <option>75</option>
3.12 + <option>100</option>
3.13 + <option>125</option>
3.14 + </select>
3.15 + DU zusätzlichen Ozonverlust bei der Breite
3.16 + <select name="Gradzahl" size="1" font-size="14" border-color="gray">
3.17 + <option>80° N</option>
3.18 + <option>70° N</option>
3.19 + <option>60° N</option>
3.20 + <option selected> 50° N</option>
3.21 + <option>50° S</option>
3.22 + <option>60° S</option>
3.23 + <option>70° S</option>
3.24 + <option>80° S</option>
3.25 + </select>
3.26 + :
3.27 + <input type="submit" value="Graph anzeigen" font-color="black" font-size="16" border-color="gray"/>
3.28 + </p>
3.29 + </h4>
3.30 +</tr>
3.31 +</table>
3.32 +</form>
4.1 --- a/templates/en/html/ozoneloss_uvi_form.html Mon Feb 03 23:07:26 2020 +0100
4.2 +++ b/templates/en/html/ozoneloss_uvi_form.html Tue Feb 04 08:47:05 2020 +0100
4.3 @@ -3,18 +3,20 @@
4.4 <tr> <h4>
4.5 <p> UV index for
4.6 <select name="Dobson-Unit" size="1" font-size="14" border-color="gray">
4.7 + <option>{{o3offsetstr}}</option>
4.8 <option>25</option>
4.9 - <option selected>50</option>
4.10 + <option>50</option>
4.11 <option>75</option>
4.12 <option>100</option>
4.13 <option>125</option>
4.14 </select>
4.15 DU additional ozone loss at latitude
4.16 <select name="Gradzahl" size="1" font-size="14" border-color="gray">
4.17 + <option>{{latstr}}</option>
4.18 <option>80° N</option>
4.19 <option>70° N</option>
4.20 <option>60° N</option>
4.21 - <option selected> 50° N</option>
4.22 + <option>50° N</option>
4.23 <option>50° S</option>
4.24 <option>60° S</option>
4.25 <option>70° S</option>
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/templates/en/html/ozoneloss_uvi_form_start.html Tue Feb 04 08:47:05 2020 +0100
5.3 @@ -0,0 +1,29 @@
5.4 +<form method="post" action="/ozoneloss/uvi_graph">
5.5 +<table border="0" width="100%">
5.6 + <tr> <h4>
5.7 + <p> UV index for
5.8 + <select name="Dobson-Unit" size="1" font-size="14" border-color="gray">
5.9 + <option>25</option>
5.10 + <option selected>50</option>
5.11 + <option>75</option>
5.12 + <option>100</option>
5.13 + <option>125</option>
5.14 + </select>
5.15 + DU additional ozone loss at latitude
5.16 + <select name="Gradzahl" size="1" font-size="14" border-color="gray">
5.17 + <option>80° N</option>
5.18 + <option>70° N</option>
5.19 + <option>60° N</option>
5.20 + <option selected> 50° N</option>
5.21 + <option>50° S</option>
5.22 + <option>60° S</option>
5.23 + <option>70° S</option>
5.24 + <option>80° S</option>
5.25 + </select>
5.26 + :
5.27 + <input type="submit" value="Show figure" font-color="black" font-size="16" border-color="gray"/>
5.28 + </p>
5.29 + </h4>
5.30 +</tr>
5.31 +</table>
5.32 +</form>
6.1 --- a/templates/graph.html Mon Feb 03 23:07:26 2020 +0100
6.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
6.3 @@ -1,79 +0,0 @@
6.4 -{% extends "theme.html" %}
6.5 -<head>
6.6 -}
6.7 -label{
6.8 -font-size: 18;
6.9 -}
6.10 -
6.11 -font-family {
6.12 -Timed New Roman, sans-serif;
6.13 -}
6.14 -
6.15 -select {
6.16 -font-size:14;
6.17 -border-color: gray;
6.18 -}
6.19 -
6.20 -input{
6.21 -font-color: black;
6.22 -font-size: 16;
6.23 -border-color: gray;
6.24 -}
6.25 -
6.26 -</head>
6.27 -{% block body %}
6.28 -<div class="container">
6.29 -<div class="col-lg-12">
6.30 -<div class="row">
6.31 -{{ content|safe }}
6.32 -</div>
6.33 -
6.34 -<br>
6.35 -
6.36 -<form method="post" action="/ozoneloss/uvi_graph">
6.37 -<table border="0" width="100%">
6.38 - <tr> <h4>
6.39 - <p> UV-Index für
6.40 - <select name="Dobson-Unit" size="1" font-size="14" border-color="gray">
6.41 - <option>{{o3offsetstr}}</option>
6.42 - <option>25</option>
6.43 - <option>50</option>
6.44 - <option>75</option>
6.45 - <option>100</option>
6.46 - </select>
6.47 - DU zusätzlichen Ozonverlust bei der Breite
6.48 - <select name="Gradzahl" size="1" font-size="14" border-color="gray">
6.49 - <option>{{latstr}}</option>
6.50 - <option>80° N</option>
6.51 - <option>70° N</option>
6.52 - <option>60° N</option>
6.53 - <option>50° N</option>
6.54 - <option>50° S</option>
6.55 - <option>60° S</option>
6.56 - <option>70° S</option>
6.57 - <option>80° S</option>
6.58 - </select>
6.59 - :
6.60 - <input type="submit" value="{{button_text}}" font-color="black" font-size="16" border-color="gray"/>
6.61 - </p>
6.62 - </h4>
6.63 -</tr>
6.64 -</table>
6.65 -</form>
6.66 -<br>
6.67 -<img src="/static/images/uvindex/{{figname}}" border="6">
6.68 -<br>
6.69 -{{ html_table|safe }}
6.70 -<br>
6.71 -<br>
6.72 -
6.73 -<div class="row">
6.74 -{{ content_explanation|safe }}
6.75 -{{ modal_info|safe }}
6.76 -</div>
6.77 -
6.78 -</div>
6.79 -
6.80 -</div>
6.81 -
6.82 -{% endblock %}
7.1 Binary file translations/de/LC_MESSAGES/messages.mo has changed
8.1 --- a/translations/de/LC_MESSAGES/messages.po Mon Feb 03 23:07:26 2020 +0100
8.2 +++ b/translations/de/LC_MESSAGES/messages.po Tue Feb 04 08:47:05 2020 +0100
8.3 @@ -124,6 +124,3 @@
8.4 #: eskp.py:376
8.5 msgid "This information is not available!"
8.6 msgstr "Diese Information steht nicht zur Verfügung"
8.7 -
8.8 -msgid "Graph anzeigen"
8.9 -msgstr "Graph anzeigen"
9.1 Binary file translations/en/LC_MESSAGES/messages.mo has changed
10.1 --- a/translations/en/LC_MESSAGES/messages.po Mon Feb 03 23:07:26 2020 +0100
10.2 +++ b/translations/en/LC_MESSAGES/messages.po Tue Feb 04 08:47:05 2020 +0100
10.3 @@ -79,6 +79,3 @@
10.4 #: eskp.py:376
10.5 msgid "This information is not available!"
10.6 msgstr "This information is not available!"
10.7 -
10.8 -msgid "Graph anzeigen"
10.9 -msgstr "Show figure"