1.1 --- a/eskp.py	Fri May 16 10:18:42 2014 +0200
     1.2 +++ b/eskp.py	Fri May 16 11:10:42 2014 +0200
     1.3 @@ -61,9 +61,11 @@
     1.4  app.jinja_env.globals.update(get_o3lossclams_dates=get_o3lossclams_dates)
     1.5  app.jinja_env.globals.update(get_vpsc_dates=get_vpsc_dates)
     1.6  
     1.7 -def author_info(name, filename):
     1.8 +
     1.9 +def modal_info(template, act, title, filename):
    1.10      content = get_content(filename)
    1.11 -    html = render_template("/author_info.html", act="author", title=name, content=content, exit=_(u"Close"))
    1.12 +    print template
    1.13 +    html = render_template(template, act=act, title=title, content=content, exit=_(u"Close"))
    1.14      return html
    1.15  
    1.16  
    1.17 @@ -126,9 +128,11 @@
    1.18      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss.rst")
    1.19      content = get_content(filename)
    1.20      filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_author.rst")
    1.21 -    author = author_info(_(u"Ozoneloss"), filename)
    1.22 +    author = modal_info("/author_info.html", "author", _(u"Ozoneloss"), filename)
    1.23 +    filename = os.path.join("templates", get_locale(), "rst", "ozoneloss_publications.rst")
    1.24 +    publications = modal_info("/publications_info.html", "publications", _(u"Ozoneloss"), filename)
    1.25      return render_template("/ozoneloss.html", act="ozoneloss", content=content,
    1.26 -                           author=author, contact = u"Dr. Jens-Uwe Grooß", publications=u"Publications" )
    1.27 +                           author=author, contact = u"Dr. Jens-Uwe Grooß", publications=publications )
    1.28  
    1.29  @app.route("/ozoneloss/clams")
    1.30  def ozoneloss_clams():
    1.31 @@ -147,7 +151,7 @@
    1.32      filename = os.path.join("templates", get_locale(), "rst", "iek-7.rst")
    1.33      content = get_content(filename)
    1.34      filename = os.path.join("templates", get_locale(), "rst", "iek-7_author.rst")
    1.35 -    author = author_info(_(u"IEK-7"), filename)
    1.36 +    author = modal_info("/author_info.html", "author", _(u"IEK-7"), filename)
    1.37      return render_template("/iek-7.html", act="iek-7", content=content,
    1.38                             author=author, contact = u"Sandra Stein")
    1.39  

     2.1 --- a/templates/author_info.html	Fri May 16 10:18:42 2014 +0200
     2.2 +++ b/templates/author_info.html	Fri May 16 11:10:42 2014 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  <!-- Modal -->
     2.5 -<div class="modal fade" id="myModal" tabindex="-1" role="dialog"
     2.6 -   aria-labelledby="myModalLabel" aria-hidden="true">
     2.7 +<div class="modal fade" id="AuthorInfoModal" tabindex="-1" role="dialog"
     2.8 +   aria-labelledby="AuthorInfoModalLabel" aria-hidden="true">
     2.9     <div class="modal-dialog">
    2.10        <div class="modal-content">
    2.11           <div class="modal-header">
    2.12 @@ -8,7 +8,7 @@
    2.13                 data-dismiss="modal" aria-hidden="true">
    2.14                    &times;
    2.15              </button>
    2.16 -            <h4 class="modal-title" id="myModalLabel">
    2.17 +            <h4 class="modal-title" id="AuthorInfoModalLabel">
    2.18                 {{ title }}
    2.19              </h4>
    2.20           </div>
    2.21 @@ -21,4 +21,5 @@
    2.22              </button>
    2.23           </div>
    2.24        </div><!-- /.modal-content -->
    2.25 +   </div>
    2.26  </div><!-- /.modal -->

     3.1 --- a/templates/author_info_link.html	Fri May 16 10:18:42 2014 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,14 +0,0 @@
     3.4 -
     3.5 -<ul class="list-unstyled">
     3.6 -<li>
     3.7 -    <a data-toggle="modal" data-target="#myModal">
     3.8 -Kontakt: {{ contact }}
     3.9 -</a>
    3.10 -</li>
    3.11 -{% if publications %}
    3.12 -   <li>
    3.13 -    {{ publications }}
    3.14 -    </li>
    3.15 -{% endif %}
    3.16 -</ul>
    3.17 -

     4.1 --- a/templates/iek-7.html	Fri May 16 10:18:42 2014 +0200
     4.2 +++ b/templates/iek-7.html	Fri May 16 11:10:42 2014 +0200
     4.3 @@ -8,6 +8,6 @@
     4.4      {{ content|safe }}
     4.5   </div>
     4.6  {{ author|safe }}
     4.7 +{% include "info_link.html" %}
     4.8  </div>
     4.9 -{% include "author_info_link.html" %}
    4.10  {% endblock %}

     5.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.2 +++ b/templates/info_link.html	Fri May 16 11:10:42 2014 +0200
     5.3 @@ -0,0 +1,17 @@
     5.4 +
     5.5 +<ul class="list-unstyled">
     5.6 +<li>
     5.7 +    <a data-toggle="modal" data-target="#AuthorInfoModal">
     5.8 +Kontakt: {{ contact }}
     5.9 +</a>
    5.10 +</li>
    5.11 +{% if publications %}
    5.12 +   <li>
    5.13 +      <a data-toggle="modal" data-target="#PublicationsInfoModal">
    5.14 +Veröffentlichungen
    5.15 +      </a>
    5.16 +
    5.17 +   </li>
    5.18 +{% endif %}
    5.19 +</ul>
    5.20 +

     6.1 --- a/templates/ozoneloss.html	Fri May 16 10:18:42 2014 +0200
     6.2 +++ b/templates/ozoneloss.html	Fri May 16 11:10:42 2014 +0200
     6.3 @@ -13,9 +13,10 @@
     6.4        <br>
     6.5        <img src="/static/images/clams_do3col_11032812.png" alt="Delta O3 column">
     6.6        </center>
     6.7 +
     6.8     </div>
     6.9  {{ author|safe }}
    6.10 -
    6.11 +{{ publications|safe }}
    6.12 +{% include "info_link.html" %}
    6.13  </div>
    6.14 -{% include "author_info_link.html" %}
    6.15  {% endblock %}