add environment configuration

required: `BRANDING_ORG_NAME`, `BRANDING_ORG_SITE_NAME`, `BRANDING_LIABILITY_URL`, `BRANDING_EMAIL_SIGNATURE`, `BRANDING_SUPPORT_EMAIL`
optional: `BRANDING_CSS_URL`, `BRANDING_HEADLINE_1`, `BRANDING_HEADLINE_2`, `BRANDING_PRIVACY_URL`

- add details on config settings to README
- add sample Swing Left config (CSS and environment settings)
- update pages and email templates to use config values
- add test for email signatures

Author: kielni

README.md

@@ -241,3 +241,43 @@ Locally:
     ```
     pytest
     ```
+
+## Branding
+
+Organizations using Nomad need to set these environment variables:
+
+  - `BRANDING_ORG_NAME` - organization name; default "Ragtag"
+  - `BRANDING_ORG_SITE_NAME` - site name (not full URL), default "ragtag.org"
+  - `BRANDING_LIABILITY_URL` - URL to organizer liability statement (required)
+  - `BRANDING_EMAIL_SIGNATURE` - default "The Nomad team"
+  - `BRANDING_SUPPORT_EMAIL` - default `[email protected]`
+
+These environment variables have reasonable defaults; setting these is optiona:
+
+  - `BRANDING_CSS_URL` - URL to CSS with skin-specific overrides; default is no overrides
+  - `BRANDING_HEADLINE_1` - default "Carpool to canvass in battleground districts near you"
+  - `BRANDING_HEADLINE_2` - default "Find other volunteers near you and join a carpool."
+  - `BRANDING_PRIVACY_URL` - default `/terms.html`; the default `terms.html` uses values of `BRANDING_ORG_NAME`, `BRANDING_ORG_SITE_NAME`, and `BRANDING_SUPPORT_EMAIL`
+
+### sample Swing Left branding
+
+to use sample sample config for Swing Left locally:
+
+    cat branding/swing-left >> .env
+
+sample branding config values: [branding/swing-left](branding/swing-left)
+
+sample CSS overrides: [static/css/swing-left.css](static/css/swing-left.css)
+
+restart app to reload config from `.env`
+
+### branding QA
+
+  - `BRANDING_ORG_NAME` in [terms.html](templates/auth/terms.html) (ie "Ragtag Nomad Privacy Policy")
+  - `BRANDING_ORG_SITE_NAME` in [terms.html](templates/auth/terms.html) ie "nomad.ragtag.org, the "Site""
+  - `BRANDING_SUPPORT_EMAIL` in [terms.html](templates/auth/terms.html) ie "email [email protected]"
+  - `BRANDING_LIABILITY_URL` in email templates: [driver_reminder](templates/email/driver_reminder.html), [ride_approved.html](templates/email/ride_approved.html)
+  - `BRANDING_EMAIL_SIGNATURE` in all [email templates](templates/email)
+  - logo on home page, defined in CSS referenced by `BRANDING_CSS_URL`
+  - `BRANDING_HEADLINE_1` and `BRANDING_HEADLINE_1` on home page, below "SHARE YOUR RIDE"
+  - `BRANDING_PRIVACY_URL` privacy policy links on [login](app/templates/auth/login.html) and [mobile and desktop nav](app/templates/_template.html)

app/config.py

@@ -52,8 +52,30 @@ class Config:
     USE_SESSION_FOR_NEXT = True
 
     SENTRY_DSN = os.environ.get('SENTRY_DSN')
+
     DATE_FORMAT = os.environ.get('DATE_FORMAT', '%a %b %-d %Y at %-I:%M %p')
 
+    BRANDING_ORG_NAME = os.environ.get('BRANDING_ORG_NAME') or \
+        'Ragtag'
+    BRANDING_ORG_SITE_NAME = os.environ.get('BRANDING_SITE_NAME') or \
+        'ragtag.org'
+    BRANDING_ORG_EMAIL = os.environ.get('BRANDING_ORG_EMAIL') or \
+        '[email protected]'
+    BRANDING_LIABILITY_URL = os.environ.get('BRANDING_LIABILITY_URL') or \
+        'set config BRANDING_LIABILITY_URL'
+    # see example static/css/swing-left.css
+    BRANDING_CSS_URL = os.environ.get('BRANDING_CSS_URL', None)
+    BRANDING_HEADLINE_1 = os.environ.get('BRANDING_HEADLINE_1') or \
+        'Carpool to canvass in battleground districts near you'
+    BRANDING_HEADLINE_2 = os.environ.get('BRANDING_HEADLINE_2') or \
+        'Find other volunteers near you and join a carpool.'
+    BRANDING_EMAIL_SIGNATURE = os.environ.get('BRANDING_EMAIL_SIGNATURE') or \
+        'The Nomad team'
+    BRANDING_PRIVACY_URL = os.environ.get('BRANDING_PRIVACY_URL') or \
+        '/terms.html'
+    BRANDING_SUPPORT_EMAIL = os.environ.get('BRANDING_SUPPORT_EMAIL') or \
+        '[email protected]'
+
     @staticmethod
     def init_app(app):
         pass

app/static/css/styles.css

@@ -208,10 +208,10 @@ select:focus {
 	width: 143px;
 	height: 50px;
 	margin: 10px 0;
-	background: url("../img/logo-swingleft.png") top left / contain no-repeat;
+	background: url("../img/logo_ragtag.png") top left / contain no-repeat;
 }
 .header-left .logo.generic {
-	background: url("../img/logo-swingleft.png") top left / contain no-repeat;
+	background: url("../img/logo_ragtag.png") top left / contain no-repeat;
 }
 
 .header-left .header-search-bar {

app/static/css/swing-left.css

@@ -0,0 +1,8 @@
+.header-left .logo {
+    width: 143px;
+    height: 50px;
+    background: url("../img/logo-swingleft.png") top left / contain no-repeat;
+}
+.header-left .logo.generic {
+    background: url("../img/logo-swingleft.png") top left / contain no-repeat;
+}

app/templates/_template.html

@@ -90,6 +90,9 @@
 <link href="https://fonts.googleapis.com/css?family=Merriweather:400,700|Source+Sans+Pro:300,400,600,700" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap-datetimepicker/4.17.47/css/bootstrap-datetimepicker.min.css" integrity="sha256-yMjaV542P+q1RnH6XByCPDfUFhmOafWbeLPmqKh11zo=" crossorigin="anonymous" />
 <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/styles.css') }}">
+{% if config.get('BRANDING_CSS_URL') %}
+  <link rel="stylesheet" type="text/css" href="{{config.get('BRANDING_CSS_URL')}}">
+{% endif %}
 
 <link rel="apple-touch-icon-precomposed" sizes="144x144" href="{{ url_for('static', filename='img/favicon/apple-touch-icon-144x144.png') }}" />
 <link rel="apple-touch-icon-precomposed" sizes="152x152" href="{{ url_for('static', filename='img/favicon/apple-touch-icon-152x152.png') }}" />
@@ -123,7 +126,7 @@
 {% endif %}
         <li><a href="{{ url_for('carpool.find') }}">Find a ride</a></li>
         <li><a href="{{ url_for('carpool.new') }}">Give a ride</a></li>
-        <li class="divider"><a href="{{ url_for('auth.terms') }}">Privacy &amp; Terms</a></li>
+        <li class="divider"><a href="{{ config.get('BRANDING_PRIVACY_URL') }}">Privacy &amp; Terms</a></li>
 {% if current_user.is_authenticated %}
         <li><a href="{{ url_for('auth.profile') }}">Profile</a></li>
         <li><a href="#" onClick="return doLogout()">Logout</a></li>
@@ -148,7 +151,7 @@
   <ul class="nav-bar">
     <li class="active"><a href="{{ url_for('carpool.find') }}">Find a ride</a></li>
       <li><a href="{{ url_for('carpool.new') }}">Give a ride</a></li>
-      <li><a href="{{ url_for('auth.terms') }}">Privacy &amp; Terms</a></li>
+      <li><a href="{{ config.get('BRANDING_PRIVACY_URL') }}">Privacy &amp; Terms</a></li>
 {% if current_user.is_authenticated %}
       <li><a href="{{ url_for('carpool.mine') }}">My rides</a></li>
 {% endif %}

app/templates/auth/login.html

@@ -17,7 +17,7 @@
         {%- endwith %}
         <div class="interstitial-page">
             <h1>Log in to continue</h1>
-            <p>Please verify your identity by logging in through one of the following options. We will not save your information or use it for any purpose other than to verify that you are a human. For more info, check out our <a href="{{ url_for('auth.terms') }}">privacy policy</a>.</p>
+            <p>Please verify your identity by logging in through one of the following options. We will not save your information or use it for any purpose other than to verify that you are a human. For more info, check out our <a href="{{ config.get('BRANDING_PRIVACY_URL') }}">privacy policy</a>.</p>
             <br><br>
             <a href="{{ url_for('auth.oauth_authorize', provider='facebook') }}"><input class="primary" type="submit" value="Log in through Facebook"></a>&nbsp;&nbsp; or &nbsp;&nbsp;<a href="{{ url_for('auth.oauth_authorize', provider='google') }}"><input class="primary" type="submit" value="Log in through Google"></a>
         </div>