add link for hanging posters, image URL in city email

visiblegovernment · Jul 8, 2011 · 16f877f · 16f877f
1 parent 7c3f150
commit 16f877f
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 4 deletions.
diff --git a/mainapp/views/main.py b/mainapp/views/main.py
@@ -89,4 +89,10 @@ def search_address(request):
 
 def about(request):
    return render_to_response("about.html",{'faq_entries' : FaqEntry.objects.all().order_by('order')},
-                context_instance=RequestContext(request))    
+                context_instance=RequestContext(request)) 
+
+def posters(request): 
+   return render_to_response("posters.html",
+                {'languages': settings.LANGUAGES },
+                 context_instance=RequestContext(request))
+
diff --git a/media/css/layout-8.css b/media/css/layout-8.css
@@ -469,6 +469,8 @@ input.big_button:hover {background: url("/media/images/search-hover.png") no-rep
 #instructable img {padding-right:1.5em;}
 #contact_us_form { width:450px; text-align: left; }
 #contact_us_form p { margin-bottom: .5em; }
+#posters { text-align: center;  }
+#posters p {width: 450px; margin: 20px auto;}
 
 .left {float:left;}
 .right {float:right;}
diff --git a/media/posters/FMSPoster_en.pdf b/media/posters/FMSPoster_en.pdf
diff --git a/media/posters/FMSPoster_fr.pdf b/media/posters/FMSPoster_fr.pdf
diff --git a/templates/base.html b/templates/base.html
@@ -88,7 +88,7 @@
 
 				<div id="footer" class="container_12">
 					<div class='grid_12'>
-					<a href="http://visiblegovernment.ca">VisibleGovernment.ca</a>  | {% trans "Promotions" %}: <a href="/promotions/OBC">OBC</a></p>
+					<a href="http://visiblegovernment.ca">VisibleGovernment.ca</a>  | <a href="/posters/">{% trans "Hang a Poster" %}</a></p>
 					</div>
 				</div>
 

diff --git a/templates/emails/confirm/message.txt b/templates/emails/confirm/message.txt
@@ -9,4 +9,16 @@ To confirm your submission, please click on the following URL:
 {{confirm_url}}
 
 Thank you,
-The FixMyStreet.ca Team
+The FixMyStreet.ca Team
+
+
+{% if update.first_update %}
+--------------------------------------------------------------
+
+The more people who know about fixmystreet.ca, the more 
+useful it will be.  Share your report on Twitter or Facebook, 
+or hang a poster at a university or local coffee shop: 
+http://fixmystreet.ca/posters/
+
+--------------------------------------------------------------
+{% endif %}
diff --git a/templates/emails/send_report_to_city/message.txt b/templates/emails/send_report_to_city/message.txt
@@ -5,6 +5,7 @@ Phone:        {{update.phone}}
 Email:        {{update.email}}
 FMS ID:       {{update.report.id}}
 {% if update.report.address %}Location:     {{update.report.address}}{% endif %}
+{% if update.report.photo %}Image URL:    {{SITE_URL}}/media/{{update.report.photo}}{% endif %}
 
 {{update.desc|safe}}
 

diff --git a/templates/posters.html b/templates/posters.html
@@ -0,0 +1,22 @@
+{% extends "base.html" %}
+{% load i18n %}
+{% block title %}
+	{% trans "Posters" %}
+{% endblock %}
+{% block content %}
+<div id="page_content_container">
+<h3>FixMyStreet Canada {% trans "Posters" %}</h3>
+<div id="posters">
+<p>{% blocktrans %}
+Help spread the word.  The more people who know about fixmystreet.ca, the more 
+useful it will be.  Share your report on Twitter or Facebook, 
+or hang a poster at a university or neighbourhood coffee shop.
+{% endblocktrans %}
+<ul>
+{% for lang in languages %}
+	<li><a href='/media/posters/FMSPoster_{{lang.0}}.pdf'> {% trans "Poster" %} - {{lang.1}}</a></li>
+{% endfor %}
+</ul>
+</div>
+</div>
+{% endblock %}
diff --git a/urls.py b/urls.py
@@ -34,7 +34,8 @@
 urlpatterns += patterns('mainapp.views.main',
     (r'^$', 'home', {}, 'home_url_name'),
     (r'^search', 'search_address'),
-    (r'about/$', 'about',{}, 'about_url_name')
+    (r'about/$', 'about',{}, 'about_url_name'),
+    (r'posters/$', 'posters',{}, 'posters'),
 )
 
 urlpatterns += patterns('mainapp.views.faq',