(refactor) port remaining flavors to static site build

- convert index.html templates to Handlebars - merge language_picker.html template into index.html - convert en locale code to en-us in configs - remove duplicate config keys
mapseed · Aug 22, 2017 · 9639435 · 9639435
1 parent a8d2297
commit 9639435
Show file tree

Hide file tree

Showing 39 changed files with 194 additions and 401 deletions.
diff --git a/src/flavors/bogtobay/config.yml b/src/flavors/bogtobay/config.yml
@@ -21,7 +21,7 @@ languages:
   - code: es
     label: Hablo Español
 
-  - code: en
+  - code: en-us
     label: I Speak English
 
 
@@ -48,13 +48,11 @@ map:
 # map layer loading
 
     - id: osm
-      type: basemap
       url: //api.tiles.mapbox.com/v4/heyduwamishcore.3fd2d9aa/{z}/{x}/{y}.png?access_token=pk.eyJ1IjoiaGV5ZHV3YW1pc2hjb3JlIiwiYSI6ImNpaTEyNDNtdjAwMG10OW0wYzFtYmlsZXgifQ.yfrIdudUO9j_lKNtTZQU-g
       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">.'
       type: basemap
 
     - id: satellite
-      type: basemap
       url: //api.tiles.mapbox.com/v4/smartercleanup.pe3o4gdn/{z}/{x}/{y}.png?access_token=pk.eyJ1Ijoic21hcnRlcmNsZWFudXAiLCJhIjoiTnFhUWc2cyJ9.CqPJH-9yspIMudowQJx2Uw
       attribution: '&copy; OpenStreetMap contributors, CC-BY-SA. <a href="//mapbox.com/about/maps" target="_blank">Terms &amp; Feedback</a>. Geocoding Courtesy of <a href="//www.mapquest.com/" target="_blank">MapQuest</a> <img src="//developer.mapquest.com/content/osm/mq_logo.png">.'
       type: basemap
@@ -678,7 +676,6 @@ place:
   # Labels for the buttons that toggle the map and list views
   show_list_button_label: _(See All Reports)
   show_map_button_label: _(Show the Map)
-  action_text: _(added)
   title: _(New post)
   action_text: _(created)
   anonymous_name: _(Someone)

diff --git a/src/flavors/bogtobay/templates/index.html b/src/flavors/bogtobay/templates/index.html
@@ -1,30 +1,41 @@
-{% extends 'base.html' %}
-{% load i18n %}
+{{#extends "../../../base/templates/base"}}
 
-{% block site-title %}
+{{#block "site-title"}}
 <a href="/">
-  <img src="{{STATIC_URL}}css/images/bogtobay-logo-large.png" />
+  <img src="{{STATIC_URL}}css/images/bogtobay-logo-large.png" alt="{{ config.app.name }}" />
 </a>
-{% endblock %}
+{{/block}}
 
-<!--
-  This will place content at the top of the side bar
- -->
-{% block sidebar %}
-{% endblock %}
+{{#block "language_picker"}}
+	<div id="language-picker">
+	  <nav class="access" role="article">
+	    <ul class="menu">
+	      <li class="menu-item">
+	        <a class="current-language {{ LANGUAGE_CODE }} btn btn-block">Español</a>
+          <ul class="menu">
+            {{#each config.languages}}
+	            <li class="menu-item">
+	              <a href="/{{this.code}}/index.html" class="{{ this.code }} btn btn-block">{{ this.label }}</a>
+	            </li>
+            {{/each}}
+          </ul>
+	      </li>
+	    </ul>
+	  </nav>
+	</div>
+{{/block}}
 
 <!--
   This will place content in the colophon below the map
  -->
-{% block colophon %}
+{{#block "colophon"}}
 <p id="powered-by">{% blocktrans %}Powered by{% endblocktrans %} <a href="//shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="//openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
-{% endblock %}
+{{/block}}
 
 <!--
   Analytics, custom JS, and such go here
  -->
-
-{% block includes %}
+{{#block "includes"}}
 <!--<script src="{{STATIC_URL}}js/views/commitment-view.js"></script>-->
 <script>
   (function(S) {
@@ -35,4 +46,6 @@
     })
   }(Shareabouts));
 </script>
-{% endblock %}
+{{/block}}
+
+{{/extends}}
diff --git a/src/flavors/bogtobay/templates/language_picker.html b/src/flavors/bogtobay/templates/language_picker.html
diff --git a/src/flavors/central-puget-sound/config.yml b/src/flavors/central-puget-sound/config.yml
@@ -21,7 +21,7 @@ languages:
   - code: es
     label: Hablo Español
 
-  - code: en
+  - code: en-us
     label: I Speak English
 
 #   - code: vi

diff --git a/src/flavors/central-puget-sound/templates/index.html b/src/flavors/central-puget-sound/templates/index.html
@@ -1,30 +1,40 @@
-{{#extends "../../../base/templates/base.hbs"}}
-<!-- 
-{{#load i18n }}
- -->
-{{#block site-title}}
+{{#extends "../../../base/templates/base"}}
+
+{{#block "site-title"}}
 <a href="/page/about" rel="internal">{{ config.app.name }}</a>
 {{/block}}
 
-<!--
-  This will place content at the top of the side bar
- -->
-{{#block sidebar}}
+{{#block "language_picker"}}
+	<div id="language-picker">
+	  <nav class="access" role="article">
+	    <ul class="menu">
+	      <li class="menu-item">
+	        <a class="current-language {{ LANGUAGE_CODE }} btn btn-block">Español</a>
+	        <ul class="menu">
+	          {{#each config.languages}}
+		          <li class="menu-item">
+		            <a href="/{{this.code}}/index.html" class="{{ this.code }} btn btn-block">{{ this.label }}</a>
+		          </li>
+	          {{/each}}
+	        </ul>
+	      </li>
+	    </ul>
+	  </nav>
+	</div>
 {{/block}}
 
 <!--
   This will place content in the colophon below the map
  -->
-{{#block colophon}}
+{{#block "colophon"}}
 <p id="powered-by">{{#_}}Powered by{{/_}} <a href="//shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="//openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
 {{/block}}
 
 <!--
   Analytics, custom JS, and such go here
  -->
 
-{{#block includes}}
-<!--<script src="{{STATIC_URL}}js/views/commitment-view.js"></script>-->
+{{#block "includes"}}
 <script>
   (function(S) {
 // ========================================

diff --git a/src/flavors/central-puget-sound/templates/language_picker.html b/src/flavors/central-puget-sound/templates/language_picker.html
diff --git a/src/flavors/defaultflavor/config.yml b/src/flavors/defaultflavor/config.yml
@@ -18,7 +18,7 @@ app:
   # list_enabled: false
 
 # languages:
-#   - code: en
+#   - code: en-us
 #     label: I Speak English
 
 #   - code: es

diff --git a/src/flavors/defaultflavor/templates/index.html b/src/flavors/defaultflavor/templates/index.html
@@ -1,25 +1,29 @@
-{% extends 'base.html' %}
-{% load i18n %}
+{{#extends "../../../base/templates/base"}}
 
-{% block site-title %}
+{{#block "site-title"}}
 <a href="/">{{ config.app.name }}</a>
-{% endblock %}
+{{/block}}
 
 <!--
   This will place content at the top of the side bar
  -->
-{% block sidebar %}
-{% endblock %}
+{{#block "sidebar"}}
+{{/block}}
+
+{{#block "language_picker"}}
+{{/block}}
 
 <!--
   This will place content in the colophon below the map
  -->
-{% block colophon %}
-<p id="powered-by">{% blocktrans %}Powered by{% endblocktrans %} <a href="http://shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="http://openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
-{% endblock %}
+{{#block "colophon"}}
+<p id="powered-by">{{#_}}Powered by{{/_}} <a href="http://shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="http://openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
+{{/block}}
 
 <!--
   Analytics, custom JS, and such go here
  -->
-{% block includes %}
-{% endblock %}
+{{#block "includes"}}
+{{/block}}
+
+{{/extends}}
diff --git a/src/flavors/duwamish-watershed/config.yml b/src/flavors/duwamish-watershed/config.yml
@@ -18,7 +18,7 @@ app:
   list_enabled: false
 
 languages:
-  - code: en
+  - code: en-us
     label: I Speak English
 
   - code: es
@@ -575,7 +575,6 @@ place:
   # Labels for the buttons that toggle the map and list views
   show_list_button_label: _(See All Reports)
   show_map_button_label: _(Show the Map)
-  action_text: _(added)
   title: _(Tell us more...)
   action_text: _(created)
   anonymous_name: _(Someone)

diff --git a/src/flavors/duwamish-watershed/templates/index.html b/src/flavors/duwamish-watershed/templates/index.html
@@ -1,30 +1,23 @@
-{% extends 'base.html' %}
-{% load i18n %}
+{{#extends "../../../base/templates/base"}}
 
-{% block site-title %}
+{{#block "site-title"}}
 <a href="/">
 The Green-Duwamish Watershed
 </a>
-{% endblock %}
-
-<!--
-  This will place content at the top of the side bar
- -->
-{% block sidebar %}
-{% endblock %}
+{{/block}}
 
 <!--
   This will place content in the colophon below the map
  -->
-{% block colophon %}
-<p id="powered-by">{% blocktrans %}Powered by{% endblocktrans %} <a href="//shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="//openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
-{% endblock %}
+{{#block "colophon"}}
+<p id="powered-by">{{#_}}Powered by{{/_}}<a href="//shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="//openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
+{{/block}}
 
 <!--
   Analytics, custom JS, and such go here
  -->
 
-{% block includes %}
+{{#block "includes"}}
 <!--<script src="{{STATIC_URL}}js/views/commitment-view.js"></script>-->
 <script>
   (function(S) {
@@ -35,4 +28,6 @@
     })
   }(Shareabouts));
 </script>
-{% endblock %}
+{{/block}}
+
+{{/extends}}
diff --git a/src/flavors/duwamish_flavor/config.yml b/src/flavors/duwamish_flavor/config.yml
@@ -21,7 +21,7 @@ app:
   # list_enabled: false
 
 languages:
-  - code: en
+  - code: en-us
     label: I Speak English
 
   - code: es
@@ -1114,7 +1114,6 @@ place:
   # Labels for the buttons that toggle the map and list views
   show_list_button_label: _(See All Reports)
   show_map_button_label: _(Show the Map)
-  action_text: _(added)
   title: _(Tell us more...)
   action_text: _(created)
   anonymous_name: _(Someone)

diff --git a/src/flavors/duwamish_flavor/templates/index.html b/src/flavors/duwamish_flavor/templates/index.html
@@ -1,31 +1,23 @@
-{% extends 'base.html' %}
-{% load i18n %}
+{{#extends "../../../base/templates/base"}}
 
-{% block site-title %}
+{{#block "site-title"}}
 <a href="/">
-  <img id="site-title-image" src="{{STATIC_URL}}css/images/site-title_hey-duwamish.png" alt="{{ config.app.name }}"></img>
+  <img id="site-title-image" src="/css/images/site-title_hey-duwamish.png" alt="{{ config.app.name }}"></img>
 </a>
-{% endblock %}
-
-<!--
-  This will place content at the top of the side bar
- -->
-{% block sidebar %}
-{% endblock %}
+{{/block}}
 
 <!--
   This will place content in the colophon below the map
  -->
-{% block colophon %}
-<p id="powered-by">{% blocktrans %}Powered by{% endblocktrans %} <a href="//shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="//openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
-{% endblock %}
+{{#block "colophon"}}
+<p id="powered-by">{{#_}}Powered by{{/_}} <a href="//shareabouts.org/" class="shareabouts-logo" target="_blank">Shareabouts</a>, <span class="nobreak">a project of <a href="//openplans.org/" class="openplans-logo" target="_blank">OpenPlans</a></span></p>
+{{/block}}
 
 <!--
   Analytics, custom JS, and such go here
  -->
 
-{% block includes %}
-<!--<script src="{{STATIC_URL}}js/views/commitment-view.js"></script>-->
+{{#block "includes"}}
 <script>
   (function(S) {
 // ========================================
@@ -35,5 +27,6 @@
     })
   }(Shareabouts));
 </script>
+{{/block}}
 
-{% endblock %}
+{{/extends}}
diff --git a/src/flavors/greensboropb/config.yml b/src/flavors/greensboropb/config.yml
@@ -10,7 +10,7 @@ app:
   tagline: _(How would YOU spend $100K?)
 
 # languages:
-#   - code: en
+#   - code: en-us
 #     label: English
 
 #   - code: es