updates

4 files changed, 139 insertions, 63 deletions

diff --git a/templates/curating.html b/templates/curating.html
index bdd6536..bad1b66 100644
--- a/templates/curating.html
+++ b/templates/curating.html
@@ -1,21 +1,40 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
-    <div class="container-fluid main">
-        <div class="row">
-            <div class="col">
-                <h1>{{ bag('translation', this.alt, 'curating') }}</h1>
-                
-                <h2>{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</h2>
-                <h3>Start: {{ this.date_start|dateformat('Y-MM-dd') }}</h3>
-                <h3>{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}</h3>
-				<h3>{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }} </h3>
-                <h3>{{ bag('translation', this.alt, 'place') }}: {{ this.place }} </h3>
-                <h3>{{ bag('translation', this.alt, 'country') }}: {{ this.country }} </h3>
-                <h3>{{ bag('translation', this.alt, 'website') }}: <a href="{{ this.url }}">{{this.url}}</a> </h3>
-                <h3>{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }} </h3>
-                {{ this.info }}
-            </div>
-        </div>
+<div class="workdescription">
+	<table style="width:100%">
+		<tr>
+			<th><h1>{{ bag('translation', this.alt, 'curating') }}</h1></th>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</td>
+		</tr>
+		<tr>
+			<td class="work">Start: {{ this.date_start|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'place') }}: {{ this.place }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'country') }}: {{ this.country }}</td>
+		</tr>
+		{% if this.tfwebsite == True %}<tr>
+			<td class="work">{{bag('translation', this.alt, 'website')}}: <a href="{{ this.website }}">{{this.website}}</a></td>
+		</tr>{% endif %}
+		{% if this.comment == true %}<tr>
+			<td class="work">{{ this.comment }}</td>
+		</tr>{% endif %}
+	</table>
+</div>
+<div class="pagework">
+	<div class="pageinner">
+		{{ this.info }}
     </div>
+</div>
 {% endblock %}
diff --git a/templates/exhibition.html b/templates/exhibition.html
index bec0642..3bd9067 100644
--- a/templates/exhibition.html
+++ b/templates/exhibition.html
@@ -1,21 +1,41 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
-    <div class="container-fluid main">
-        <div class="row">
-            <div class="col">
-                <h1>{{ bag('translation', this.alt, 'exhibition') }}</h1>
-                
-                <h2>{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</h2>
-                <h3>Start: {{ this.date_start|dateformat('Y-MM-dd') }}</h3>
-                <h3>{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}</h3>
-                <h3>{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }} </h3>
-                <h3>{{ bag('translation', this.alt, 'place') }}: {{ this.place }} </h3>
-                <h3>{{ bag('translation', this.alt, 'country') }}: {{ this.country }} </h3>
-                <h3>{{ bag('translation', this.alt, 'website') }}: <a href="{{ this.url }}">{{this.url}}</a> </h3>
-                <h3>{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }} </h3>
-                {{ this.info }}
-            </div>
-        </div>
+<div class="workdescription">
+	<table style="width:100%">
+		<tr>
+			<th><h1>{{ bag('translation', this.alt, 'exhibition') }}</h1></th>
+		</tr>		
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</td>
+		</tr>
+		<tr>
+			<td class="work">Start: {{ this.date_start|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'place') }}: {{ this.place }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'country') }}: {{ this.country }}</td>
+		</tr>
+		{% if this.tfwebsite == True %}<tr>
+			<td class="work">{{bag('translation', this.alt, 'website')}}: <a href="{{ this.website }}">{{this.website}}</a></td>
+		</tr>{% endif %}
+		{% if this.comment == true %}<tr>
+			<td class="work">{{ this.comment }}</td>
+		</tr>{% endif %}
+	</table>
+</div>
+<div class="pagework">
+	<div class="pageinner">
+		{{ this.info }}
     </div>
+</div>
+
 {% endblock %}
diff --git a/templates/lecture.html b/templates/lecture.html
index 284040e..74fbc69 100644
--- a/templates/lecture.html
+++ b/templates/lecture.html
@@ -1,20 +1,37 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
-    <div class="container-fluid main">
-        <div class="row">
-            <div class="col">
-                <h1>{{ bag('translation', this.alt, 'lecture') }}</h1>
-                
-                <h2>{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</h2>
-                <h3>{{ bag('translation', this.alt, 'date') }}: {{ this.date }}</h3>
-                <h3>{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }} </h3>
-                <h3>{{ bag('translation', this.alt, 'place') }}: {{ this.place }} </h3>
-                <h3>{{ bag('translation', this.alt, 'country') }}: {{ this.country }} </h3>
-                <h3>{{ bag('translation', this.alt, 'website') }}: <a href="{{ this.url }}">{{this.url}}</a> </h3>
-                <h3>{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }} </h3>
-                {{ this.info }}
-            </div>
-        </div>
+<div class="workdescription">
+	<table style="width:100%">
+		<tr>
+			<th><h1>{{ bag('translation', this.alt, 'lecture') }}</h1></th>
+		</tr>		
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'date') }}: {{ this.date|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'place') }}: {{ this.place }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'country') }}: {{ this.country }}</td>
+		</tr>
+		{% if this.tfwebsite == True %}<tr>
+			<td class="work">{{bag('translation', this.alt, 'website')}}: <a href="{{ this.website }}">{{this.website}}</a></td>
+		</tr>{% endif %}
+		{% if this.comment == true %}<tr>
+			<td class="work">{{ this.comment }}</td>
+		</tr>{% endif %}
+	</table>
+</div>
+<div class="pagework">
+	<div class="pageinner">
+		{{ this.info }}
     </div>
+</div>
 {% endblock %}
diff --git a/templates/performance.html b/templates/performance.html
index 9a6ff23..6dff70e 100644
--- a/templates/performance.html
+++ b/templates/performance.html
@@ -1,21 +1,41 @@
 {% extends "layout.html" %}
 {% block title %}{{ this.title }}{% endblock %}
 {% block body %}
-    <div class="container-fluid main">
-        <div class="row">
-            <div class="col">
-                <h1>{{ bag('translation', this.alt, 'performance') }}</h1>
-                
-                <h2>{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</h2>
-                <h3>Start: {{ this.date_start|dateformat('Y-MM-dd') }}</h3>
-                <h3>{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}</h3>
-                <h3>{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }} </h3>
-                <h3>{{ bag('translation', this.alt, 'place') }}: {{ this.place }} </h3>
-                <h3>{{ bag('translation', this.alt, 'country') }}: {{ this.country }} </h3>
-                <h3>{{ bag('translation', this.alt, 'website') }}: <a href="{{ this.url }}">{{this.url}}</a> </h3>
-                <h3>{{ bag('translation', this.alt, 'comment') }}: {{ this.comment }} </h3>
-                {{ this.info }}
-            </div>
-        </div>
+
+<div class="workdescription">
+	<table style="width:100%">
+		<tr>
+			<th><h1>{{ bag('translation', this.alt, 'performance') }}</h1></th>
+		</tr>		
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'title') }}: {{ this.title }}</td>
+		</tr>
+		<tr>
+			<td class="work">Start: {{ this.date_start|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'end') }}: {{ this.date_end|dateformat('Y-MM-dd') }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'venue') }}: {{ this.venue }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'place') }}: {{ this.place }}</td>
+		</tr>
+		<tr>
+			<td class="work">{{ bag('translation', this.alt, 'country') }}: {{ this.country }}</td>
+		</tr>
+		{% if this.tfwebsite == True %}<tr>
+			<td class="work">{{bag('translation', this.alt, 'website')}}: <a href="{{ this.website }}">{{this.website}}</a></td>
+		</tr>{% endif %}
+		{% if this.comment == true %}<tr>
+			<td class="work">{{ this.comment }}</td>
+		</tr>{% endif %}
+	</table>
+</div>
+<div class="pagework">
+	<div class="pageinner">
+		{{ this.info }}
     </div>
+</div>
 {% endblock %}