Merge branch 'master' of github.com:Gluejar/regluit into tastypie1

frontend/templates/base.html

@@ -40,6 +40,12 @@
 
 </div>
 
+<div id="footer">
+	<ul class="menu">
+    	<li><a href="{% url privacy %}"><span>Privacy</span></a></li>
+    </ul>
+</div>
+
 </body>
 </html>
 

frontend/templates/privacy.html

@@ -1,3 +1,7 @@
+{% extends "base.html" %}
+
+{% block content %}
+
 <h1>Gluejar Privacy Policy</h1>
 
 Date of last revision: September 13, 2011
@@ -46,3 +50,6 @@ Date of last revision: September 13, 2011
 <h2>Contact Us</h2>
 
 <p>If you have any questions regarding this privacy policy, you can contact us at <a href="mailto:contact@gluejar.com?Subject=Questions%about%20privacy%20policy">contact@gluejar.com</a>, or using our contact page.</p>
+
+{% endblock %}
+

frontend/urls.py

@@ -4,4 +4,5 @@ urlpatterns = patterns(
     "regluit.frontend.views",
     url(r"^$", "home", name="home"),
     url(r"^supporter/(?P<supporter_username>.+)/$", "supporter", name="supporter"),
+    url(r"^privacy$", "textpage", {'page': 'privacy'}, name="privacy"),
 )

frontend/views.py

@@ -16,3 +16,9 @@ def supporter(request, supporter_username):
         {"supporter": supporter},
         context_instance=RequestContext(request)
     )
+
+def textpage(request, page):	
+    return render_to_response(page + '.html', 
+        {},
+        context_instance=RequestContext(request)
+    )

static/css/layout.css

@@ -20,6 +20,7 @@ body{
 #header{ height:90px;}
 
 .logo{ float:left; padding-top:20px;}
+.logo a img{border: none;}
 .topmenu{ float:right; padding-top:25px;}
 .topmenu ul li{ float:left; padding:0 10px;}
 .topmenu ul li a{ height:36px; line-height:36px; display:block; color:#fff; text-decoration:none; font-weight:bold; font-size:13px; letter-spacing:1px; text-transform:capitalize;}
@@ -132,3 +133,9 @@ a{ font-weight:bold; font-size:13px; text-decoration:none; cursor:pointer;}
     padding-top: 5px;
     padding-bottom: 5px;
 }
+
+#footer{
+	border-top: 7px solid #edf3f4;
+	clear: both;
+	height:90px;
+}