Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	digitalglarus/templates/digitalglarus/base.html
This commit is contained in:
rascencio 2015-09-20 19:10:50 +02:00
commit af0ce20881
4 changed files with 17 additions and 7 deletions

View file

@ -64,7 +64,10 @@
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
<a href="{% url 'digitalglarus:index' %}">Home</a>
<a href="{% url 'digitalglarus:letscowork' %}">Crowdfounding</a>
</li>
<li>
<a href="{% url 'digitalglarus:home' %}">Home</a>
</li>
<li>
<a href="{% url 'digitalglarus:about' %}">About</a>
@ -72,9 +75,6 @@
<li>
<a href="{% url 'digitalglarus:contact' %}">Contact</a>
</li>
<li>
<a href="{% url 'digitalglarus:landing' %}">Crowdfunding</a>
</li>
</ul>
</div>
<!-- /.navbar-collapse -->

View file

@ -6,5 +6,6 @@ urlpatterns = [
url(r'^$', views.index, name='index'),
url(r'about$', views.about, name='about'),
url(r'contact$', views.contact, name='contact'),
url(r'landing$', views.landing, name='landing'),
url(r'letscowork$', views.letscowork, name='letscowork'),
url(r'home$', views.home, name='home'),
]

View file

@ -23,11 +23,20 @@ def detail(request, message_id):
def about(request):
return render(request, 'digitalglarus/about.html')
#def index(request):
# return render(request, 'digitalglarus/index.html')
#
#def letscowork(request):
# return render(request, 'digitalglarus/letscowork.html')
def index(request):
return render(request, 'digitalglarus/letscowork.html')
def home(request):
return render(request, 'digitalglarus/index.html')
def landing(request):
return render(request, 'digitalglarus/landing.html')
def letscowork(request):
return render(request, 'digitalglarus/letscowork.html')
def contact(request):
message = Message(received_date=datetime.datetime.now())