* Aktelle Vorlagen in den src Ordner verschoben, damit sie in der Versionierung enthalten sind.

* INSTALLED_APPS auf PROJECT_APPS + PREREQ_APPS damit Vorlagen aus den kasu/templates Ordner bevorzugt werden. So lassen sich Vorlagen von 3rd Party Apps überschreiben, wie z.b. django-contrib-comments.

* Javascript Code für Google Maps entfernt, dies funktioniert mit Content Security Policy nicht mehr so gut und wird eh nicht gebraucht.

* Javascript für das Hanchan Formular vom header an des Ende des body gesetzt, der Code darf erst ausgeführt werden, wenn das Formular aufgebaut wurde.

src/events/templates/events/event_detail.html

@@ -2,6 +2,8 @@
 {% load i18n comments thumbnail %}
 
 {% block title %}{{ event.name }}{% endblock %}
+{% block description %}Veranstaltung {{ event.name }} am {{ event.start|date }}{% endblock %}
+
 
 {% block opengraph %}
   <meta property="og:type" content="activity" />
@@ -11,11 +13,7 @@
   {% if event.description %}<meta property="og:description" content="{{event.description|striptags}}" />{% endif %}
 {% endblock %}
 
-{% block extra_head %}
-  <script type="text/javascript" src="https://maps.google.com/maps/api/js?sensor=false"></script>
-{% endblock %}
-
-{% block jumbotron_background %} {{ event.get_image|thumbnail_url:'callout' }} {% endblock %}
+{% block jumbotron_background %}{{ event.get_image|thumbnail_url:'callout' }}{% endblock %}
 
 {% block teaser %}
   <h1>{{event.name}}</h1>
@@ -40,72 +38,82 @@
  </ul>
 {% endblock %}
 
-
 {% block navigation %}
-<code>{{ event. }}</code>
+{% if not event.is_future_event %}
 <ul id="navigation">
-    <li><a href="{{ event.get_absolute_url }}"><span class="fa fa-info-circle"></span> {% trans 'Info' %}</a></li>
-    <li><a href="{% url 'event-photo-list' event.pk %}"><span class="fa fa-camera-retro"></span> {{ event.photo_count }} {% trans 'Photos' %}</a></li>
-    <li><a href="{% url 'event-hanchan-list' event.pk %}" ><span class="fa fa-table"></span> {{ event.hanchan_set.count }} {% trans "Hanchans" %}</a></li>
-    <li><a href="{% url 'maistar-game-list' event.pk %}" ><span class="fa fa-glass"></span> {{ event.maistargame_set.count }} {% trans "Mai-Star Games" %}</a></li>
-    <li><a href="{% url 'event-ranking' event.id %}"><span
-            class="fa fa-trophy"></span> {% trans "Event Ranking" %}</a></li>
+  <li><a href="{{ event.get_absolute_url }}"><span
+          class="fa fa-info-circle"></span> {% trans 'Info' %}</a></li>
+  <li><a href="{% url 'event-photo-list' event.pk %}"><span
+          class="fa fa-camera-retro"></span> {{ event.photo_count }}
+    {% trans "Photos" %}</a></li>
+  <li><a href="{% url 'event-hanchan-list' event.pk %}"><span
+          class="fa fa-table"></span> {{ event.hanchan_set.count }}
+    {% trans "Hanchans" %}</a></li>
+  <li><a href="{% url 'maistar-game-list' event.pk %}"><span
+          class="fa fa-glass"></span> {{ event.maistargame_set.count }}
+    {% trans "Mai-Star Games" %}</a></li>
+  {% if event.hanchan_set.count > 0 %}
+  <li><a href="{% url 'event-ranking' event.id %}"><span
+          class="fa fa-trophy"></span> {% trans "Event Ranking" %}</a></li>
+  {% endif %}
 </ul>
+{% endif %}
 {% endblock %}
 
 {% block maincontent %}
-<div class="grid_6" id="google_maps">
-&nbsp;
+<div class="grid_12">
+  {% if event.description %}
+  {{event.description|safe}}
+  {% else %}
+  {{event.location.description|safe}}
+  {% endif %}
 </div>
-
 <div class="grid_6">
   <h3>{% trans 'Location' %}</h3>
   <strong>{{ event.location.name }}</strong>
   <address>
-  {{event.location.street_address}}<br />
-  {{event.location.postal_code}} {{event.location.locality}} <br />
-  {{event.location.get_country_display}}
+    {{event.location.street_address}}<br/>
+    {{event.location.postal_code}} {{event.location.locality}} <br/>
+    {{event.location.get_country_display}}
   </address>
   {% if event.location.url %}
-  <p><strong>{% trans "Homepage" %}:</strong> <a href="{{ event.location.url }}">{{ event.location.url }}</a></p>
+  <p><strong>{% trans "Homepage" %}:</strong> <a
+          href="{{ event.location.url }}">{{ event.location.url }}</a></p>
   {% endif %}
-    <h3>{% trans "Date" %}</h3>
-    <ul>
-      <li><strong>{% trans "Start" %}:</strong> {{ event.start }}</li>
-      {% if event.end %}<li><strong>{% trans "End" %}:</strong> {{ event.end }}</li>{% endif %}
-      {% if event.url %}<li><strong>{% trans "Homepage" %}:</strong> <a href="{{ event.url }}">{{ event.url }}</a></li>{% endif %}
-    </ul>
 </div>
-
-<div class="grid_12">
- {% if event.description %}
-    {{event.description|safe}}
-  {% else %}
-    {{event.location.description|safe}}
-  {% endif %}
-  <p class="more_link">
-
-      <a class="button" href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}" target="_blank">
-        <span class="fa fa-facebook"></span>
-        {% trans 'Share on Facebook'%}
-      </a>
-
-      <a class="button" href="https://plus.google.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}" onclick="javascript:window.open(this.href,
-  '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;">
-          <span class="fa fa-google-plus"></span>
-          {% trans 'Share on Google+'%}
-      </a>
-  <a class="button" href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}" target='_blank'>
-        <span class="fa fa-twitter"></span>
-        {% trans 'Share on Twitter' %}
-  </a>
-  <a class="button" href="http://maps.google.com/maps?q={{event.location.address|urlencode}}&amp;z=16" target="gmaps">
-      <span class="fa fa-map"></span>
-      {% trans 'Show on Google Maps' %}
-  </a>
-  </p>
+<div class="grid_6">
+  <h3>{% trans "Date" %}</h3>
+  <ul>
+    <li><strong>{% trans "Start" %}:</strong> {{ event.start }}</li>
+    {% if event.end %}
+    <li><strong>{% trans "End" %}:</strong> {{ event.end }}</li>
+    {% endif %}
+    {% if event.url %}
+    <li><strong>{% trans "Homepage" %}:</strong> <a href="{{ event.url }}">{{
+      event.url }}</a></li>
+    {% endif %}
+  </ul>
 </div>
-<br class="clear" />
+<p class="grid_12 more_link">
+  <a class="button" rel="nofollow" target="_blank"
+     href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}">
+    <span class="fa fa-facebook"></span> {% trans 'Share on Facebook'%}
+  </a>
+  <a class="button" rel="nofollow" target="_blank"
+     href="https://plus.google.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}">
+    <span class="fa fa-google-plus"></span> {% trans 'Share on Google+'%}
+  </a>
+  <a class="button" rel="nofollow" target="_blank"
+     href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at{{event.get_absolute_url|urlencode}}">
+    <span class="fa fa-twitter"></span>
+    {% trans 'Share on Twitter' %}
+  </a>
+  <a class="button" rel="nofollow" target="_blank"
+     href="http://maps.google.com/maps?q={{event.location.address|urlencode}}&amp;z=16">
+    <span class="fa fa-map"></span> {% trans 'Show on Google Maps' %}
+  </a>
+</p>
+<br class="clear"/>
 {% endblock %}
 
 {% block comments %}

src/events/templates/events/event_list.html

@@ -2,7 +2,7 @@
 {% load i18n comments thumbnail %}
 
 {% block title %}{% trans "Upcoming Events" %}{% endblock %}
-{% block teaser%}<h2>{% trans "Upcoming Events" %}</h2>{% endblock %}
+{% block teaser%}<h1>{% trans "Upcoming Events" %}</h1>{% endblock %}
 {% block maincontent %}
 
 {% regroup event_list by start|date:'F Y' as month_list %}

src/events/templates/events/eventseries_form.html

@@ -1,10 +1,12 @@
 {% extends "events/event_detail.html" %}
 {% load i18n comments %}
 
-{% block title %}{{ event.name }}{% endblock %}
+{% block title %}Weitere Termine für {{ event.name }}{% endblock %}
+
+{% block maincontent %}
+
+{{ event.description|safe }}
 
-{% block main_content %}
-<h3>Hier kommt eine Tabelle rein!</h3>
 <form class="grid_12" method="post">
   {% csrf_token %}
   {{ formset.management_form }}

src/events/templates/events/page.html

@@ -5,8 +5,8 @@
 
 {% block additional_buttonbar %}
 {% if perms.events.add_event %}
-  <a href="{% url 'event-form' %}" class="button">
-      <span class="fa fa-calendar-plus-o"></span> {% trans 'Add Event' %}</a>
+  <a href="{% url 'event-form' %}" class="button"><span
+     class="fa fa-calendar-plus-o"></span> {% trans 'Add Event' %}</a>
 {% endif %}
 {% endblock %}
 

src/events/templates/events/photo_detail.html

@@ -2,19 +2,24 @@
 {% load i18n comments thumbnail %}
 
 {% block title %} {{ photo.name }} - {{ photo.event.name }} {% endblock %}
+{% block description %}{% spaceless %}
+{% if photo.description %}{{photo.description}}
+{% else %}
+Foto {{ photo.name }} vom {{ photo.date_created|default:photo.created_date }} geschossen bei {{event.name}}
+{% endif %}
+{% endspaceless %}{% endblock %}
 
 {% block extra_head %}
-    <script type="text/javascript" src="{{ STATIC_URL }}/js/jquery.min.js"></script>
-    <script type="text/javascript" src="{{ STATIC_URL }}/js/mousetrap.js"></script>
-{% endblock %}
-
-{% block javascript %}
+<script type="text/javascript" src="{{ STATIC_URL }}/js/jquery.min.js"></script>
+<script type="text/javascript" src="{{ STATIC_URL }}/js/mousetrap.js"></script>
+<script type="text/javascript">
 if ($('a.previous').attr('href')) {
     Mousetrap.bind('left', function() { window.location = $('a.previous').attr('href'); });
 }
 if ($('a.next').attr('href')) {
     Mousetrap.bind('right', function() { window.location = $('a.next').attr('href'); });
 }
+</script>
 {% endblock %}
 
 {% block teaser %}
@@ -29,7 +34,7 @@ if ($('a.next').attr('href')) {
 <meta property="og:title" content="{{photo.name}} - Foto" />
 <meta property="og:url" content="http://www.kasu.at{{photo.get_absolute_url}}" />
 <meta property="og:image" content="http://www.kasu.at{{photo.thumbnail.url}}" />
-{% if photo.description %}<meta property="og:description" content="{{photo.description}}" />{% endif %} 
+{% if photo.description %}<meta property="og:description" content="{{photo.description}}" />{% endif %}
 {% endblock %}
 
 {% block maincontent %}