From a2e54f1327a078c9bcf3c67c51cc182b29018080 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique@roux.li>
Date: Thu, 17 Sep 2015 16:46:21 +0200
Subject: [PATCH 1/6] Added favicon

Added favicon in base html template
---
 .../static/digitalglarus/img/favicon.ico         | Bin 0 -> 1150 bytes
 digitalglarus/templates/digitalglarus/base.html  |   3 +++
 2 files changed, 3 insertions(+)
 create mode 100644 digitalglarus/static/digitalglarus/img/favicon.ico

diff --git a/digitalglarus/static/digitalglarus/img/favicon.ico b/digitalglarus/static/digitalglarus/img/favicon.ico
new file mode 100644
index 0000000000000000000000000000000000000000..c8c9c63166142502a099b474560be363a091f180
GIT binary patch
literal 1150
zcmbVMOHUI~6uu<x+>n^KcIn??gDVXSR9<R~F4VYF6WkEvZ_va@tk6=h*nxIh1cDN%
z;W4ofsFm8M7;DqV%zU1EE_b9#400#moS8G<cki8Zz8N99=;-bibUr5rP6=^V2yvc3
zDaxok1tI9!nbQh<PbVB>xUNeqiK9ooRz$V9fp2B&4{W1eE3in-0W|6rlnV*U7rn_+
zn?4v5eTYq8Lu6_Ik$^%pIE46{o3IkkVYeI1&n9OPdfAKA<||L1vHXZm4Pr5T2k)Z~
z6wF6hGVUQZa|84Kevkh-6^8M;51DQMA$@>3A7Z1h?FJmDMQEed{DH*sQ<&2uST^o6
zKbM(D*msHalb!m>eyqkH!*w0b>sa`*LVFv+Lg+Tyt)JN2F-d>%7<!xMDebL7)<NlO
z|Djj=DCJ3iqV*5-a(z!v>+i-?{ix=8WGt#5zyB!Ljf$Wm5qN#x|1Ez1T-w0QiykC5
z#<d*3^?%ndm!3Q5?OoE>@x7Xcwf+p1!p9DMByffL{t(sD7JG2N@(KCu0{6`f4rA@z
z81o&wiDqM;`rP#N>8%Os|7G@?^pQp+aFuIs21ii-nqYo58N%%N1@e>6(@Re-zE$2^
zA^&MeFRm{=;cr8e^Sg2K<aNk-^pIY0Z0R{dM{H{fMfLq@uJ+d<!qJ!1i+^$Tf8eC?
E7qk$Ph5!Hn

literal 0
HcmV?d00001

diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html
index c67fa324..49829e40 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">
 

From 7a21ae5bc8c49572cf388cb2fe123acd984856b0 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique@roux.li>
Date: Thu, 17 Sep 2015 16:56:12 +0200
Subject: [PATCH 2/6] changed .gitignore

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 7c3c3235..fb94ef21 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,7 +20,7 @@ CACHE/
 .\#*
 *~
 
-static/
+/static
 
 node_modules/
 ungleich.db

From 2c4f48a0cbf3559bc4159b8e81d9c6c06cf9a68f Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique@roux.li>
Date: Sun, 20 Sep 2015 16:37:54 +0200
Subject: [PATCH 3/6] Changed index page

The index page is no set to the crowdfounding page.
The old index page is now called home.
The crowdfounding page is now in the menu on the first place,
and the home page second.
---
 digitalglarus/templates/digitalglarus/base.html     |  8 ++++----
 .../digitalglarus/{landing.html => letscowork.html} |  0
 digitalglarus/urls.py                               |  3 ++-
 digitalglarus/views.py                              | 13 +++++++++++--
 4 files changed, 17 insertions(+), 7 deletions(-)
 rename digitalglarus/templates/digitalglarus/{landing.html => letscowork.html} (100%)

diff --git a/digitalglarus/templates/digitalglarus/base.html b/digitalglarus/templates/digitalglarus/base.html
index c67fa324..81152eeb 100644
--- a/digitalglarus/templates/digitalglarus/base.html
+++ b/digitalglarus/templates/digitalglarus/base.html
@@ -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' %}">Crowdfounding</a>
-		    </li>
 		</ul>
 	    </div>
 	    <!-- /.navbar-collapse -->
diff --git a/digitalglarus/templates/digitalglarus/landing.html b/digitalglarus/templates/digitalglarus/letscowork.html
similarity index 100%
rename from digitalglarus/templates/digitalglarus/landing.html
rename to digitalglarus/templates/digitalglarus/letscowork.html
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())

From 906c793dda21cdfe2651c0603260b3f7f47e01bd Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique@roux.li>
Date: Sun, 20 Sep 2015 19:26:42 +0200
Subject: [PATCH 4/6] Changed start-date of crowdfounding to 22th september

---
 digitalglarus/templates/digitalglarus/letscowork.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalglarus/templates/digitalglarus/letscowork.html b/digitalglarus/templates/digitalglarus/letscowork.html
index 89bbdaa0..96df85ab 100644
--- a/digitalglarus/templates/digitalglarus/letscowork.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 22th of Septmeber 2015!</h1>
     </div>
     <div class="clearfix"></div>
   </div>

From 7f981c09c23f92c517edf7ae46651d1753e831a8 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique@roux.li>
Date: Sun, 20 Sep 2015 19:31:27 +0200
Subject: [PATCH 5/6] Spell error

---
 digitalglarus/templates/digitalglarus/letscowork.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalglarus/templates/digitalglarus/letscowork.html b/digitalglarus/templates/digitalglarus/letscowork.html
index 96df85ab..8de43d82 100644
--- a/digitalglarus/templates/digitalglarus/letscowork.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 22th of Septmeber 2015!</h1>
+      <h1>Our crowdfunding campaign launches on the 22nd of Septmeber 2015!</h1>
     </div>
     <div class="clearfix"></div>
   </div>

From 44d29cad4a739872b3592699ae807de5a85e2e86 Mon Sep 17 00:00:00 2001
From: Dominique Roux <dominique@roux.li>
Date: Sun, 20 Sep 2015 20:22:24 +0200
Subject: [PATCH 6/6] Typo in september

---
 digitalglarus/templates/digitalglarus/letscowork.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/digitalglarus/templates/digitalglarus/letscowork.html b/digitalglarus/templates/digitalglarus/letscowork.html
index 8de43d82..e0a78594 100644
--- a/digitalglarus/templates/digitalglarus/letscowork.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 22nd of Septmeber 2015!</h1>
+      <h1>Our crowdfunding campaign launches on the 22nd of September 2015!</h1>
     </div>
     <div class="clearfix"></div>
   </div>