Stylesheets werden nur mit Less erzeugt. Damit können sie gleich

optimiert werden.
jQuery wurde entfernt.
Übersetzungen wurden korrigiert.
Neue sync.sh Datei, welche änderungen mit rsync auf den Server spielt
und das neuladen erzwingt.
This commit is contained in:
Christian Berg
2014-12-14 23:57:40 +01:00
parent 711c303f9a
commit 9c2413a794
76 changed files with 2514 additions and 1884 deletions

View File

@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: kasu.events\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-12-09 20:35+0100\n"
"POT-Creation-Date: 2014-12-14 01:12+0100\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"
@@ -116,7 +116,17 @@ msgstr "Veranstaltungsort"
msgid "Venues"
msgstr "Veranstaltungsorte"
#: views.py:193
#: 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"
@@ -205,19 +215,11 @@ msgstr "Auf Facebook teilen"
msgid "Show on Google Maps"
msgstr "Auf Google Maps zeigen"
#: templates/events/event_detail.html:110 templates/events/event_form.html:13
msgid "Edit Event"
msgstr "Termin bearbeiten"
#: templates/events/event_form.html:13 templates/events/page.html:15
msgid "Add Event"
msgstr "Neuer Termin"
#: templates/events/event_form.html:23
#: templates/events/event_form.html:19
msgid "reset"
msgstr "Zurücksetzen"
#: templates/events/event_form.html:24
#: templates/events/event_form.html:20
msgid "save"
msgstr "Speichern"

View File

@@ -1,10 +1,6 @@
{% extends "events/page.html" %}
{% load i18n %}
{% block extra_head %}
<link rel="stylesheet" href="{{STATIC_URL}}css/jquery-ui-1.8.16.custom.css" type="text/css">
<script type="text/javascript" src="{{STATIC_URL}}js/jquery-ui-1.8.16.custom.min.js"></script>
{% endblock %}
{% block title %}{{ title }}{% endblock %}
{% block maincontent %}
<form method="post" enctype="multipart/form-data" class="grid_12">
@@ -29,21 +25,4 @@
</form>
{% endblock %}
{% block buttonbar %}{% endblock %}
{% block javascript %}
$(function() {
$.datepicker.setDefaults($.datepicker.regional['{{LANGUAGE_CODE}}']);
$( "#id_start_0" ).datepicker({
changeMonth: true,
changeYear: true,
dateFormat: 'yy-mm-dd'
});
$( "#id_end_0" ).datepicker({
changeMonth: true,
changeYear: true,
dateFormat: 'yy-mm-dd',
});
});
{% endblock %}
{% block buttonbar %}{% endblock %}

View File

@@ -88,8 +88,6 @@ class EventDetailMixin(object):
context['event'] = self.event
else:
context['event'] = self.object.event
print "EventDetailMixin"
print dir(context['event'])
return context
@@ -97,6 +95,14 @@ class EventForm(PermissionRequiredMixin, generic.UpdateView):
form_class = forms.EventForm
permission_required = 'events.add_event'
def get_context_data(self, **kwargs):
context = super(EventForm, self).get_context_data(**kwargs)
if self.kwargs.get('pk'):
context['title'] = _("Edit Event")
else:
context['title'] = _("Add Event")
return context
def get_object(self, queryset=None):
"""
If an id has been submitted, try return the existing Event for an update,