# HG changeset patch
# User Reimar Bauer <rb.proj AT googlemail DOT com>
# Date 1400595846 -7200
# Node ID 128c9379cd298fcc38dd4ba45228879b609d2efc
# Parent  45bf3ac57e9a6506719aee748a81434c29d1afa5
VCF data updated

diff -r 45bf3ac57e9a -r 128c9379cd29 eskp.py
--- a/eskp.py	Tue May 20 16:23:02 2014 +0200
+++ b/eskp.py	Tue May 20 16:24:06 2014 +0200
@@ -194,10 +194,19 @@
 def institute():
     filename = os.path.join("templates", get_locale(), "rst", "iek-7.rst")
     content = get_content(filename)
-    filename = os.path.join("templates", get_locale(), "rst", "iek-7_author.rst")
-    author = modal_info("/author_info.html", "author", _(u"IEK-7"), filename)
+    vcard_file = os.path.join("vcards", "sas.vcf")
+    author = u""
+    try:
+        card = get_vcard(vcard_file)
+    except IOError:
+        card = None
+    if card is not None:
+        qr_image = qr_image_data(card)
+        author = render_template("/author_info.html", act="author", title=_(u"IEK-7"),
+                                  card=card, image=qr_image, contact=_(u"Contact"), exit=_(u"Close"))
+
     return render_template("/iek-7.html", act="iek-7", content=content,
-                           author=author, contact = u"IEK-7")
+                           author=author, card=card, contact = u"IEK-7")
 
 
 @app.route("/imprint")
diff -r 45bf3ac57e9a -r 128c9379cd29 templates/buiseness_card.html
--- a/templates/buiseness_card.html	Tue May 20 16:23:02 2014 +0200
+++ b/templates/buiseness_card.html	Tue May 20 16:24:06 2014 +0200
@@ -4,16 +4,21 @@
         <div class="col-md-3">
             <p> {{ card.title.value }} {{ card.fn.value }}</p>
             <p> {{ card.org.value[0] }}</p>
-            <p><a href="mailto:{{ card.email.value|safe }}">{{ card.email.value|safe }}</a></p>
+            <p>E-Mail: <a href="mailto:{{ card.email.value|safe }}">{{ card.email.value|safe }}</a></p>
+            {% if card.tel.value %}
+                <p>Tel.: {{ card.tel.value }}</p>
+            {% endif %}
             <img src="data:image/png;base64,{{ image|safe }}"/>
         </div>
 
         <div class="col-md-3">
-            <img class="logo" src="{{ card.photo.value|safe}}" alt="Image von Person" />
+            {% if card.photo.value %}
+                <img class="logo" src="{{ card.photo.value|safe}}" alt="Image von Person" />
 
-            <div class="collapse navbar-collapse">
-              <ul class="nav navbar-nav navbar-right">
-            </div>
+                <div class="collapse navbar-collapse">
+                    <ul class="nav navbar-nav navbar-right">
+                </div>
+            {% endif %}
         </div>
     </div>
 </div>
diff -r 45bf3ac57e9a -r 128c9379cd29 vcards/jug.vcf
--- a/vcards/jug.vcf	Tue May 20 16:23:02 2014 +0200
+++ b/vcards/jug.vcf	Tue May 20 16:24:06 2014 +0200
@@ -3,6 +3,7 @@
 ORG:Institut für Energie- und Klimaforschung Stratosphäre (IEK-7)
 PHOTO;VALUE=URL;TYPE=JPG:http://www.fz-juelich.de/SharedDocs/Bilder/IEK/IEK-7/DE/Mitarbeiter/grooss_j_u.jpg?__blob=normal
 TITLE:Dr.
+TEL:
 FN:Jens-Uwe Grooß
 N:Grooß;Jens-Uwe;;;
 EMAIL;TYPE=INTERNET:j.-u.grooss@fz-juelich.de
diff -r 45bf3ac57e9a -r 128c9379cd29 vcards/sas.vcf
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/vcards/sas.vcf	Tue May 20 16:24:06 2014 +0200
@@ -0,0 +1,10 @@
+BEGIN:VCARD
+VERSION:3.0
+ORG:Institut für Energie- und Klimaforschung Stratosphäre (IEK-7)
+FN:Sandra Stein
+TITLE:
+N:Stein; Sandra;;;
+TEL:02461-616065
+EMAIL;TYPE=INTERNET:s.stein@fz-juelich.de
+PHOTO:
+END:VCARD