aatish
/
dynamicweb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'develop' into feature/vm_pricing

This commit is contained in:
Levi 2016-04-24 19:20:17 -05:00
parent 84e5178e9b f1dfc205ac
commit 981be2dcf4
6 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
digitalglarus/templates/base_glarus.html
View File

@ -98,11 +98,9 @@
<!-- Collect the nav links, forms, and other content for toggling --> <!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1"> <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav"> <ul class="nav navbar-nav">
{# <pre> {% filter force_escape %} {% debug %} {% endfilter %} </pre>#} <li>
{# {% show_menu 0 0 0 1 %}#} <a href="{% url 'pages-root' %}">Home</a>
<li> </li>
<a href="{% url 'digitalglarus:home' %}">Home</a>
</li>
{% show_menu_below_id "digital-glarus-page" 0 %} {% show_menu_below_id "digital-glarus-page" 0 %}
<li> <li>
<a href="{% url 'digitalglarus:supporters' %}">Supporters</a> <a href="{% url 'digitalglarus:supporters' %}">Supporters</a>

6
digitalglarus/urls.py
View File

@ -5,9 +5,9 @@ from . import views
from .views import ContactView, IndexView, AboutView from .views import ContactView, IndexView, AboutView
urlpatterns = [ urlpatterns = [
url(r'^$', IndexView.as_view(), name='home'), # url(r'^$', IndexView.as_view(), name='home'),
url(_(r'home/?$'), IndexView.as_view(), name='home'), # url(_(r'home/?$'), IndexView.as_view(), name='home'),
url(_(r'about/?$'), AboutView.as_view(), name='about'), # url(_(r'about/?$'), AboutView.as_view(), name='about'),
url(_(r'contact/?$'), ContactView.as_view(), name='contact'), url(_(r'contact/?$'), ContactView.as_view(), name='contact'),
url(_(r'supporters/?$'), views.supporters, name='supporters'), url(_(r'supporters/?$'), views.supporters, name='supporters'),
url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$',views.CalendarApi.as_view()), url(r'calendar_api/(?P<month>\d+)/(?P<year>\d+)?$',views.CalendarApi.as_view()),

2
dynamicweb/settings/base.py
View File

@ -54,7 +54,6 @@ INSTALLED_APPS = (
'django.contrib.sites', 'django.contrib.sites',
'easy_thumbnails', 'easy_thumbnails',
'utils', 'utils',
'ungleich_page',
'mptt', 'mptt',
'parler', 'parler',
'taggit', 'taggit',
@ -104,6 +103,7 @@ INSTALLED_APPS = (
'reversion', 'reversion',
# ungleich # ungleich
'ungleich', 'ungleich',
'ungleich_page',
'hosting', 'hosting',
'digitalglarus', 'digitalglarus',
'django_extensions', 'django_extensions',

2
dynamicweb/urls.py
View File

@ -28,7 +28,7 @@ urlpatterns += i18n_patterns('',
url(r'^digitalglarus/', include('digitalglarus.urls', url(r'^digitalglarus/', include('digitalglarus.urls',
namespace="digitalglarus"),name='digitalglarus'), namespace="digitalglarus"),name='digitalglarus'),
url(r'^blog/',include('ungleich.urls',namespace='ungleich')), 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')), url(r'^', include('cms.urls')),
) )

2
ungleich_page/templates/ungleich_page/landing.html
View File

@ -109,7 +109,7 @@
<!-- About Section --> <!-- About Section -->
{% include "ungleich_page/includes/_about.html" %} {% include "ungleich_page/includes/_about.html" %}$
<!-- Team Section --> <!-- Team Section -->
{% include "ungleich_page/includes/_team.html" %} {% include "ungleich_page/includes/_team.html" %}

2
ungleich_page/urls.py
View File

@ -3,6 +3,6 @@ from .views import ContactView, LandingView
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
urlpatterns = [ urlpatterns = [
url(r'', LandingView.as_view(), name='landing'), url(r'^$', LandingView.as_view(), name='landing'),
url(_(r'contact/$'), ContactView.as_view(), name='contact'), url(_(r'contact/$'), ContactView.as_view(), name='contact'),
] ]