Merge branch 'develop' of github.com:ungleich/dynamicweb into develop

This commit is contained in:
rascencio 2015-09-20 18:20:25 -06:00
commit f911a50f50
5 changed files with 21 additions and 8 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.1 KiB

View file

@ -13,6 +13,9 @@
<title>Digital Glarus - {% block title %}Welcome{% endblock %}</title> <title>Digital Glarus - {% block title %}Welcome{% endblock %}</title>
<!-- Favicon -->
<link rel="shortcut icon" href="{% static 'digitalglarus/img/favicon.ico' %}"/>
<!-- Bootstrap Core CSS --> <!-- Bootstrap Core CSS -->
<link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet"> <link href="{% static 'digitalglarus/css/bootstrap.min.css' %}" rel="stylesheet">
@ -64,7 +67,10 @@
<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">
<li> <li>
<a href="{% url 'digitalglarus:index' %}">Home</a> <a href="{% url 'digitalglarus:letscowork' %}">Crowdfunding</a>
</li>
<li>
<a href="{% url 'digitalglarus:home' %}">Home</a>
</li> </li>
<li> <li>
<a href="{% url 'digitalglarus:about' %}">About</a> <a href="{% url 'digitalglarus:about' %}">About</a>
@ -72,9 +78,6 @@
<li> <li>
<a href="{% url 'digitalglarus:contact' %}">Contact</a> <a href="{% url 'digitalglarus:contact' %}">Contact</a>
</li> </li>
<li>
<a href="{% url 'digitalglarus:landing' %}">Crowdfunding</a>
</li>
</ul> </ul>
</div> </div>
<!-- /.navbar-collapse --> <!-- /.navbar-collapse -->

View file

@ -6,7 +6,7 @@
<div class="row"> <div class="row">
<div class="box"> <div class="box">
<div class="col-lg-12 text-center"> <div class="col-lg-12 text-center">
<h1>Our crowdfunding campaign launches on the 18th of Septmeber 2015!</h1> <h1>Our crowdfunding campaign launches on the 22nd of September 2015!</h1>
</div> </div>
<div class="clearfix"></div> <div class="clearfix"></div>
</div> </div>

View file

@ -6,5 +6,6 @@ urlpatterns = [
url(r'^$', views.index, name='index'), url(r'^$', views.index, name='index'),
url(r'about$', views.about, name='about'), url(r'about$', views.about, name='about'),
url(r'contact$', views.contact, name='contact'), 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): def about(request):
return render(request, 'digitalglarus/about.html') 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): def index(request):
return render(request, 'digitalglarus/letscowork.html')
def home(request):
return render(request, 'digitalglarus/index.html') return render(request, 'digitalglarus/index.html')
def landing(request): def letscowork(request):
return render(request, 'digitalglarus/landing.html') return render(request, 'digitalglarus/letscowork.html')
def contact(request): def contact(request):
message = Message(received_date=datetime.datetime.now()) message = Message(received_date=datetime.datetime.now())