Footer Block Implemented

3 files changed, 58 insertions, 9 deletions

diff --git a/website/static/css/main.css b/website/static/css/main.css
index 7417bbe..f8c0904 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -16,7 +16,7 @@ h1, h2, h3, h4, h5, h6{
 	font-family: cabin;
 }
 body{
-	/* font-family: ubuntu; */
+	background-color: #f5f5f5;
 }
 #brand-logo{
 	width: 75px;
@@ -29,11 +29,17 @@ body{
 }
 #page-wrapper{
 	border-top: 5px solid #366c9a;
+
+	/* */
+	max-width: 1200px;
+	margin: 25px auto;
+	box-shadow: 1px 1px 15px #cccccc;
+	background: #ffffff;
 }
 #header-inner, #content-inner, #extra-inner, #footer-inner{
 	max-width: 1200px;
 	margin: 0 auto;
-	padding: 10px 0;
+	padding: 10px 15px;
 }
 #header-wrapper{
 	
@@ -69,14 +75,13 @@ ul.nav li > a:focus{
 }
 #content-inner{
 	min-height: 500px;
-	padding: 0 0 25px 0;
+	padding-bottom: 25px;
 }
 #footer-wrapper{
-	height: 300px;
 	background-color: #2F353A;
+	color: #ffffff;
 }
 #footer-inner{
-	height: 300px;
 }
 #content{
 	padding: 0 25px 0 0;
@@ -102,6 +107,10 @@ ul.nav li > a:focus{
 }
 #sidebar ul li a{
 	color: #366c9a;
+	transition: padding .5s ease-out 0s;
+}
+#sidebar ul li a:hover{
+	padding-left: 10px;
 }
 .block{
 	margin-top: 25px;
@@ -114,4 +123,22 @@ ul.nav li > a:focus{
 	font-weight: bolder;
 	margin-top:0;
 	color: #ffffff;
-}
\ No newline at end of file
+}
+.foot{
+	margin-top: 25px;
+}
+.foot-heading{
+	text-align: center;
+	font-weight: bolder;
+}
+.foot ul{
+	list-style-type: square;
+}
+.foot ul li{
+	border-bottom: 1px solid #252525;
+	
+
+	padding: 7px 0 7px 10px;
+}
+.foot ul li a{
+	color: #ffffff;
diff --git a/website/templates/page.html b/website/templates/page.html
index eedf3db..75ffcde 100644
--- a/website/templates/page.html
+++ b/website/templates/page.html
@@ -69,7 +69,7 @@
 										<div class="block">
 											<h5 class="block-heading">{{ block.textbox_name }}</h4>
 											<p>
-												{{ block.content }}
+												{{ block.content|safe }}
 											</p>
 										</div> <!-- /block -->
 									{% endif %}
@@ -90,7 +90,29 @@
 				{% block footer %}
 				<div id="footer-wrapper">
 					<div id="footer-inner">
-						Hello World
+						{% for block in footer %}
+							{% if block.linkbox_name %}
+								<div class="foot col-lg-4">
+									<h5 class="foot-heading">{{ block.linkbox_name }}</h4>
+									<ul>
+										{% for link in block.link_set.all|dictsort:"position" %}
+										<li><a href="{% url 'website:dispatcher' link.link %}">{{ link.link_name }}</a></li>
+										{% endfor %}
+									</ul>
+								</div> <!-- /foot -->
+							{% endif %}
+
+							{% if block.textbox_name %}
+								<div class="foot col-lg-4">
+									<h5 class="foot-heading">{{ block.textbox_name }}</h4>
+									<p>
+										{{ block.content|safe }}
+									</p>
+								</div> <!-- /foot -->
+							{% endif %}
+
+						{% endfor %}
+						<div class="clearfix"></div>
 					</div> <!-- /footer-inner -->
 				</div> <!-- /footer-wrapper -->
 				{% endblock %}
diff --git a/website/views.py b/website/views.py
index f52a81d..5a58f76 100644
--- a/website/views.py
+++ b/website/views.py
@@ -26,7 +26,7 @@ def dispatcher(request, permalink=''):
 	navs = Nav.objects.order_by('position')
 
 	sidebar = Block.objects.get(block_name = "sidebar")
-	footer = Block.objects.get(block_name = "sidebar")
+	footer = Block.objects.get(block_name = "footer")
 	
 	#
 	sidebar = block_sort(sidebar)