1.1 --- a/eskp.py	Mon Feb 03 20:09:53 2020 +0100
     1.2 +++ b/eskp.py	Mon Feb 03 23:07:26 2020 +0100
     1.3 @@ -196,7 +196,11 @@
     1.4  def ozoneloss_uvmap_date(date):
     1.5      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_uvmap.rst")
     1.6      content = get_content(filename)
     1.7 -    return render_template("/ozoneloss_uvmap.html", act="ozoneloss/uvmap/%s" % date, content=content, date=date)
     1.8 +    htmlfile = os.path.join("templates", get_locale(), "html", "uvi_table.html")
     1.9 +    html_table = get_html_content(htmlfile)
    1.10 +
    1.11 +    return render_template("/ozoneloss_uvmap.html", act="ozoneloss/uvmap/%s" % date, content=content,
    1.12 +                           html_table=html_table, date=date)
    1.13  
    1.14  
    1.15  @app.route('/ozoneloss/vpsc/<year>')

     2.1 --- a/templates/en/html/ozoneloss_uvi_form.html	Mon Feb 03 20:09:53 2020 +0100
     2.2 +++ b/templates/en/html/ozoneloss_uvi_form.html	Mon Feb 03 23:07:26 2020 +0100
     2.3 @@ -21,7 +21,7 @@
     2.4        <option>80° S</option>
     2.5      </select>
     2.6      : &nbsp;&nbsp;&nbsp;
     2.7 -    <input type="submit" value="Graph anzeigen" font-color="black" font-size="16" border-color="gray"/>
     2.8 +    <input type="submit" value="Show figure" font-color="black" font-size="16" border-color="gray"/>
     2.9      </p>
    2.10      </h4>		 
    2.11  </tr>

     3.1 --- a/templates/ozoneloss_uvmap.html	Mon Feb 03 20:09:53 2020 +0100
     3.2 +++ b/templates/ozoneloss_uvmap.html	Mon Feb 03 23:07:26 2020 +0100
     3.3 @@ -1,71 +1,36 @@
     3.4  {% extends "theme.html" %} 
     3.5  {% block body %}
     3.6  <div class="container">
     3.7 - <div class="col-lg-12">
     3.8 - 	<div class="row">
     3.9 -     {{ content|safe }}
    3.10 - </div>
    3.11 +  <div class="col-lg-12">
    3.12 +    <div class="row">
    3.13 +      {{ content|safe }}
    3.14 +    </div>
    3.15  
    3.16 -<ul class="nav navbar-nav navbar-right">
    3.17 -{% for href, caption in  get_o3lossuvmap_dates(date): %}
    3.18 -     <span>&nbsp&nbsp<span class="span3"><a href="{{ href }}" >{{ caption }}</a></span></span>
    3.19 -{% endfor %}
    3.20 -</ul>
    3.21 -<br>
    3.22 -     <img src="/static/images/uvmap/clams_do3col_{{date}}12.png" alt="O3 loss {{ date }}"whith="250" height="250" border="0" hspace=20>
    3.23 -     <img src="/static/images/uvmap/clams_o3col_{{date}}12.png" alt="O3 column {{ date }}"whith="250" height="250" border="0" hspace=20>
    3.24 -     <img src="/static/images/uvmap/clams_uvi_{{ date }}12.png" alt="UV Index {{ date }}" whith="250" height="250" border="0">
    3.25 +    <ul class="nav navbar-nav navbar-right">
    3.26 +      {% for href, caption in  get_o3lossuvmap_dates(date): %}
    3.27 +      <span>&nbsp&nbsp<span class="span3"><a href="{{ href }}" >{{ caption }}</a></span></span>
    3.28 +      {% endfor %}
    3.29 +    </ul>
    3.30 +    <br>
    3.31 +    <img src="/static/images/uvmap/clams_do3col_{{date}}12.png" alt="O3 loss {{ date }}"whith="250" height="250" border="0" hspace=20>
    3.32 +    <img src="/static/images/uvmap/clams_o3col_{{date}}12.png" alt="O3 column {{ date }}"whith="250" height="250" border="0" hspace=20>
    3.33 +    <img src="/static/images/uvmap/clams_uvi_{{ date }}12.png" alt="UV Index {{ date }}" whith="250" height="250" border="0">
    3.34  
    3.35  
    3.36      <br>
    3.37      <br>
    3.38      <br>
    3.39 +
    3.40 +
    3.41 +    {{ html_table|safe }}
    3.42 +    <br>
    3.43      <br>
    3.44  
    3.45 -Die unten stehenden Tabelle gibt einen Anhaltspunkt für die Bedeutung der verschiedenen UV-Indices:
    3.46 -
    3.47 -<br>
    3.48 -<br>
    3.49 -<table border="black">
    3.50 -  <colgroup>
    3.51 -  <col width="100">
    3.52 -  <col width="100">
    3.53 -  <col width="400">
    3.54 -  </colgroup>
    3.55 -  <tr>
    3.56 -    <th align="center" bgcolor="#E0E0E0">UV-Index</th>
    3.57 -    <th align="center" bgcolor="#E0E0E0">Bewertung</th>
    3.58 -    <th align="center" bgcolor="#E0E0E0">Schutz</th>
    3.59 -  </tr>
    3.60 -  <tr>
    3.61 -    <td align="center" bgcolor="#00B000">0 – 2</td>
    3.62 -    <td align="center" bgcolor="#00B000">niedrig</td>
    3.63 -    <td style="padding-left:25px;">Kein Schutz erforderlich</td>
    3.64 -  </tr>
    3.65 -  <tr>
    3.66 -    <td align="center" bgcolor="#FFFF00">3 – 5</td>
    3.67 -    <td align="center" bgcolor="#FFFF00">mäßig</td>
    3.68 -    <td style="padding-left:25px;">Schutz erforderlich: Hut, T-Shirt, Sonnenbrille, Sonnencreme</td>
    3.69 -  </tr>
    3.70 -  <tr>
    3.71 -    <td align="center" bgcolor="#F87820">6 – 7</td>
    3.72 -    <td align="center" bgcolor="#F87820">hoch</td>
    3.73 -    <td style="padding-left:25px;">Schutz erforderlich: Hut, T-Shirt, Sonnenbrille, Sonnencreme</td>
    3.74 -  </tr>
    3.75 -  <tr>
    3.76 -    <td align="center" bgcolor="#FF0000">8 – 10</td>
    3.77 -    <td align="center" bgcolor="#FF0000">sehr hoch</td>
    3.78 -    <td style="padding-left:25px;">zusätzlicher Schutz erforderlich: Aufenthalt im Freien möglichst vermeiden</td>
    3.79 -  </tr>
    3.80 -  <tr>
    3.81 -    <td align="center" bgcolor="#7F00FF">≥ 11</td>
    3.82 -    <td align="center" bgcolor="#7F00FF">extrem</td>
    3.83 -    <td style="padding-left:25px;">zusätzlicher Schutz erforderlich: Aufenthalt im Freien möglichst vermeiden</td>
    3.84 -  </tr>
    3.85 -</table>
    3.86 -<h6>Quelle: <a href="https://www.bag.admin.ch/bag/de/home/gesund-leben/umwelt-und-gesundheit/strahlung-radioaktivitaet-schall/elektromagnetische-felder-emf-uv-laser-licht/sonne_uv-strahlung/uv-index.html">
    3.87 -            Schweizerisches Bundesamt für Gesundheit</a></h6>
    3.88 +    <div class="row">
    3.89 +      {{ content_explanation|safe }}
    3.90 +      {{ modal_info|safe }}
    3.91 +    </div>
    3.92 +  </div>
    3.93  </div>
    3.94 - </div>
    3.95  
    3.96  {% endblock %}