From 4d5adcaa3463da68165a056e486edfe022b0959a Mon Sep 17 00:00:00 2001
From: Jaap Joris Vens <jj@rtts.eu>
Date: Sat, 28 Dec 2019 21:14:06 +0100
Subject: [PATCH] New conf parameter PAGE_URL_PATTERN

---
 .gitignore                           | 1 +
 cms/models.py                        | 4 ++--
 cms/static/cms/cms.scss              | 8 +++++---
 cms/templates/cms/base.html          | 2 +-
 cms/templates/cms/sections/base.html | 2 +-
 cms/views.py                         | 2 ++
 examples/project/settings.py         | 1 +
 7 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index d646835..aaf060b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *.pyc
 __pycache__/
+/django_simplecms.egg-info/
diff --git a/cms/models.py b/cms/models.py
index 5d9c698..2f3e20c 100644
--- a/cms/models.py
+++ b/cms/models.py
@@ -27,9 +27,9 @@ class Page(NumberedModel):
 
     def get_absolute_url(self):
         if self.slug:
-            return reverse('page', args=[self.slug])
+            return reverse(settings.PAGE_URL_PATTERN, args=[self.slug])
         else:
-            return reverse('page')
+            return reverse(settings.PAGE_URL_PATTERN)
 
     class Meta:
         verbose_name = _('Page')
diff --git a/cms/static/cms/cms.scss b/cms/static/cms/cms.scss
index 42963b2..c7dcc93 100644
--- a/cms/static/cms/cms.scss
+++ b/cms/static/cms/cms.scss
@@ -8,6 +8,11 @@ html, body {
   padding: 0;
 }
 
+a.button {
+  cursor: pointer;
+  border: 5px solid black;
+}
+
 div.wrapper {
   box-sizing: border-box;
   max-width: 700px;
@@ -234,9 +239,6 @@ article {
     div.button {
       text-align: center;
       padding: 1em 0;
-      a {
-        border: 5px solid black;
-      }
     }
   }
 }
diff --git a/cms/templates/cms/base.html b/cms/templates/cms/base.html
index 4327225..ee558fe 100644
--- a/cms/templates/cms/base.html
+++ b/cms/templates/cms/base.html
@@ -26,7 +26,7 @@
           {% block nav %}
             <ul id="menu">
               {% for p in pages %}
-                <li><a href="{% if p.slug %}{% url 'cms:page' p.slug %}{% else %}{% url 'cms:page' %}{% endif %}" {% if p.pk == object.pk %}class="current"{% endif %}>{{p.title}}</a></li>
+                <li><a href="{% if p.slug %}{% url page_url_pattern p.slug %}{% else %}{% url page_url_pattern %}{% endif %}" {% if p.pk == object.pk %}class="current"{% endif %}>{{p.title}}</a></li>
               {% endfor %}
               {% if user.is_staff %}
                 <li><a class="edit" href="{% url 'cms:createpage' %}">+ {% trans 'new page' %}</a></li>
diff --git a/cms/templates/cms/sections/base.html b/cms/templates/cms/sections/base.html
index c588d3b..7ebce6c 100644
--- a/cms/templates/cms/sections/base.html
+++ b/cms/templates/cms/sections/base.html
@@ -45,7 +45,7 @@
 
     {% if section.button_text %}
       <div class="button">
-        <a href="{{section.button_link}}">{{section.button_text}}</a>
+        <a class="button" href="{{section.button_link}}">{{section.button_text}}</a>
       </div>
     {% endif %}
   </div>
diff --git a/cms/views.py b/cms/views.py
index 34f7899..5521719 100644
--- a/cms/views.py
+++ b/cms/views.py
@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.urls import reverse
 from django.shortcuts import redirect
 from django.contrib.auth.mixins import UserPassesTestMixin
@@ -17,6 +18,7 @@ class MenuMixin(object):
         pages = Page.objects.filter(menu=True)
         footer = get_config(10)
         context.update({
+            'page_url_pattern': settings.PAGE_URL_PATTERN,
             'pages': pages,
             'footer': footer,
         })
diff --git a/examples/project/settings.py b/examples/project/settings.py
index 6085c17..cf1bb67 100644
--- a/examples/project/settings.py
+++ b/examples/project/settings.py
@@ -21,6 +21,7 @@ STATIC_ROOT = '/srv/' + PROJECT_NAME + '/static'
 MEDIA_URL = '/media/'
 MEDIA_ROOT = '/srv/' + PROJECT_NAME + '/media'
 LOGIN_REDIRECT_URL = '/'
+PAGE_URL_PATTERN = 'cms:page'
 
 def read(file):
     with open(file) as f: