# HG changeset patch
# User Reimar Bauer <rb.proj AT googlemail DOT com>
# Date 1417695894 -3600
# Node ID f39aa19dbc39fdea45209053117e7170bb5ccaa3
# Parent  3b0e3d47fe1f1d48c1d76bae2ac0cb69d9c8ffa2
menue structure changed

diff -r 3b0e3d47fe1f -r f39aa19dbc39 eskp.py
--- a/eskp.py	Thu Dec 04 12:44:15 2014 +0100
+++ b/eskp.py	Thu Dec 04 13:24:54 2014 +0100
@@ -52,9 +52,13 @@
 
 def get_topmenue():
     menue = [
+             ('/ozoneloss', _(u'quantification'),(
              ('/ozoneloss', _(u'Ozoneloss')),
-             ('/eskp', _(u'ESKP')),
-             ('/iek-7', _(u'IEK-7')),
+             ('/ozoneloss/clams/2015', _(u'calculations')),
+             ('/ozoneloss/vpsc/2015', _(u'estimations')))),
+
+             ('/eskp', _(u'ESKP'),(None, None)),
+             ('/iek-7', _(u'IEK-7'),(None, None))
             ]
     return menue
 
diff -r 3b0e3d47fe1f -r f39aa19dbc39 templates/theme.html
--- a/templates/theme.html	Thu Dec 04 12:44:15 2014 +0100
+++ b/templates/theme.html	Thu Dec 04 13:24:54 2014 +0100
@@ -65,9 +65,22 @@
             </div>
             <div class="collapse navbar-collapse">
               <ul class="nav navbar-nav navbar-right">
-               {% for href, caption in get_topmenue(): %}
-               {%- if href[1:] == act -%} 
-               <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
+               {% for href, caption, submenu in get_topmenue(): %}
+                  {% if submenu[0] %}
+                      <li class="dropdown">
+
+                       <a href="{{ href }}" data-toggle="dropdown" class="dropdown-toggle">{{ caption }} <b class="caret"></b></a>
+
+                       <ul class="dropdown-menu">
+                       {% for href, caption in submenu: %}
+                           <li><a href="{{ href }}"> {{ caption }}</a></li>
+                       {% endfor %}
+                       </ul>
+                  </li>
+                  {% else %}
+                  {%- if href[1:] == act -%}
+                     <li class="active">{% else %} <li>{% endif %}<a href="{{ href }}" >{{ caption }}</a></li>
+                  {% endif %}
                {% endfor %}
 
              </ul>
diff -r 3b0e3d47fe1f -r f39aa19dbc39 translations/de/LC_MESSAGES/messages.po
--- a/translations/de/LC_MESSAGES/messages.po	Thu Dec 04 12:44:15 2014 +0100
+++ b/translations/de/LC_MESSAGES/messages.po	Thu Dec 04 13:24:54 2014 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-04 10:37+0100\n"
+"POT-Creation-Date: 2014-12-04 13:24+0100\n"
 "PO-Revision-Date: 2014-05-05 11:10+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: de <LL@li.org>\n"
@@ -18,63 +18,72 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: eskp.py:55 eskp.py:179 eskp.py:183
+#: eskp.py:55
+msgid "quantification"
+msgstr "Quantifizierung"
+
+#: eskp.py:56 eskp.py:183 eskp.py:187
 msgid "Ozoneloss"
 msgstr "Ozonverlust"
 
-#: eskp.py:56
+#: eskp.py:57
+msgid "calculations"
+msgstr "Berechnungen"
+
+#: eskp.py:58
+msgid "estimations"
+msgstr "Abschätzungen"
+
+#: eskp.py:60
 msgid "ESKP"
 msgstr "ESKP"
 
-#: eskp.py:57 eskp.py:211
+#: eskp.py:61 eskp.py:215
 msgid "IEK-7"
 msgstr "IEK-7"
 
-#: eskp.py:65 eskp.py:74
+#: eskp.py:69 eskp.py:78
 msgid "2015"
 msgstr "2015"
 
-#: eskp.py:66 eskp.py:77
+#: eskp.py:70 eskp.py:81
 msgid "2012"
 msgstr "2012"
 
-#: eskp.py:67 eskp.py:78
+#: eskp.py:71 eskp.py:82
 msgid "2011"
 msgstr "2011"
 
-#: eskp.py:68 eskp.py:79
+#: eskp.py:72 eskp.py:83
 msgid "2010"
 msgstr "2010"
 
-#: eskp.py:75
+#: eskp.py:79
 msgid "2014"
 msgstr "2014"
 
-#: eskp.py:76
+#: eskp.py:80
 msgid "2013"
 msgstr "2013"
 
-#: eskp.py:89 eskp.py:180 eskp.py:212
+#: eskp.py:93 eskp.py:184 eskp.py:216
 msgid "Close"
 msgstr "Schließen"
 
-#: eskp.py:103 eskp.py:129 eskp.py:137
+#: eskp.py:107 eskp.py:133 eskp.py:141
 msgid "About ESKP"
 msgstr "Über ESKP"
 
-#: eskp.py:180 eskp.py:212
+#: eskp.py:184 eskp.py:216
 msgid "Contact"
 msgstr "Ansprechpartner"
 
-#: eskp.py:230
+#: eskp.py:234
 #, python-format
 msgid "Url: %(url)s not found"
 msgstr "Url: %(url)s nicht gefunden"
 
-#: eskp.py:231
+#: eskp.py:235
 msgid "This information is not available!"
 msgstr "Diese Information steht nicht zur Verfügung"
 
-#~ msgid "ozoneloss"
-#~ msgstr "Ozonverlust"
-
diff -r 3b0e3d47fe1f -r f39aa19dbc39 translations/en/LC_MESSAGES/messages.po
--- a/translations/en/LC_MESSAGES/messages.po	Thu Dec 04 12:44:15 2014 +0100
+++ b/translations/en/LC_MESSAGES/messages.po	Thu Dec 04 13:24:54 2014 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-04 10:37+0100\n"
+"POT-Creation-Date: 2014-12-04 13:24+0100\n"
 "PO-Revision-Date: 2014-05-05 11:10+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: en <LL@li.org>\n"
@@ -18,60 +18,72 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: eskp.py:55 eskp.py:179 eskp.py:183
+#: eskp.py:55
+msgid "quantification"
+msgstr ""
+
+#: eskp.py:56 eskp.py:183 eskp.py:187
 msgid "Ozoneloss"
 msgstr ""
 
-#: eskp.py:56
+#: eskp.py:57
+msgid "calculations"
+msgstr ""
+
+#: eskp.py:58
+msgid "estimations"
+msgstr ""
+
+#: eskp.py:60
 msgid "ESKP"
 msgstr ""
 
-#: eskp.py:57 eskp.py:211
+#: eskp.py:61 eskp.py:215
 msgid "IEK-7"
 msgstr ""
 
-#: eskp.py:65 eskp.py:74
+#: eskp.py:69 eskp.py:78
 msgid "2015"
 msgstr ""
 
-#: eskp.py:66 eskp.py:77
+#: eskp.py:70 eskp.py:81
 msgid "2012"
 msgstr ""
 
-#: eskp.py:67 eskp.py:78
+#: eskp.py:71 eskp.py:82
 msgid "2011"
 msgstr ""
 
-#: eskp.py:68 eskp.py:79
+#: eskp.py:72 eskp.py:83
 msgid "2010"
 msgstr ""
 
-#: eskp.py:75
+#: eskp.py:79
 msgid "2014"
 msgstr ""
 
-#: eskp.py:76
+#: eskp.py:80
 msgid "2013"
 msgstr ""
 
-#: eskp.py:89 eskp.py:180 eskp.py:212
+#: eskp.py:93 eskp.py:184 eskp.py:216
 msgid "Close"
 msgstr ""
 
-#: eskp.py:103 eskp.py:129 eskp.py:137
+#: eskp.py:107 eskp.py:133 eskp.py:141
 msgid "About ESKP"
 msgstr ""
 
-#: eskp.py:180 eskp.py:212
+#: eskp.py:184 eskp.py:216
 msgid "Contact"
 msgstr ""
 
-#: eskp.py:230
+#: eskp.py:234
 #, python-format
 msgid "Url: %(url)s not found"
 msgstr ""
 
-#: eskp.py:231
+#: eskp.py:235
 msgid "This information is not available!"
 msgstr ""
 
@@ -141,3 +153,9 @@
 #~ msgid "ozoneloss"
 #~ msgstr ""
 
+#~ msgid "model calculatations"
+#~ msgstr ""
+
+#~ msgid "from temperature"
+#~ msgstr ""
+
diff -r 3b0e3d47fe1f -r f39aa19dbc39 translations/eskp.pot
--- a/translations/eskp.pot	Thu Dec 04 12:44:15 2014 +0100
+++ b/translations/eskp.pot	Thu Dec 04 13:24:54 2014 +0100
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-04 10:37+0100\n"
+"POT-Creation-Date: 2014-12-04 13:24+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,60 +17,72 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: eskp.py:55 eskp.py:179 eskp.py:183
+#: eskp.py:55
+msgid "quantification"
+msgstr ""
+
+#: eskp.py:56 eskp.py:183 eskp.py:187
 msgid "Ozoneloss"
 msgstr ""
 
-#: eskp.py:56
+#: eskp.py:57
+msgid "calculations"
+msgstr ""
+
+#: eskp.py:58
+msgid "estimations"
+msgstr ""
+
+#: eskp.py:60
 msgid "ESKP"
 msgstr ""
 
-#: eskp.py:57 eskp.py:211
+#: eskp.py:61 eskp.py:215
 msgid "IEK-7"
 msgstr ""
 
-#: eskp.py:65 eskp.py:74
+#: eskp.py:69 eskp.py:78
 msgid "2015"
 msgstr ""
 
-#: eskp.py:66 eskp.py:77
+#: eskp.py:70 eskp.py:81
 msgid "2012"
 msgstr ""
 
-#: eskp.py:67 eskp.py:78
+#: eskp.py:71 eskp.py:82
 msgid "2011"
 msgstr ""
 
-#: eskp.py:68 eskp.py:79
+#: eskp.py:72 eskp.py:83
 msgid "2010"
 msgstr ""
 
-#: eskp.py:75
+#: eskp.py:79
 msgid "2014"
 msgstr ""
 
-#: eskp.py:76
+#: eskp.py:80
 msgid "2013"
 msgstr ""
 
-#: eskp.py:89 eskp.py:180 eskp.py:212
+#: eskp.py:93 eskp.py:184 eskp.py:216
 msgid "Close"
 msgstr ""
 
-#: eskp.py:103 eskp.py:129 eskp.py:137
+#: eskp.py:107 eskp.py:133 eskp.py:141
 msgid "About ESKP"
 msgstr ""
 
-#: eskp.py:180 eskp.py:212
+#: eskp.py:184 eskp.py:216
 msgid "Contact"
 msgstr ""
 
-#: eskp.py:230
+#: eskp.py:234
 #, python-format
 msgid "Url: %(url)s not found"
 msgstr ""
 
-#: eskp.py:231
+#: eskp.py:235
 msgid "This information is not available!"
 msgstr ""