New conf parameter PAGE_URL_PATTERN

readwriteweb
Jaap Joris Vens 2019-12-28 21:14:06 +01:00
rodzic f8f4e03454
commit 4d5adcaa34
7 zmienionych plików z 13 dodań i 7 usunięć

1
.gitignore vendored
Wyświetl plik

@ -1,2 +1,3 @@
*.pyc
__pycache__/
/django_simplecms.egg-info/

Wyświetl plik

@ -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')

Wyświetl plik

@ -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;
}
}
}
}

Wyświetl plik

@ -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>

Wyświetl plik

@ -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>

Wyświetl plik

@ -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,
})

Wyświetl plik

@ -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: