diff --git a/extras/website/website/forms.py b/extras/website/website/forms.py index f7c81ca86..7bcf54e9d 100644 --- a/extras/website/website/forms.py +++ b/extras/website/website/forms.py @@ -1,17 +1,29 @@ from django import forms - -TOPIC_CHOICES = ( - ('question', 'General question'), - ('bug', 'Bug report'), - ('reference', 'Add OpenSlides reference'), -) +from django.utils.translation import ugettext as _ class ContactForm(forms.Form): error_css_class = 'error' required_css_class = 'required' - topic = forms.ChoiceField(choices=TOPIC_CHOICES) - subject = forms.CharField(max_length=100) - message = forms.CharField() - sender = forms.EmailField() - cc_myself = forms.BooleanField(required=False) + subject = forms.CharField(label=_("Betreff")) + message = forms.CharField(widget=forms.Textarea(), label=_("Nachricht")) + sender = forms.EmailField(label=_("Absender")) + cc_myself = forms.BooleanField(required=False,label=_("Kopie an meine Adresse")) +class OrderEventForm(forms.Form): + error_css_class = 'error' + required_css_class = 'required' + event_name = forms.CharField(label=_("Veranstaltungsname")) + event_description = forms.CharField(max_length=100, label=_("Kurzbeschreibung der Veranstaltung")) + event_date = forms.CharField(label=_("Veranstaltungszeitraum")) + event_location = forms.CharField(label=_("Veranstaltungsort")) + +class OrderContactForm(forms.Form): + error_css_class = 'error' + required_css_class = 'required' + contact_organisation = forms.CharField(label=_("Organisation")) + contact_street = forms.CharField(label=_("Strasse")) + contact_postcode = forms.CharField(label=_("PLZ")) + contact_location = forms.CharField(label=_("Ort")) + contact_name = forms.CharField(label=_("Ansprechpartner")) + contact_phone = forms.CharField(label=_("Telefon")) + contact_email = forms.EmailField(label=_("E-Mail")) diff --git a/extras/website/website/settings.py b/extras/website/website/settings.py index 78c5f5ee3..c2d38e3d2 100644 --- a/extras/website/website/settings.py +++ b/extras/website/website/settings.py @@ -23,6 +23,8 @@ DATABASES = { SITE_ROOT = os.path.realpath(os.path.dirname(__file__)) +EMAIL_HOST = "localhost" + # Local time zone for this installation. Choices can be found here: # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name # although not all choices may be available on all operating systems. diff --git a/extras/website/website/static/css/style.css b/extras/website/website/static/css/style.css index 788f99774..16e89500e 100755 --- a/extras/website/website/static/css/style.css +++ b/extras/website/website/static/css/style.css @@ -177,3 +177,7 @@ form .error input, form .error textarea { float: left; margin-right: 20px; } + +input, textarea { + width: 380px; +} \ No newline at end of file diff --git a/extras/website/website/templates/home.html b/extras/website/website/templates/home.html index fa12df922..57a2f0abe 100644 --- a/extras/website/website/templates/home.html +++ b/extras/website/website/templates/home.html @@ -13,25 +13,29 @@ {% block container %}
Mehr Transparenz.
Mehr Offenheit.
Mehr Effizienz.
+
Mehr Transparenz.
Mehr Flexibilität.
Mehr Effizienz.
Die Lösung für Ihre Versammlung!
+ {% if package == '1' %}TODO,-{% endif %} + {% if package == '2' %}TODO,-{% endif %} + {% if package == '3' %}TODO,-{% endif %} € + zzgl. 19% MwSt.
+ +Haben Sie noch Fragen?
+Emanuel Schütze
+ Intevation GmbH
+ Neuer Graben 17
+ D-49074 Osnabrück
+ E-Mail: emanuel.schuetze@intevation.de
+ Tel: ++49-541-335083-746
TODO,- € zzgl. 19% MwSt.
-TODO,- €zzgl. 19% MwSt.
-TODO,- €zzgl. 19% MwSt.
-Ein USB-Stick mit Ihrer individuell vorkonfigurierten OpenSlides-Installation wird erstellt.
+ +{% endblock %} diff --git a/extras/website/website/urls.py b/extras/website/website/urls.py index 919a5ce30..0387dff63 100644 --- a/extras/website/website/urls.py +++ b/extras/website/website/urls.py @@ -18,6 +18,8 @@ urlpatterns = i18n_patterns('', url(r'^about/press$', TemplateView.as_view(template_name="press.html"), name='press',), url(r'^download/$', TemplateView.as_view(template_name="download.html"), name='download',), url(r'^pricing/$', TemplateView.as_view(template_name="pricing.html"), name='pricing',), + url(r'^pricing/order/(?P