xeniac/kasu
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

Kleine anpassungen für die Stablität der Seite.

Browse Source 
* Methode Bilder zu löschen wurde geändert damit weniger Fehlermeldungen auftreten.
* kleine änderungen für PEP-8 kompatibiltät
* Nicht alle Seiten sind im Menü verankert, hier hat der Teaser-Block Fehler verursacht.
* reCaptcha wird keine IP Adresse übergeben (Das funktioniert leider nicht)
This commit is contained in:
Christian Berg
2015-02-08 11:33:13 +01:00
parent 9c2413a794
commit cb4b15b3c6
53 changed files with 259 additions and 243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
content/context_processors.py
View File

@@ -11,8 +11,8 @@ from . import models
def content_menus(request):
current_page = None
current_path = request.path_info[1:request.path_info.rfind('.')]
current_top_page = None
current_path = request.path_info[1:request.path_info.rfind('.')]
# erzeuge das Top-Level Menü
top_menu_items = []

21
content/locale/de/LC_MESSAGES/django.po
View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kasu.content\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-12-14 01:12+0100\n"
"POT-Creation-Date: 2015-01-05 19:23+0100\n"
"PO-Revision-Date: 2014-12-08 16:15+0100\n"
"Last-Translator: Christian Berg <xeniac.at@gmail.com>\n"
"Language-Team: Kasu <verein@kasu.at>\n"
@@ -214,33 +214,34 @@ msgstr "Auf Twitter teilen"
msgid "Share on Facebook"
msgstr "Auf Facebook teilen"
#: templates/content/article_form.html:22 templates/content/page_form.html:29
#: templates/content/page_form.html:35
#: templates/content/article_form.html:22 templates/content/page_form.html:40
#: templates/content/page_form.html:46
msgid "German"
msgstr "Deutsch"
#: templates/content/article_form.html:23 templates/content/page_form.html:30
#: templates/content/page_form.html:39
#: templates/content/article_form.html:23 templates/content/page_form.html:41
#: templates/content/page_form.html:50
msgid "English"
msgstr "Englisch"
#: templates/content/article_form.html:36 templates/content/page_form.html:50
#: templates/content/article_form.html:36 templates/content/page_form.html:61
msgid "reset"
msgstr "Zurücksetzen"
#: templates/content/article_form.html:37 templates/content/page_form.html:51
#: templates/content/article_form.html:37 templates/content/page_form.html:62
msgid "save"
msgstr "Speichern"
#: templates/content/page_form.html:4 templates/content/page_form.html:24
#: templates/content/page_form.html:5 templates/content/page_form.html:35
msgid "Edit Page"
msgstr "Seite bearbeiten"
#: templates/content/page_form.html:4 templates/content/page_form.html:24
#: templates/content/page_form.html:6 templates/content/page_form.html:20
#: templates/content/page_form.html:35
msgid "Add Page"
msgstr "Seite hinzufügen"
#: templates/content/page_form.html:45
#: templates/content/page_form.html:56
msgid "HTML Specific"
msgstr "HTML spezifisch"

2
content/templates/content/page.html
View File

@@ -21,7 +21,7 @@
{% 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.menu_name}}</a></h2>
<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>

15
content/templates/content/page_form.html
View File

@@ -1,16 +1,27 @@
{% extends "base.html" %}
{% load i18n fieldset_extras %}
{% block title %}{% if object.pk %}{% trans "Edit Page" %}: {{ page.title }}{% else %}{% trans "Add Page" %}{% endif %}{% endblock %}
{% block title %}
{% 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-1.6.2.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/jquery-2.1.3.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 %}
{% block jumbotron_background %}{{STATIC_URL}}img/teaser/edit_page.jpg{% endblock %}
{% block teaser %}
{% if object.pk %}<h1>{{ page.title }}</h1>
{% else %}<h1>{% trans "Add Page" %}</h1>
{% endif %}
{% endblock %}
{% block maincontent %}
{% get_fieldset "parent, slug, content_type, status" from form as fieldset_common %}