From 8aba6cfb4e2369e1f23f8789eb217c43bb644426 Mon Sep 17 00:00:00 2001 From: thatandromeda Date: Tue, 13 Sep 2011 14:59:29 -0300 Subject: [PATCH 1/3] added urlpattern for privacy page --- frontend/urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/frontend/urls.py b/frontend/urls.py index c3740c5c..5c79172a 100644 --- a/frontend/urls.py +++ b/frontend/urls.py @@ -4,4 +4,5 @@ urlpatterns = patterns( "regluit.frontend.views", url(r"^$", "home", name="home"), url(r"^supporter/(?P.+)/$", "supporter", name="supporter"), + url(r"^privacy$", "textpage", name="privacy"), ) From b9fa228608d5f7133043e300aca05060175e58bd Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 13 Sep 2011 14:35:06 -0400 Subject: [PATCH 2/3] privacy policy now displays in footer --- frontend/templates/base.html | 6 ++++++ frontend/templates/privacy.html | 7 +++++++ frontend/urls.py | 2 +- frontend/views.py | 6 ++++++ static/css/layout.css | 6 ++++++ 5 files changed, 26 insertions(+), 1 deletion(-) diff --git a/frontend/templates/base.html b/frontend/templates/base.html index 552ed910..6b2ef4e1 100644 --- a/frontend/templates/base.html +++ b/frontend/templates/base.html @@ -40,6 +40,12 @@ + + diff --git a/frontend/templates/privacy.html b/frontend/templates/privacy.html index bd19059c..f1d22431 100644 --- a/frontend/templates/privacy.html +++ b/frontend/templates/privacy.html @@ -1,3 +1,7 @@ +{% extends "base.html" %} + +{% block content %} +

Gluejar Privacy Policy

Date of last revision: September 13, 2011 @@ -46,3 +50,6 @@ Date of last revision: September 13, 2011

Contact Us

If you have any questions regarding this privacy policy, you can contact us at contact@gluejar.com, or using our contact page.

+ +{% endblock %} + diff --git a/frontend/urls.py b/frontend/urls.py index 5c79172a..30f7799b 100644 --- a/frontend/urls.py +++ b/frontend/urls.py @@ -4,5 +4,5 @@ urlpatterns = patterns( "regluit.frontend.views", url(r"^$", "home", name="home"), url(r"^supporter/(?P.+)/$", "supporter", name="supporter"), - url(r"^privacy$", "textpage", name="privacy"), + url(r"^privacy$", "textpage", {'page': 'privacy'}, name="privacy"), ) diff --git a/frontend/views.py b/frontend/views.py index 9dd667f6..0a516cce 100755 --- a/frontend/views.py +++ b/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) + ) diff --git a/static/css/layout.css b/static/css/layout.css index 6592018a..f3886721 100755 --- a/static/css/layout.css +++ b/static/css/layout.css @@ -132,3 +132,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; +} From bd189eeb8313ce937de81fd24257e390036bb54f Mon Sep 17 00:00:00 2001 From: Andromeda Yelton Date: Tue, 13 Sep 2011 15:03:30 -0400 Subject: [PATCH 3/3] changed logo to grey version --- static/css/layout.css | 1 + static/images/logo.png | Bin 2347 -> 2525 bytes 2 files changed, 1 insertion(+) diff --git a/static/css/layout.css b/static/css/layout.css index f3886721..fbd04399 100755 --- a/static/css/layout.css +++ b/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;} diff --git a/static/images/logo.png b/static/images/logo.png index fb69f9d9caa755e94760f64dcc2046c641086914..524ec6ef950d32a20a478148745bb5e969951e90 100755 GIT binary patch literal 2525 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 R`pp0U002ovPDHLkV1jXmSc?Dv