fixed external linking in sidebar block

6 files changed, 51 insertions, 24 deletions

diff --git a/website/static/css/main.css b/website/static/css/main.css
index f8c0904..887fa62 100644
--- a/website/static/css/main.css
+++ b/website/static/css/main.css
@@ -36,7 +36,7 @@ body{
 	box-shadow: 1px 1px 15px #cccccc;
 	background: #ffffff;
 }
-#header-inner, #content-inner, #extra-inner, #footer-inner{
+#header-inner, #content-inner, #extra-inner, #footer-inner, #credits{
 	max-width: 1200px;
 	margin: 0 auto;
 	padding: 10px 15px;
@@ -78,6 +78,7 @@ ul.nav li > a:focus{
 	padding-bottom: 25px;
 }
 #footer-wrapper{
+    position: relative;
 	background-color: #2F353A;
 	color: #ffffff;
 }
@@ -110,7 +111,13 @@ ul.nav li > a:focus{
 	transition: padding .5s ease-out 0s;
 }
 #sidebar ul li a:hover{
-	padding-left: 10px;
+	padding-left: 5px;
+}
+#django-logo{
+    position: absolute;
+    width: 35px;
+    right: 10px;
+    bottom: 7px;
 }
 .block{
 	margin-top: 25px;
diff --git a/website/static/images/django-logo.png b/website/static/images/django-logo.png
new file mode 100644
index 0000000..e1260b8
--- /dev/null
+++ b/website/static/images/django-logo.png
diff --git a/website/templates/home.html b/website/templates/home.html
index d57d09f..e69de29 100644
--- a/website/templates/home.html
+++ b/website/templates/home.html
@@ -1 +0,0 @@
-as
\ No newline at end of file
diff --git a/website/templates/page.html b/website/templates/page.html
index 75ffcde..93f4a79 100644
--- a/website/templates/page.html
+++ b/website/templates/page.html
@@ -22,8 +22,17 @@
 						<ul id="main-nav" class="nav nav-pills pull-right">
 						{% for nav in navs %}
 							{% with subnavs=nav.subnav_set.all %}
+							{% if nav.link|slice:":4" == "http" or nav.link == "#" %}
+							<li>
+								<a href="{{ nav.link }}">
+							{% else %}
 							<li class="dropdown">
+							    {% if subnavs|length > 0 %}
 								<a  class="dropdown-toggle" data-toggle="dropdown" href="#">
+								{% else %}
+								<a href="{% url 'website:dispatcher' nav.link %}">
+								{% endif %}
+							{% endif %}
 									{{ nav.nav_name }} {% if subnavs|length > 0 %} <span class="caret"></span> {% endif %}
 								</a>
 								{% if subnavs|length > 0 %}
@@ -59,7 +68,11 @@
 											<h5 class="block-heading">{{ block.linkbox_name }}</h4>
 											<ul>
 												{% for link in block.link_set.all|dictsort:"position" %}
+												{% if link.link|slice:":4" == "http" or nav.link == "#" %}
+												<li><a href="{{link.link}}">{{ link.link_name }}</a></li>
+												{% else %}
 												<li><a href="{% url 'website:dispatcher' link.link %}">{{ link.link_name }}</a></li>
+												{% endif %}
 												{% endfor %}
 											</ul>
 										</div> <!-- /block -->
@@ -96,7 +109,11 @@
 									<h5 class="foot-heading">{{ block.linkbox_name }}</h4>
 									<ul>
 										{% for link in block.link_set.all|dictsort:"position" %}
+										{% if link.link|slice:":4" == "http" or link.link == "#" %}
+										<li><a href="{{ link.link }}">{{ link.link_name }}</a></li>
+										{% else %}
 										<li><a href="{% url 'website:dispatcher' link.link %}">{{ link.link_name }}</a></li>
+										{% endif %}
 										{% endfor %}
 									</ul>
 								</div> <!-- /foot -->
@@ -113,16 +130,18 @@
 
 						{% endfor %}
 						<div class="clearfix"></div>
+						<img id="django-logo" src="{% static 'images/django-logo.png' %}">
 					</div> <!-- /footer-inner -->
 				</div> <!-- /footer-wrapper -->
 				{% endblock %}
 
 			{% endblock %}
-		</div>
+		</div> <!-- /page-wrapper -->
+
 		<script src="{% static 'js/jquery.min.js' %}"></script>
 		<script src="{% static 'js/bootstrap.min.js' %}"></script>
 		<script type="text/javascript">
 			
 		</script>
 	</body>
-</html>
\ No newline at end of file
+</html>
diff --git a/website/urls.py b/website/urls.py
index 7cca8ad..808f537 100644
--- a/website/urls.py
+++ b/website/urls.py
@@ -3,6 +3,6 @@ from django.conf.urls import patterns, include, url
 urlpatterns = patterns('',
 
 	# Main pages dispatcher
-	url(r'^$', 'website.views.home', name="home"),
+	url(r'^$', 'website.views.dispatcher', name="home"),
 	url(r'^(?P<permalink>.+)/$', 'website.views.dispatcher', name="dispatcher"),
-)
\ No newline at end of file
+)
diff --git a/website/views.py b/website/views.py
index 5a58f76..92e2777 100644
--- a/website/views.py
+++ b/website/views.py
@@ -18,24 +18,26 @@ def block_sort(obj):
 	items = sorted(items, key=get_pos)
 	return items
 
-def home(request):
-	return render_to_response('home.html')
+def get_blocks():
+    sidebar = Block.objects.get(block_name = "sidebar")
+    footer = Block.objects.get(block_name = "footer")
+    blocks = {
+        'navs': Nav.objects.order_by('position'),
+        'sidebar': block_sort(sidebar),
+        'footer': block_sort(footer)
+    }
+    return blocks
 
 def dispatcher(request, permalink=''):
-	page = get_object_or_404(Page, permalink=permalink)
-	navs = Nav.objects.order_by('position')
-
-	sidebar = Block.objects.get(block_name = "sidebar")
-	footer = Block.objects.get(block_name = "footer")
-	
-	#
-	sidebar = block_sort(sidebar)
-	footer = block_sort(footer)
-
-	context = {
-		'navs': navs,
+    if permalink == '':
+        permalink = 'home'
+
+    page = get_object_or_404(Page, permalink=permalink)
+    blocks = get_blocks()
+    context = {
 		'page': page,
-		'sidebar': sidebar,
-		'footer': footer
+		'navs': blocks['navs'],
+		'sidebar': blocks['sidebar'],
+		'footer': blocks['footer']
 	}
-	return render_to_response('page.html', context)
\ No newline at end of file
+    return render_to_response('page.html', context)