Merge pull request #668 from mapseed/content

Content & translations

src/flavors/gtopenspace/config.yml

@@ -35,6 +35,7 @@ map:
   layers:
     # SmarterCleanup Mapbox base layer:
     - id: transport
+      type: basemap
       url: //{s}.tile.thunderforest.com/transport/{z}/{x}/{y}.png?apikey=e72cddbdee5d4ecc81f5731d89655980
       attribution: '<a href="/page/terms">Terms and conditions</a> &copy; OpenStreetMap contributors, CC-BY-SA. <a href="//mapbox.com/about/maps" target="_blank">Mapbox</a>. Geocoding Courtesy of <a href="//www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png">.'
 
@@ -891,7 +892,9 @@ story:
     default_visible_layers:
       - 10sites
       - restoration
+      - transport
     tagline: _(Explore other priority sites)
+    basemap: transport
     order:
       - url: sp-connection
       - url: gateway-park

src/flavors/gtopenspace/locale/zh_Hant/LC_MESSAGES/django.po

@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2017-03-24 20:49-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[email protected]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: flavors/gtopenspace/templates/index.html:58
+msgid "Powered by"
+msgstr ""

src/flavors/pboakland/jstemplates/pages/getinvolved.html

@@ -1,25 +1,10 @@
 <h1>{{#_}}Get more involved{{/_}}</h1>
 
 <p>{{#_}}Already submitted an idea? There are many more ways to get involved in participatory budgeting:{{/_}}</p>
-{{#_}}
-<h4>The PB Vote takes place Feb 18-22nd!</h4>
-{{/_}}
-{{#_}}
-<em>
-<a href="https://pbstanford.org/oakland2017d1"><h1>Vote here for District 1</h1></a>
-<a href="https://pbstanford.org/oakland2017d2"><h1>Vote here for District 2</h1></a>
-</em>
-{{/_}}
-{{#_}}
-<strong><p>Voting will take place at the district kick off events (details below), online, and at mobile sites throughout the districts.<br><br>Online voting is open through Thursday, Feb. 23rd at 11:59 pm!</strong>
-{{/_}}
-{{#_}}
-<img src="http://i.imgur.com/u13G9jG.png">
-<img src="http://i.imgur.com/nkhPpWV.png">
-{{/_}}
+
 <h3>{{#_}}Volunteer{{/_}}</h3>
 
-<p>{{#_}}There are lots of ways to get involved in PB in Oakland! You can help to get the word out to district residents, facilitate small group meetings, provide support at PB events, and more. Sign up <a href="http://www.123contactform.com/form-2317799/PB-Oakland-Volunteer-Sign-Up" target="_blank">here</a>.{{/_}}</p>
+<p>{{#_}}You can help to get the word out to district residents, facilitate small group meetings, provide support at PB events, and more. Sign up <a href="http://www.123contactform.com/form-2317799/PB-Oakland-Volunteer-Sign-Up" target="_blank">here</a>.{{/_}}</p>
 
 <h3>{{#_}}Contact Us{{/_}}</h3>
 

src/flavors/pboakland/jstemplates/pages/overview.html

@@ -3,22 +3,32 @@ <h1>{{#_}}Participatory Budgeting Oakland{{/_}}</h1>
 <img src="http://www.africablogging.org/wp-content/uploads/2016/07/n-DEMOCRACY-VOTING-HANDS-628x314.jpg">
 
 <p>{{#_}}is an innovative democratic process that gives Oakland residents of City Council Districts 1 and 2 the power to set priorities for how federal Community Development Block Grant (CDBG) funds should be spent to improve low-to-moderate income communities in their district.{{/_}}</p>
+
 {{#_}}
-<em>
-<a href="https://pbstanford.org/oakland2017d1"><h1>Vote here for District 1</h1></a>
-<a href="https://pbstanford.org/oakland2017d2"><h1>Vote here for District 2</h1></a>
-</em>
-{{/_}}
-{{#_}}
-<strong><p>Voting will take place at the district kick off events (details below), online, and at mobile sites throughout the districts.<br><br>Online voting is open through Thursday, Feb. 23rd at 11:59 pm!</strong>
-{{/_}}
-<br>
-<br>
-{{#_}}
-<img src="http://i.imgur.com/u13G9jG.png">
-<img src="http://i.imgur.com/nkhPpWV.png">
+<a href="http://www2.oaklandnet.com/oakca1/groups/ceda/documents/policy/oak062978.pdf"><h2>The results are in!</h2></a>
+<strong><em>You made it happen: here are your PB Oakland priorities winners</em></strong>
 {{/_}}
-<p>{{#_}}For more information on the City of Oakland’s Community Development Block Grant (CDBG) program, click <a href="http://www2.oaklandnet.com/government/o/hcd/s/CDBG/index.htm" target=”_blank”>here</a>.{{/_}}</p>
+<br><br>
+<p>
+We are excited to share that the first ever PB Oakland process is complete!
+</p>
+<p>
+Over 1,200 community members voted in PB Oakland to help decide how to spend $784,678 over 2 years to benefit low-and moderate-income residents in Oakland Council Districts 1 and 2!
+</p>
+<p>
+Thank you to everyone who participated in the first ever PB Oakland process! You are helping to deepen democracy and build stronger communities through PB during a time when we all need it the most.
+</p>
+<p>
+Special thanks to the Community Development District Board Members, District 1 and 2 Staff, the Budget Delegates, our outreach partners: Asian Pacific Environmental Network (APEN) and Oakland Rising, and all the volunteers and participants! This process has been administered by the City of Oakland Housing & Community Development Department with support from the Participatory Budgeting Project and supported by generous grants from The California Endowment and the Akonadi Foundation.​
+</p>
+<p>
+The full list of winning priority projects can be found here: <a href="http://www2.oaklandnet.com/oakca1/groups/ceda/documents/policy/oak062978.pdf">CD1 and CD2 Funding Priorities</a>. The city of Oakland is currently conducting a Request for Proposals (RFP) process in which the Community Development District Boards will make funding recommendations in April. For more information on the RFP process, <a href="http://www2.oaklandnet.com/government/o/hcd/s/CDBG/index.htm">click here</a>.
+</p>
+<p>
+P.S. If there was an idea you were rooting for that didn’t win, don’t worry! All of the ideas submitted during the process will be shared with both District Boards and Council Office staff for future consideration.
+</p>
+
+<p>{{#_}}For more information on the City of Oakland’s Community Development Block Grant (CDBG) program, <a href="http://www2.oaklandnet.com/government/o/hcd/s/CDBG/index.htm" target=”_blank”>click here</a>.{{/_}}</p>
 
 <p>{{#_}}For information on participatory budgeting in the U.S. and Canada, visit the website of the <a href="http://www.participatorybudgeting.org/" target=”_blank”>Participatory Budgeting Project</a>.{{/_}}</p>