Fehlerbereinigung.

Mahjong Ranking berechnet nun die richtigen Ränge zu den legendären Kyu/Dan Punkten.

Stablie Version bevor die Datenstruktur des Mahjongrankings vereinfacht wird.

requirements/base.txt

@@ -3,6 +3,7 @@ django >= 1.7, < 1.9
 django-appconf
 django-compressor
 django-contrib-comments
+django-extra-views
 django-grappelli
 django-imagekit
 django-markdown
@@ -20,5 +21,3 @@ pytz==2013d
 requests
 requests-oauthlib
 xlwt
-
-bzr+https://code.launchpad.net/~adam.russell/pyexiv2/pyexiv2-0.3

requirements/development.txt

@@ -3,3 +3,4 @@ django-debug-toolbar
 django-sslserver
 rosetta
 sqlparse
+bzr+https://code.launchpad.net/~adam.russell/pyexiv2/pyexiv2-0.3

src/content/forms.py

@@ -48,7 +48,7 @@ class PageForm(forms.ModelForm):
         cleaned_data = super(PageForm, self).clean()
         content_type = cleaned_data.get("content_type")
         pdf_de = cleaned_data.get("pdf_de")
-        if not pdf_de and content_type == "2":
+        if content_type == "2" and not cleaned_data.get("pdf_de"):
             msg = _('Please upload a PDF-File to this PDF-Page.')
             self._errors["content_type"] = self.error_class([msg])
             self._errors["pdf_de"] = self.error_class([msg])

src/content/locale/de/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.content\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-05 19:23+0100\n"
-"PO-Revision-Date: 2014-12-08 16:15+0100\n"
+"POT-Creation-Date: 2015-08-16 11:34+0200\n"
+"PO-Revision-Date: 2015-08-15 17:30+0200\n"
 "Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
 "Language: de\n"
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Translated-Using: django-rosetta 0.7.2\n"
-"X-Generator: Poedit 1.6.11\n"
+"X-Generator: Poedit 1.8.3\n"
 
 #: feeds.py:16
 msgid "Current news from Kasu"
@@ -43,7 +43,7 @@ msgstr "Schlagzeile"
 msgid "Content"
 msgstr "Inhalt"
 
-#: models.py:52 models.py:231 templates/content/article_detail.html:34
+#: models.py:52 models.py:231 templates/content/article_detail.html:25
 msgid "Category"
 msgstr "Kategorie"
 
@@ -55,7 +55,7 @@ msgstr "Bild"
 msgid "Slug"
 msgstr "Slug"
 
-#: models.py:57 templates/content/article_detail.html:32
+#: models.py:57 templates/content/article_detail.html:23
 msgid "Author"
 msgstr "Autor"
 
@@ -131,66 +131,43 @@ msgstr "Beschreibung"
 msgid "Categories"
 msgstr "Kategorien"
 
-#: views.py:42
-msgid "This Category does not exist."
-msgstr "Diese Kategorie existiert nicht."
-
-#: views.py:93 templates/content/article_detail.html:52
-#: templates/content/article_form.html:17
-msgid "Edit Article"
-msgstr "Artikel bearbeiten"
-
-#: views.py:95 templates/content/article_form.html:17
-msgid "Create Article"
-msgstr "Artikel erstellen"
-
-#: views.py:160
-#, python-format
-msgid "No Page found matching the Path %s"
-msgstr "Keine Seite unter dem Pfad %s gefunden"
-
-#: views.py:174
-#, python-format
-msgid "No PDF Document found matching the Path %s"
-msgstr "Kein PDF Dokument unter dem Pfad %s gefunden."
-
 #: templates/content/article_archive.html:5
 #: templates/content/article_archive.html:11
-#: templates/content/article_archive.html:17
+#: templates/content/article_archive.html:19
 msgid "Article Archive"
 msgstr "Nachrichtenarchiv"
 
-#: templates/content/article_archive.html:32
+#: templates/content/article_archive.html:34
 #: templates/content/article_archive_month.html:5
 #: templates/content/article_archive_year.html:7
 msgid "Archive"
 msgstr "Archiv"
 
-#: templates/content/article_archive.html:49
+#: templates/content/article_archive.html:51
 msgid "All Categories"
 msgstr "Alle Kategorien"
 
-#: templates/content/article_archive.html:64
+#: templates/content/article_archive.html:66
 msgid "created on"
 msgstr "erstellt am"
 
-#: templates/content/article_archive.html:65
+#: templates/content/article_archive.html:67
 msgid "by"
 msgstr "von"
 
-#: templates/content/article_archive.html:66
+#: templates/content/article_archive.html:68
 msgid "comments"
 msgstr "Kommentare"
 
-#: templates/content/article_archive.html:70
+#: templates/content/article_archive.html:72
 msgid "Read More"
 msgstr "Mehr lesen"
 
-#: templates/content/article_archive.html:73
+#: templates/content/article_archive.html:75
 msgid "We're sorry. Your search yielded no results."
 msgstr "Es tut uns leid. Deine Suche ergab keine Treffer."
 
-#: templates/content/article_archive.html:91
+#: templates/content/article_archive.html:93
 msgid "Add Article"
 msgstr "neuer Artikel "
 
@@ -198,21 +175,22 @@ msgstr "neuer Artikel "
 msgid "back"
 msgstr "Zurück"
 
-#: templates/content/article_detail.html:33
+#: templates/content/article_detail.html:24
 msgid "Created on"
 msgstr "Erstellt am"
 
-#: templates/content/article_detail.html:39
-msgid "Share on Google+"
-msgstr "Auf Google+ teilen"
+#: templates/content/article_detail.html:36
+msgid "share on"
+msgstr "Teile auf"
 
-#: templates/content/article_detail.html:40
-msgid "Share on Twitter"
-msgstr "Auf Twitter teilen"
+#: templates/content/article_detail.html:51
+#: templates/content/article_form.html:17 views.py:88
+msgid "Edit Article"
+msgstr "Artikel bearbeiten"
 
-#: templates/content/article_detail.html:41
-msgid "Share on Facebook"
-msgstr "Auf Facebook teilen"
+#: templates/content/article_form.html:17 views.py:90
+msgid "Create Article"
+msgstr "Artikel erstellen"
 
 #: templates/content/article_form.html:22 templates/content/page_form.html:40
 #: templates/content/page_form.html:46
@@ -245,5 +223,28 @@ msgstr "Seite hinzufügen"
 msgid "HTML Specific"
 msgstr "HTML spezifisch"
 
+#: views.py:22
+msgid "This Category does not exist."
+msgstr "Diese Kategorie existiert nicht."
+
+#: views.py:155
+#, python-format
+msgid "No Page found matching the Path %s"
+msgstr "Keine Seite unter dem Pfad %s gefunden"
+
+#: views.py:169
+#, python-format
+msgid "No PDF Document found matching the Path %s"
+msgstr "Kein PDF Dokument unter dem Pfad %s gefunden."
+
+#~ msgid "Share on Google+"
+#~ msgstr "Auf Google+ teilen"
+
+#~ msgid "Share on Twitter"
+#~ msgstr "Auf Twitter teilen"
+
+#~ msgid "Share on Facebook"
+#~ msgstr "Auf Facebook teilen"
+
 #~ msgid "Subpages"
 #~ msgstr "Unterseiten"

src/content/templates/content/article_archive.html

@@ -13,6 +13,8 @@
  {% if month %}{{ month|date:'F Y' }}</h2>{% elif year %}{{year}}{% endif %}
 {% endblock %}
 
+{% block jumbotron_background %}{% if active_category %}{{ active_category.image.url }}{% else %}{{STATIC_URL}}img/teaser/{{current_top_page.slug}}.jpg{% endif %}{% endblock %}
+
 {% block teaser %}<h2>
    {% trans 'Article Archive' %}
    {% if active_category %} - {{active_category.name}}{% endif %}
@@ -62,7 +64,7 @@
     <h3><a href="{{article.get_absolute_url}}">{{article.headline}}</a></h3>
     <ul class="info">
      <li><span class="fa fa-calendar-o" title="{% trans 'created on' %}"></span> <time datetime="{{article.date_created|date:'c'}}">{{ article.date_created|date }}</time></li>
-     <li><span class="fa fa-user" title="{% trans 'by' %}"/> {{ article.author }}</li>
+     <li><span class="fa fa-user" title="{% trans 'by' %}"></span> {{ article.author }}</li>
      <li><span class="fa fa-comments" title="{% trans 'comments' %}"></span> <a href="{{article.get_absolute_url}}#comments" >{{comment_count}} {% trans "comments" %}</a></li>
     </ul>
     <a href="{{article.get_absolute_url}}"><img src="{{article.posting_image.url}}" alt="{{article.category}}:" class="posting_image" width="200" height="120"/></a>

src/content/templates/content/article_detail.html

@@ -16,29 +16,28 @@
 
 {% block itemscope %}itemscope itemtype="http://schema.org/Article"{% endblock %}
 
-{% block teaser %}<h2 itemprop="name">{{article.headline}}</h2>{% endblock %}
-
-{% block content %}
-<p>&nbsp;</p>
-<div itemprop="articleBody">{{ article.content }}</div>
+{% block teaser %}
+<h2 itemprop="name">{{article.headline}}</h2>
+<div id="teaser_text">
+    <ul class="info">
+        <li><span class="fa fa-user"></span> <strong>{% trans 'Author' %}:</strong> <a href="{% url 'membership-details' article.author %}" itemprop="author">{{article.author}}</a></li>
+        <li><span class="fa fa-calendar-o"></span> <strong>{% trans 'Created on' %}: </strong><time datetime="{{article.date_created|date:'Y-m-d H:i'}}">{{ article.date_created|date }}</time></li>
+        <li><span class="fa fa-tag"></span> <strong>{% trans "Category"%}: </strong><a href="{{ article.category.get_absolute_url }}" itemprop="articleSection">{{article.category.name}}</a></li>
+    </ul>
+</div>
 {% endblock %}
 
-{% block sidebar %}
-  <p>&nbsp;</p>
+{% block maincontent %}
+<div itemprop="articleBody" class="grid_12">
     <img alt="{{article.category.name}}" src="{{article.posting_image.url}}" class="posting_image" itemprop="image"/>
-  <p>&nbsp;</p>
-
-  <ul class="fa-ul">
-   <li><span class="fa-li fa fa-user"></span> <strong>{% trans 'Author' %}:</strong> <a href="{% url 'membership-details' article.author %}" itemprop="author">{{article.author}}</a></li>
-   <li><span class="fa-li fa fa-calendar-o"></span> <strong>{% trans 'Created on' %}: </strong><time datetime="{{article.date_created|date:'Y-m-d H:i'}}">{{ article.date_created|date }}</time></li>
-   <li><span class="fa-li fa fa-tag"></span> <strong>{% trans "Category"%}: </strong><a href="{{ article.category.get_absolute_url }}" itemprop="articleSection">{{article.category.name}}</a></li>
-  </ul>
-
-  <p class="center">
-   <a href="https://plus.google.com/share?url=http%3A%2F%2Fwww.kasu.at{{article.get_absolute_url|urlencode}}" onclick="javascript:window.open(this.href,
-    '', 'menubar=no,toolbar=no,resizable=yes,scrollbars=yes,height=600,width=600');return false;"><img src="{{STATIC_URL}}img/google_plus.png" alt="Google+" title="{% trans 'Share on Google+'%}" width="39" height="39"/></a>
-   <a href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at{{article.get_absolute_url|urlencode}}" target='_blank'><img src="{{STATIC_URL}}img/twitter.png" alt="Twitter" title="{% trans 'Share on Twitter' %}"  width="39" height="39"/></a>
-   <a href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{article.get_absolute_url|urlencode}}?t={{article.headline|urlencode}}" target="_blank"><img src="{{STATIC_URL}}img/facebook.png" alt="Facebook" title="{% trans 'Share on Facebook'%}" width="39" height="39"/></a>
+    {{ article.content }}
+</div>
+  <p class="right">
+      <strong>{% trans 'share on' %}:</strong>
+   <a class="button" href="https://plus.google.com/share?url=http%3A%2F%2Fwww.kasu.at{{article.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> Google+</a>
+   <a class="button" href="https://twitter.com/share?url=http%3A%2F%2Fwww.kasu.at{{article.get_absolute_url|urlencode}}" target='_blank'><span class="fa fa-twitter"></span> Twitter</a>
+   <a class="button" href="http://facebook.com/sharer.php?u=http%3A%2F%2Fwww.kasu.at{{article.get_absolute_url|urlencode}}?t={{article.headline|urlencode}}" target="_blank"><span class="fa fa-facebook"></span> Facebook</a>
   </p>
 {% endblock %}
 

src/content/templates/content/article_form.html

@@ -2,9 +2,11 @@
 {% load i18n fieldset_extras %}
 
 {% block extra_head %}
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-1.6.2.min.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
  <script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js" ></script>
- <script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"></script>
+ {{ form.media }}
+
+<!-- script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"></script -->
 {% endblock %}
 
 {% block maincontent %}
@@ -39,7 +41,7 @@
  </form>
 {% endblock %}
 
-{% block javascript %}
+{% block java_script %}
 CKEDITOR.replace( 'id_content_de' );
 CKEDITOR.replace( 'id_content_en' );
 {% endblock %}

src/content/templates/content/page.html

@@ -13,25 +13,10 @@
   <meta property="og:description" content="{{ page.content|striptags|truncatewords:25 }}" />
 {% endblock %}
 
-{% block content %}
+{% block maincontent %}
   {{ page.content }}
 {% endblock %}
 
-{% block sidebar %}
-{% if current_top_page.subpages %}
-{% for subpage in current_top_page.subpages.all %}
-  {% if subpage.content_type > 0 %}
-    <h2><a href="{{ subpage.get_absolute_url }}">{{subpage.title}}</a></h2>
-    <ul class="list">
-      {% for subpage in subpage.subpages.all %}
-        <li class="{{subpage.css_class}}"><a href="{{ subpage.get_absolute_url }}">{{ subpage.menu_name }}</a></li>
-      {% endfor %}
-    </ul>
-  {% endif %}
-{% endfor %}
-{% endif %}
-{% endblock %}
-
 {% block comments %}{% if page.enable_comments %}
   {% render_comment_list for page %}
   {% render_comment_form for page %}

src/content/templates/content/page_form.html

@@ -2,13 +2,11 @@
 {% load i18n fieldset_extras %}
 
 {% block title %}
-    {% if object.pk %}{% trans "Edit Page" %}:  {{ page.title }}
-    {% else %}{% trans "Add Page" %}
-    {% endif %}
+    {% if object.pk %}{% trans "Edit Page" %}:  {{ page.title }}{% else %}{% trans "Add Page" %}{% endif %}
 {% endblock %}
 
 {% block extra_head %}
- <script type="text/javascript" src="{{ STATIC_URL }}js/jquery-2.1.3.min.js"></script>
+ <script type="text/javascript" src="{{ STATIC_URL }}js/jquery.min.js"></script>
  <script type="text/javascript" src="{{ STATIC_URL }}js/language_tabs.js" ></script>
  <script type="text/javascript" src="{{ STATIC_URL }}js/ckeditor/ckeditor.js"></script>
  {% endblock %}
@@ -23,49 +21,53 @@
 
 
 {% block maincontent %}
-
 {% get_fieldset "parent, slug, content_type, status" from form as fieldset_common %}
-{% get_fieldset "menu_name_de, title_de, pdf_de, content_de" from form as fieldset_de %}
-{% get_fieldset "menu_name_en, title_en, pdf_en, content_en" from form as fieldset_en %}
+{% get_fieldset "menu_name_de, title_de, pdf_de" from form as fieldset_de %}
+{% get_fieldset "menu_name_en, title_en, pdf_en" from form as fieldset_en %}
 {% get_fieldset "template, enable_comments" from form as fieldset_html %}
 
-<form method="post" enctype="multipart/form-data" class="grid_12">
- {% csrf_token %}
+<form method="post" enctype="multipart/form-data">
     <fieldset>
+        {% csrf_token %}
             <legend>{% if object.pk %}{% trans "Edit Page" %}{% else %}{% trans "Add Page" %}{% endif %}</legend>
             {% with fieldset_common as form %}{% include "form.html" %}{% endwith %}
- </fieldset>
-
- <ul class="tabs">
-  <li><a href="#de">{% trans "German" %}</a></li>
-  <li><a href="#en">{% trans "English" %}</a></li>
- </ul>
-
- <div class="tab_container">
-  <fieldset id="de" class="tab_content">
-   <legend>{% trans "German" %}</legend>
-   {% with fieldset_de as form %}{% include "form.html" %}{% endwith %}
-  </fieldset>
-  <fieldset id="en" class="tab_content">
-   <legend>{% trans "English" %}</legend>
-   {% with fieldset_en as form %}{% include "form.html" %}{% endwith %}
-  </fieldset>
- </div>
-
- <fieldset>
             <legend>{% trans "HTML Specific" %}</legend>
             {% with fieldset_html as form %}{% include "form.html" %}{% endwith %}
     </fieldset>
 
- <p class="buttonbar">
+    <ul class="tabs grid_12">
+        <li><a href="#de">{% trans "German" %}</a></li>
+        <li><a href="#en">{% trans "English" %}</a></li>
+    </ul>
+
+    <div class="tab_container grid_12"">
+        <section id="de" class="tab_content">
+            <fieldset>
+                <legend>{% trans "German" %}</legend>
+                {% with fieldset_de as form %}{% include "form.html" %}{% endwith %}
+            </fieldset>
+            <br>
+            {{form.content_de}}
+        </section>
+        <section id="en" class="tab_content">
+            <fieldset>
+                <legend>{% trans "English" %}</legend>
+                {% with fieldset_en as form %}{% include "form.html" %}{% endwith %}
+            </fieldset>
+            <br>
+        {{form.content_en}}
+        </section>
+ </div>
+ <p></p>
+ <p class="buttonbar grid_12">
   <button type="reset"><span class="fa fa-undo"></span> {% trans 'reset' %}</button>
   <button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button>
  </p>
 </form>
-
 {% endblock %}
 
 {% block javascript %}
+    CKEDITOR.dtd.$removeEmpty['span'] = false;
     CKEDITOR.replace( 'id_content_de' );
     CKEDITOR.replace( 'id_content_en' );
 {% endblock %}

src/events/forms.py

@@ -58,3 +58,5 @@ class EventForm(forms.ModelForm):
     class Meta(object):
         model = models.Event
         exclude = ('event_count', 'event_series', )
+
+EventSeriesFormset = forms.inlineformset_factory(models.Event, models.Event, fields=('start', 'end'), form=EventForm)

src/events/locale/de/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.events\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-05 19:23+0100\n"
+"POT-Creation-Date: 2015-08-16 11:34+0200\n"
 "PO-Revision-Date: 2014-12-08 16:06+0100\n"
 "Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
@@ -35,31 +35,30 @@ msgstr "Beginn"
 msgid "end"
 msgstr "Ende"
 
-#: models.py:67 models.py:155
+#: models.py:67 models.py:161
 msgid "Name"
 msgstr "Name"
 
-#: models.py:68 models.py:156
+#: models.py:68 models.py:162
 msgid "Description"
 msgstr "Beschreibung"
 
 #: models.py:70 templates/events/event_archive.html:41
-#: templates/events/event_detail.html:31 templates/events/event_detail.html:77
-#: templates/events/event_list.html:15
+#: templates/events/event_detail.html:31 templates/events/event_detail.html:76
 msgid "Start"
 msgstr "Beginn"
 
 #: models.py:71 templates/events/event_detail.html:32
-#: templates/events/event_detail.html:78
+#: templates/events/event_detail.html:77
 msgid "End"
 msgstr "Ende"
 
-#: models.py:72 models.py:159 templates/events/event_detail.html:37
-#: templates/events/event_detail.html:73 templates/events/event_detail.html:79
+#: models.py:72 models.py:165 templates/events/event_detail.html:36
+#: templates/events/event_detail.html:72 templates/events/event_detail.html:78
 msgid "Homepage"
 msgstr "Homepage"
 
-#: models.py:73 models.py:157
+#: models.py:73 models.py:163
 msgid "Image"
 msgstr "Bild"
 
@@ -92,134 +91,129 @@ msgstr "Termin"
 msgid "Events"
 msgstr "Termine"
 
-#: models.py:160
+#: models.py:166
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: models.py:161
+#: models.py:167
 msgid "Street Address"
 msgstr "Straße"
 
-#: models.py:162
+#: models.py:168
 msgid "Locality"
 msgstr "Ort"
 
-#: models.py:163
+#: models.py:169
 msgid "Country"
 msgstr "Land"
 
-#: models.py:166
+#: models.py:172
 msgid "Venue"
 msgstr "Veranstaltungsort"
 
-#: models.py:167
+#: models.py:173
 msgid "Venues"
 msgstr "Veranstaltungsorte"
 
-#: views.py:101 templates/events/event_detail.html:110
-#: templates/events/event_form.html:9
-msgid "Edit Event"
-msgstr "Termin bearbeiten"
-
-#: views.py:103 templates/events/event_form.html:9
-#: templates/events/page.html:15
-msgid "Add Event"
-msgstr "Neuer Termin"
-
-#: views.py:199
-msgid "Event does not exist"
-msgstr "Veranstaltung gibt es nicht"
-
 #: templates/events/event_archive.html:5 templates/events/event_archive.html:9
 msgid "Event Archive"
 msgstr "Veranstaltungsarchiv"
 
-#: templates/events/event_archive.html:36 templates/events/event_list.html:11
+#: templates/events/event_archive.html:36 templates/events/event_list.html:14
 msgid "Event Image"
 msgstr "Veranstaltungsbild"
 
-#: templates/events/event_archive.html:44 templates/events/event_list.html:18
+#: templates/events/event_archive.html:44
 msgid "from"
 msgstr "von"
 
-#: templates/events/event_archive.html:44 templates/events/event_list.html:18
+#: templates/events/event_archive.html:44
 msgid "to"
 msgstr "bis"
 
 #: templates/events/event_archive.html:52
-#: templates/events/event_detail.html:35 templates/events/event_detail.html:65
-#: templates/events/event_list.html:26
+#: templates/events/event_detail.html:33 templates/events/event_detail.html:64
+#: templates/events/event_list.html:25
 msgid "Location"
 msgstr "Ort"
 
-#: templates/events/event_archive.html:56
-#: templates/events/event_archive.html:57 templates/events/event_list.html:30
+#: templates/events/event_archive.html:53 templates/events/event_list.html:26
 msgid "Comments"
 msgstr "Kommentare"
 
-#: templates/events/event_archive.html:60
-#: templates/events/event_archive.html:61
-#: templates/events/event_detail.html:39 templates/events/event_detail.html:49
+#: templates/events/event_archive.html:54
+#: templates/events/event_detail.html:38 templates/events/event_detail.html:48
 msgid "Photos"
 msgstr "Fotos"
 
-#: templates/events/event_archive.html:64
-#: templates/events/event_archive.html:65
-#: templates/events/event_archive.html:66
-#: templates/events/event_detail.html:38 templates/events/event_detail.html:48
-#: templates/events/event_detail.html:50
+#: templates/events/event_archive.html:55
+#: templates/events/event_archive.html:56
+#: templates/events/event_detail.html:37 templates/events/event_detail.html:49
 msgid "Hanchans"
 msgstr "Hanchans"
 
-#: templates/events/event_archive.html:70
-msgid " Edit"
-msgstr "Bearbeiten"
-
-#: templates/events/event_detail.html:40
+#: templates/events/event_detail.html:39
 msgid "tourney"
 msgstr "Turnier"
 
-#: templates/events/event_detail.html:40
+#: templates/events/event_detail.html:39
 msgid "other rules apply here"
 msgstr "hier gelten andere Regeln"
 
-#: templates/events/event_detail.html:48
+#: templates/events/event_detail.html:47
 msgid "Info"
 msgstr "Info"
 
-#: templates/events/event_detail.html:51
+#: templates/events/event_detail.html:50
 msgid "Mai-Star Games"
 msgstr "Mai-Star Spiele"
 
-#: templates/events/event_detail.html:54
+#: templates/events/event_detail.html:53
 msgid "Tournament Ranking"
 msgstr "Turnier Wertung"
 
-#: templates/events/event_detail.html:75
+#: templates/events/event_detail.html:74 templates/events/event_list.html:24
 msgid "Date"
 msgstr "Datum"
 
-#: templates/events/event_detail.html:91
+#: templates/events/event_detail.html:90
 msgid "Share on Google+"
 msgstr "Auf Google+ teilen"
 
-#: templates/events/event_detail.html:92
+#: templates/events/event_detail.html:91
 msgid "Share on Twitter"
 msgstr "Auf Twitter teilen"
 
-#: templates/events/event_detail.html:93
+#: templates/events/event_detail.html:92
 msgid "Share on Facebook"
 msgstr "Auf Facebook teilen"
 
-#: templates/events/event_detail.html:94
+#: templates/events/event_detail.html:93
 msgid "Show on Google Maps"
 msgstr "Auf Google Maps zeigen"
 
+#: templates/events/event_detail.html:109 templates/events/event_form.html:9
+#: views.py:103
+msgid "Edit Event"
+msgstr "Termin bearbeiten"
+
+#: templates/events/event_detail.html:112
+#, fuzzy
+#| msgid "Date"
+msgid "Add Dates"
+msgstr "Datum"
+
+#: templates/events/event_form.html:9 templates/events/page.html:9
+#: views.py:105
+msgid "Add Event"
+msgstr "Neuer Termin"
+
 #: templates/events/event_form.html:19
 msgid "reset"
 msgstr "Zurücksetzen"
 
 #: templates/events/event_form.html:20
+#: templates/events/eventseries_form.html:30
 msgid "save"
 msgstr "Speichern"
 
@@ -227,13 +221,22 @@ msgstr "Speichern"
 msgid "Upcoming Events"
 msgstr "Bevorstehende Veranstaltungen"
 
-#: templates/events/event_list.html:41
-msgid " Upload"
-msgstr "Hochladen"
+#: templates/events/eventseries_form.html:29
+msgid "back"
+msgstr ""
 
-#: templates/events/page.html:10
-msgid "Add to Google Calendar"
-msgstr "Zu Google Kalender hinzufügen"
+#: views.py:214
+msgid "Event does not exist"
+msgstr "Veranstaltung gibt es nicht"
+
+#~ msgid " Edit"
+#~ msgstr "Bearbeiten"
+
+#~ msgid " Upload"
+#~ msgstr "Hochladen"
+
+#~ msgid "Add to Google Calendar"
+#~ msgstr "Zu Google Kalender hinzufügen"
 
 #~ msgid "left"
 #~ msgstr "Links"

src/events/models.py

@@ -104,6 +104,14 @@ class Event(image_models.ImageModel):
         }
         return reverse('event-detail', kwargs=kwargs)
 
+    def get_eventseries_form_url(self):
+        kwargs = {
+            'pk': self.id,
+            'year': self.start.strftime('%Y'),
+            'month': self.start.strftime('%m')
+        }
+        return reverse('eventseries-form', kwargs=kwargs)
+
     def get_edit_url(self):
         kwargs = {
             'pk': self.id,
@@ -133,19 +141,17 @@ class Event(image_models.ImageModel):
             return None
 
     def save(self, **kwargs):
+        # Fülle fehlende Felder mit den Angaben der Hauptveranstaltung aus.
         if self.event_series:
             master_event = self.event_series
-            self.description = master_event.description
+            self.name = self.name or master_event.name
+            self.description = self.description or master_event.description
             self.location = master_event.location
             self.url = master_event.url
-            self.image = master_event.image
+            self.image = self.image or master_event.image
         self.photo_count = self.photo_set.count()
         super(Event, self).save(**kwargs)
 
-        # Update the rest of the event series:
-        for sub_event in Event.objects.filter(event_series=self):
-            sub_event.save()
-
         # Update the Hanchans if necesery:
         for hanchan in self.hanchan_set.all():
             hanchan.save()

src/events/templates/events/event_archive.html

@@ -50,9 +50,10 @@
     <p>{{event.description|truncatewords_html:20}}</p>
     <ul class="info">
         <li><span class="fa fa-map-marker" title="{% trans 'Location' %}"></span> {{ event.location }}</li>
-        <li><a href="{{event.get_absolute_url}}#comments"><span class="fa fa-comments" title="{% trans 'Comments' %}"></span> {{ comment_count }}</a></li>
-        <li><a href="{% url 'event-photo-list' event.pk %}"><span class="fa fa-picture-o" title="{% trans 'Photos' %}"></span> {{ event.photo_count }}</a></li>
-        <li><a href="{% url 'event-hanchan-list' event.pk %}"><span class="fa fa-table" title="{% trans 'Hanchans' %}"></span> {{ event.hanchan_set.count }} {% trans 'Hanchans' %}</a></li>
+        <li><span class="fa fa-comments" title="{% trans 'Comments' %}"></span> <a href="{{event.get_absolute_url}}#comments">{{ comment_count }}</a></li>
+        <li><span class="fa fa-camera-retro" title="{% trans 'Photos' %}"></span> <a href="{% url 'event-photo-list' event.pk %}">{{ event.photo_count }}</a></li>
+        <li><span class="fa fa-table" title="{% trans 'Hanchans' %}"></span> <a href="{% url 'event-hanchan-list' event.pk %}">{{ event.hanchan_set.count }}</a></li>
+        <li><span class="fa fa-glass" title="{% trans 'Hanchans' %}"></span> <a href="{% url 'maistar-game-list' event.pk %}">{{ event.maistargame_set.count }}</a></li>
     </ul>
     {% if perms.events.change_event %}
     <p class="right"><a href="{{ event.get_edit_url }}" class="button"><span class="fa fa-pencil"></span></a></p>

src/events/templates/events/event_detail.html

@@ -108,6 +108,9 @@
   {% if perms.events.change_event %}
     <a class="button" href="{{ event.get_edit_url }}"><span class="fa fa-pencil"></span> {% trans "Edit Event" %}</a>
   {% endif %}
+  {% if perms.events.add_event %}
+    <a class="button" href="{{ event.get_eventseries_form_url }}"><span class="fa fa-calendar-plus-o"></span> {% trans "Add Dates" %}</a>
+  {% endif %}
 {% endblock %}
 
 {% block javascript %}

src/events/templates/events/event_list.html

@@ -5,44 +5,30 @@
 {% block teaser%}<h2>{% trans "Upcoming Events" %}</h2>{% endblock %}
 {% block maincontent %}
 
-{% for event in event_list %}
-{% ifchanged %}<h3 class="grid_12">{{ event.start|date:'F Y' }}</h3>{% endifchanged %}
+{% regroup event_list by start|date:'F Y' as month_list %}
+{% for month in month_list %}
+    <h3 class="grid_12">{{ month.grouper }}</h3>
+    {% for event in month.list %}
         {% get_comment_count for event as comment_count %}
-    <a href="{{ event.get_absolute_url }}" class="grid_2"><img src="{{ event.get_thumbnail.url }}" alt=" {% trans 'Event Image' %}"
-                                                class="thumbnail"/></a>
-    <div class="grid_4" style="min-height:160px">
-        <h4><a href="{{ event.get_absolute_url }}">{{ event.name }}</a>
-            <sup>
-            {{ event.start|date:'SHORT_DATE_FORMAT' }}
-            {% if event.end %}
-            {% trans "from" %} {{ event.start|time:'H:i' }} {% trans "to" %} {{ event.end|time:'H:i' }}
-            {% else %}
-            {{ event.start|time:'H:i' }}
-            {% endif %}
-            </sup>
-        </h4>
-        <p>{{event.description|truncatewords_html:20}}</p>
-        <ul class="info">
-        <li>
-            <span class="fa fa-map-marker" title="{% trans 'Location' %}"></span>
-            {{ event.location }}
-        </li>
-        <li>
-            <span class="fa fa-comments" title="{% trans 'Comments' %}"></span>
-            <a href="{{event.get_absolute_url}}#comments">{{ comment_count }}</a>
-        </li>
-    </ul>
-    <p class="right">
+        <a href="{{ event.get_absolute_url }}" class="grid_2"><img
+           src="{{ event.get_thumbnail.url }}" alt=" {% trans 'Event Image' %}"  class="thumbnail"/></a>
+        <div class="grid_4">
             {% if perms.events.change_event %}
-        <a href="{{ event.get_edit_url }}" class="button"><span class="fa fa-pencil"></span></a>
+            <a href="{{ event.get_edit_url }}" class="button" style="float:right"><span class="fa fa-pencil"></span></a>
             {% endif %}
             {% if perms.events.add_photo %}
-        <a href="{% url 'event-photo-list' event.pk %}" class="button"><span class="fa fa-file-picture-o"></span></a>
+            <a href="{% url 'event-photo-list' event.pk %}" class="button" style="float:right"><span class="fa fa-camera-retro"></span></a>
             {% endif %}
-    </p>
+            <h4><a href="{{ event.get_absolute_url }}">{{ event.name }}</a></h4>
+            <ul class="info">
+                <li><span class="fa fa-calendar-o" title="{% trans 'Date' %}"></span> <time datetime="{{event.start|date:'c'}}">{{ event.start|date:'SHORT_DATE_FORMAT' }}</time></li>
+                <li><span class="fa fa-map-marker" title="{% trans 'Location' %}"></span> {{ event.location }}</li>
+                <li><span class="fa fa-comments" title="{% trans 'Comments' %}"></span> <a href="{{event.get_absolute_url}}#comments">{{ comment_count }}</a></li>
+            </ul>
+            <p>{{event.description|truncatewords_html:20}}</p>
         </div>
+        {% if forloop.counter|divisibleby:2 %}<br class="clear">{% endif %}
+    {% endfor %}
 {% endfor %}
-
 {% if page_obj.has_other_pages %}{% include 'paginator.html' %}{% endif %}
-
 {% endblock %}

src/events/templates/events/eventseries_form.html

@@ -0,0 +1,40 @@
+{% extends "events/event_detail.html" %}
+{% load i18n django_markdown comments %}
+
+{% block title %}{{ event.name }}{% endblock %}
+
+{% block teaser %}
+  <h1>{{event.name}}</h1>
+  {% if event.description %}
+  <div id="teaser_text">{{event.description|markdown|truncatewords_html:75}}</div>
+  {% endif %}
+{% endblock %}
+
+{% block event_content %}
+<h3>Hier kommt eine Tabelle rein!</h3>
+<form class="grid_12" method="post">
+  {% csrf_token %}
+  {{ formset.management_form }}
+  <table>
+    {% for form in formset %}
+      {% if forloop.counter = 1 %}
+        <tr>{% for field in form.visible_fields %}<th>{{field.label_tag}}</th>{% endfor %}<th></th></tr>
+      {% endif %}
+      <tr>
+        {% for field in form.visible_fields %}<td class="{{field.css_classes}}">{{field}} {% for error in field.errors %}<br />{{error}}{% endfor %}</td>{% endfor %}
+        <td width="*">{{form.id}}</td>
+      </tr>
+    {% endfor %}
+    <tfoot><tr><td colspan="4" class="buttonbar">
+      <a href="{{ event.get_absolute_url }}" class="button"><span class="fa fa-undo"></span> {% trans 'back' %}</a>
+      <button type="submit"><span class="fa fa-hdd-o"></span> {% trans 'save' %}</button>
+    </td></tr></tfoot>
+  </table>
+</form>
+{% endblock %}
+
+{% block comments %}{% endblock %}
+
+{% block buttonbar %}
+{% endblock %}
+

src/events/templates/events/page.html

@@ -3,13 +3,6 @@
 
 {% block title %}{{page.title}}{% endblock %}
 
-
-{% block sidebar %}
- <a href="http://www.google.com/calendar/render?cid=https%3A%2F%2Fkasu.at%2Fevents.ics"
-    target="_blank"><img src="http://www.google.com/calendar/images/ext/gc_button6.gif"
-                         alt="{% trans 'Add to Google Calendar' %}"></a>
-{% endblock %}
-
 {% block additional_buttonbar %}
 {% if perms.events.add_event %}
   <a href="{% url 'event-form' %}" class="button">

src/events/urls.py

@@ -12,6 +12,8 @@ urlpatterns = patterns(
         name='event-archive'),
     url(r'^(?P<year>[\d]{4})/(?P<month>[\d]+)/(?P<pk>[\d]+)/$',
         EventDetail.as_view(), name='event-detail'),
+    url(r'^(?P<year>[\d]{4})/(?P<month>[\d]+)/(?P<pk>[\d]+)/add_dates/$',
+        EventSeriesForm.as_view(), name='eventseries-form'),
     url(r'^(?P<year>[\d]{4})/(?P<month>[\d]+)/(?P<pk>[\d]+)/edit/$',
         EventForm.as_view(), name='event-form'),
     url(r'^add/$', EventForm.as_view(), name='event-form'),

src/events/views.py

@@ -5,6 +5,7 @@ from datetime import timedelta
 from django.contrib.auth.decorators import permission_required
 from django.contrib.auth import get_user_model
 from django.core.urlresolvers import reverse
+from extra_views import ModelFormSetView, InlineFormSetView
 from django.http import HttpResponse, Http404
 from django.shortcuts import redirect
 from django.utils import timezone
@@ -93,6 +94,7 @@ class EventDetailMixin(object):
 
 class EventForm(PermissionRequiredMixin, generic.UpdateView):
     form_class = forms.EventForm
+    template_name = 'events/event_form.html'
     permission_required = 'events.add_event'
 
     def get_context_data(self, **kwargs):
@@ -110,15 +112,28 @@ class EventForm(PermissionRequiredMixin, generic.UpdateView):
         @param queryset:
         """
         if self.kwargs.get('pk'):
-            event = models.Event.objects.get(pk=self.kwargs['pk'])
-            if event.event_series:
-                return event.event_series
-            else:
-                return event
+            return models.Event.objects.get(pk=self.kwargs['pk'])
         else:
             return models.Event()
 
 
+class EventSeriesForm(EventDetailMixin, PermissionRequiredMixin, InlineFormSetView):
+    model = models.Event
+    inline_model = models.Event
+    fk_name = 'event_series'
+    fields = ('start', 'end')
+    form_class = forms.EventForm
+    extra = 3
+    permission_required = 'events.add_event'
+    template_name = 'events/eventseries_form.html'
+
+    def get_object(self, queryset=None):
+        self.event = models.Event.objects.get(pk=self.kwargs['pk'])
+        if self.event.event_series:
+            self.event = self.event.event_series
+        return self.event
+
+
 class EventGallery(generic.ListView):
     template_name = 'events/photo_gallery.html'
     queryset = models.Event.objects.filter(start__lt=timezone.now(),

src/kasu/image_models.py

@@ -24,15 +24,15 @@ CHOICES_VERTICAL = (
 
 
 class ArticleImage(imagekit.ImageSpec):
-    format = 'PNG'
+    format = 'JPEG'
     width = 200
     height = 120
-    processors = [SmartResize(width=200, height=120)]
+    processors = [ResizeToFill(width=200, height=120, anchor=(0, 0.5))]
 
 
 class CalloutImage(imagekit.ImageSpec):
     format = 'JPEG'
-    width = 660
+    width = 941
     height = 300
 
     @property
@@ -52,13 +52,13 @@ class CalloutImage(imagekit.ImageSpec):
 
 
 class DisplayImage(imagekit.ImageSpec):
-    format = 'PNG'
+    format = 'JPEG'
     processors = [Transpose(),
                   ResizeToFit(width=940, height=940, upscale=False)]
 
 
 class ThumbnailImage(CalloutImage):
-    format = 'PNG'
+    format = 'JPEG'
     width = 140
     height = 140
 

src/kasu/locale/de/LC_MESSAGES/django.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kasu.utils\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2015-01-05 19:23+0100\n"
-"PO-Revision-Date: 2015-08-04 23:47+0100\n"
-"Last-Translator: Christian Berg <xeniac@posteo.at>\n"
+"POT-Creation-Date: 2015-08-16 11:34+0200\n"
+"PO-Revision-Date: 2015-08-16 11:38+0200\n"
+"Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
 "Language-Team: Kasu <verein@kasu.at>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 1.6.11\n"
+"X-Generator: Poedit 1.8.3\n"
 "X-Translated-Using: django-rosetta 0.7.6\n"
 
 #: image_models.py:14
@@ -43,6 +43,355 @@ msgstr "Mitte"
 msgid "bottom"
 msgstr "Unten"
 
+#: settings/base.py:75
+msgid "German"
+msgstr "Deutsch"
+
+#: settings/base.py:76
+msgid "English"
+msgstr "Englisch"
+
+#: templates/404.html:8
+msgid "The page your requested does not exist on this server."
+msgstr "Die angeforderte Seite existiert auf diesem Server nicht."
+
+#: templates/base.html:21
+msgid "Current News"
+msgstr "Aktuelle Neuigkeiten"
+
+#: templates/base.html:23 templates/index.html:37
+msgid "Recent Comments"
+msgstr "Kürzliche Kommentare"
+
+#: templates/base.html:41
+msgid "Menu"
+msgstr "Menü"
+
+#: templates/base.html:65
+msgid "Current Event"
+msgstr "Aktuelle Veranstaltung"
+
+#: templates/base.html:69
+msgid "Since"
+msgstr "seit"
+
+#: templates/base.html:70 templates/base.html.py:84
+msgid "Start"
+msgstr "Beginn"
+
+#: templates/base.html:73 templates/base.html.py:87
+msgid "Location"
+msgstr "Ort"
+
+#: templates/base.html:78
+msgid "Next Event"
+msgstr "Nächste Veranstaltung"
+
+#: templates/base.html:83
+msgid "in"
+msgstr "in"
+
+#: templates/base.html:89
+msgid "More Details"
+msgstr "Mehr Details"
+
+#: templates/base.html:92
+msgid "Upcoming events"
+msgstr "Bevorstehende Veranstaltungen"
+
+#: templates/base.html:142
+msgid "Edit Page"
+msgstr "Seite bearbeiten"
+
+#: templates/base.html:144
+msgid "Add Subpage"
+msgstr "Unterseite Hinzufügen"
+
+#: templates/base.html:152
+msgid "Imprint"
+msgstr "Impressum"
+
+#: templates/base.html:153
+msgid "contact"
+msgstr "Kontakt"
+
+#: templates/base.html:158
+msgid "Language"
+msgstr "Sprache"
+
+#: templates/base.html:167
+msgid "Go"
+msgstr "Los"
+
+#: templates/base.html:172
+msgid "Logged in as"
+msgstr "Angemeldet als"
+
+#: templates/base.html:174
+msgid "Admin"
+msgstr "Admin"
+
+#: templates/base.html:175
+msgid "Logout"
+msgstr "Abmelden"
+
+#: templates/base.html:177
+msgid "no user logged in"
+msgstr "Niemand angemeldet"
+
+#: templates/base.html:178 templates/comments/form.html:44
+#: templates/registration/login.html:31
+msgid "register"
+msgstr "Registrieren"
+
+#: templates/base.html:179 templates/comments/form.html:45
+#: templates/registration/login.html:6 templates/registration/login.html:8
+#: templates/registration/login.html:37
+msgid "login"
+msgstr "anmelden"
+
+#: templates/base.html:181 templates/registration/login.html:53
+msgid "Login with Facebook"
+msgstr "über Facebook anmelden"
+
+#: templates/base.html:183 templates/registration/login.html:54
+msgid "Login with Twitter"
+msgstr "über Twitter anmelden"
+
+#: templates/base.html:185 templates/registration/login.html:55
+msgid "Login with Google"
+msgstr "über Google anmelden"
+
+#: templates/comments/form.html:5
+msgid "New Comment"
+msgstr "Neuer Kommentar"
+
+#: templates/comments/form.html:20
+msgid "now"
+msgstr "Jetzt"
+
+#: templates/comments/form.html:25
+msgid "Preview"
+msgstr "Vorschau"
+
+#: templates/comments/form.html:26
+msgid "Post"
+msgstr "Schreiben"
+
+#: templates/comments/form.html:35
+msgid "not logged in"
+msgstr "Nicht angemeldet"
+
+#: templates/comments/form.html:39
+msgid "Register now, or Login to leave a comment here."
+msgstr "Jetzt registrieren, oder anmelden um einen Kommentar zu schreiben."
+
+#: templates/comments/list.html:2 templates/index.html:24
+msgid "Comments"
+msgstr "Kommentare"
+
+#: templates/comments/posted.html:4 templates/comments/posted.html.py:7
+msgid "Thank you for your comment"
+msgstr "Danke für deinen Kommentar."
+
+#: templates/comments/preview.html:4 templates/comments/preview.html.py:6
+msgid "Preview your comment"
+msgstr "Vorschau deines Kommentars"
+
+#: templates/comments/preview.html:10
+msgid "Please correct the error below"
+msgid_plural "Please correct the errors below"
+msgstr[0] "Bitte den Fehler weiter unten beheben"
+msgstr[1] "Bitte die Fehler weiter unten beheben"
+
+#: templates/index.html:4
+msgid "traditional Asian game culture"
+msgstr "traditionelle asiatische Spielkultur"
+
+#: templates/index.html:30
+msgid "Read More"
+msgstr "Mehr lesen"
+
+#: templates/index.html:42
+#, python-format
+msgid ""
+"\n"
+"                From <a href=\"%(user_link)s\">%(author)s</a> in\n"
+"                <a href=\"%(comment_link)s\">&ldquo;%(object)s&rdquo;</a>\n"
+"                since\n"
+"                <time datetime=\"%(submit_date)s\">%(since)s</time>\n"
+"                "
+msgstr ""
+"\n"
+"Von <a href=\"%(user_link)s\">%(author)s</a> in\n"
+"                <a href=\"%(comment_link)s\">&ldquo;%(object)s&rdquo;</a>\n"
+"                seit\n"
+"                <time datetime=\"%(submit_date)s\">%(since)s</time>\n"
+"                "
+
+#: templates/index.html:54
+msgid "Kasu in the social network"
+msgstr "Kasu im sozialem Netzwerk"
+
+#: templates/index.html:58 templates/index.html.py:60 templates/index.html:62
+msgid "Visit us on"
+msgstr "Besuche uns auf"
+
+#: templates/index.html:71
+msgid "Add Article"
+msgstr "Artikel hinzufügen"
+
+#: templates/paginator.html:4
+msgid "Previous"
+msgstr "Vorherige"
+
+#: templates/paginator.html:6
+msgid "Prev"
+msgstr "Vorherige"
+
+#: templates/paginator.html:16 templates/paginator.html.py:18
+msgid "Next"
+msgstr "Nächste"
+
+#: templates/registration/login.html:15
+msgid "Have you already registered?"
+msgstr "Bereits registriert?"
+
+#: templates/registration/login.html:16
+msgid ""
+"\n"
+"<p>As a registered member you can:</p>\n"
+"<ul>\n"
+" <li>leave comments on this page.</li>\n"
+" <li>subscribe to our Newsletter</li>\n"
+" <li>apply to a membership to our club</li>\n"
+" <li>club-members have access to our ranking-system</li>\n"
+"</ul>\n"
+msgstr ""
+"\n"
+"<p>Als registiertes Mitglied kannst du:</p>\n"
+"<ul>\n"
+"<li>Kommentare auf dieser Seite schreiben.</li>\n"
+"<li>Unserem Newsletter beitreten</li>\n"
+"<li>Clubmitglied werden</li>\n"
+"<li>Clubmitglieder haben auch Zugang zu unserem Ranking System</li>\n"
+"</ul>\n"
+
+#: templates/registration/login.html:25
+msgid ""
+"\n"
+"<p>You can register here with your Google, or Facebook account.\n"
+"If you don't own such an account, or do not want to use it for "
+"authentication,\n"
+"you can fill out our registration form.</p>\n"
+msgstr ""
+"\n"
+"<p>Du kannst dich hier mit deinen Google, Twitter, oder Facebook Account "
+"anmelden. Wenn du so etwas nicht besitzt, oder es nicht für die Anmeldung "
+"verwenden möchtest, kannst du auch unser Registrierungsformular verwenden.</"
+"p>\n"
+
+#: templates/registration/login.html:41
+msgid "Your username and password didn't match. Please try again."
+msgstr ""
+"Benutzername und Passwort haben nicht gepasst. Bitte noch einmal versuchen."
+
+#: templates/registration/login.html:44
+msgid "Forgot your Password?"
+msgstr "Passwort vergessen?"
+
+#: templates/registration/login.html:46
+#: templates/registration/password_reset_complete.html:13
+msgid "Login"
+msgstr "Anmelden"
+
+#: templates/registration/login.html:52
+msgid "or login with an existing Account"
+msgstr "oder mit einem bestehenden Account anmelden"
+
+#: templates/registration/password_change_done.html:4
+#: templates/registration/password_change_done.html:7
+msgid "Password change successful"
+msgstr "Passwort erfolgreich geändert"
+
+#: templates/registration/password_change_done.html:8
+msgid "Your password was changed."
+msgstr "Dein Passwort wurde geändert."
+
+#: templates/registration/password_change_form.html:4
+#: templates/registration/password_change_form.html:9
+#: templates/registration/password_change_form.html:16
+msgid "Password change"
+msgstr "Passwort ändern"
+
+#: templates/registration/password_change_form.html:10
+msgid ""
+"Please enter your old password, for security's sake, and then enter your new "
+"password twice so we can verify you typed it in correctly."
+msgstr ""
+"Bitte gebe aus Sicherheitsgründen den altes Passwort an und anschließend 2x "
+"das neue Passwort, so können wir sicher gehen das du es korrekt eingegeben "
+"hast."
+
+#: templates/registration/password_change_form.html:23
+msgid "Change Password"
+msgstr "Passwort ändern"
+
+#: templates/registration/password_reset_complete.html:4
+#: templates/registration/password_reset_complete.html:6
+#: templates/registration/password_reset_complete.html:9
+msgid "Password reset complete"
+msgstr "Passwort fertig zurückgesetzt"
+
+#: templates/registration/password_reset_complete.html:10
+msgid "Your password has been set.  You may go ahead and log in now."
+msgstr "Dein Passwort wurde geändert. Du kannst dich nun damit anmelden."
+
+#: templates/registration/password_reset_confirm.html:4
+#: templates/registration/password_reset_confirm.html:6
+#: templates/registration/password_reset_confirm.html:15
+msgid "Enter new password"
+msgstr "Neues Passwort eingeben"
+
+#: templates/registration/password_reset_confirm.html:12
+msgid ""
+"Please enter your new password twice so we can verify you typed it in "
+"correctly."
+msgstr ""
+"Bitte gib das neue Passwort 2x ein, so können wir sicher sein das du es "
+"korrekt eingegeben hast."
+
+#: templates/registration/password_reset_confirm.html:18
+msgid "Change my password"
+msgstr "Mein Passwort ändern"
+
+#: templates/registration/password_reset_confirm.html:26
+msgid "Password reset unsuccessful"
+msgstr "Passwort nicht erfolgreich zurückgesetzt"
+
+#: templates/registration/password_reset_confirm.html:27
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a new password reset."
+msgstr ""
+"Der Link zum zurücksetzen des Passwortes ist ungültig, da er schon einmal "
+"verwendet wurde. Bitte veranlasse eine erneute Zurücksetzung."
+
+#: templates/registration/password_reset_done.html:4
+#: templates/registration/password_reset_done.html:6
+#: templates/registration/password_reset_done.html:12
+msgid "Password reset successful"
+msgstr "Passwort erfolgreich zurückgesetzt"
+
+#: templates/registration/password_reset_form.html:4
+#: templates/registration/password_reset_form.html:6
+msgid "Password reset"
+msgstr "Passwort zurücksetzen"
+
+#: templates/registration/password_reset_form.html:21
+msgid "Transmit"
+msgstr "Übertragen"
+
 #: utils.py:19
 msgid "United Kingdom"
 msgstr "Vereinigtes Königreich"
@@ -1027,373 +1376,26 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: utils.py:269
+#: utils.py:270
 msgid "Rejected"
 msgstr "Zurückgewiesen"
 
-#: utils.py:270
+#: utils.py:271
 msgid "Waiting..."
 msgstr "Wartend..."
 
-#: utils.py:271
+#: utils.py:272
 msgid "Published"
 msgstr "Veröffentlicht"
 
-#: settings/base.py:85
-msgid "German"
-msgstr "Deutsch"
+#~ msgid "Created on"
+#~ msgstr "Erstellt am"
 
-#: settings/base.py:86
-msgid "English"
-msgstr "Englisch"
+#~ msgid "Author"
+#~ msgstr "Autor"
 
-#: templates/404.html:8
-msgid "The page your requested does not exist on this server."
-msgstr "Die angeforderte Seite existiert auf diesem Server nicht."
-
-#: templates/base.html:23
-msgid "Current News"
-msgstr "Aktuelle Neuigkeiten"
-
-#: templates/base.html:25 templates/index.html:44
-msgid "Recent Comments"
-msgstr "Kürzliche Kommentare"
-
-#: templates/base.html:42
-msgid "Menu"
-msgstr "Menü"
-
-#: templates/base.html:57
-msgid "Current Event"
-msgstr "Aktuelle Veranstaltung"
-
-#: templates/base.html:60
-msgid "Since"
-msgstr "seit"
-
-#: templates/base.html:61 templates/base.html.py:72
-msgid "Start"
-msgstr "Beginn"
-
-#: templates/base.html:62 templates/base.html.py:73
-msgid "Location"
-msgstr "Ort"
-
-#: templates/base.html:64 templates/base.html.py:75
-msgid "More Details"
-msgstr "Mehr Details"
-
-#: templates/base.html:67
-msgid "Next Event"
-msgstr "Nächste Veranstaltung"
-
-#: templates/base.html:71
-msgid "in"
-msgstr "in"
-
-#: templates/base.html:78
-msgid "Upcoming events"
-msgstr "Bevorstehende Veranstaltungen"
-
-#: templates/base.html:127
-msgid "Edit Page"
-msgstr "Seite bearbeiten"
-
-#: templates/base.html:129
-msgid "Add Subpage"
-msgstr "Unterseite Hinzufügen"
-
-#: templates/base.html:138
-msgid "Imprint"
-msgstr "Impressum"
-
-#: templates/base.html:139
-msgid "contact"
-msgstr "Kontakt"
-
-#: templates/base.html:144
-msgid "Language"
-msgstr "Sprache"
-
-#: templates/base.html:153
-msgid "Go"
-msgstr "Los"
-
-#: templates/base.html:158
-msgid "Logged in as"
-msgstr "Angemeldet als"
-
-#: templates/base.html:160
-msgid "Admin"
-msgstr "Admin"
-
-#: templates/base.html:161
-msgid "Logout"
-msgstr "Abmelden"
-
-#: templates/base.html:163
-msgid "no user logged in"
-msgstr "Niemand angemeldet"
-
-#: templates/base.html:164 templates/comments/form.html:46
-#: templates/registration/login.html:32 templates/registration/login.html:33
-msgid "register"
-msgstr "Registrieren"
-
-#: templates/base.html:165 templates/comments/form.html:47
-#: templates/registration/login.html:6 templates/registration/login.html:8
-#: templates/registration/login.html:39
-msgid "login"
-msgstr "anmelden"
-
-#: templates/base.html:166 templates/registration/login.html:58
-msgid "Login with Facebook"
-msgstr "über Facebook anmelden"
-
-#: templates/base.html:167 templates/registration/login.html:59
-msgid "Login with Twitter"
-msgstr "über Twitter anmelden"
-
-#: templates/base.html:168 templates/registration/login.html:60
-msgid "Login with Google"
-msgstr "über Google anmelden"
-
-#: templates/index.html:7
-msgid "traditional Asian game culture"
-msgstr "traditionelle asiatische Spielkultur"
-
-#: templates/index.html:21 templates/index.html.py:22
-msgid "Created on"
-msgstr "Erstellt am"
-
-#: templates/index.html:25 templates/index.html.py:26
-msgid "Author"
-msgstr "Autor"
-
-#: templates/index.html:28 templates/index.html.py:30
-#: templates/comments/list.html:2
-msgid "Comments"
-msgstr "Kommentare"
-
-#: templates/index.html:29
-msgid "comments"
-msgstr "Kommentare"
-
-#: templates/index.html:36
-msgid "Read More"
-msgstr "Mehr lesen"
-
-#: templates/index.html:50
-#, python-format
-msgid ""
-"\n"
-"                From <a href=\"%(user_link)s\">%(author)s</a> in\n"
-"                <a href=\"%(comment_link)s\">&ldquo;%(object)s&rdquo;</a>\n"
-"                since\n"
-"                <time datetime=\"%(submit_date)s\">%(since)s</time>\n"
-"                "
-msgstr ""
-"\n"
-"Von <a href=\"%(user_link)s\">%(author)s</a> in\n"
-"                <a href=\"%(comment_link)s\">&ldquo;%(object)s&rdquo;</a>\n"
-"                seit\n"
-"                <time datetime=\"%(submit_date)s\">%(since)s</time>\n"
-"                "
-
-#: templates/index.html:62
-msgid "Kasu in the social network"
-msgstr "Kasu im sozialem Netzwerk"
-
-#: templates/index.html:66 templates/index.html.py:68 templates/index.html:71
-msgid "Visit us on"
-msgstr "Besuche uns auf"
-
-#: templates/index.html:81
-msgid "Add Article"
-msgstr "Artikel hinzufügen"
-
-#: templates/paginator.html:4
-msgid "Previous"
-msgstr "Vorherige"
-
-#: templates/paginator.html:6
-msgid "Prev"
-msgstr "Vorherige"
-
-#: templates/paginator.html:16 templates/paginator.html.py:18
-msgid "Next"
-msgstr "Nächste"
-
-#: templates/comments/form.html:5
-msgid "New Comment"
-msgstr "Neuer Kommentar"
-
-#: templates/comments/form.html:19
-msgid "now"
-msgstr "Jetzt"
-
-#: templates/comments/form.html:25
-msgid "Preview"
-msgstr "Vorschau"
-
-#: templates/comments/form.html:28
-msgid "Post"
-msgstr "Schreiben"
-
-#: templates/comments/form.html:37
-msgid "not logged in"
-msgstr "Nicht angemeldet"
-
-#: templates/comments/form.html:41
-msgid "Register now, or Login to leave a comment here."
-msgstr "Jetzt registrieren, oder anmelden um einen Kommentar zu schreiben."
-
-#: templates/comments/posted.html:4 templates/comments/posted.html.py:7
-msgid "Thank you for your comment"
-msgstr "Danke für deinen Kommentar."
-
-#: templates/comments/preview.html:4 templates/comments/preview.html.py:10
-msgid "Preview your comment"
-msgstr "Vorschau deines Kommentars"
-
-#: templates/comments/preview.html:8
-msgid "Please correct the error below"
-msgid_plural "Please correct the errors below"
-msgstr[0] "Bitte den Fehler weiter unten beheben"
-msgstr[1] "Bitte die Fehler weiter unten beheben"
-
-#: templates/registration/login.html:15
-msgid "Have you already registered?"
-msgstr "Bereits registriert?"
-
-#: templates/registration/login.html:16
-msgid ""
-"\n"
-"<p>As a registered member you can:</p>\n"
-"<ul>\n"
-" <li>leave comments on this page.</li>\n"
-" <li>subscribe to our Newsletter</li>\n"
-" <li>apply to a membership to our club</li>\n"
-" <li>club-members have access to our ranking-system</li>\n"
-"</ul>\n"
-msgstr ""
-"\n"
-"<p>Als registiertes Mitglied kannst du:</p>\n"
-"<ul>\n"
-"<li>Kommentare auf dieser Seite schreiben.</li>\n"
-"<li>Unserem Newsletter beitreten</li>\n"
-"<li>Clubmitglied werden</li>\n"
-"<li>Clubmitglieder haben auch Zugang zu unserem Ranking System</li>\n"
-"</ul>\n"
-
-#: templates/registration/login.html:25
-msgid ""
-"\n"
-"<p>You can register here with your Google, or Facebook account.\n"
-"If you don't own such an account, or do not want to use it for authentication,\n"
-"you can fill out our registration form.</p>\n"
-msgstr ""
-"\n"
-"<p>Du kannst dich hier mit deinen Google, Twitter, oder Facebook Account anmelden. Wenn du so etwas nicht besitzt, oder es nicht für die Anmeldung verwenden möchtest, kannst du auch unser Registrierungsformular verwenden.</p>\n"
-
-#: templates/registration/login.html:43
-msgid "Your username and password didn't match. Please try again."
-msgstr ""
-"Benutzername und Passwort haben nicht gepasst. Bitte noch einmal versuchen."
-
-#: templates/registration/login.html:46
-msgid "Forgot your Password?"
-msgstr "Passwort vergessen?"
-
-#: templates/registration/login.html:49
-#: templates/registration/password_change_form.html:23
-#: templates/registration/password_reset_complete.html:14
-#: templates/registration/password_reset_complete.html:15
-msgid "Login"
-msgstr "Anmelden"
-
-#: templates/registration/login.html:56
-msgid "or login with an existing Account"
-msgstr "oder mit einem bestehenden Account anmelden"
-
-#: templates/registration/password_change_done.html:4
-#: templates/registration/password_change_done.html:7
-msgid "Password change successful"
-msgstr "Passwort erfolgreich geändert"
-
-#: templates/registration/password_change_done.html:8
-msgid "Your password was changed."
-msgstr "Dein Passwort wurde geändert."
-
-#: templates/registration/password_change_form.html:4
-#: templates/registration/password_change_form.html:9
-#: templates/registration/password_change_form.html:16
-msgid "Password change"
-msgstr "Passwort ändern"
-
-#: templates/registration/password_change_form.html:10
-msgid ""
-"Please enter your old password, for security's sake, and then enter your new"
-" password twice so we can verify you typed it in correctly."
-msgstr ""
-"Bitte gebe aus Sicherheitsgründen den altes Passwort an und anschließend 2x "
-"das neue Passwort, so können wir sicher gehen das du es korrekt eingegeben "
-"hast."
-
-#: templates/registration/password_change_form.html:23
-msgid "Change Password"
-msgstr "Passwort ändern"
-
-#: templates/registration/password_reset_complete.html:4
-#: templates/registration/password_reset_complete.html:6
-#: templates/registration/password_reset_complete.html:9
-msgid "Password reset complete"
-msgstr "Passwort fertig zurückgesetzt"
-
-#: templates/registration/password_reset_complete.html:10
-msgid "Your password has been set.  You may go ahead and log in now."
-msgstr "Dein Passwort wurde geändert. Du kannst dich nun damit anmelden."
-
-#: templates/registration/password_reset_confirm.html:4
-#: templates/registration/password_reset_confirm.html:6
-#: templates/registration/password_reset_confirm.html:15
-msgid "Enter new password"
-msgstr "Neues Passwort eingeben"
-
-#: templates/registration/password_reset_confirm.html:12
-msgid ""
-"Please enter your new password twice so we can verify you typed it in "
-"correctly."
-msgstr ""
-"Bitte gib das neue Passwort 2x ein, so können wir sicher sein das du es "
-"korrekt eingegeben hast."
-
-#: templates/registration/password_reset_confirm.html:18
-msgid "Change my password"
-msgstr "Mein Passwort ändern"
-
-#: templates/registration/password_reset_confirm.html:26
-msgid "Password reset unsuccessful"
-msgstr "Passwort nicht erfolgreich zurückgesetzt"
-
-#: templates/registration/password_reset_confirm.html:27
-msgid ""
-"The password reset link was invalid, possibly because it has already been "
-"used.  Please request a new password reset."
-msgstr ""
-"Der Link zum zurücksetzen des Passwortes ist ungültig, da er schon einmal "
-"verwendet wurde. Bitte veranlasse eine erneute Zurücksetzung."
-
-#: templates/registration/password_reset_done.html:4
-#: templates/registration/password_reset_done.html:6
-#: templates/registration/password_reset_done.html:12
-msgid "Password reset successful"
-msgstr "Passwort erfolgreich zurückgesetzt"
-
-#: templates/registration/password_reset_form.html:4
-#: templates/registration/password_reset_form.html:6
-msgid "Password reset"
-msgstr "Passwort zurücksetzen"
+#~ msgid "comments"
+#~ msgstr "Kommentare"
 
 #~ msgid "Log in"
 #~ msgstr "Anmelden"

src/kasu/logging.conf

@@ -1,34 +0,0 @@
-[loggers]
-keys=root,doloto.pystories
-
-[handlers]
-keys=consoleHandler,rfileHandler
-
-[formatters]
-keys=simpleFormatter
-
-[logger_doloto.pystories]
-level=DEBUG
-handlers=consoleHandler,rfileHandler
-qualname=doloto
-propagate=0
-
-[logger_root]
-level=DEBUG
-handlers=consoleHandler,rfileHandler
-
-[handler_consoleHandler]
-class=StreamHandler
-level=DEBUG
-formatter=simpleFormatter
-args=(sys.stdout,)
-
-[handler_rfileHandler]
-class=handlers.RotatingFileHandler
-level=DEBUG
-formatter=simpleFormatter
-args=(%(log_path)s,'a',50000,5)
-
-[formatter_simpleFormatter]
-format=%(asctime)s - %(name)s - %(levelname)s - %(message)s
-datefmt=