Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions shoop_demo/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,30 @@
import os

from django.conf import settings
from django.conf.urls import patterns, include, url
from django.conf.urls import patterns, include, re_path
from django.conf.urls.static import static
from django.contrib import admin
import shoop.admin.urls
import shoop.front.urls


def _ns_url(regex, urls, name):
return url(regex, include(urls, namespace=name, app_name=name))
return re_path(regex, include(urls, namespace=name, app_name=name))


_URLS = [
_ns_url(r'^sa/', shoop.admin.urls, 'shoop_admin'),
_ns_url(r'^', shoop.front.urls, 'shoop'),
_ns_url(r"^sa/", shoop.admin.urls, "shoop_admin"),
_ns_url(r"^", shoop.front.urls, "shoop"),
]

_STATIC_DIRS = [
'static_src',
'bower_components',
"static_src",
"bower_components",
]

_STATIC_MAP = [
(settings.MEDIA_URL, settings.MEDIA_ROOT),
] + [('/' + x + '/', os.path.join(settings.BASE_DIR, x)) for x in _STATIC_DIRS]
] + [("/" + x + "/", os.path.join(settings.BASE_DIR, x)) for x in _STATIC_DIRS]


def _get_statics():
Expand All @@ -42,4 +42,4 @@ def _get_statics():
return result


urlpatterns = patterns('', *_URLS) + _get_statics()
urlpatterns = patterns("", *_URLS) + _get_statics()
10 changes: 5 additions & 5 deletions wintergear/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
# LICENSE file in the root directory of this source tree.

from django.conf import settings
from django.utils.encoding import force_text
from django.utils.encoding import force_str

from shoop.apps import AppConfig
from shoop.xtheme import Theme
Expand All @@ -20,14 +20,16 @@ class WintergearTheme(Theme):

def get_view(self, view_name):
import wintergear.views as views

return getattr(views, view_name, None)

def _format_cms_links(self, **query_kwargs):
if "shoop.simple_cms" not in settings.INSTALLED_APPS:
return
from shoop.simple_cms.models import Page

for page in Page.objects.visible().filter(**query_kwargs):
yield {"url": "/%s" % page.url, "text": force_text(page)}
yield {"url": "/%s" % page.url, "text": force_str(page)}

def get_cms_navigation_links(self):
return self._format_cms_links(visible_in_menu=True)
Expand All @@ -37,9 +39,7 @@ class WintergearThemeAppConfig(AppConfig):
name = "wintergear"
verbose_name = WintergearTheme.name
label = "wintergear"
provides = {
"xtheme": "wintergear:WintergearTheme"
}
provides = {"xtheme": "wintergear:WintergearTheme"}


default_app_config = "wintergear.WintergearThemeAppConfig"