kopia lustrzana https://github.com/rtts/django-simplecms
New conf parameter PAGE_URL_PATTERN
rodzic
f8f4e03454
commit
4d5adcaa34
|
@ -1,2 +1,3 @@
|
||||||
*.pyc
|
*.pyc
|
||||||
__pycache__/
|
__pycache__/
|
||||||
|
/django_simplecms.egg-info/
|
||||||
|
|
|
@ -27,9 +27,9 @@ class Page(NumberedModel):
|
||||||
|
|
||||||
def get_absolute_url(self):
|
def get_absolute_url(self):
|
||||||
if self.slug:
|
if self.slug:
|
||||||
return reverse('page', args=[self.slug])
|
return reverse(settings.PAGE_URL_PATTERN, args=[self.slug])
|
||||||
else:
|
else:
|
||||||
return reverse('page')
|
return reverse(settings.PAGE_URL_PATTERN)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
verbose_name = _('Page')
|
verbose_name = _('Page')
|
||||||
|
|
|
@ -8,6 +8,11 @@ html, body {
|
||||||
padding: 0;
|
padding: 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
a.button {
|
||||||
|
cursor: pointer;
|
||||||
|
border: 5px solid black;
|
||||||
|
}
|
||||||
|
|
||||||
div.wrapper {
|
div.wrapper {
|
||||||
box-sizing: border-box;
|
box-sizing: border-box;
|
||||||
max-width: 700px;
|
max-width: 700px;
|
||||||
|
@ -234,9 +239,6 @@ article {
|
||||||
div.button {
|
div.button {
|
||||||
text-align: center;
|
text-align: center;
|
||||||
padding: 1em 0;
|
padding: 1em 0;
|
||||||
a {
|
|
||||||
border: 5px solid black;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
{% block nav %}
|
{% block nav %}
|
||||||
<ul id="menu">
|
<ul id="menu">
|
||||||
{% for p in pages %}
|
{% 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 %}
|
{% endfor %}
|
||||||
{% if user.is_staff %}
|
{% if user.is_staff %}
|
||||||
<li><a class="edit" href="{% url 'cms:createpage' %}">+ {% trans 'new page' %}</a></li>
|
<li><a class="edit" href="{% url 'cms:createpage' %}">+ {% trans 'new page' %}</a></li>
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
|
|
||||||
{% if section.button_text %}
|
{% if section.button_text %}
|
||||||
<div class="button">
|
<div class="button">
|
||||||
<a href="{{section.button_link}}">{{section.button_text}}</a>
|
<a class="button" href="{{section.button_link}}">{{section.button_text}}</a>
|
||||||
</div>
|
</div>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -1,3 +1,4 @@
|
||||||
|
from django.conf import settings
|
||||||
from django.urls import reverse
|
from django.urls import reverse
|
||||||
from django.shortcuts import redirect
|
from django.shortcuts import redirect
|
||||||
from django.contrib.auth.mixins import UserPassesTestMixin
|
from django.contrib.auth.mixins import UserPassesTestMixin
|
||||||
|
@ -17,6 +18,7 @@ class MenuMixin(object):
|
||||||
pages = Page.objects.filter(menu=True)
|
pages = Page.objects.filter(menu=True)
|
||||||
footer = get_config(10)
|
footer = get_config(10)
|
||||||
context.update({
|
context.update({
|
||||||
|
'page_url_pattern': settings.PAGE_URL_PATTERN,
|
||||||
'pages': pages,
|
'pages': pages,
|
||||||
'footer': footer,
|
'footer': footer,
|
||||||
})
|
})
|
||||||
|
|
|
@ -21,6 +21,7 @@ STATIC_ROOT = '/srv/' + PROJECT_NAME + '/static'
|
||||||
MEDIA_URL = '/media/'
|
MEDIA_URL = '/media/'
|
||||||
MEDIA_ROOT = '/srv/' + PROJECT_NAME + '/media'
|
MEDIA_ROOT = '/srv/' + PROJECT_NAME + '/media'
|
||||||
LOGIN_REDIRECT_URL = '/'
|
LOGIN_REDIRECT_URL = '/'
|
||||||
|
PAGE_URL_PATTERN = 'cms:page'
|
||||||
|
|
||||||
def read(file):
|
def read(file):
|
||||||
with open(file) as f:
|
with open(file) as f:
|
||||||
|
|
Ładowanie…
Reference in New Issue