# HG changeset patch
# User Reimar Bauer <rb.proj AT googlemail DOT com>
# Date 1400144782 -7200
# Node ID bdf11bb4cb981ac2ee0fa6a17fe18e0c9318b869
# Parent  b732704e750d0720cd83f409130b6f07ef0442f1
bootstrap modal for contact data added

diff -r b732704e750d -r bdf11bb4cb98 eskp.py
--- a/eskp.py	Tue May 13 12:32:22 2014 +0200
+++ b/eskp.py	Thu May 15 11:06:22 2014 +0200
@@ -4,7 +4,7 @@
 import codecs
 
 from docutils.core import publish_parts
-from flask import Flask
+from flask import Flask, Response
 from flask import render_template
 from flask import request
 from flask.ext.babel import gettext as _
@@ -22,7 +22,6 @@
 
 app.config['BABEL_DEFAULT_LOCALE'] = 'de'
 
-
 def get_content(filename, overrides=None):
     content = u""
     filename = os.path.join(ESKP_PATH, filename)
@@ -62,6 +61,12 @@
 app.jinja_env.globals.update(get_o3lossclams_dates=get_o3lossclams_dates)
 app.jinja_env.globals.update(get_vpsc_dates=get_vpsc_dates)
 
+def author_info(name, filename):
+    content = get_content(filename)
+    html = render_template("/author_info.html", act="author", title=name, content=content, exit=_(u"Close"))
+    return html
+
+
 @babel.localeselector
 def get_locale():
     """ToDo: if translation is completed, switch to en """
@@ -126,7 +131,10 @@
 def ozoneloss():
     filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
     content = get_content(filename)
-    return render_template("/ozoneloss.html", act="ozoneloss", content=content)
+    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_author.rst")
+    author = author_info(_(u"Ozoneloss"), filename)
+    return render_template("/ozoneloss.html", act="ozoneloss", content=content,
+                           author=author, contact = u"Dr. Jens-Uwe Grooß", publications=u"Publications" )
 
 @app.route("/ozoneloss/clams")
 def ozoneloss_clams():
@@ -144,7 +152,10 @@
 def institute():
     filename = os.path.join("templates", get_locale(), "rst", "iek-7.rst")
     content = get_content(filename)
-    return render_template("/iek-7.html", act="iek-7", content=content)
+    filename = os.path.join("templates", get_locale(), "rst", "iek-7_author.rst")
+    author = author_info(_(u"IEK-7"), filename)
+    return render_template("/iek-7.html", act="iek-7", content=content,
+                           author=author, contact = u"Sandra Stein")
 
 
 @app.route("/imprint")
@@ -155,6 +166,8 @@
 
 
 
+
+
 @app.errorhandler(404)
 def page_not_found(e):
     msg = _(u"Url: %(url)s not found", url=request.url)
diff -r b732704e750d -r bdf11bb4cb98 templates/author_info.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/author_info.html	Thu May 15 11:06:22 2014 +0200
@@ -0,0 +1,24 @@
+<!-- Modal -->
+<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
+   aria-labelledby="myModalLabel" aria-hidden="true">
+   <div class="modal-dialog">
+      <div class="modal-content">
+         <div class="modal-header">
+            <button type="button" class="close"
+               data-dismiss="modal" aria-hidden="true">
+                  &times;
+            </button>
+            <h4 class="modal-title" id="myModalLabel">
+               {{ title }}
+            </h4>
+         </div>
+         <div class="modal-body">
+            {{ content|safe }}
+         </div>
+         <div class="modal-footer">
+            <button type="button" class="btn btn-default"
+               data-dismiss="modal"> {{ exit }}
+            </button>
+         </div>
+      </div><!-- /.modal-content -->
+</div><!-- /.modal -->
diff -r b732704e750d -r bdf11bb4cb98 templates/author_info_link.html
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/author_info_link.html	Thu May 15 11:06:22 2014 +0200
@@ -0,0 +1,14 @@
+
+<ul class="list-unstyled">
+<li>
+    <a data-toggle="modal" data-target="#myModal">
+Kontakt: {{ contact }}
+</a>
+</li>
+{% if publications %}
+   <li>
+    {{ publications }}
+    </li>
+{% endif %}
+</ul>
+
diff -r b732704e750d -r bdf11bb4cb98 templates/de/rst/iek-7_author.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/de/rst/iek-7_author.rst	Thu May 15 11:06:22 2014 +0200
@@ -0,0 +1,13 @@
+Ansprechpartner
+================
+
+**Sandra Stein**
+
+Kontaktdaten:
+~~~~~~~~~~~~~
+
+::
+
+ Sekretariat IEK-7
+ Sandra Stein
+ Tel 02461-61/6065
diff -r b732704e750d -r bdf11bb4cb98 templates/de/rst/ozoneloss_author.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/de/rst/ozoneloss_author.rst	Thu May 15 11:06:22 2014 +0200
@@ -0,0 +1,7 @@
+Ansprechpartner
+================
+
+Kontaktdaten:
+~~~~~~~~~~~~~
+
+
diff -r b732704e750d -r bdf11bb4cb98 templates/de/rst/ozoneloss_publications.rst
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/templates/de/rst/ozoneloss_publications.rst	Thu May 15 11:06:22 2014 +0200
@@ -0,0 +1,3 @@
+Extreme Ozonverluste im Frühjahr über Europa
+==============================================
+
diff -r b732704e750d -r bdf11bb4cb98 templates/footer.html
--- a/templates/footer.html	Tue May 13 12:32:22 2014 +0200
+++ b/templates/footer.html	Thu May 15 11:06:22 2014 +0200
@@ -8,4 +8,4 @@
        </div>
     </div>
   </div>
-</div>
+</div>
\ No newline at end of file
diff -r b732704e750d -r bdf11bb4cb98 templates/iek-7.html
--- a/templates/iek-7.html	Tue May 13 12:32:22 2014 +0200
+++ b/templates/iek-7.html	Thu May 15 11:06:22 2014 +0200
@@ -4,12 +4,10 @@
  <div class="col-lg-12">
    <img src="/static/images/start_iek7.png">
     <br>
-
  	<div class="row">
-
     {{ content|safe }}
  </div>
-
-
+{{ author|safe }}
 </div>
+{% include "author_info_link.html" %}
 {% endblock %}
diff -r b732704e750d -r bdf11bb4cb98 templates/index.html
--- a/templates/index.html	Tue May 13 12:32:22 2014 +0200
+++ b/templates/index.html	Thu May 15 11:06:22 2014 +0200
@@ -11,6 +11,5 @@
     </div>
   </div>  
 </div>
-
 {% endblock %}
 
diff -r b732704e750d -r bdf11bb4cb98 templates/ozoneloss.html
--- a/templates/ozoneloss.html	Tue May 13 12:32:22 2014 +0200
+++ b/templates/ozoneloss.html	Thu May 15 11:06:22 2014 +0200
@@ -14,5 +14,8 @@
       <img src="/static/images/clams_do3col_11032812.png" alt="Delta O3 column">
       </center>
    </div>
+{{ author|safe }}
+
 </div>
+{% include "author_info_link.html" %}
 {% endblock %}
diff -r b732704e750d -r bdf11bb4cb98 templates/ozoneloss_vpsc.html
--- a/templates/ozoneloss_vpsc.html	Tue May 13 12:32:22 2014 +0200
+++ b/templates/ozoneloss_vpsc.html	Thu May 15 11:06:22 2014 +0200
@@ -20,7 +20,7 @@
 
 <div class="row">
 {{ content_explanation|safe }}
-
+{{ modal_info|safe }}
 </div>
 
 </div>
diff -r b732704e750d -r bdf11bb4cb98 templates/theme.html
--- a/templates/theme.html	Tue May 13 12:32:22 2014 +0200
+++ b/templates/theme.html	Thu May 15 11:06:22 2014 +0200
@@ -60,6 +60,7 @@
     </header>
     <div id="main">
       {% block body %}{% endblock %}
+
     </div><!-- /main -->
   </div> <!-- /wrap -->
   {% include "footer.html" %}
diff -r b732704e750d -r bdf11bb4cb98 translations/de/LC_MESSAGES/messages.mo
Binary file translations/de/LC_MESSAGES/messages.mo has changed
diff -r b732704e750d -r bdf11bb4cb98 translations/de/LC_MESSAGES/messages.po
--- a/translations/de/LC_MESSAGES/messages.po	Tue May 13 12:32:22 2014 +0200
+++ b/translations/de/LC_MESSAGES/messages.po	Thu May 15 11:06:22 2014 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-05 11:15+0200\n"
+"POT-Creation-Date: 2014-05-15 10:13+0200\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,29 +18,55 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: eskp.py:35
+#: eskp.py:37 eskp.py:135
+msgid "Ozoneloss"
+msgstr "Ozonverlust"
+
+#: eskp.py:38
 msgid "ESKP"
 msgstr ""
 
-#: eskp.py:36
-msgid "Ozoneloss"
-msgstr "Ozonverlust"
-
-#: eskp.py:37
+#: eskp.py:39
 msgid "IEK-7"
 msgstr "IEK-7"
 
-#: eskp.py:57 eskp.py:68 eskp.py:79
+#: eskp.py:46 eskp.py:55
+msgid "2012"
+msgstr ""
+
+#: eskp.py:47 eskp.py:56
+msgid "2011"
+msgstr ""
+
+#: eskp.py:48 eskp.py:57
+msgid "2010"
+msgstr ""
+
+#: eskp.py:53
+msgid "2014"
+msgstr ""
+
+#: eskp.py:54
+msgid "2013"
+msgstr ""
+
+#: eskp.py:66
+msgid "Close"
+msgstr "Schließen"
+
+#: eskp.py:80 eskp.py:109 eskp.py:120
 msgid "About ESKP"
 msgstr "Über ESKP"
 
-#: eskp.py:111
+#: eskp.py:170
 #, python-format
 msgid "Url: %(url)s not found"
 msgstr "Url: %(url)s nicht gefunden"
 
-#: eskp.py:112
+#: eskp.py:171
 msgid "This information is not available!"
 msgstr "Diese Information steht nicht zur Verfügung"
 
+#~ msgid "ozoneloss"
+#~ msgstr "Ozonverlust"
 
diff -r b732704e750d -r bdf11bb4cb98 translations/en/LC_MESSAGES/messages.po
--- a/translations/en/LC_MESSAGES/messages.po	Tue May 13 12:32:22 2014 +0200
+++ b/translations/en/LC_MESSAGES/messages.po	Thu May 15 11:06:22 2014 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-05 11:15+0200\n"
+"POT-Creation-Date: 2014-05-15 10:13+0200\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,28 +18,52 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: eskp.py:35
+#: eskp.py:37 eskp.py:135
+msgid "Ozoneloss"
+msgstr ""
+
+#: eskp.py:38
 msgid "ESKP"
 msgstr ""
 
-#: eskp.py:36
-msgid "Ozoneloss"
-msgstr ""
-
-#: eskp.py:37
+#: eskp.py:39
 msgid "IEK-7"
 msgstr ""
 
-#: eskp.py:57 eskp.py:68 eskp.py:79
+#: eskp.py:46 eskp.py:55
+msgid "2012"
+msgstr ""
+
+#: eskp.py:47 eskp.py:56
+msgid "2011"
+msgstr ""
+
+#: eskp.py:48 eskp.py:57
+msgid "2010"
+msgstr ""
+
+#: eskp.py:53
+msgid "2014"
+msgstr ""
+
+#: eskp.py:54
+msgid "2013"
+msgstr ""
+
+#: eskp.py:66
+msgid "Close"
+msgstr ""
+
+#: eskp.py:80 eskp.py:109 eskp.py:120
 msgid "About ESKP"
 msgstr ""
 
-#: eskp.py:111
+#: eskp.py:170
 #, python-format
 msgid "Url: %(url)s not found"
 msgstr ""
 
-#: eskp.py:112
+#: eskp.py:171
 msgid "This information is not available!"
 msgstr ""
 
@@ -106,3 +130,6 @@
 #~ msgid "__Valentin Pratz,  novice programmers"
 #~ msgstr ""
 
+#~ msgid "ozoneloss"
+#~ msgstr ""
+
diff -r b732704e750d -r bdf11bb4cb98 translations/eskp.pot
--- a/translations/eskp.pot	Tue May 13 12:32:22 2014 +0200
+++ b/translations/eskp.pot	Thu May 15 11:06:22 2014 +0200
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-05-05 11:15+0200\n"
+"POT-Creation-Date: 2014-05-15 10:13+0200\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,28 +17,52 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 1.3\n"
 
-#: eskp.py:35
+#: eskp.py:37 eskp.py:135
+msgid "Ozoneloss"
+msgstr ""
+
+#: eskp.py:38
 msgid "ESKP"
 msgstr ""
 
-#: eskp.py:36
-msgid "Ozoneloss"
-msgstr ""
-
-#: eskp.py:37
+#: eskp.py:39
 msgid "IEK-7"
 msgstr ""
 
-#: eskp.py:57 eskp.py:68 eskp.py:79
+#: eskp.py:46 eskp.py:55
+msgid "2012"
+msgstr ""
+
+#: eskp.py:47 eskp.py:56
+msgid "2011"
+msgstr ""
+
+#: eskp.py:48 eskp.py:57
+msgid "2010"
+msgstr ""
+
+#: eskp.py:53
+msgid "2014"
+msgstr ""
+
+#: eskp.py:54
+msgid "2013"
+msgstr ""
+
+#: eskp.py:66
+msgid "Close"
+msgstr ""
+
+#: eskp.py:80 eskp.py:109 eskp.py:120
 msgid "About ESKP"
 msgstr ""
 
-#: eskp.py:111
+#: eskp.py:170
 #, python-format
 msgid "Url: %(url)s not found"
 msgstr ""
 
-#: eskp.py:112
+#: eskp.py:171
 msgid "This information is not available!"
 msgstr ""