1.1 --- a/eskp.py	Thu Dec 04 12:44:15 2014 +0100
     1.2 +++ b/eskp.py	Thu Dec 04 13:24:54 2014 +0100
     1.3 @@ -52,9 +52,13 @@
     1.4  
     1.5  def get_topmenue():
     1.6      menue = [
     1.7 +             ('/ozoneloss', _(u'quantification'),(
     1.8               ('/ozoneloss', _(u'Ozoneloss')),
     1.9 -             ('/eskp', _(u'ESKP')),
    1.10 -             ('/iek-7', _(u'IEK-7')),
    1.11 +             ('/ozoneloss/clams/2015', _(u'calculations')),
    1.12 +             ('/ozoneloss/vpsc/2015', _(u'estimations')))),
    1.13 +
    1.14 +             ('/eskp', _(u'ESKP'),(None, None)),
    1.15 +             ('/iek-7', _(u'IEK-7'),(None, None))
    1.16              ]
    1.17      return menue
    1.18  

     2.1 --- a/templates/theme.html	Thu Dec 04 12:44:15 2014 +0100
     2.2 +++ b/templates/theme.html	Thu Dec 04 13:24:54 2014 +0100
     2.3 @@ -65,9 +65,22 @@
     2.4              </div>
     2.5              <div class="collapse navbar-collapse">
     2.6                <ul class="nav navbar-nav navbar-right">
     2.7 -               {% for href, caption in get_topmenue(): %}
     2.8 -               {%- if href[1:] == act -%} 
     2.9 -               <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
    2.10 +               {% for href, caption, submenu in get_topmenue(): %}
    2.11 +                  {% if submenu[0] %}
    2.12 +                      <li class="dropdown">
    2.13 +
    2.14 +                       <a href="{{ href }}" data-toggle="dropdown" class="dropdown-toggle">{{ caption }} <b class="caret"></b></a>
    2.15 +
    2.16 +                       <ul class="dropdown-menu">
    2.17 +                       {% for href, caption in submenu: %}
    2.18 +                           <li><a href="{{ href }}"> {{ caption }}</a></li>
    2.19 +                       {% endfor %}
    2.20 +                       </ul>
    2.21 +                  </li>
    2.22 +                  {% else %}
    2.23 +                  {%- if href[1:] == act -%}
    2.24 +                     <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
    2.25 +                  {% endif %}
    2.26                 {% endfor %}
    2.27  
    2.28               </ul>

     3.1 --- a/translations/de/LC_MESSAGES/messages.po	Thu Dec 04 12:44:15 2014 +0100
     3.2 +++ b/translations/de/LC_MESSAGES/messages.po	Thu Dec 04 13:24:54 2014 +0100
     3.3 @@ -8,7 +8,7 @@
     3.4  msgstr ""
     3.5  "Project-Id-Version: PROJECT VERSION\n"
     3.6  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
     3.7 -"POT-Creation-Date: 2014-12-04 10:37+0100\n"
     3.8 +"POT-Creation-Date: 2014-12-04 13:24+0100\n"
     3.9  "PO-Revision-Date: 2014-05-05 11:10+0200\n"
    3.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    3.11  "Language-Team: de <LL@li.org>\n"
    3.12 @@ -18,63 +18,72 @@
    3.13  "Content-Transfer-Encoding: 8bit\n"
    3.14  "Generated-By: Babel 1.3\n"
    3.15  
    3.16 -#: eskp.py:55 eskp.py:179 eskp.py:183
    3.17 +#: eskp.py:55
    3.18 +msgid "quantification"
    3.19 +msgstr "Quantifizierung"
    3.20 +
    3.21 +#: eskp.py:56 eskp.py:183 eskp.py:187
    3.22  msgid "Ozoneloss"
    3.23  msgstr "Ozonverlust"
    3.24  
    3.25 -#: eskp.py:56
    3.26 +#: eskp.py:57
    3.27 +msgid "calculations"
    3.28 +msgstr "Berechnungen"
    3.29 +
    3.30 +#: eskp.py:58
    3.31 +msgid "estimations"
    3.32 +msgstr "Abschätzungen"
    3.33 +
    3.34 +#: eskp.py:60
    3.35  msgid "ESKP"
    3.36  msgstr "ESKP"
    3.37  
    3.38 -#: eskp.py:57 eskp.py:211
    3.39 +#: eskp.py:61 eskp.py:215
    3.40  msgid "IEK-7"
    3.41  msgstr "IEK-7"
    3.42  
    3.43 -#: eskp.py:65 eskp.py:74
    3.44 +#: eskp.py:69 eskp.py:78
    3.45  msgid "2015"
    3.46  msgstr "2015"
    3.47  
    3.48 -#: eskp.py:66 eskp.py:77
    3.49 +#: eskp.py:70 eskp.py:81
    3.50  msgid "2012"
    3.51  msgstr "2012"
    3.52  
    3.53 -#: eskp.py:67 eskp.py:78
    3.54 +#: eskp.py:71 eskp.py:82
    3.55  msgid "2011"
    3.56  msgstr "2011"
    3.57  
    3.58 -#: eskp.py:68 eskp.py:79
    3.59 +#: eskp.py:72 eskp.py:83
    3.60  msgid "2010"
    3.61  msgstr "2010"
    3.62  
    3.63 -#: eskp.py:75
    3.64 +#: eskp.py:79
    3.65  msgid "2014"
    3.66  msgstr "2014"
    3.67  
    3.68 -#: eskp.py:76
    3.69 +#: eskp.py:80
    3.70  msgid "2013"
    3.71  msgstr "2013"
    3.72  
    3.73 -#: eskp.py:89 eskp.py:180 eskp.py:212
    3.74 +#: eskp.py:93 eskp.py:184 eskp.py:216
    3.75  msgid "Close"
    3.76  msgstr "Schließen"
    3.77  
    3.78 -#: eskp.py:103 eskp.py:129 eskp.py:137
    3.79 +#: eskp.py:107 eskp.py:133 eskp.py:141
    3.80  msgid "About ESKP"
    3.81  msgstr "Über ESKP"
    3.82  
    3.83 -#: eskp.py:180 eskp.py:212
    3.84 +#: eskp.py:184 eskp.py:216
    3.85  msgid "Contact"
    3.86  msgstr "Ansprechpartner"
    3.87  
    3.88 -#: eskp.py:230
    3.89 +#: eskp.py:234
    3.90  #, python-format
    3.91  msgid "Url: %(url)s not found"
    3.92  msgstr "Url: %(url)s nicht gefunden"
    3.93  
    3.94 -#: eskp.py:231
    3.95 +#: eskp.py:235
    3.96  msgid "This information is not available!"
    3.97  msgstr "Diese Information steht nicht zur Verfügung"
    3.98  
    3.99 -#~ msgid "ozoneloss"
   3.100 -#~ msgstr "Ozonverlust"
   3.101 -

     4.1 --- a/translations/en/LC_MESSAGES/messages.po	Thu Dec 04 12:44:15 2014 +0100
     4.2 +++ b/translations/en/LC_MESSAGES/messages.po	Thu Dec 04 13:24:54 2014 +0100
     4.3 @@ -8,7 +8,7 @@
     4.4  msgstr ""
     4.5  "Project-Id-Version: PROJECT VERSION\n"
     4.6  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
     4.7 -"POT-Creation-Date: 2014-12-04 10:37+0100\n"
     4.8 +"POT-Creation-Date: 2014-12-04 13:24+0100\n"
     4.9  "PO-Revision-Date: 2014-05-05 11:10+0200\n"
    4.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    4.11  "Language-Team: en <LL@li.org>\n"
    4.12 @@ -18,60 +18,72 @@
    4.13  "Content-Transfer-Encoding: 8bit\n"
    4.14  "Generated-By: Babel 1.3\n"
    4.15  
    4.16 -#: eskp.py:55 eskp.py:179 eskp.py:183
    4.17 +#: eskp.py:55
    4.18 +msgid "quantification"
    4.19 +msgstr ""
    4.20 +
    4.21 +#: eskp.py:56 eskp.py:183 eskp.py:187
    4.22  msgid "Ozoneloss"
    4.23  msgstr ""
    4.24  
    4.25 -#: eskp.py:56
    4.26 +#: eskp.py:57
    4.27 +msgid "calculations"
    4.28 +msgstr ""
    4.29 +
    4.30 +#: eskp.py:58
    4.31 +msgid "estimations"
    4.32 +msgstr ""
    4.33 +
    4.34 +#: eskp.py:60
    4.35  msgid "ESKP"
    4.36  msgstr ""
    4.37  
    4.38 -#: eskp.py:57 eskp.py:211
    4.39 +#: eskp.py:61 eskp.py:215
    4.40  msgid "IEK-7"
    4.41  msgstr ""
    4.42  
    4.43 -#: eskp.py:65 eskp.py:74
    4.44 +#: eskp.py:69 eskp.py:78
    4.45  msgid "2015"
    4.46  msgstr ""
    4.47  
    4.48 -#: eskp.py:66 eskp.py:77
    4.49 +#: eskp.py:70 eskp.py:81
    4.50  msgid "2012"
    4.51  msgstr ""
    4.52  
    4.53 -#: eskp.py:67 eskp.py:78
    4.54 +#: eskp.py:71 eskp.py:82
    4.55  msgid "2011"
    4.56  msgstr ""
    4.57  
    4.58 -#: eskp.py:68 eskp.py:79
    4.59 +#: eskp.py:72 eskp.py:83
    4.60  msgid "2010"
    4.61  msgstr ""
    4.62  
    4.63 -#: eskp.py:75
    4.64 +#: eskp.py:79
    4.65  msgid "2014"
    4.66  msgstr ""
    4.67  
    4.68 -#: eskp.py:76
    4.69 +#: eskp.py:80
    4.70  msgid "2013"
    4.71  msgstr ""
    4.72  
    4.73 -#: eskp.py:89 eskp.py:180 eskp.py:212
    4.74 +#: eskp.py:93 eskp.py:184 eskp.py:216
    4.75  msgid "Close"
    4.76  msgstr ""
    4.77  
    4.78 -#: eskp.py:103 eskp.py:129 eskp.py:137
    4.79 +#: eskp.py:107 eskp.py:133 eskp.py:141
    4.80  msgid "About ESKP"
    4.81  msgstr ""
    4.82  
    4.83 -#: eskp.py:180 eskp.py:212
    4.84 +#: eskp.py:184 eskp.py:216
    4.85  msgid "Contact"
    4.86  msgstr ""
    4.87  
    4.88 -#: eskp.py:230
    4.89 +#: eskp.py:234
    4.90  #, python-format
    4.91  msgid "Url: %(url)s not found"
    4.92  msgstr ""
    4.93  
    4.94 -#: eskp.py:231
    4.95 +#: eskp.py:235
    4.96  msgid "This information is not available!"
    4.97  msgstr ""
    4.98  
    4.99 @@ -141,3 +153,9 @@
   4.100  #~ msgid "ozoneloss"
   4.101  #~ msgstr ""
   4.102  
   4.103 +#~ msgid "model calculatations"
   4.104 +#~ msgstr ""
   4.105 +
   4.106 +#~ msgid "from temperature"
   4.107 +#~ msgstr ""
   4.108 +

     5.1 --- a/translations/eskp.pot	Thu Dec 04 12:44:15 2014 +0100
     5.2 +++ b/translations/eskp.pot	Thu Dec 04 13:24:54 2014 +0100
     5.3 @@ -8,7 +8,7 @@
     5.4  msgstr ""
     5.5  "Project-Id-Version: PROJECT VERSION\n"
     5.6  "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
     5.7 -"POT-Creation-Date: 2014-12-04 10:37+0100\n"
     5.8 +"POT-Creation-Date: 2014-12-04 13:24+0100\n"
     5.9  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
    5.10  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
    5.11  "Language-Team: LANGUAGE <LL@li.org>\n"
    5.12 @@ -17,60 +17,72 @@
    5.13  "Content-Transfer-Encoding: 8bit\n"
    5.14  "Generated-By: Babel 1.3\n"
    5.15  
    5.16 -#: eskp.py:55 eskp.py:179 eskp.py:183
    5.17 +#: eskp.py:55
    5.18 +msgid "quantification"
    5.19 +msgstr ""
    5.20 +
    5.21 +#: eskp.py:56 eskp.py:183 eskp.py:187
    5.22  msgid "Ozoneloss"
    5.23  msgstr ""
    5.24  
    5.25 -#: eskp.py:56
    5.26 +#: eskp.py:57
    5.27 +msgid "calculations"
    5.28 +msgstr ""
    5.29 +
    5.30 +#: eskp.py:58
    5.31 +msgid "estimations"
    5.32 +msgstr ""
    5.33 +
    5.34 +#: eskp.py:60
    5.35  msgid "ESKP"
    5.36  msgstr ""
    5.37  
    5.38 -#: eskp.py:57 eskp.py:211
    5.39 +#: eskp.py:61 eskp.py:215
    5.40  msgid "IEK-7"
    5.41  msgstr ""
    5.42  
    5.43 -#: eskp.py:65 eskp.py:74
    5.44 +#: eskp.py:69 eskp.py:78
    5.45  msgid "2015"
    5.46  msgstr ""
    5.47  
    5.48 -#: eskp.py:66 eskp.py:77
    5.49 +#: eskp.py:70 eskp.py:81
    5.50  msgid "2012"
    5.51  msgstr ""
    5.52  
    5.53 -#: eskp.py:67 eskp.py:78
    5.54 +#: eskp.py:71 eskp.py:82
    5.55  msgid "2011"
    5.56  msgstr ""
    5.57  
    5.58 -#: eskp.py:68 eskp.py:79
    5.59 +#: eskp.py:72 eskp.py:83
    5.60  msgid "2010"
    5.61  msgstr ""
    5.62  
    5.63 -#: eskp.py:75
    5.64 +#: eskp.py:79
    5.65  msgid "2014"
    5.66  msgstr ""
    5.67  
    5.68 -#: eskp.py:76
    5.69 +#: eskp.py:80
    5.70  msgid "2013"
    5.71  msgstr ""
    5.72  
    5.73 -#: eskp.py:89 eskp.py:180 eskp.py:212
    5.74 +#: eskp.py:93 eskp.py:184 eskp.py:216
    5.75  msgid "Close"
    5.76  msgstr ""
    5.77  
    5.78 -#: eskp.py:103 eskp.py:129 eskp.py:137
    5.79 +#: eskp.py:107 eskp.py:133 eskp.py:141
    5.80  msgid "About ESKP"
    5.81  msgstr ""
    5.82  
    5.83 -#: eskp.py:180 eskp.py:212
    5.84 +#: eskp.py:184 eskp.py:216
    5.85  msgid "Contact"
    5.86  msgstr ""
    5.87  
    5.88 -#: eskp.py:230
    5.89 +#: eskp.py:234
    5.90  #, python-format
    5.91  msgid "Url: %(url)s not found"
    5.92  msgstr ""
    5.93  
    5.94 -#: eskp.py:231
    5.95 +#: eskp.py:235
    5.96  msgid "This information is not available!"
    5.97  msgstr ""
    5.98