diff --git a/digitalglarus/static/digitalglarus/img/favicon.ico b/digitalglarus/static/digitalglarus/img/favicon.ico new file mode 100644 index 00000000..c8c9c631 Binary files /dev/null and b/digitalglarus/static/digitalglarus/img/favicon.ico differ diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html index de21ef2e..481482f0 100644 --- a/digitalglarus/templates/digitalglarus/base.html +++ b/digitalglarus/templates/digitalglarus/base.html @@ -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 --> diff --git a/digitalglarus/templates/digitalglarus/landing.html b/digitalglarus/templates/digitalglarus/letscowork.html similarity index 93% rename from digitalglarus/templates/digitalglarus/landing.html rename to digitalglarus/templates/digitalglarus/letscowork.html index 89bbdaa0..e0a78594 100644 --- a/digitalglarus/templates/digitalglarus/landing.html +++ b/digitalglarus/templates/digitalglarus/letscowork.html @@ -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> diff --git a/digitalglarus/urls.py b/digitalglarus/urls.py index ecca23b4..585c6554 100644 --- a/digitalglarus/urls.py +++ b/digitalglarus/urls.py @@ -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'), ] diff --git a/digitalglarus/views.py b/digitalglarus/views.py index f915d800..071fe6b3 100644 --- a/digitalglarus/views.py +++ b/digitalglarus/views.py @@ -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())