Fill in a lot of gaps

theodi · Aug 2, 2016 · 75d23e9 · 75d23e9
1 parent a15a853
commit 75d23e9
Show file tree

Hide file tree

Showing 15 changed files with 402 additions and 81 deletions.
diff --git a/_collaborate/code.md b/_collaborate/code.md
@@ -0,0 +1,5 @@
+---
+title: Code
+---
+
+<img src='https://archive.org/download/zx_Learn_BASIC_Programming_on_the_Sinclair_ZX_Spectrum_1984_Logic_3_Tape_1_of_2_Sid/zx_Learn_BASIC_Programming_on_the_Sinclair_ZX_Spectrum_1984_Logic_3_Tape_1_of_2_Sid.gif' />
diff --git a/_collaborate/fellowships.md b/_collaborate/fellowships.md
@@ -0,0 +1,4 @@
+---
+title: Fellowships
+---
+<img src='https://thecinematicexperiance.files.wordpress.com/2015/01/lord-of-the-rings-1-the-fellowship-of-the-ring-10.jpg' />
diff --git a/_collaborate/research.md b/_collaborate/research.md
@@ -0,0 +1,5 @@
+---
+title: Research
+---
+
+<img src='https://media.giphy.com/media/3o7ZeGFFAZUc79Dsxq/giphy.gif' />
diff --git a/_config.yml b/_config.yml
@@ -3,31 +3,41 @@ defaults:
       layout: default
 
   - scope:
+      path: ''
       type: team
     values:
       layout: person
 
   - scope:
+      path: ''
       type: posts
     values:
       layout: blost
 
   - scope:
+      path: ''
       type: tools
     values:
       layout: tool
-      output: true
 
   - scope:
+      path: ''
       type: projects
     values:
       layout: project
 
   - scope:
+      path: ''
       type: research
     values:
       layout: research
 
+  - scope:
+      path: ''
+      type: collaborate
+    values:
+      layout: collaborate
+
 collections:
   tools:
     output: true
@@ -37,5 +47,7 @@ collections:
     output: true
   research:
     output: true
+  collaborate:
+    output: true
 
 permalink: pretty
diff --git a/_data/links.yml b/_data/links.yml
@@ -1,7 +1,7 @@
-- title:       Github
-  url:         https://github.com/theodi
-  fontawesome: fa-github
-
 - title:       Twitter
   url:         https://twitter.com/odilabs
   fontawesome: fa-twitter
+
+- title:       Github
+  url:         https://github.com/theodi
+  fontawesome: fa-github
diff --git a/_data/navigation.yml b/_data/navigation.yml
@@ -43,3 +43,21 @@
 
 - name: Blog
   path: /blog
+
+- name: Become an ODI Labs Fellow
+  path: /collaborate/fellowships
+  subhead: Come and work with us for 3-6 months
+  colour: 12
+  not_our: true
+
+- name: Build on our code
+  path: /collaborate/code
+  subhead: Use our tools and libraries in your work
+  colour: 3
+  not_our: true
+
+- name: Partner with us
+  path: /collaborate/research
+  subhead: Collaborate on research projects
+  colour: 7
+  not_our: true
diff --git a/_includes/footer.html b/_includes/footer.html
@@ -1,9 +1,58 @@
-<div id='footer'>
-  <ul class='list-inline'>
-    {% for link in site.data.links %}
-      <li>
-        <a href='{{ link.url }}' title='{{ link.title }}'><i class='fa {{ link.fontawesome }}'></i><span class='hidden-xs'> {{ link.title }}</span></a>
-      </li>
-    {% endfor %}
-  </ul>
-</div>
+<footer class="site-footer">
+  <div class="container">
+    <div class="row">
+      <div class="col-md-8 footer-content">
+        <p>
+          <a href="http://www.theodi.org/contact">
+            Open Data Institute, 65 Clifton Street, London EC2A 4JE
+          </a>
+        </p>
+        <p class="license">
+          <a href="http://creativecommons.org/licenses/by-sa/2.0/uk/deed.en_GB" rel="license">
+            <img alt="Creative Commons Licence" height="15" src="//static.theodi.org/assets/cc-a23fe95f04508432c8d97c00b0a36254.png" width="80">
+          </a>
+        </p>
+      </div>
+      <div class="col-md-4 footer-nav">
+        <nav>
+          <ul class="pull-right list-inline">
+            {% for link in site.data.links %}
+              <li>
+                <a href='{{ link.url }}' title='{{ link.title }}'>
+                  <img alt="{{ link.title }}" src="//static.theodi.org/assets/{{ link.title | downcase}}.png" title="{{ link.title }}">
+                </a>
+              </li>
+            {% endfor %}
+          </ul>
+        </nav>
+<!--<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>
+<br>-->
+        <nav>
+          <ul class="pull-right list-inline">
+            <li class=" ">
+              <a href="https://theodi.org/terms-of-use" class=" ">
+                Terms of use
+              </a>
+            </li>
+            <li class=" ">
+              <a href="https://theodi.org/privacy-policy" class=" ">
+                Privacy policy
+              </a>
+            </li>
+            <li class=" ">
+              <a href="https://theodi.org/cookie-policy" class=" ">
+                Cookie policy
+              </a>
+            </li>
+          </ul>
+        </nav>
+      </div>
+    </div>
+  </div>
+</footer>
diff --git a/_includes/header.html b/_includes/header.html
@@ -9,7 +9,7 @@
           <span class="icon-bar"></span>
         </button>
         <a class="navbar-brand" href="/">
-          <img alt="The ODI" id="odi-logo" src="//static.theodi.org/assets/logo-header-dc4ead7a18ea4133873c79502c174638.png">
+          <img alt="ODILabs" id="odi-logo" src="/assets/images/bubbles-outside.svg">
         </a>
       </div>
 
@@ -24,23 +24,27 @@
         <ul class="nav navbar-nav main-nav">
 
           {% for item in site.data.navigation %}
-            {% if item.children %}
-              <li class='dropdown'>
-                <a href='{{item.path}}' class='dropdown-toggle' data-toggle='dropdown'>{{ item.name }}
-                  <i class='fa fa-chevron-circle-down'></i>
-                </a>
-                <ul class='dropdown-menu' role='menu'>
-                  {% for child in item.children %}
-                    <li>
-                      <a href='{{ child.path }}'>{{ child.name }}</a>
-                    </li>
-                  {% endfor %}
-                </ul>
-              </li>
-            {% else %}
-              <li>
-                <a href='{{ item.path }}'>{{ item.name }}</a>
-              </li>
+            {% assign bits = item.path | split: '/' %}
+            {% capture size %}{{ bits | size }}{% endcapture %}
+            {% if size == '2' %}
+              {% if item.children %}
+                <li class='dropdown'>
+                  <a href='{{item.path}}' class='dropdown-toggle' data-toggle='dropdown'>{{ item.name }}
+                    <i class='fa fa-chevron-circle-down'></i>
+                  </a>
+                  <ul class='dropdown-menu' role='menu'>
+                    {% for child in item.children %}
+                      <li>
+                        <a href='{{ child.path }}'>{{ child.name }}</a>
+                      </li>
+                    {% endfor %}
+                  </ul>
+                </li>
+              {% else %}
+                <li>
+                  <a href='{{ item.path }}'>{{ item.name }}</a>
+                </li>
+              {% endif %}
             {% endif %}
           {% endfor %}
 
@@ -50,3 +54,7 @@
   </div>
 
 </header>
+
+<script>
+{% include svg-logo.html %}
+</script>
diff --git a/_includes/logo-modal.html b/_includes/logo-modal.html
@@ -44,10 +44,10 @@ <h4 class="modal-title" id="myModalLabel">
 </div>
 
 <script>
-$("#odi-logo").on("contextmenu",function(e){
+  $("#odi-logo").on("contextmenu",function(e){
     e.preventDefault()
     e.stopPropagation()
     $('#getLogo').modal()
     return false
-});
+  })
 </script>
diff --git a/_includes/navigation.html b/_includes/navigation.html
@@ -18,23 +18,27 @@
     <div class='collapse navbar-collapse' id='navbar-collapse'>
       <ul class='nav navbar-nav'>
         {% for item in site.data.navigation %}
-          {% if item.children %}
-            <li class='dropdown'>
-              <a href='{{item.path}}' class='dropdown-toggle' data-toggle='dropdown'>{{ item.name }}
-                <i class='fa fa-chevron-circle-down'></i>
-              </a>
-              <ul class='dropdown-menu' role='menu'>
-                {% for child in item.children %}
-                  <li>
-                    <a href='{{ child.path }}'>{{ child.name }}</a>
-                  </li>
-                {% endfor %}
-              </ul>
-            </li>
-          {% else %}
-            <li>
-              <a href='{{ item.path }}'>{{ item.name }}</a>
-            </li>
+          {% assign bits = item.path | split: '/' %}
+          {% capture size %}{{ bits | size }}{% endcapture %}
+          {% if size == '2' %}
+            {% if item.children %}
+              <li class='dropdown'>
+                <a href='{{item.path}}' class='dropdown-toggle' data-toggle='dropdown'>{{ item.name }}
+                  <i class='fa fa-chevron-circle-down'></i>
+                </a>
+                <ul class='dropdown-menu' role='menu'>
+                  {% for child in item.children %}
+                    <li>
+                      <a href='{{ child.path }}'>{{ child.name }}</a>
+                    </li>
+                  {% endfor %}
+                </ul>
+              </li>
+            {% else %}
+              <li>
+                <a href='{{ item.path }}'>{{ item.name }}</a>
+              </li>
+            {% endif %}
           {% endif %}
         {% endfor %}
       </ul>

diff --git a/_includes/svg-logo.html b/_includes/svg-logo.html
@@ -0,0 +1,63 @@
+var odi_path = [
+  /* move to start */
+  'M 193 64',
+
+  /* 'O' */
+  'c -5 -12.4 -12.4 -23.8 -22.2 -33.6',
+  'c -18.9 -18.9 -43.9 -29.3 -70.6 -29.3',
+  'c -26.7 0 -51.8 10.4 -70.6 29.3',
+  'c -18.9 18.9 -29.2 43.9 -29.2 70.6',
+  'c 0 26.7 10.4 51.8 29.2 70.6',
+  'c 18.9 18.9 43.9 29.3 70.6 29.3',
+  'c 26.7 0 51.8 -10.4 70.6 -29.3',
+  'c 9.7 -9.7 17.2 -21.1 22.2 -33.6',
+
+  /* bottom of 'D' */
+  'v 61.3',
+  'h 84.8',
+  'c 14.7 0 28.4 -2.4 40.9 -7',
+  'c 12.3 -4.6 23.1 -11.3 32 -19.9',
+  'c 10 -9.6 17.4 -21.2 22.2 -34.3',
+
+  /* 'I' */
+  'v 61',
+  'h 93.5',
+  'v -197',
+  'h -93.5',
+  'v 61.1',
+
+  /* top of 'D' */
+  'c -4.8 -13.2 -12.2 -24.7 -22.2 -34.3',
+  'c -9 -8.6 -19.8 -15.3 -32 -19.9',
+  'c -12.5 -4.6 -26.2 -7 -40.9 -7',
+  'h -84.8',
+  'v 61.4'
+]
+
+var colour = '#fff'
+var logo = SVG('canvas')
+logo.viewbox({
+  x: 0,
+  y: 0,
+  width: 467,
+  height: 202
+})
+
+var badge = logo.path(odi_path.join(' ')).fill(colour)
+
+logo.viewbox({
+  x: 0,
+  y: 0,
+  width: 990,
+  height: 200
+})
+
+word = 'labs'
+
+var text = logo.text(word).move(512, -147).fill(colour)
+text.font({
+  family: 'Helvetica Neue',
+  size: 265,
+  anchor: 'left',
+  weight: 200
+})
diff --git a/_layouts/collaborate.html b/_layouts/collaborate.html
@@ -0,0 +1,5 @@
+---
+layout: default
+---
+
+{{content}}