From a92e230dde27b10de2b09a57a6c1f6071f0c127f Mon Sep 17 00:00:00 2001
From: Guus Hoekman <mail@guushoekman.com>
Date: Tue, 30 May 2017 13:34:53 +0200
Subject: [PATCH] code4sa to openup

---
 bower.json                                    |   4 +-
 nearby/settings.py                            |   2 +-
 .../code4sa-styles/.bower.json                |   6 +-
 .../code4sa-styles/bower.json                 |   6 +-
 nearby/static/images/openup-logo.svg          | 138 ++++++++++++++++++
 nearby/templates/councillor/_form.html        |   8 +-
 6 files changed, 151 insertions(+), 13 deletions(-)
 create mode 100644 nearby/static/images/openup-logo.svg

diff --git a/bower.json b/bower.json
index e435842..6bdb9a1 100644
--- a/bower.json
+++ b/bower.json
@@ -2,14 +2,14 @@
   "name": "code4sa-django-template",
   "version": "0.0.1",
   "authors": [
-    "Greg Kempe <greg@code4sa.org>"
+    "Greg Kempe <greg@openup.org.za>"
   ],
   "description": "Code4SA Django Template",
   "moduleType": [
     "globals"
   ],
   "license": "MIT",
-  "homepage": "https://github.com/Code4SA/django-template",
+  "homepage": "https://github.com/OpenUpSA/django-template",
   "private": true,
   "ignore": [
     "**/.*",
diff --git a/nearby/settings.py b/nearby/settings.py
index 61e4229..9e077f0 100644
--- a/nearby/settings.py
+++ b/nearby/settings.py
@@ -87,7 +87,7 @@
 
 
 # Email
-ADMINS = [('Code4SA', 'webapps@code4sa.org')]
+ADMINS = [('Code4SA', 'webapps@openup.org.za')]
 DEFAULT_FROM_EMAIL = ADMINS[0][1]
 SERVER_EMAIL = DEFAULT_FROM_EMAIL
 
diff --git a/nearby/static/bower_components/code4sa-styles/.bower.json b/nearby/static/bower_components/code4sa-styles/.bower.json
index 3c5840d..52850f9 100644
--- a/nearby/static/bower_components/code4sa-styles/.bower.json
+++ b/nearby/static/bower_components/code4sa-styles/.bower.json
@@ -1,9 +1,9 @@
 {
   "name": "code4sa-styles",
   "version": "0.9.4",
-  "homepage": "https://github.com/Code4SA/styles",
+  "homepage": "https://github.com/OpenUpSA/styles",
   "authors": [
-    "Greg Kempe <greg@code4sa.org>",
+    "Greg Kempe <greg@openup.org.za>",
     "Fritz Jooste <fritz@fritzjooste.com>"
   ],
   "description": "Code for South Africa Website Styleguide",
@@ -18,7 +18,7 @@
     "tag": "v0.9.4",
     "commit": "3b68981597d74d51dbc91e2b5393e0e548225c9e"
   },
-  "_source": "git://github.com/Code4SA/styles.git",
+  "_source": "git://github.com/OpenUpSA/styles.git",
   "_target": "~0.9.4",
   "_originalSource": "code4sa-styles",
   "_direct": true
diff --git a/nearby/static/bower_components/code4sa-styles/bower.json b/nearby/static/bower_components/code4sa-styles/bower.json
index 35c3e9d..1afd70e 100644
--- a/nearby/static/bower_components/code4sa-styles/bower.json
+++ b/nearby/static/bower_components/code4sa-styles/bower.json
@@ -1,12 +1,12 @@
 {
   "name": "code4sa-styles",
   "version": "0.9.4",
-  "homepage": "https://github.com/Code4SA/styles",
+  "homepage": "https://github.com/OpenUpSA/styles",
   "authors": [
-    "Greg Kempe <greg@code4sa.org>",
+    "Greg Kempe <greg@openup.org.za>",
     "Fritz Jooste <fritz@fritzjooste.com>"
   ],
-  "description": "Code for South Africa Website Styleguide",
+  "description": "OpenUp Website Styleguide",
   "license": "MIT",
   "ignore": [
     "**/.*",
diff --git a/nearby/static/images/openup-logo.svg b/nearby/static/images/openup-logo.svg
new file mode 100644
index 0000000..01ea865
--- /dev/null
+++ b/nearby/static/images/openup-logo.svg
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.4, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_2"
+   x="0px"
+   y="0px"
+   width="400px"
+   height="194px"
+   viewBox="0 0 400 194"
+   enable-background="new 0 0 400 194"
+   xml:space="preserve"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="OpenUp-logo_3.svg"
+   inkscape:export-filename="/Users/greg/Downloads/OpenUp-logo_3.png"
+   inkscape:export-xdpi="57.540001"
+   inkscape:export-ydpi="57.540001"><metadata
+     id="metadata71"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+     id="defs69" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1209"
+     inkscape:window-height="681"
+     id="namedview67"
+     showgrid="false"
+     inkscape:zoom="0.775"
+     inkscape:cx="200"
+     inkscape:cy="97"
+     inkscape:window-x="99"
+     inkscape:window-y="59"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="g3" /><g
+     id="g3"><g
+       id="g5"
+       transform="translate(131.6129,0)"><path
+         d="m 56.938,100.484 c 0,7.312 -1.85,13.062 -5.547,17.25 -3.698,4.188 -8.839,6.281 -15.422,6.281 -6.729,0 -11.922,-2.057 -15.578,-6.172 -3.656,-4.114 -5.484,-9.922 -5.484,-17.422 0,-7.438 1.833,-13.203 5.5,-17.297 3.666,-4.094 8.875,-6.141 15.625,-6.141 6.562,0 11.688,2.083 15.375,6.25 3.687,4.168 5.531,9.918 5.531,17.251 z m -36.407,0 c 0,6.188 1.317,10.881 3.953,14.078 2.635,3.198 6.463,4.797 11.484,4.797 5.062,0 8.885,-1.594 11.469,-4.781 2.583,-3.188 3.875,-7.885 3.875,-14.094 0,-6.146 -1.287,-10.807 -3.859,-13.984 -2.573,-3.177 -6.381,-4.766 -11.422,-4.766 -5.062,0 -8.912,1.599 -11.547,4.797 -2.635,3.198 -3.953,7.849 -3.953,13.953 z"
+         id="path7"
+         inkscape:connector-curvature="0"
+         style="fill:#6d6e70" /><path
+         d="m 79.722,124.016 c -2.229,0 -4.266,-0.412 -6.109,-1.234 -1.843,-0.822 -3.391,-2.088 -4.641,-3.797 l -0.375,0 c 0.25,2 0.375,3.896 0.375,5.688 l 0,14.094 -5.188,0 0,-49.626 4.219,0 0.719,4.688 0.25,0 c 1.333,-1.875 2.885,-3.229 4.656,-4.062 1.771,-0.833 3.802,-1.25 6.094,-1.25 4.541,0 8.047,1.552 10.516,4.656 2.469,3.104 3.703,7.458 3.703,13.062 0,5.625 -1.256,9.995 -3.766,13.109 -2.511,3.115 -5.995,4.672 -10.453,4.672 z m -0.75,-31.094 c -3.5,0 -6.031,0.969 -7.594,2.906 -1.563,1.937 -2.365,5.021 -2.406,9.25 l 0,1.156 c 0,4.812 0.802,8.256 2.406,10.328 1.604,2.073 4.177,3.109 7.719,3.109 2.958,0 5.275,-1.197 6.953,-3.594 1.677,-2.396 2.516,-5.697 2.516,-9.906 0,-4.271 -0.839,-7.547 -2.516,-9.828 -1.678,-2.281 -4.037,-3.421 -7.078,-3.421 z"
+         id="path9"
+         inkscape:connector-curvature="0"
+         style="fill:#6d6e70" /><path
+         d="m 114.911,124.016 c -5.062,0 -9.058,-1.541 -11.984,-4.625 -2.928,-3.083 -4.391,-7.364 -4.391,-12.844 0,-5.521 1.359,-9.906 4.078,-13.156 2.719,-3.25 6.369,-4.875 10.953,-4.875 4.291,0 7.688,1.412 10.188,4.234 2.5,2.823 3.75,6.547 3.75,11.172 l 0,3.281 -23.594,0 c 0.104,4.021 1.119,7.073 3.047,9.156 1.927,2.084 4.641,3.125 8.141,3.125 3.688,0 7.333,-0.771 10.938,-2.312 l 0,4.625 c -1.834,0.792 -3.568,1.359 -5.203,1.703 -1.637,0.344 -3.61,0.516 -5.923,0.516 z m -1.406,-31.157 c -2.75,0 -4.943,0.896 -6.578,2.688 -1.636,1.792 -2.6,4.271 -2.891,7.438 l 17.906,0 c 0,-3.271 -0.729,-5.776 -2.188,-7.516 -1.458,-1.74 -3.541,-2.61 -6.249,-2.61 z"
+         id="path11"
+         inkscape:connector-curvature="0"
+         style="fill:#6d6e70" /><path
+         d="m 157.227,123.391 0,-22.156 c 0,-2.792 -0.636,-4.875 -1.906,-6.25 -1.271,-1.375 -3.261,-2.062 -5.969,-2.062 -3.584,0 -6.209,0.969 -7.875,2.906 -1.667,1.938 -2.5,5.136 -2.5,9.594 l 0,17.969 -5.188,0 0,-34.25 4.219,0 0.844,4.688 0.25,0 c 1.062,-1.688 2.552,-2.995 4.469,-3.922 1.916,-0.927 4.052,-1.391 6.406,-1.391 4.125,0 7.229,0.995 9.312,2.984 2.083,1.99 3.125,5.172 3.125,9.547 l 0,22.344 -5.187,0 z"
+         id="path13"
+         inkscape:connector-curvature="0"
+         style="fill:#6d6e70" /><path
+         d="m 207.071,77.703 0,29.562 c 0,5.209 -1.573,9.303 -4.719,12.281 -3.146,2.979 -7.469,4.469 -12.969,4.469 -5.5,0 -9.756,-1.5 -12.766,-4.5 -3.011,-3 -4.516,-7.125 -4.516,-12.375 l 0,-29.437 5.312,0 0,29.812 c 0,3.812 1.041,6.74 3.125,8.781 2.083,2.042 5.146,3.062 9.188,3.062 3.854,0 6.822,-1.025 8.906,-3.078 2.083,-2.052 3.125,-4.994 3.125,-8.828 l 0,-29.75 5.314,0 z"
+         id="path15"
+         inkscape:connector-curvature="0"
+         style="fill:#6d6e70" /><path
+         d="m 230.481,124.016 c -2.229,0 -4.266,-0.412 -6.109,-1.234 -1.843,-0.822 -3.391,-2.088 -4.641,-3.797 l -0.375,0 c 0.25,2 0.375,3.896 0.375,5.688 l 0,14.094 -5.188,0 0,-49.626 4.219,0 0.719,4.688 0.25,0 c 1.333,-1.875 2.885,-3.229 4.656,-4.062 1.771,-0.833 3.802,-1.25 6.094,-1.25 4.541,0 8.047,1.552 10.516,4.656 2.469,3.104 3.703,7.458 3.703,13.062 0,5.625 -1.256,9.995 -3.766,13.109 -2.51,3.115 -5.995,4.672 -10.453,4.672 z m -0.75,-31.094 c -3.5,0 -6.031,0.969 -7.594,2.906 -1.563,1.937 -2.365,5.021 -2.406,9.25 l 0,1.156 c 0,4.812 0.802,8.256 2.406,10.328 1.604,2.073 4.177,3.109 7.719,3.109 2.958,0 5.275,-1.197 6.953,-3.594 1.677,-2.396 2.516,-5.697 2.516,-9.906 0,-4.271 -0.839,-7.547 -2.516,-9.828 -1.677,-2.281 -4.037,-3.421 -7.078,-3.421 z"
+         id="path17"
+         inkscape:connector-curvature="0"
+         style="fill:#6d6e70" /></g><g
+       id="g19"
+       transform="translate(-251.6129,0)"><path
+         d="m 293.696,73.025 7.734,-12.958 10.947,7.964 8.834,-6.686 14.105,10.53 4.668,-7.922 11.402,2.288 4.715,-8.976 9.295,-0.23 6.082,-5.122 C 355.874,27.723 330.347,12.105 314.015,16.772 298.464,21.217 285.931,44.66 283.992,71.078 l 9.704,1.947 z"
+         id="path21"
+         style="fill:#a4da22;fill-opacity:1"
+         inkscape:connector-curvature="0" /><path
+         d="m 370.245,101.094 -7.127,-2.18 -5.977,8.025 -12.836,-7.881 -7.943,4.773 -9.51,-16.218 -11.254,4.385 -6,-11.779 -8.217,7.092 -11.123,-10 c -4.619,9.189 -7.934,19.397 -9.17,29.937 -4.434,37.785 15.021,62.176 42.172,65.359 27.152,3.184 51.721,-16.043 56.152,-53.826 0.75,-6.391 0.697,-12.838 0.016,-19.158 l -9.183,1.471 z"
+         id="path23"
+         style="fill:#a4da22;fill-opacity:1"
+         inkscape:connector-curvature="0" /><g
+         id="g25"><path
+           d="m 320.114,171.781 c -14.285,0 -27.25,-5.83 -36.508,-16.417 -9.808,-11.218 -14.992,-26.979 -14.992,-45.583 0,-40.747 28.799,-77.001 51.5,-77.001 11.316,0 24.269,9.01 34.647,24.102 10.71,15.572 16.853,34.854 16.853,52.899 0,18.604 -5.185,34.365 -14.992,45.583 -9.258,10.587 -22.223,16.417 -36.508,16.417 z m 0,-135.001 c -20.74,0 -47.5,35.4 -47.5,73.001 0,17.62 4.843,32.472 14.004,42.949 8.486,9.706 20.382,15.051 33.496,15.051 13.114,0 25.01,-5.345 33.496,-15.051 9.161,-10.478 14.004,-25.329 14.004,-42.949 0,-17.257 -5.886,-35.712 -16.147,-50.633 C 341.834,45.143 330.113,36.78 320.114,36.78 Z"
+           id="path27"
+           inkscape:connector-curvature="0"
+           style="fill:#6d6e70" /></g><g
+         id="g29"><path
+           d="m 309.104,160.781 c -0.188,0 -0.379,-0.035 -0.564,-0.11 -30.091,-12.241 -30.271,-48.203 -30.269,-48.564 0.004,-0.826 0.675,-1.493 1.5,-1.493 0,0 0.004,0 0.006,10e-4 0.828,0.003 1.497,0.677 1.494,1.505 -0.001,0.342 0.208,34.305 28.399,45.772 0.768,0.312 1.136,1.188 0.824,1.955 -0.237,0.582 -0.798,0.934 -1.39,0.934 z"
+           id="path31"
+           inkscape:connector-curvature="0"
+           style="fill:#6d6e70" /></g><g
+         id="g33"><path
+           d="m 345.605,70.031 c -0.571,0 -1.117,-0.329 -1.368,-0.884 -0.533,-1.18 -1.125,-2.352 -1.761,-3.484 -0.406,-0.723 -0.149,-1.637 0.573,-2.043 0.722,-0.405 1.638,-0.148 2.042,0.574 0.679,1.209 1.311,2.459 1.88,3.719 0.341,0.756 0.005,1.644 -0.75,1.984 -0.2,0.091 -0.409,0.134 -0.616,0.134 z"
+           id="path35"
+           inkscape:connector-curvature="0"
+           style="fill:#6d6e70" /></g><g
+         id="g37"><path
+           stroke-miterlimit="10"
+           d="M 342.673,63.052"
+           id="path39"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#6d6e70;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10" /></g><g
+         id="g41"><path
+           stroke-miterlimit="10"
+           d="M 341.62,61.442"
+           id="path43"
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#6d6e70;stroke-width:3;stroke-linecap:round;stroke-miterlimit:10" /></g><g
+         id="g45"><path
+           d="m 341.621,62.942 c -0.479,0 -0.948,-0.229 -1.239,-0.654 -5.16,-7.547 -11.005,-11.193 -11.063,-11.23 -0.705,-0.434 -0.926,-1.357 -0.491,-2.062 0.435,-0.707 1.359,-0.925 2.063,-0.492 0.261,0.16 6.45,4.023 11.968,12.092 0.468,0.685 0.292,1.617 -0.392,2.086 -0.259,0.174 -0.554,0.26 -0.846,0.26 z"
+           id="path47"
+           inkscape:connector-curvature="0"
+           style="fill:#6d6e70" /></g><g
+         id="g49"><path
+           d="m 272.77,58.614 c -0.216,0 -0.435,-0.047 -0.643,-0.146 -0.748,-0.355 -1.066,-1.248 -0.712,-1.996 0.162,-0.342 4.064,-8.445 13.176,-16.797 0.611,-0.558 1.56,-0.518 2.119,0.092 0.56,0.611 0.519,1.561 -0.092,2.12 -8.652,7.931 -12.455,15.793 -12.493,15.872 -0.257,0.539 -0.795,0.855 -1.355,0.855 z"
+           id="path51"
+           inkscape:connector-curvature="0"
+           style="fill:#6d6e70" /></g><g
+         id="g53"><path
+           d="m 266.77,54.114 c -0.144,0 -0.289,-0.031 -0.428,-0.098 -0.499,-0.236 -0.711,-0.832 -0.475,-1.331 0.16,-0.337 4.021,-8.354 13.062,-16.642 0.408,-0.373 1.04,-0.347 1.413,0.061 0.373,0.408 0.346,1.04 -0.062,1.414 -8.733,8.006 -12.568,15.945 -12.606,16.025 -0.171,0.36 -0.53,0.571 -0.904,0.571 z"
+           id="path55"
+           inkscape:connector-curvature="0"
+           style="fill:#6d6e70" /></g><g
+         id="g57"><g
+           id="g59"><path
+             d="m 372.662,165.844 c -0.303,0 -0.607,-0.091 -0.872,-0.28 -0.674,-0.481 -0.829,-1.419 -0.347,-2.093 6.828,-9.547 8.927,-18.025 8.947,-18.11 0.194,-0.805 1.004,-1.3 1.809,-1.107 0.805,0.193 1.301,1.002 1.108,1.807 -0.088,0.367 -2.233,9.103 -9.425,19.157 -0.291,0.408 -0.752,0.626 -1.22,0.626 z"
+             id="path61"
+             inkscape:connector-curvature="0"
+             style="fill:#6d6e70" /></g><g
+           id="g63"><path
+             d="m 379.359,168.018 c -0.201,0 -0.404,-0.061 -0.581,-0.187 -0.449,-0.321 -0.553,-0.946 -0.231,-1.396 6.91,-9.658 9.004,-18.196 9.024,-18.281 0.129,-0.537 0.669,-0.865 1.205,-0.74 0.537,0.129 0.868,0.668 0.74,1.205 -0.087,0.363 -2.208,9.006 -9.343,18.98 -0.194,0.273 -0.502,0.419 -0.814,0.419 z"
+             id="path65"
+             inkscape:connector-curvature="0"
+             style="fill:#6d6e70" /></g></g></g></g></svg>
\ No newline at end of file
diff --git a/nearby/templates/councillor/_form.html b/nearby/templates/councillor/_form.html
index 48bc71d..2a4d21d 100644
--- a/nearby/templates/councillor/_form.html
+++ b/nearby/templates/councillor/_form.html
@@ -38,7 +38,7 @@ <h3>Find your ward councillor</h3>
           <a class="logo" href="http://www.pa.org.za" target="_blank"><img src="{% static 'images/pa-logo.png' %}"></a>
         </div>
         <div class="col-xs-4">
-          <a class="logo" href="http://code4sa.org" target="_blank"><img src="{% static 'bower_components/code4sa-styles/images/code4sa_logo.png' %}"></a>
+          <a class="logo" href="https://openup.org.za" target="_blank"><img src="{% static 'images/openup-logo.svg' %}"></a>
         </div>
       </div>
     </div>
@@ -47,9 +47,9 @@ <h3>Find your ward councillor</h3>
 
 <p class="text-right">
   <a href="#embed-modal" data-toggle="modal">Add this to your website</a> |
-  <a href="mailto:info@code4sa.org">Get in touch</a> |
+  <a href="mailto:info@openup.org.za">Get in touch</a> |
   Data from the <a href="https://www.elections.org.za/content/For-voters/who-is-my-councillor-/" target="_blank">IEC</a> and others |
-  <a href="https://github.com/Code4SA/nearby" target="_blank">Source on GitHub</a>
+  <a href="https://github.com/OpenUpSA/nearby" target="_blank">Source on GitHub</a>
 </p>
 
 <div class="modal fade" id="embed-modal">
@@ -66,7 +66,7 @@ <h4 class="modal-title">Add this to your website</h4>
 &lt;div id="councillor-iframe"&gt;&lt;/div&gt;
 &lt;script type="text/javascript" src="https://nearby.code4sa.org/static/councillor-embed.js"&gt;&lt;/script&gt;
         </pre>
-        <p>Contact <a href="mailto:info@code4sa.org">info@code4sa.org</a> with any questions.</p>
+        <p>Contact <a href="mailto:info@openup.org.za">info@openup.org.za</a> with any questions.</p>
       </div>
       <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>