From 666bffee082e8b31208a7ba8eb2e07f7a9c914a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= <matej.kocian@gmail.com>
Date: Wed, 18 Nov 2015 20:18:18 +0100
Subject: [PATCH 1/2] =?UTF-8?q?CKeditor:=20nevytv=C3=A1=C5=99ej=20zbyte?=
 =?UTF-8?q?=C4=8Dn=C4=9B=20HTML=20entity?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mamweb/settings_common.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/mamweb/settings_common.py b/mamweb/settings_common.py
index 4330c9e7..5b3fe86b 100644
--- a/mamweb/settings_common.py
+++ b/mamweb/settings_common.py
@@ -235,6 +235,10 @@ LOGGING = {
 SEMINAR_RESENI_DIR = os.path.join(BASE_DIR, 'media', 'reseni')
 
 
-
+CKEDITOR_CONFIGS = {
+    'default': {
+        'entities': False
+    }
+}
 
 

From 577ac83d040b9d40744f1d50e1fcaa1d063717a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mat=C4=9Bj=20Koci=C3=A1n?= <matej.kocian@gmail.com>
Date: Fri, 20 Nov 2015 11:15:10 +0100
Subject: [PATCH 2/2] =?UTF-8?q?Galerie:=20=C5=99a=C4=8F=20obr=C3=A1zky=20d?=
 =?UTF-8?q?efaultn=C4=9B=20dle=20data=20po=C5=99=C3=ADzen=C3=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Aby fungovaly přechody mezi galeriemi v detailu.
---
 .../migrations/0005_obrazek_ordering_datum.py  | 18 ++++++++++++++++++
 galerie/models.py                              |  1 +
 2 files changed, 19 insertions(+)
 create mode 100644 galerie/migrations/0005_obrazek_ordering_datum.py

diff --git a/galerie/migrations/0005_obrazek_ordering_datum.py b/galerie/migrations/0005_obrazek_ordering_datum.py
new file mode 100644
index 00000000..988e0fd4
--- /dev/null
+++ b/galerie/migrations/0005_obrazek_ordering_datum.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('galerie', '0004_nepovinna_galerie_u_obrazku'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='obrazek',
+            options={'ordering': ['datum'], 'verbose_name': 'Obr\xe1zek', 'verbose_name_plural': 'Obr\xe1zky'},
+        ),
+    ]
diff --git a/galerie/models.py b/galerie/models.py
index b5a1c0a8..22457ba1 100644
--- a/galerie/models.py
+++ b/galerie/models.py
@@ -84,6 +84,7 @@ class Obrazek(models.Model):
   class Meta:
     verbose_name = 'Obrázek'
     verbose_name_plural = 'Obrázky'
+    ordering = ['datum']
   def save(self):
     original = Image.open(self.obrazek_velky)
     # vycteni EXIFu