Oops! We are calling ourselves now members!

Code-for-All · Nov 7, 2018 · 73c1c01 · 73c1c01
1 parent ed637e6
commit 73c1c01
Show file tree

Hide file tree

Showing 13 changed files with 72 additions and 51 deletions.
diff --git a/_config.yml b/_config.yml
@@ -5,3 +5,7 @@ collections:
   projects:
     output: true
 excerpt_separator: <!--more-->
+plugins:
+  - jekyll-redirect-from
+whitelist:
+  - jekyll-redirect-from
diff --git a/_includes/members.liquid b/_includes/members.liquid
@@ -0,0 +1,13 @@
+{% assign members = "" | split: "" %}
+{% assign members_governing = "" | split: "" %}
+{% assign members_affiliate = "" | split: "" %}
+{% for org in site.data.organizations %}
+    {% if org.tags contains "Code for All" %}
+        {% assign members = members | push: org %}
+        {% if org.tags contains "Code for All Affiliate" %}
+            {% assign members_affiliate = members_affiliate | push: org %}
+        {% else %}
+            {% assign members_governing = members_governing | push: org %}
+        {% endif %}
+    {% endif %}
+{% endfor %}
diff --git a/_includes/partners.liquid b/_includes/partners.liquid
diff --git a/_includes/scripts.html b/_includes/scripts.html
@@ -64,7 +64,10 @@
 <script src="{{ '/assets/js/resources.js' | relative_url }}"></script>
 {% endif %}
 
+{% if page.url == "/" %}
 <script src="{{ '/assets/js/medium.js' | relative_url }}"></script>
+{% endif %}
+
 <script src="/assets/js/burger.js"></script>
 <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.0/umd/popper.min.js" integrity="sha384-cs/chFZiN24E4KMATLdqdvsezGxaGsi4hLGOzlXwp5UZB1LY//20VyM2taTB4QvJ"
 crossorigin="anonymous"></script>

diff --git a/_layouts/contact.html b/_layouts/contact.html
@@ -87,7 +87,7 @@ <h2 class="contact-h2 inv-left inv-contact">Join organization close to you!</h2>
                         Organizations in your country might need your support, so don't hesitate to contact them.</p>
                 </div>
                 <div class="col-9 col-sm-8 col-md-4 col-lg-3">
-                    <a class="involved-button btn-gthb-contact last-button" href="{% link chapters.md %}">
+                    <a class="involved-button btn-gthb-contact last-button" href="{% link members.md %}">
                         <span class="involved-link-text text-involved search-small-text">
                             <span class="involved-search-icon"></span> Find local organization
                         </span>

diff --git a/_layouts/partners.html → _layouts/members.html b/_layouts/partners.html → _layouts/members.html
@@ -8,7 +8,7 @@
         <div class="container">
             <div class="row justify-content-center">
                 <div class="col col-sm-4 offset-sm-8 offset-0 map-absol map-absol">
-                    <h1 class="map-h1-large">Our Partners</h1>
+                    <h1 class="map-h1-large">Our Members</h1>
                     <h3 class="map-h3">Code for All is a collaborative network, made up of organisations from all over the world.</h3>
                 </div>
             </div>
@@ -22,13 +22,13 @@ <h3 class="map-h3">Code for All is a collaborative network, made up of organisat
             <div class="container">
                 <div class="row justify-content-center">
                     <div class="col">
-                        <h1 class="governing-text">Governing Partners</h1>
+                        <h1 class="governing-text">Governing Members</h1>
                         <h2 class="governing-text-small">The ones who make decisions about the network’s strategy, activities and growth.</h2>
                     </div>
                     <div class="w-100">
                     </div>
-                        {% include partners.liquid %}
-                         {% for org in partners_governing %}
+                        {% include members.liquid %}
+                         {% for org in members_governing %}
                             {% capture logo_url %}{% if org.logo_url %}{{ org.logo_url }}{% else %}/assets/images/partner logos/{{ org.name | slugify }}.jpg{% endif %}{% endcapture %}
                             <div id="{{ org.name | slugify }}" class="col-6 col-sm-4 col-md-3 col-lg-2 col-xl-2">
                                 <a href="{{ org.website }}">
@@ -54,13 +54,13 @@ <h2 class="governing-text-small">The ones who make decisions about the network
             <div class="container">
                 <div class="row justify-content-center">
                     <div class="col-sm-8">
-                        <h1 class="affiliate-text">Affiliate Partners</h1>
+                        <h1 class="affiliate-text">Affiliate Members</h1>
                         <h2 class="governing-text-small">Trusted partners of governing organizations sharing Code for All mission.</h2>
                     </div>
                 </div>
 
                 <div class="row justify-content-center">
-                    {% for org in partners_affiliate %}
+                    {% for org in members_affiliate %}
                     {% capture logo_url %}{% if org.logo_url %}{{ org.logo_url }}{% else %}/assets/images/partner logos/{{ org.name | slugify }}.jpg{% endif %}{% endcapture %}
                     <div class="col-6 col-sm-3 col-md-3 col-lg-2">
                         <a href="{{ org.website }}">

diff --git a/_layouts/participate.html b/_layouts/participate.html
@@ -35,7 +35,7 @@
           <div class="content notification">
               <p>
                 <i>A committee composed of representatives from current
-                  governing partners of Code for All who have been
+                  governing members of Code for All who have been
                   good-standing members for at least a year will be charged
                   with evaluating new candidates for partnership. The
                   committee will meet on demand, as applications for

diff --git a/_layouts/redirect.html b/_layouts/redirect.html
@@ -1,23 +1,36 @@
 <!DOCTYPE html>
 <html class="has-navbar-fixed-top">
-{% include head.html %}
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+      <title>Redirecting | Code for All</title>
+    <meta name="description" content="An international network of organizations who believe that digital technology opens new channels for citizens to more meaningfully engage in the public sphere and have a positive impact on their communities.">
+    <link href="https://fonts.googleapis.com/css?family=Lato" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css?family=Muli:300,400i,600,700,800,900" rel="stylesheet">
+    <link rel="stylesheet" href="{{ '/assets/css/bootstrap.css' | relative_url }}">
+    <link rel="stylesheet" href="{{ '/assets/css/style.css' | relative_url }}">
+    <link href="https://use.fontawesome.com/releases/v5.0.6/css/all.css" rel="stylesheet">
+    <link rel="icon" href="{{ '/assets/images/favicons/favicon-16x16.png' | relative_url }}" sizes="16x16">
+    <link rel="icon" href="{{ '/assets/images/favicons/favicon-32x32.png' | relative_url }}" sizes="32x32">
+    <link rel="icon" href="{{ '/assets/images/favicons/favicon-96x96.png' | relative_url }}" sizes="96x96">
+
+      <script>location="{{ page.redirect.to }}"</script>
+     <link rel="canonical" href="{{ page.redirect.to }}"/>
+      <meta http-equiv="refresh" content="0;url={{ page.redirect.to }}" />
+  </head>
   <body>
   {% include header.html %}
-  {% comment %}
-    Don't use 'redirect_to' to avoid conflict
-    with the page redirection plugin: if that is defined
-    it takes over.
-  {% endcomment %}
-  <link rel="canonical" href="{{ page.redir_to }}"/>
-  <meta http-equiv="refresh" content="0;url={{ page.redir_to }}" />
-</head>
-<body>
-  <section class="section">
-    <div class="container">
-      <h1>Redirecting...</h1>
-      <a href="{{ page.redir_to }}">Click here if you are not redirected.<a>
-      <script>location='{{ page.redir_to }}'</script>
+    <div class="about-info">
+        <div class="container">
+            <div class="row">
+                <div class="col">
+                    <h2 class="about-info-h2">Redirecting..</h2>
+                    <p><a href="{{ page.redirect.to }}">Click here if you are not redirected.<a></p>
+                </div>
+            </div>
+        </div>
     </div>
-  </section>
-</body>
-</html>
+
+  {% include footer.html %}
+  </body>
+</html>
diff --git a/assets/js/map.js b/assets/js/map.js
@@ -2,7 +2,7 @@
 ---
 $(document).ready(function () {
 
-  $.getJSON("/partners.geojson", function (orgs){
+  $.getJSON("/members.geojson", function (orgs){
     $(".mobile-menu").click(function (e) {
       e.preventDefault();
       $(".nav-global-secondary ul").slideToggle();

diff --git a/chapters.md b/chapters.md
diff --git a/partners.geojson → members.geojson b/partners.geojson → members.geojson
@@ -2,8 +2,8 @@
 ---
 {
 "features": [
-{% include partners.liquid %}
- {% for org in partners %}
+{% include members.liquid %}
+ {% for org in members %}
  {
    "geometry": {
      "coordinates": [

diff --git a/members.md b/members.md
@@ -0,0 +1,9 @@
+---
+title: Members
+permalink: members/
+redirect_from: partners
+layout: members
+nav: true
+js: map
+position: 2
+---
diff --git a/partners.json b/partners.json
@@ -1,3 +1,3 @@
 ---
 ---
-{% include partners.liquid %}{{ partners | jsonify }}
+{% include members.liquid %}{{ members | jsonify }}