{{ message.received_date }}
-Back to Main
+
Back to Main
diff --git a/digitalglarus/admin.py b/digitalglarus/admin.py
index 92dea7a0..0c84adb1 100644
--- a/digitalglarus/admin.py
+++ b/digitalglarus/admin.py
@@ -1,5 +1,6 @@
from django.contrib import admin
-from .models import Message, Supporter, DGGallery, DGPicture
+from .models import Supporter, DGGallery, DGPicture
+from utils.models import ContactMessage
#
class DGPictureInline(admin.StackedInline):
model = DGPicture
@@ -8,5 +9,5 @@ class DGGalleryAdmin(admin.ModelAdmin):
inlines = [DGPictureInline]
admin.site.register(DGGallery, DGGalleryAdmin)
-admin.site.register(Message)
+admin.site.register(ContactMessage)
admin.site.register(Supporter)
\ No newline at end of file
diff --git a/digitalglarus/locale/de/LC_MESSAGES/django.po b/digitalglarus/locale/de/LC_MESSAGES/django.po
index 0aa6bf8a..87b79204 100644
--- a/digitalglarus/locale/de/LC_MESSAGES/django.po
+++ b/digitalglarus/locale/de/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-04-09 12:46-0500\n"
+"POT-Creation-Date: 2016-04-15 22:24-0500\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME \n"
"Language-Team: LANGUAGE \n"
@@ -26,22 +26,6 @@ msgstr ""
msgid "Digital Glarus Supporters"
msgstr ""
-#: forms.py:21
-msgid "Name"
-msgstr "Name"
-
-#: forms.py:22
-msgid "Email"
-msgstr "Email"
-
-#: forms.py:23
-msgid "Phone number"
-msgstr "Telefon"
-
-#: forms.py:24
-msgid "Message"
-msgstr "Nachricht"
-
#: templates/glarus_blog/includes/blog_item.html:32
msgid "read more"
msgstr ""
@@ -79,17 +63,40 @@ msgid "Change to language:"
msgstr ""
#: urls.py:8
+msgid "home/?$"
+msgstr "haus/?$"
+
+#: urls.py:9
+msgid "about/?$"
+msgstr "etwa/?$"
+
+#: urls.py:10
msgid "contact/?$"
msgstr "kontakt/?$"
-#: urls.py:9
+#: urls.py:11
msgid "supporters/?$"
msgstr "befurworter/?$"
-#: urls.py:10
+#: urls.py:12
msgid "support-us/?$"
msgstr ""
#: views.py:23
msgid "Message Successfully Sent"
msgstr ""
+
+#~ msgid "index/?$"
+#~ msgstr "index/?$"
+
+#~ msgid "Name"
+#~ msgstr "Name"
+
+#~ msgid "Email"
+#~ msgstr "Email"
+
+#~ msgid "Phone number"
+#~ msgstr "Telefon"
+
+#~ msgid "Message"
+#~ msgstr "Nachricht"
diff --git a/digitalglarus/migrations/0006_delete_message.py b/digitalglarus/migrations/0006_delete_message.py
new file mode 100644
index 00000000..6cc3e674
--- /dev/null
+++ b/digitalglarus/migrations/0006_delete_message.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.4 on 2016-04-10 17:10
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('digitalglarus', '0005_auto_20160407_0519'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='Message',
+ ),
+ ]
diff --git a/digitalglarus/models.py b/digitalglarus/models.py
index 6c24ae0d..19962a2f 100644
--- a/digitalglarus/models.py
+++ b/digitalglarus/models.py
@@ -3,21 +3,10 @@ from cms.models import CMSPlugin
from filer.fields.image import FilerImageField
-class Message(models.Model):
- name = models.CharField(max_length=200)
- email = models.EmailField()
- phone_number = models.CharField(max_length=200)
- message = models.TextField()
- received_date = models.DateTimeField(auto_now_add=True)
-
- def __str__(self):
- return "%s - %s - %s" % (self.name, self.email, self.received_date)
-
-
class Supporter(models.Model):
name = models.CharField(max_length=200)
description = models.TextField(null=True, blank=True)
-
+
def __str__(self):
return "%s" % (self.name)
diff --git a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css
index c1df6431..3c8f4e29 100755
--- a/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css
+++ b/digitalglarus/static/blog.ungleich.ch/css/clean-blog.css
@@ -322,6 +322,8 @@ footer .copyright {
.floating-label-form-group-with-focus label {
color: #0085a1;
}
+
+
form .row:first-child .floating-label-form-group {
border-top: 1px solid #eeeeee;
}
diff --git a/digitalglarus/templates/base_glarus.html b/digitalglarus/templates/base_glarus.html
index 36a86190..192f7f66 100644
--- a/digitalglarus/templates/base_glarus.html
+++ b/digitalglarus/templates/base_glarus.html
@@ -83,7 +83,7 @@
{# {% filter force_escape %} {% debug %} {% endfilter %}
#}
{# {% show_menu 0 0 0 1 %}#}
- Home
+ Home
{% show_menu_below_id "digital-glarus-page" 0 %}
diff --git a/digitalglarus/templates/contact.html b/digitalglarus/templates/contact.html
index bb7447c0..ba12c5ae 100755
--- a/digitalglarus/templates/contact.html
+++ b/digitalglarus/templates/contact.html
@@ -40,7 +40,7 @@
{% static_placeholder "digital_glarus_contact_form_text" %}
-