Merge pull request #12 from OpenUpSA/openupify

code4sa to openup

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": [
     "**/.*",

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
 

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

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": [
     "**/.*",

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>