From fcb15c7e7efa5a0f7479423b700a6e67c5ef2e19 Mon Sep 17 00:00:00 2001 From: Christian Berg Date: Sat, 18 Feb 2017 16:15:35 +0100 Subject: [PATCH] * Aktelle Vorlagen in den src Ordner verschoben, damit sie in der Versionierung enthalten sind. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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. --- .../templates/content/article_archive.html | 0 .../content/article_archive_month.html | 0 .../content/article_archive_year.html | 0 .../templates/content/article_detail.html | 0 .../templates/content/article_form.html | 23 ++-- src/content/templates/content/clear_page.html | 0 src/content/templates/content/page.html | 0 src/content/templates/content/page_form.html | 23 ++-- src/content/templates/content/page_pdf.html | 0 .../templates/events/event_archive.html | 0 src/events/templates/events/event_detail.html | 118 ++++++++++-------- src/events/templates/events/event_form.html | 0 src/events/templates/events/event_list.html | 2 +- src/events/templates/events/event_site.html | 0 .../templates/events/eventseries_form.html | 8 +- src/events/templates/events/page.html | 4 +- .../events/photo_confirm_delete.html | 0 src/events/templates/events/photo_detail.html | 17 ++- .../templates/events/photo_gallery.html | 0 src/events/templates/events/photo_list.html | 0 src/events/templates/events/photo_upload.html | 0 src/kasu/settings.py | 4 +- src/kasu/templates/base.html | 22 +++- src/kasu/templates/comments/form.html | 0 src/kasu/templates/comments/list.html | 0 src/kasu/templates/comments/posted.html | 0 src/kasu/templates/comments/preview.html | 0 src/kasu/urls.py | 6 +- .../mahjong_ranking/eventhanchan_list.html | 0 .../mahjong_ranking/eventranking_list.html | 0 .../hanchan_confirm_delete.html | 0 .../mahjong_ranking/hanchan_form.html | 46 ++++--- .../mahjong_ranking/kyudanranking_list.html | 24 ++-- .../mahjong_ranking/ladder_redbox.html | 0 .../templates/mahjong_ranking/page.html | 0 .../mahjong_ranking/player_dan_score.html | 0 .../mahjong_ranking/player_invalid_score.html | 0 .../mahjong_ranking/player_kyu_score.html | 0 .../mahjong_ranking/player_ladder_score.html | 0 .../mahjong_ranking/seasonranking_list.html | 0 .../templates/maistar_ranking/game_form.html | 0 .../templates/maistar_ranking/game_list.html | 0 .../hanchan_confirm_delete.html | 0 .../templates/maistar_ranking/page.html | 0 .../maistar_ranking/player_game_list.html | 0 .../maistar_ranking/ranking_list.html | 0 .../templates/registration/login.html | 103 ++++++++------- .../registration/password_change_done.html | 0 .../registration/password_change_form.html | 0 .../registration/password_reset_complete.html | 0 .../registration/password_reset_confirm.html | 0 .../registration/password_reset_done.html | 0 .../registration/password_reset_form.html | 0 53 files changed, 226 insertions(+), 174 deletions(-) mode change 100644 => 100755 src/content/templates/content/article_archive.html mode change 100644 => 100755 src/content/templates/content/article_archive_month.html mode change 100644 => 100755 src/content/templates/content/article_archive_year.html mode change 100644 => 100755 src/content/templates/content/article_detail.html mode change 100644 => 100755 src/content/templates/content/article_form.html mode change 100644 => 100755 src/content/templates/content/clear_page.html mode change 100644 => 100755 src/content/templates/content/page.html mode change 100644 => 100755 src/content/templates/content/page_form.html mode change 100644 => 100755 src/content/templates/content/page_pdf.html mode change 100644 => 100755 src/events/templates/events/event_archive.html mode change 100644 => 100755 src/events/templates/events/event_detail.html mode change 100644 => 100755 src/events/templates/events/event_form.html mode change 100644 => 100755 src/events/templates/events/event_list.html mode change 100644 => 100755 src/events/templates/events/event_site.html mode change 100644 => 100755 src/events/templates/events/eventseries_form.html mode change 100644 => 100755 src/events/templates/events/page.html mode change 100644 => 100755 src/events/templates/events/photo_confirm_delete.html mode change 100644 => 100755 src/events/templates/events/photo_detail.html mode change 100644 => 100755 src/events/templates/events/photo_gallery.html mode change 100644 => 100755 src/events/templates/events/photo_list.html mode change 100644 => 100755 src/events/templates/events/photo_upload.html mode change 100644 => 100755 src/kasu/templates/comments/form.html mode change 100644 => 100755 src/kasu/templates/comments/list.html mode change 100644 => 100755 src/kasu/templates/comments/posted.html mode change 100644 => 100755 src/kasu/templates/comments/preview.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/eventhanchan_list.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/eventranking_list.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/hanchan_confirm_delete.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/hanchan_form.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/kyudanranking_list.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/ladder_redbox.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/page.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/player_dan_score.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/player_invalid_score.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/player_kyu_score.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/player_ladder_score.html mode change 100644 => 100755 src/mahjong_ranking/templates/mahjong_ranking/seasonranking_list.html mode change 100644 => 100755 src/maistar_ranking/templates/maistar_ranking/game_form.html mode change 100644 => 100755 src/maistar_ranking/templates/maistar_ranking/game_list.html mode change 100644 => 100755 src/maistar_ranking/templates/maistar_ranking/hanchan_confirm_delete.html mode change 100644 => 100755 src/maistar_ranking/templates/maistar_ranking/page.html mode change 100644 => 100755 src/maistar_ranking/templates/maistar_ranking/player_game_list.html mode change 100644 => 100755 src/maistar_ranking/templates/maistar_ranking/ranking_list.html mode change 100644 => 100755 src/membership/templates/registration/login.html mode change 100644 => 100755 src/membership/templates/registration/password_change_done.html mode change 100644 => 100755 src/membership/templates/registration/password_change_form.html mode change 100644 => 100755 src/membership/templates/registration/password_reset_complete.html mode change 100644 => 100755 src/membership/templates/registration/password_reset_confirm.html mode change 100644 => 100755 src/membership/templates/registration/password_reset_done.html mode change 100644 => 100755 src/membership/templates/registration/password_reset_form.html diff --git a/src/content/templates/content/article_archive.html b/src/content/templates/content/article_archive.html old mode 100644 new mode 100755 diff --git a/src/content/templates/content/article_archive_month.html b/src/content/templates/content/article_archive_month.html old mode 100644 new mode 100755 diff --git a/src/content/templates/content/article_archive_year.html b/src/content/templates/content/article_archive_year.html old mode 100644 new mode 100755 diff --git a/src/content/templates/content/article_detail.html b/src/content/templates/content/article_detail.html old mode 100644 new mode 100755 diff --git a/src/content/templates/content/article_form.html b/src/content/templates/content/article_form.html old mode 100644 new mode 100755 index 67b1048..2cb6fcf --- a/src/content/templates/content/article_form.html +++ b/src/content/templates/content/article_form.html @@ -2,9 +2,19 @@ {% load i18n fieldset_extras %} {% block extra_head %} - - - + + + + {% endblock %} {% block maincontent %} @@ -45,11 +55,4 @@ {% endblock %} -{% block javascript %} - CKEDITOR.dtd.$removeEmpty['span'] = false; - CKEDITOR.replace( 'id_content_de' ); - CKEDITOR.replace( 'id_content_en' ); -{% endblock %} - - {% block buttonbar %}{% endblock %} \ No newline at end of file diff --git a/src/content/templates/content/clear_page.html b/src/content/templates/content/clear_page.html old mode 100644 new mode 100755 diff --git a/src/content/templates/content/page.html b/src/content/templates/content/page.html old mode 100644 new mode 100755 diff --git a/src/content/templates/content/page_form.html b/src/content/templates/content/page_form.html old mode 100644 new mode 100755 index d0c6752..a100afb --- a/src/content/templates/content/page_form.html +++ b/src/content/templates/content/page_form.html @@ -6,10 +6,20 @@ {% endblock %} {% block extra_head %} - - - - {% endblock %} + + + + +{% endblock %} {% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %} @@ -66,8 +76,3 @@ {% endblock %} -{% block javascript %} - CKEDITOR.dtd.$removeEmpty['span'] = false; - CKEDITOR.replace( 'id_content_de' ); - CKEDITOR.replace( 'id_content_en' ); -{% endblock %} diff --git a/src/content/templates/content/page_pdf.html b/src/content/templates/content/page_pdf.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/event_archive.html b/src/events/templates/events/event_archive.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/event_detail.html b/src/events/templates/events/event_detail.html old mode 100644 new mode 100755 index eca342a..b492eeb --- a/src/events/templates/events/event_detail.html +++ b/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 %} @@ -11,11 +13,7 @@ {% if event.description %}{% endif %} {% endblock %} -{% block extra_head %} - -{% endblock %} - -{% block jumbotron_background %} {{ event.get_image|thumbnail_url:'callout' }} {% endblock %} +{% block jumbotron_background %}{{ event.get_image|thumbnail_url:'callout' }}{% endblock %} {% block teaser %}

{{event.name}}

@@ -40,72 +38,82 @@ {% endblock %} - {% block navigation %} -{{ event. }} +{% if not event.is_future_event %} +{% endif %} {% endblock %} {% block maincontent %} -
-  +
+ {% if event.description %} + {{event.description|safe}} + {% else %} + {{event.location.description|safe}} + {% endif %}
-

{% trans 'Location' %}

{{ event.location.name }}
- {{event.location.street_address}}
- {{event.location.postal_code}} {{event.location.locality}}
- {{event.location.get_country_display}} + {{event.location.street_address}}
+ {{event.location.postal_code}} {{event.location.locality}}
+ {{event.location.get_country_display}}
{% if event.location.url %} -

{% trans "Homepage" %}: {{ event.location.url }}

+

{% trans "Homepage" %}: {{ event.location.url }}

{% endif %} -

{% trans "Date" %}

-
    -
  • {% trans "Start" %}: {{ event.start }}
    • - {% if event.end %}
  • {% trans "End" %}: {{ event.end }}
    • {% endif %} - {% if event.url %}
  • {% trans "Homepage" %}: {{ event.url }}
    • {% endif %} -
- -
- {% if event.description %} - {{event.description|safe}} - {% else %} - {{event.location.description|safe}} - {% endif %} -

- - - - {% trans 'Share on Facebook'%} - - - - - {% trans 'Share on Google+'%} - - - - {% trans 'Share on Twitter' %} - - - - {% trans 'Show on Google Maps' %} - -

+
+

{% trans "Date" %}

+
    +
  • {% trans "Start" %}: {{ event.start }}
    • + {% if event.end %} +
  • {% trans "End" %}: {{ event.end }}
    • + {% endif %} + {% if event.url %} +
  • {% trans "Homepage" %}: {{ + event.url }}
    • + {% endif %} +
-
+

+ + {% trans 'Share on Facebook'%} + + + {% trans 'Share on Google+'%} + + + + {% trans 'Share on Twitter' %} + + + {% trans 'Show on Google Maps' %} + +

+
{% endblock %} {% block comments %} diff --git a/src/events/templates/events/event_form.html b/src/events/templates/events/event_form.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/event_list.html b/src/events/templates/events/event_list.html old mode 100644 new mode 100755 index 6e59210..a685789 --- a/src/events/templates/events/event_list.html +++ b/src/events/templates/events/event_list.html @@ -2,7 +2,7 @@ {% load i18n comments thumbnail %} {% block title %}{% trans "Upcoming Events" %}{% endblock %} -{% block teaser%}

{% trans "Upcoming Events" %}

{% endblock %} +{% block teaser%}

{% trans "Upcoming Events" %}

{% endblock %} {% block maincontent %} {% regroup event_list by start|date:'F Y' as month_list %} diff --git a/src/events/templates/events/event_site.html b/src/events/templates/events/event_site.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/eventseries_form.html b/src/events/templates/events/eventseries_form.html old mode 100644 new mode 100755 index b917691..626b13a --- a/src/events/templates/events/eventseries_form.html +++ b/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 %} -

Hier kommt eine Tabelle rein!

{% csrf_token %} {{ formset.management_form }} diff --git a/src/events/templates/events/page.html b/src/events/templates/events/page.html old mode 100644 new mode 100755 index 8b3ba02..496351d --- a/src/events/templates/events/page.html +++ b/src/events/templates/events/page.html @@ -5,8 +5,8 @@ {% block additional_buttonbar %} {% if perms.events.add_event %} - - {% trans 'Add Event' %} + {% trans 'Add Event' %} {% endif %} {% endblock %} diff --git a/src/events/templates/events/photo_confirm_delete.html b/src/events/templates/events/photo_confirm_delete.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/photo_detail.html b/src/events/templates/events/photo_detail.html old mode 100644 new mode 100755 index 42ee6e6..a956ac0 --- a/src/events/templates/events/photo_detail.html +++ b/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 %} - - -{% endblock %} - -{% block javascript %} + + + {% endblock %} {% block teaser %} @@ -29,7 +34,7 @@ if ($('a.next').attr('href')) { -{% if photo.description %}{% endif %} +{% if photo.description %}{% endif %} {% endblock %} {% block maincontent %} diff --git a/src/events/templates/events/photo_gallery.html b/src/events/templates/events/photo_gallery.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/photo_list.html b/src/events/templates/events/photo_list.html old mode 100644 new mode 100755 diff --git a/src/events/templates/events/photo_upload.html b/src/events/templates/events/photo_upload.html old mode 100644 new mode 100755 diff --git a/src/kasu/settings.py b/src/kasu/settings.py index 12b96fa..acdce80 100644 --- a/src/kasu/settings.py +++ b/src/kasu/settings.py @@ -53,7 +53,7 @@ PROJECT_APPS = [ 'maistar_ranking', 'mahjong_ranking', ] -INSTALLED_APPS = PREREQ_APPS + PROJECT_APPS +INSTALLED_APPS = PROJECT_APPS + PREREQ_APPS # Caches CACHES = { @@ -112,7 +112,7 @@ TEMPLATES = [ #Settings for Security Middleware CSP_DEFAULT_SRC = ("'self'",) CSP_IMG_SRC = CSP_DEFAULT_SRC -CSP_SCRIPT_SRC = CSP_DEFAULT_SRC +CSP_SCRIPT_SRC = ("'self'", "'unsafe-inline'") CSP_STYLE_SRC = ("'self'", "'unsafe-inline'") SECURE_BROWSER_XSS_FILTER = True SECURE_CONTENT_TYPE_NOSNIFF = True diff --git a/src/kasu/templates/base.html b/src/kasu/templates/base.html index 302843e..e9f1fd9 100644 --- a/src/kasu/templates/base.html +++ b/src/kasu/templates/base.html @@ -6,7 +6,6 @@ - - - + @@ -28,7 +26,6 @@ - {% block opengraph %} @@ -38,6 +35,21 @@ {% endblock %} {% block extra_head %}{% endblock %} + + +