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

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

11
digitalglarus/templates/digitalglarus/base.html
View file

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

2
digitalglarus/templates/digitalglarus/landing.html → digitalglarus/templates/digitalglarus/letscowork.html
View file

@ -6,7 +6,7 @@
<div class="row">
<div class="box">
<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 class="clearfix"></div>
</div>