Merge branch 'develop' into feature/vm_pricing
This commit is contained in:
commit
981be2dcf4
6 changed files with 10 additions and 12 deletions
|
@ -98,11 +98,9 @@
|
|||
<!-- Collect the nav links, forms, and other content for toggling -->
|
||||
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
|
||||
<ul class="nav navbar-nav">
|
||||
{# <pre> {% filter force_escape %} {% debug %} {% endfilter %} </pre>#}
|
||||
{# {% show_menu 0 0 0 1 %}#}
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:home' %}">Home</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="{% url 'pages-root' %}">Home</a>
|
||||
</li>
|
||||
{% show_menu_below_id "digital-glarus-page" 0 %}
|
||||
<li>
|
||||
<a href="{% url 'digitalglarus:supporters' %}">Supporters</a>
|
||||
|
|
|
@ -5,9 +5,9 @@ from . import views
|
|||
from .views import ContactView, IndexView, AboutView
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^$', IndexView.as_view(), name='home'),
|
||||
url(_(r'home/?$'), IndexView.as_view(), name='home'),
|
||||
url(_(r'about/?$'), AboutView.as_view(), name='about'),
|
||||
# url(r'^$', IndexView.as_view(), name='home'),
|
||||
# url(_(r'home/?$'), IndexView.as_view(), name='home'),
|
||||
# url(_(r'about/?$'), AboutView.as_view(), name='about'),
|
||||
url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
|
||||
url(_(r'supporters/?$'), views.supporters, name='supporters'),
|
||||
url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$',views.CalendarApi.as_view()),
|
||||
|
|
|
@ -54,7 +54,6 @@ INSTALLED_APPS = (
|
|||
'django.contrib.sites',
|
||||
'easy_thumbnails',
|
||||
'utils',
|
||||
'ungleich_page',
|
||||
'mptt',
|
||||
'parler',
|
||||
'taggit',
|
||||
|
@ -104,6 +103,7 @@ INSTALLED_APPS = (
|
|||
'reversion',
|
||||
# ungleich
|
||||
'ungleich',
|
||||
'ungleich_page',
|
||||
'hosting',
|
||||
'digitalglarus',
|
||||
'django_extensions',
|
||||
|
|
|
@ -28,7 +28,7 @@ urlpatterns += i18n_patterns('',
|
|||
url(r'^digitalglarus/', include('digitalglarus.urls',
|
||||
namespace="digitalglarus"),name='digitalglarus'),
|
||||
url(r'^blog/',include('ungleich.urls',namespace='ungleich')),
|
||||
url(r'^',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
|
||||
url(r'^ungleich_page/',include('ungleich_page.urls',namespace='ungleich_page'),name='ungleich_page'),
|
||||
url(r'^', include('cms.urls')),
|
||||
)
|
||||
|
||||
|
|
|
@ -109,7 +109,7 @@
|
|||
|
||||
|
||||
<!-- About Section -->
|
||||
{% include "ungleich_page/includes/_about.html" %}
|
||||
{% include "ungleich_page/includes/_about.html" %}$
|
||||
|
||||
<!-- Team Section -->
|
||||
{% include "ungleich_page/includes/_team.html" %}
|
||||
|
|
|
@ -3,6 +3,6 @@ from .views import ContactView, LandingView
|
|||
from django.utils.translation import ugettext_lazy as _
|
||||
|
||||
urlpatterns = [
|
||||
url(r'', LandingView.as_view(), name='landing'),
|
||||
url(r'^$', LandingView.as_view(), name='landing'),
|
||||
url(_(r'contact/$'), ContactView.as_view(), name='contact'),
|
||||
]
|
||||
|
|
Loading…
Reference in a new issue