From 142cf148b57f0d262e8bda64630c6d7c2b0c2a6e Mon Sep 17 00:00:00 2001
From: Jayaram Pai
Date: Mon, 28 Oct 2013 22:48:35 +0530
Subject: Block Sorting implemented

---
 website/models.py           |  2 +-
 website/templates/page.html | 41 +++++++++++++++++++++--------------------
 website/views.py            | 33 +++++++++++++++++++++++++++------
 3 files changed, 49 insertions(+), 27 deletions(-)

(limited to 'website')

diff --git a/website/models.py b/website/models.py
index cba975b..b0776e6 100644
--- a/website/models.py
+++ b/website/models.py
@@ -66,4 +66,4 @@ class TextBox(models.Model):
 	visible = models.BooleanField()
 
 	def __unicode__(self):
-		return self.box_name
+		return self.textbox_name
diff --git a/website/templates/page.html b/website/templates/page.html
index 8d05fd5..eedf3db 100644
--- a/website/templates/page.html
+++ b/website/templates/page.html
@@ -53,27 +53,28 @@
 							</div> <!-- /content -->
 
 							<div id="sidebar" class="col-lg-2">
-								<div class="block">
-									<h5 class="block-heading">Projects</h4>
-									<ul>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-									</ul>
-								</div> <!-- /block -->
+								{% for block in sidebar %}
+									{% if block.linkbox_name %}
+										<div class="block">
+											<h5 class="block-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> <!-- /block -->
+									{% endif %}
 
-								<div class="block">
-									<h5 class="block-heading">FOSSEE</h4>
-									<ul>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-										<li><a href="#">Hello World</a></li>
-									</ul>
-								</div> <!-- /block -->
+									{% if block.textbox_name %}
+										<div class="block">
+											<h5 class="block-heading">{{ block.textbox_name }}</h4>
+											<p>
+												{{ block.content }}
+											</p>
+										</div> <!-- /block -->
+									{% endif %}
+
+								{% endfor %}
 							</div> <!-- /sidebar -->
 							<div class="clearfix"></div>
 					</div> <!-- /content-inner -->
diff --git a/website/views.py b/website/views.py
index f08629b..f52a81d 100644
--- a/website/views.py
+++ b/website/views.py
@@ -1,20 +1,41 @@
 from django.http import HttpResponse
 from django.shortcuts import render_to_response, get_object_or_404
 
-from website.models import Nav, SubNav, Page
+from website.models import Nav, Page, Block
 
-def generate_nav():
-	x=10
+def block_sort(obj):
+	linkboxes = obj.linkbox_set.all()
+	textboxes = obj.textbox_set.all()
+
+	items = []
+	for item in linkboxes:
+		items.append(item)
+
+	for item in textboxes:
+		items.append(item)
+
+	def get_pos(x): return x.position
+	items = sorted(items, key=get_pos)
+	return items
 
 def home(request):
 	return render_to_response('home.html')
 
 def dispatcher(request, permalink=''):
 	page = get_object_or_404(Page, permalink=permalink)
-	navs = Nav.objects.all()
+	navs = Nav.objects.order_by('position')
+
+	sidebar = Block.objects.get(block_name = "sidebar")
+	footer = Block.objects.get(block_name = "sidebar")
+	
+	#
+	sidebar = block_sort(sidebar)
+	footer = block_sort(footer)
 
 	context = {
-		"navs": navs,
-		"page": page
+		'navs': navs,
+		'page': page,
+		'sidebar': sidebar,
+		'footer': footer
 	}
 	return render_to_response('page.html', context)
\ No newline at end of file
-- 
cgit