Merge branch 'emaw/website-master' into HEAD

.gitignore

@@ -1,3 +1,4 @@
 _site
 .idea
 vendor
+*.swp

Gemfile.lock

@@ -1,21 +1,21 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.2)
+    addressable (2.6.0)
       public_suffix (>= 2.0.2, < 4.0)
     colorator (1.1.0)
-    concurrent-ruby (1.1.1)
+    concurrent-ruby (1.1.5)
     em-websocket (0.5.1)
       eventmachine (>= 0.12.9)
       http_parser.rb (~> 0.6.0)
     eventmachine (1.2.7)
-    ffi (1.9.25)
+    ffi (1.10.0)
     forwardable-extended (2.6.0)
-    geocoder (1.5.0)
+    geocoder (1.5.1)
     http_parser.rb (0.6.0)
     i18n (0.9.5)
       concurrent-ruby (~> 1.0)
-    jekyll (3.7.4)
+    jekyll (3.8.5)
       addressable (~> 2.4)
       colorator (~> 1.0)
       em-websocket (~> 0.5)
@@ -30,10 +30,10 @@ GEM
       safe_yaml (~> 1.0)
     jekyll-sass-converter (1.5.2)
       sass (~> 3.4)
-    jekyll-watch (2.1.2)
+    jekyll-watch (2.2.1)
       listen (~> 3.0)
     kramdown (1.17.0)
-    liquid (4.0.0)
+    liquid (4.0.3)
     listen (3.1.5)
       rb-fsevent (~> 0.9, >= 0.9.4)
       rb-inotify (~> 0.9, >= 0.9.7)
@@ -41,14 +41,14 @@ GEM
     mercenary (0.3.6)
     pathutil (0.16.2)
       forwardable-extended (~> 2.6)
-    public_suffix (2.0.5)
+    public_suffix (3.0.3)
     rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
+    rb-inotify (0.10.0)
-      ffi (>= 0.5.0, < 2)
+      ffi (~> 1.0)
-    rouge (2.2.1)
+    rouge (3.3.0)
     ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
-    sass (3.7.2)
+    sass (3.7.4)
       sass-listen (~> 4.0.0)
     sass-listen (4.0.0)
       rb-fsevent (~> 0.9, >= 0.9.4)
@@ -62,4 +62,4 @@ DEPENDENCIES
   jekyll
 
 BUNDLED WITH
-   1.17.1
+   1.17.3

README.md

@@ -2,7 +2,37 @@
 
 ## Introduction
 
-This is a port of the current Wordpress version of the [CoTech Website][] to a statically-generated site using [Jekyll][].
+This is a port of the current WordPress version of the CoTech website to a statically-generated site using Jekyll. The site consists of a bunch of markdown files and images stored in git.coop. The Jekyll build process is automated so that there is no need to have Jekyll installed and running to make changes to the site.
+
+  * Live site: https://coops.tech/
+  * Dev site: https://dev.coops.tech/
+
+## Updating the site
+
+It is possible to edit markdown files and upload images through the [GitLab Web IDE](https://docs.gitlab.com/ce/user/project/web_ide/). To use this, got to the [GitLab website page](https://git.coop/cotech/website) and click the Web IDE button to the left below the toolbar.
+
+Each page type lives in it's own folder.
+
+  * _clients contains client pages
+  * _coops contains coop pages
+  * _services contains service pages
+  * _technologies contains technology pages
+
+To change a coop page, edit the relevant coop file in the _coops directory. Each file contains a metadata block at the top of the file, followed by the main text describing the coop. The metadata block contains the coop details and lists of clients, services and technologies associated with the coop.
+
+If using GitLab Web IDE, make your changes to the relevant files and then commit your changes by clicking the commit button in the bottom-left corner. Add a brief description of the changes you have made as a the commit message and then click 'Stage & Commit'. It is okay to commit to the master git branch if you are simply updating your coop details, but if you are making extensive changes to many coop pages it is better to create a new branch and merge request and ask someone else to review your changes before they merge your changes in the master branch.
+
+Once your changes have been committed to the master branch an automatic build of the dev site is triggered. This will take a few minutes to run and you can check the status of the build here: https://git.coop/cotech/website/pipelines. Once the build has completed you will be able to see your changes on the dev site: https://dev.coops.tech/.
+
+If you're happy with they changes on the dev site, then you can deploy them to the live site. See the Deployment section below on how to do this.
+
+### Adding new clients, services and technologies
+
+You will need to add a new markdown file in the relevant directory for the new item. The file only needs to contain a metadata block with the details describing the new item, this is typically just a title and name (which are usually the same), but look at other items for examples.
+
+Along with the new file you will also need to upload a logo or image for the new item. Images live in a sub-directory of the images directory and should be named the same as the markdown file, but with a .png extension. Images should be formatted as a PNG and optimized for the web.
+
+Once the new file and image have been created then you can add the new client, service or technology as a list item in the metadata section of the relevant coop file.
 
 ## Run the site locally
 
@@ -65,11 +95,21 @@ And visit [localhost:4000](http://localhost:4000) to view the site.
 
 ## Deployment
 
+### Dev/Staging
+
 When changes are committed to the `master` branch the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to [dev.coops.tech](https://dev.coops.tech).
 
-Once someone has verified that looks ok, you can use the
+### Production
-[GitLab environments](https://git.coop/cotech/website/environments)
+
-to promote it to [www.coops.tech](https://www.coops.tech)
+You need to manually deploy the changes from dev to production.
+
+1. View the changes on [dev.coops.tech](https://dev.coops.tech) and ensure you're happy for them to be pushed to production.
+
+2. Visit [GitLab environments](https://git.coop/cotech/website/environments). __NOTE.__ If you don't have access to the environments page then post a message in the [Website category of the CoTech forum](https://community.coops.tech/c/cotech/website) to ask someone to do it for you.
+
+3. Click the "Play" icon on the right of the screen in the row for the "dev" environment and choose "deploy:production".
+
+4. Your changes will be visible in production when the commit listed in the "production" environment row matches the commit listed in the "dev" environment row.
 
 ## Contributing
 

_clients/acorn.md

@@ -0,0 +1,3 @@
+---
+title: ACORN
+---

_clients/alpha-complex.md

@@ -0,0 +1,3 @@
+---
+title: The Alpha Complex
+---

_clients/apc.md

@@ -0,0 +1,3 @@
+---
+title: Association for Progressive Communications
+---

_clients/friendshouse.md

@@ -0,0 +1,3 @@
+---
+title: Friends House	
+---

_clients/generation-rent.md

@@ -0,0 +1,3 @@
+---
+title: Generation Rent
+---

_clients/greenpeace.md

@@ -0,0 +1,3 @@
+---
+title: Greenpeace
+---

_clients/ica.md

@@ -0,0 +1,3 @@
+---
+title: International Co-operatives Alliance
+---

_clients/land-explorer.md

@@ -0,0 +1,3 @@
+---
+title: Land Explorer
+---

_clients/nswp.md

@@ -0,0 +1,3 @@
+---
+title: Global Network of Sex Work Projects
+---

_clients/pbi.md

@@ -0,0 +1,3 @@
+---
+title: Peace Brigades International
+---

_clients/political-education-network.md

@@ -0,0 +1,3 @@
+---
+title: Political Education Network
+---

_clients/privacy-international.md

@@ -0,0 +1,3 @@
+---
+title: Privacy International
+---

_clients/public-law-project.md

@@ -0,0 +1,3 @@
+---
+title: Public Law Project
+---

_clients/reinventory.md

@@ -0,0 +1,3 @@
+---
+title: Reinventory
+---

_clients/unesco.md

@@ -0,0 +1,3 @@
+---
+title: United Nations Educational, Scientific and Cultural Organization
+---

_clients/webpost.md

@@ -0,0 +1,3 @@
+---
+title: Webpost
+---

_clients/weco.md

@@ -0,0 +1,3 @@
+---
+title: We Collective
+---

_clients/woodcraftfolk.md

@@ -0,0 +1,3 @@
+---
+title: Woodcraft Folk 
+---

_config.yml

@@ -1,6 +1,9 @@
 ---
-title: Cotech Website
+title: CoTech
+long_title: Cooperative Technologists
+description: Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership.
 timezone: UTC
+url: https://www.coops.tech
 exclude:
 - scripts
 - vendor

_coops/agile-collective.md

@@ -1,18 +1,16 @@
 ---
 title: Agile Collective
 name: Agile Collective
-members: 9
+members: 12
 website: http://agile.coop/
 email: info@agile.coop
 twitter: AgileCollective
 github: agilecollective
 telephone: '01865 403 120'
-address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4
+address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE
-  1JE
 latitude: 51.7483161
 longitude: -1.2390645000000404
 clients:
-- bond
 - global-canopy-programme
 - information-architecture-institute
 - international-land-coalition
@@ -39,7 +37,6 @@ services:
 technologies:
 - apache
 - gnu-bash
-- centos
 - d3
 - drupal
 - gitlab

_coops/co-operative-web.md

@@ -46,16 +46,17 @@ services:
 - hosting
 - ideation
 - mentoring
+- virtual-servers
 technologies:
 - net
 - angular-1-x
 - centos
 - express-js
 - gitlab
-- google-maps
 - htmlcss
 - java
 - javascript
+- laravel
 - mysql
 - nginx
 - node-js
@@ -70,4 +71,4 @@ technologies:
 
 We are a 26 person worker co-operative based in Birmingham. Our focus is on development, rather than design or marketing stuff, and we work across all types of technology providing bespoke services by the hour, under retainers or for fixed price.
 
-We specialise in building big data driven systems development and supporting both legacy and new applications for a range of clients, from large blue chip companies to small startups.
+We specialise in building big data driven systems development and supporting both legacy and new applications for a range of clients, from large blue chip companies to small startups.

_coops/code-operative.md

@@ -0,0 +1,49 @@
+---
+title: Code-Operative
+name: Code-Operative
+members: 8
+website: https://code-operative.co.uk
+email: contact@code-operative.co.uk
+twitter: code_operative
+github: Code-Operative
+address: Baltic Business Quarters, Abbott's Hill, Gateshead, United Kingdom, NE8 3DF
+latitude: 54.966587
+longitude: -1.595418
+clients:
+- acorn
+- weco
+- generation-rent
+- alpha-complex
+- land-explorer
+- webpost
+- reinventory
+- political-education-network
+services:
+- development
+- consultancy
+- database-solutions
+- machine-learning
+- web-design
+technologies:
+- angular
+- ionic
+- reactjs
+- node-js
+- javascript
+- htmlcss
+- django-2
+- python
+- laravel
+- php
+- c
+- net
+- java
+- google-maps
+- postgresql
+- sql-server
+- ubuntu
+---
+
+Code-Operative is a community of tech freelancers based in the North-East of England, with members and affiliates based further afield as well. Code-Op's processes are designed to bridge the gap between freelancers and the clients who need them, operating a not-for-profit model which puts quality and the needs of client and freelancer first.
+
+We can offer the traditional role-based services of an agency but we can also manage existing projects and build new systems from scratch.

_coops/go-free-range.md

@@ -6,7 +6,7 @@ website: https://gofreerange.com/
 email: lets@gofreerange.com
 twitter: freerange
 github: freerange
-telephone: N/A
+telephone: +44 (0)20 3823 6286
 address: The Foundry, 156 Blackfriars Road, London, SE1 8EN.
 latitude: 51.501086
 longitude: -0.1064455

_coops/greennet.md

@@ -0,0 +1,63 @@
+---
+title: GreenNet
+name: GreenNet
+members: 8
+website: http://greennet.org.uk
+email: info@gn.apc.org
+twitter: GreenNetISP
+telephone: '0330 559 4011'
+address: The Green House, 244-254 Cambridge Heath Road, London E2 9DA
+latitude: 51.532930285126
+longitude: -0.056744813919067
+
+clients:
+- apc
+- ica
+- woodcraftfolk
+- privacy-international
+- unesco
+- friendshouse
+- pbi
+- nswp
+- public-law-project
+
+services:
+- development
+- sysadmin
+- user-research
+- web-design
+- virtual-servers
+- mailing
+- hosting
+- it-security
+- domain-names
+- email
+- community-building
+- broadband
+
+technologies:
+- apache
+- gnu-bash
+- drupal
+- gitlab
+- htmlcss
+- javascript
+- matomo
+- php
+- symfony
+- ubuntu
+- ansible
+- civicrm
+- debian
+- docker
+- lets-encrypt
+- mailman
+- mediawiki
+- munin
+- mysql
+- nextcloud
+- wordpress
+- xen-hypervisor
+---
+
+GreenNet is a not-for-profit non-hierarchical collective established 1985, providing internet services, broadband, web design, email and hosting to supporters of peace, the environment and human rights. We are members of ISPA UK and the APC.

_coops/mc3.md

@@ -7,7 +7,7 @@ email: contact@mc3.coop
 twitter: 
 github: 
 telephone: "+44 1484 846231"
-address: Huddersfield
+address: 24 Bridge Street, Slaithwaite, Huddersfield, HD7 5JN
 latitude: 53.6466645
 longitude: -1.7822482
 clients: 

_coops/mediablaze-hosts.md

@@ -2,12 +2,12 @@
 title: MediaBlaze Hosts
 name: MediaBlaze Hosts
 members: 
-website: http://mediablazehosts.coop
+website: https://mediablazehosts.coop
-email: letschat@mediablazehosts.coop
+email: cs@mediablazehosts.coop
 twitter: MediaBlazeHosts
 github: mediablazehosts
 telephone: 0333 335 0166
-address: 31 Station Road,Charing,Ashford,Kent,TN27 0JA
+address: MediaBlaze Hosts, 31 Station Road,Charing,Ashford,Kent,TN27 0JA
 latitude: 51.20871820000001
 longitude: 0.7920888999999534
 clients: 
@@ -45,4 +45,4 @@ From standard Web Hosting to SSL Certificates and more, including business consu
 
 Security is core for us, that’s why we’re always looking for new ways to increase your safety online and provide you with some of the best and trusted services out there at an affordable cost.
 
-Visit: http://mediablazehosts.coop for more information about us and our services, or email: letschat@mediablazehosts.coop
+Visit: https://mediablazehosts.coop for more information about us and our services, or email: cs@mediablazehosts.coop

_coops/open-ecommerce.md

@@ -7,7 +7,7 @@ email: info@open-ecommerce.org
 twitter: timeline
 github: open-ecommerce
 telephone: "+44 020 3731 9073"
-address: Unit 23A Iliffe Yard,,London,UK,SE17 3QD
+address: Unit 23A Iliffe Yard,London,UK,SE17 3QD
 latitude: 51.48941875721223
 longitude: -0.10058949123231287
 clients:

_coops/outlandish.md

@@ -70,6 +70,7 @@ technologies:
 - aws-redshift
 - symfony
 - wordpress
+- laravel
 ---
 
 Outlandish is made up of around 20 collaborators and co-owners who love quality code, and apps that challenge the status quo.

_coops/the-dot-project.md

@@ -7,7 +7,7 @@ email: annie@thedotproject.co
 twitter: dotprojectco
 github: techforgoodbath
 telephone: '07496276003'
-address: Bath,United Kingdom,BA1
+address: 20 Quarry Rock Gardens, Bath, BA2 6EF
 latitude: 51.375801
 longitude: -2.359903900000063
 clients:

_coops/webarchitects.md

@@ -1,7 +1,7 @@
 ---
 title: Webarchitects Co-operative
 name: Webarchitects Co-operative
-members: 60
+members: 3
 website: https://www.webarchitects.coop/
 email: info@webarch.net
 twitter: webarchcoop
@@ -45,6 +45,7 @@ clients:
 - green-black-cross
 - green-bike-project
 - green-homes-sheffield
+- greenpeace
 - greenwich-co-operative-development-agency
 - guardian-observer-chapel-branch-of-the-national-union-of-journalists
 - independent-labour-publications
@@ -123,9 +124,10 @@ technologies:
 - xen-hypervisor
 ---
 
-Webarchitects is a Sheffield based, small and friendly, multi-stakeholder co-operative which customers can join and which provides ethical and green, WordPress hosting, general web hosting, virtual servers, email services, domain name services and GNU/Linux sysadmin and devop support services to individuals and progressive organisations.
+[Webarchitects](https://www.webarchitects.coop/) is a Sheffield based, small and friendly, [multi-stakeholder co-operative](https://www.webarchitects.coop/about) which [customers can join](https://www.webarchitects.coop/join) and which provides [ethical](https://www.webarchitects.coop/ethics) and [green](https://www.webarchitects.coop/green-energy), [WordPress hosting](https://www.webarchitects.coop/wordpress), [Discourse hosting](https://www.webarchitects.coop/discourse), [Nextcloud hosting](https://www.webarchitects.coop/nextcloud), [general web hosting](https://www.webarchitects.coop/shared-hosting), [virtual servers](https://www.webarchitects.coop/virtual-servers), [email services](https://www.webarchitects.coop/email), [domain name services](https://www.webarchitects.coop/domain-names) and [GNU/Linux sysadmin](https://www.webarchitects.coop/support) and [DevOps support services](https://www.webarchitects.coop/development) to individuals and progressive organisations.
 
 The purpose of our co-operative is:
-   > To enable the provision of internet based services for socially responsible groups and individuals, using free open source software wherever possible, in a manner that aims to minimise fossil fuel usage and ecological impacts and which also provides sustainable employment
 
-We offer free accounts on git.coop to members of our co-op, visit our website to find out more.
+> To enable the provision of internet based services for socially responsible groups and individuals, using free open source software wherever possible, in a manner that aims to minimise fossil fuel usage and ecological impacts and which also provides sustainable employment
+
+We offer free accounts on our GitLab server at [git.coop](https://git.coop/) to members of our co-op, visit [our website](https://www.webarchitects.coop/) to find out more.

_includes/footer.html

@@ -18,10 +18,10 @@
   <div class="footer-lower">
     <div class="row">
       <div class="small-12 columns">
-        <img src="/app/themes/coop-tech-oowp-theme/public/img/coop-logo.png" class="float-center" />
+        <img src="/assets/img/coop-logo.png" class="float-center" />
-        <p>Site developed by <a href="http://glowboxdesign.co.uk/" target="_blank">Glowbox Design</a> &amp; <a href="http://outlandish.com" target="_blank">Outlandish</a>.</p>
+        <p>Site developed by <a href="https://glowboxdesign.co.uk/" target="_blank">Glowbox Design</a>, <a href="https://gofreerange.com/" target="_blank">Go Free Range</a> &amp; <a href="https://outlandish.com" target="_blank">Outlandish</a>.</p>
         <p>Source code available on <a href="https://git.coop/cotech/website" target="_blank">git.coop</a>.</p>
-        <p>Hosted by <a href="https://www.webarchitects.coop/" target="_blank">Webarchitects</a> for CoTech &#xa9;2018</p>
+        <p>Hosted by <a href="https://www.webarchitects.coop/" target="_blank">Webarchitects</a> for CoTech &#xa9;2019</p>
       </div>
     </div>
   </div>

_includes/head.html

@@ -1,24 +1,64 @@
 <head>
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <meta name="description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
+{% if page.description %}
+  <meta name="description" content="{{ page.description | strip_html | strip_newlines | condense_spaces }}" />
+{% elsif page.collection == 'coops' and page.content %}
+  <meta name="description" content="{{ page.content | strip_html | strip_newlines | condense_spaces | truncate:150 }}" />
+{% else %}
+  <meta name="description" content="{{ site.description }}" />
+{% endif %}
   <meta charset="UTF-8">
-  <title>{{ page.title }} &laquo; Cooperative Technologists</title>
+{% if page.layout == "home" %}
+  <title>{{ page.title }} &laquo; {{ site.long_title }}</title>
+{% else %}
+  <title>{{ page.title }} &laquo; {{ site.title }} &laquo; {{ site.long_title }}</title>
+{% endif %}
   <meta property="og:type" content="website" />
-  <meta property="og:title" content="{{ page.title }}" />
+{% if page.layout == "home" %}
-  <meta property="og:description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
+  <meta property="og:title" content="{{ page.title }} &laquo; {{ site.long_title }}" />
-  <meta property="og:site_name" content="Cooperative Technologists" />
+{% else %}
-  <meta property="og:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
+  <meta property="og:title" content="{{ page.title }} &laquo; {{ site.title }} &laquo; {{ site.long_title }}" />
+{% endif %}
+{% if page.description %}
+  <meta property="og:description" content="{{ page.description | strip_html | strip_newlines }}" />
+{% elsif page.collection == 'coops' and page.content %}
+  <meta property="og:description" content="{{ page.content | strip_html | strip_newlines | condense_spaces | truncate:150 }}" />
+{% else %}
+  <meta property="og:description" content="{{ site.description }}" />
+{% endif %}
+  <meta property="og:site_name" content="{{ page.title }} &laquo; {{ site.long_title }}" />
+{% if page.collection == 'coops' %}
+  <meta property="og:image" content="/images/coops/{{ page.slug }}.png" />
+{% elsif page.collection == 'services' %}
+  <meta property="og:image" content="/images/services/{{ page.slug }}.png" />
+{% elsif page.collection == 'technologies' %}
+  <meta property="og:image" content="/images/technologies/{{ page.slug }}.png" />
+{% elsif page.collection == 'clients' %}
+  <meta property="og:image" content="/images/clients/{{ page.slug }}.png" />
+{% else %}
+  <meta property="og:image" content="/assets/img/Cotech_512x512.png" />
+{% endif %}
   <meta property="og:locale" content="en_GB" />
   <meta name="twitter:card" content="summary" />
   <meta name="twitter:site" content="@CotechUK" />
-  <meta name="twitter:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
+{% if page.collection == 'coops' %}
+  <meta name="twitter:image" content="{{ site.url }}/images/coops/{{ page.slug }}.png" />
+{% elsif page.collection == 'services' %}
+  <meta name="twitter:image" content="{{ site.url }}/images/services/{{ page.slug }}.png" />
+{% elsif page.collection == 'technologies' %}
+  <meta name="twitter:image" content="{{ site.url }}/images/technologies/{{ page.slug }}.png" />
+{% elsif page.collection == 'clients' %}
+  <meta name="twitter:image" content="{{ site.url }}/images/clients/{{ page.slug }}.png" />
+{% else %}
+  <meta name="twitter:image" content="{{ site.url }}/assets/img/Cotech_512x512.png" />
+{% endif %}
   <link rel="canonical" href="{{ page.url | absolute_url }}" />
-  <link rel='stylesheet' id='app-css' href='/app/themes/coop-tech-oowp-theme/public/css/app.css?ver=4.8' type='text/css' media='all' />
+  <link rel='stylesheet' id='app-css' href='/assets/css/app.css?ver=4.8' type='text/css' media='all' />
-  <script type='text/javascript' src='/app/themes/coop-tech-oowp-theme/public/js/vendor.js?ver=4.8'></script>
+  <script type='text/javascript' src='/assets/js/vendor.js?ver=4.8'></script>
-  <link rel="icon" href="/app/uploads/2017/02/cropped-cotech_512x512-32x32.png" sizes="32x32" />
+  <link rel="icon" href="/assets/img/cropped-cotech_512x512-32x32.png" sizes="32x32" />
-  <link rel="icon" href="/app/uploads/2017/02/cropped-cotech_512x512-192x192.png" sizes="192x192" />
+  <link rel="icon" href="/assets/img/cropped-cotech_512x512-192x192.png" sizes="192x192" />
-  <link rel="apple-touch-icon-precomposed" href="/app/uploads/2017/02/cropped-cotech_512x512-180x180.png" />
+  <link rel="apple-touch-icon-precomposed" href="/assets/img/cropped-cotech_512x512-180x180.png" />
-  <meta name="msapplication-TileImage" content="/app/uploads/2017/02/cropped-cotech_512x512-270x270.png" />
+  <meta name="msapplication-TileImage" content="/assets/img/cropped-cotech_512x512-270x270.png" />
   <style type="text/css" id="wp-custom-css">
     section#contact div.row div p a:active,
     section#contact div.row div p a:focus,
@@ -27,8 +67,8 @@
       color: white;
     }
   </style>
-  <link rel="stylesheet" href="/app/themes/coop-tech-oowp-theme/public/foundation-icons/foundation-icons.css">
+  <link rel="stylesheet" href="/assets/foundation-icons/foundation-icons.css">
-  <link rel="icon" type="image/x-icon" href="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">
+  <link rel="icon" type="image/x-icon" href="/assets/img/CoTech-logo.png">
   <script type="text/javascript">
     window.mapboxAccessToken = '{{ site.mapbox_access_token }}';
   </script>

_includes/header.html

@@ -4,10 +4,11 @@
       <div class="top-bar-title">
         <strong>
           <a id="logo" href="/">
-            <img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
+            <img src="/assets/img/CoTech-logo.png">CoTech
           </a>
         </strong>
         <a class="back" href="/">&#8592; Go Back</a>
+        <a class="close" href="/">&#10006;</a>
       </div>
     </div>
   </div>

_includes/javascripts.html

@@ -1 +1 @@
-<script type='text/javascript' src='/app/themes/coop-tech-oowp-theme/public/js/app.js?ver=4.8'></script>
+<script type='text/javascript' src='/assets/js/app.js?ver=4.8'></script>

_layouts/coop.html

@@ -87,7 +87,7 @@
                   {% assign s = site.services | where: "slug", service | first %}
                   <div class="column">
                     <a href="{{ s.url | relative_url }}" class="service-thumb">
-                      <div class="service-thumb-img float-center" style="background-image: url(/images/services/{{ s.slug }}.png)"></div>
+                      <div class="service-thumb-img float-center" style="background-image: url(/images/services/{{ s.slug }})"></div>
                       <div>{{ s.name }}</div>
                     </a>
                   </div>
@@ -107,7 +107,7 @@
                   {% assign t = site.technologies | where: "slug", technology | first %}
                   <div class="column">
                     <a href="{{ t.url | relative_url }}" class="technology-thumb">
-                      <div class="technology-thumb-img float-center" style="background-image: url(/images/technologies/{{ t.slug }}.png)"></div>
+                      <div class="technology-thumb-img float-center" style="background-image: url(/images/technologies/{{ t.slug }})"></div>
                     <div>{{ t.name }}</div>
                   </a>
                 </div>
@@ -126,7 +126,7 @@
                 {% for client in page.clients %}
                   {% assign c = site.clients | where: "slug", client | first %}
                   <div class="column client-thumb-container">
-                    <div class="client-thumb" style="background-image: url(/images/clients/{{ c.slug }}.png)"></div>
+                    <div class="client-thumb" style="background-image: url(/images/clients/{{ c.slug }})"></div>
                     <div class="client-thumb-header">{{ c.title }}</div>
                   </div>
                 {% endfor %}

_layouts/home.html

@@ -12,7 +12,7 @@
         <div class="top-bar-title">
           <strong>
             <a id="logo" href="/">
-              <img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
+              <img src="/assets/img/CoTech-logo.png">CoTech
             </a>
           </strong>
           <span data-responsive-toggle="responsive-menu" data-hide-for="medium">
@@ -22,11 +22,14 @@
         <div id="responsive-menu">
           <div class="top-bar-right">
             <ul class="dropdown menu vertical medium-horizontal" data-magellan>
-              <li><a href="#members">Members</a></li>
+              <li><a href="/#members">Members</a></li>
-              <li><a href="#clients">Clients</a></li>
+              <li><a href="/#clients">Clients</a></li>
-              <li><a href="#services">Services</a></li>
+              <li><a href="/#services">Services</a></li>
-              <li><a href="#technologies">Technologies</a></li>
+              <li><a href="/#technologies">Technologies</a></li>
-              <li><a href="#contact" class="button">Get In Touch</a></li>
+              <li><a href="/about">About</a></li>
+              <li><a href="/join">Join</a></li>
+              <li><a href="/manifesto">Manifesto</a></li>
+              <li><a href="/#contact" class="button">Get In Touch</a></li>
             </ul>
           </div>
         </div>

_layouts/service.html

@@ -15,8 +15,11 @@
     <div id="page-banner">
       <div class="row">
         <div class="small-12 small-centered columns">
-          <img src="/images/services/{{ page.slug }}.png" alt="">
+          <img src="/images/services/{{ page.slug }}" alt="">
           <h1>Coops that offer <span>{{ page.name }}</span></h1>
+{% if page.description %}
+          <p>{{ page.description }}</p>
+{% endif %}          
         </div>
       </div>
     </div>
@@ -40,7 +43,7 @@
                 {% if coop.services contains page.slug %}
                   <div class="column">
                     <a href="{{ coop.url | relative_url }}" class="coop-thumb">
-                      <img src="/images/coops/{{ coop.slug }}.png" alt="">
+                      <img src="/images/coops/{{ coop.slug }}" alt="">
                     </a>
                   </div>
                 {% endif %}

_layouts/technology.html

@@ -17,6 +17,9 @@
         <div class="small-12 small-centered columns">
           <img src="/images/technologies/{{ page.slug }}" alt="{{ page.name }}">
           <h1>Coops that use <span>{{ page.name }}</span></h1>
+{% if page.description %}
+          <p>{{ page.description }}</p>
+{% endif %} 
         </div>
       </div>
     </div>

_services/broadband.md

@@ -0,0 +1,4 @@
+---
+title: Broadband
+name: Broadband
+---

_services/devops.md

@@ -1,4 +1,5 @@
 ---
-title: Devops
+title: DevOps
 name: Devops
+description: Technology Cooperatives which provide services using software development practices that combines software development (Dev) and information technology operations (Ops) to shorten the systems development life cycle while delivering features, fixes, and update.
 ---

_services/machine-learning.md

@@ -0,0 +1,4 @@
+---
+title: Machine Learning
+name: Machine Learning
+---

_services/virtual-servers.md

@@ -1,4 +1,5 @@
 ---
 title: Virtual Servers
 name: Virtual Servers
+description: CoTech co-operatives who provide virtual servers to clients.
 ---

_technologies/angular.md

@@ -0,0 +1,4 @@
+---
+title: Angular
+name: Angular
+---

_technologies/ansible.md

@@ -1,4 +1,5 @@
 ---
 title: Ansible
 name: Ansible
+description: Technology Co-operatives which supply devops services using Ansible, the agentless open-source software provisioning, configuration management, and application-deployment tool.
 ---

_technologies/discourse.md

@@ -1,4 +1,5 @@
 ---
 title: Discourse
 name: Discourse
+description: Technology co-ops who can supply Discourse servers, Discourse is the leading open source, elegant and modern, web based, discussion forum software. 
 ---

_technologies/ionic.md

@@ -0,0 +1,4 @@
+---
+title: Ionic
+name: Ionic
+---

_technologies/wordpress.md

@@ -1,4 +1,5 @@
 ---
 title: WordPress
 name: WordPress
+description: Technology co-operatives who can help you with the design, deployment, hosting and managment of WordPress sites, WordPress is the worlds leading open source web based content management software.
 ---

assets/css/app.css

@@ -13,8 +13,8 @@
  * -------------------------- */
 @font-face {
   font-family: 'FontAwesome';
-  src: url("../fonts/fontawesome-webfont.eot?v=4.7.0");
+  src: url("/assets/fonts/fontawesome-webfont.eot?v=4.7.0");
-  src: url("../fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("../fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("../fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("../fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("../fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg");
+  src: url("/assets/fonts/fontawesome-webfont.eot?#iefix&v=4.7.0") format("embedded-opentype"), url("/assets/fonts/fontawesome-webfont.woff2?v=4.7.0") format("woff2"), url("/assets/fonts/fontawesome-webfont.woff?v=4.7.0") format("woff"), url("/assets/fonts/fontawesome-webfont.ttf?v=4.7.0") format("truetype"), url("/assets/fonts/fontawesome-webfont.svg?v=4.7.0#fontawesomeregular") format("svg");
   font-weight: normal;
   font-style: normal; }
 
@@ -27,7 +27,7 @@
   -moz-osx-font-smoothing: grayscale; }
 
 /* makes the font 33% larger relative to the icon container */
-.fa-lg {
+.fa-lg {f
   font-size: 1.33333em;
   line-height: 0.75em;
   vertical-align: -15%; }
@@ -4180,6 +4180,7 @@ a {
   text-decoration: none;
   line-height: inherit;
   cursor: pointer; }
+
   a:hover, a:focus {
     color: #1585cf; }
   a img {
@@ -6346,7 +6347,9 @@ table.hover tbody tr:nth-of-type(even):hover {
 
 .top-bar-title {
   float: left;
-  margin-right: 1rem; }
+  margin-right: 1rem;
+  width: 100%;
+}
 
 .top-bar-left {
   float: left; }
@@ -6460,15 +6463,15 @@ table.hover tbody tr:nth-of-type(even):hover {
 /* ---------------------------------------- Typography  ---------------------------------------- */
 @font-face {
   font-family: 'open_sansregular';
-  src: url("../fonts/OpenSans-Regular-webfont.eot");
+  src: url("/assets/fonts/OpenSans-Regular-webfont.eot");
-  src: url("../fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Regular-webfont.woff") format("woff"), url("../fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Regular-webfont.svg#open_sansregular") format("svg");
+  src: url("/assets/fonts/OpenSans-Regular-webfont.eot?#iefix") format("embedded-opentype"), url("/assets/fonts/OpenSans-Regular-webfont.woff") format("woff"), url("/assets/fonts/OpenSans-Regular-webfont.ttf") format("truetype"), url("/assets/fonts/OpenSans-Regular-webfont.svg#open_sansregular") format("svg");
   font-weight: normal;
   font-style: normal; }
 
 @font-face {
   font-family: 'open_sansbold';
-  src: url("../fonts/OpenSans-Bold-webfont.eot");
+  src: url("/assets/fonts/OpenSans-Bold-webfont.eot");
-  src: url("../fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("../fonts/OpenSans-Bold-webfont.woff") format("woff"), url("../fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("../fonts/OpenSans-Bold-webfont.svg#open_sansbold") format("svg");
+  src: url("/assets/fonts/OpenSans-Bold-webfont.eot?#iefix") format("embedded-opentype"), url("/assets/fonts/OpenSans-Bold-webfont.woff") format("woff"), url("/assets/fonts/OpenSans-Bold-webfont.ttf") format("truetype"), url("/assets/fonts/OpenSans-Bold-webfont.svg#open_sansbold") format("svg");
   font-weight: normal;
   font-style: normal; }
 
@@ -6550,7 +6553,7 @@ a:focus {
 #banner {
   padding: 8rem 0;
   text-align: center;
-  background-image: url(../img/banner-collage.jpg);
+  background-image: url(/assets/img/banner-collage.jpg);
   background-position: center center;
   background-repeat: no-repeat;
   background-size: cover; }
@@ -6705,6 +6708,12 @@ h5#join-us {
 .home #clients {
   background-color: #f7f7f5; }
 
+
+
+.client:nth-child(n+7){
+    display: none;
+}
+
 .client-thumb {
   height: 150px;
   width: 100%;
@@ -6828,6 +6837,9 @@ h5#join-us {
   padding-left: 2rem;
   color: #9196a2; }
 
+.close{
+  float: right;
+}
 #page-banner {
   margin-bottom: 4rem;
   text-align: center; }
@@ -6878,6 +6890,9 @@ h5#join-us {
 .coop .client-thumb-container:hover .client-thumb-header, .coop .client-thumb-container:focus .client-thumb-header {
   color: #000000; }
 
+.coop a {
+  word-break: break-all;
+}
 /* ---------------------------------------- SERVICE/TECHNOLOGY  ---------------------------------------- */
 .service #page-banner,
 .technology #page-banner {
@@ -6968,3 +6983,8 @@ footer {
         color: #ffffff; }
 
 /*# sourceMappingURL=app.css.map */
+
+
+.forum-links a{
+  margin: 0 auto;
+}

assets/js/app.js

@@ -51,3 +51,8 @@ app.createMapMultiMarker = function(mapId, lat, lng, zoom, markersArray) {
 };
 
 //# sourceMappingURL=app.js.map
+$('#client-list .column').shuffle();
+window.setInterval(function(){
+    /// call your function here
+    $('#client-list .column').shuffle();
+}, 7000);

index.html

@@ -8,12 +8,12 @@ layout: home
     <div class="small-12 medium-10 large-8 small-centered columns">
 
       <div class="small-3 columns">
-        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-coops.png" class="float-center">
+        <img src="/assets/img/icon-coops.png" class="float-center">
         <h6>Co-ops</h6>
         <h5>{{ site.coops.size }}</h5>
       </div>
       <div class="small-3 columns">
-        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-staff.png" class="float-center">
+        <img src="/assets/img/icon-staff.png" class="float-center">
         <h6>Staff</h6>
         {% assign total_members = 0 %}
         {% for coop in site.coops %}
@@ -22,20 +22,26 @@ layout: home
         <h5>{{ total_members }}+</h5>
       </div>
       <div class="small-3 columns">
-        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-revenue.png" class="float-center">
+        <img src="/assets/img/icon-revenue.png" class="float-center">
         <h6>Revenue</h6>
         <h5>£10.3m</h5>
       </div>
       <div class="small-3 columns">
-        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-clients.png" class="float-center">
+        <img src="/assets/img/icon-clients.png" class="float-center">
         <h6>Clients</h6>
         <h5>{{ site.clients.size }}+</h5>
       </div>
+        <br />
+        <p>CoTech is a network of ethical co-operatives providing technology, digital and creative services.</p>
+        <p>Working with co-operatives has major benefits: you’ll work directly with the people who own the business, who have a stake in making sure your project succeeds. With no private shareholders drawing out dividends, you’ll get genuine value for money.  And on top of that, you’ll get the benefit of working with small and responsive businesses which draw on the skills, specialisms and security of a large network.</p>
+        <p>Browse our co-operatives and services or get in touch if you’d like us to help you find the right co-op partner.</p>
+        <p>If you’re a tech co-op or a co-operatively minded freelancer and you’d like to <a href="/join">join us</a>.</p>
 
     </div>
   </div>
 </div>
 
+
 <section id="members" data-magellan-target="members">
   <div class="row">
     <div class="small-12 columns">
@@ -102,11 +108,11 @@ layout: home
     <div class="small-12 columns">
       <h2>Clients</h2>
       <p>Here are some of the amazing clients we have worked with so far</p>
-      <div class="row small-up-2 medium-up-3 large-up-6">
+      <div id='client-list' class="row small-up-2 medium-up-3 large-up-6">
-        {% assign clients = site.clients | sample:6 %}
+        {% assign clients = site.clients %}
         {% for client in clients %}
-          <div class="column">
+          <div class="column client">
-            <div class="client-thumb" style="background-image: url(/images/clients/{{ client.slug }})"></div>
+            <div class="client-thumb" style='background-image: url(/images/clients/{{ client.slug }}') title="{{client.slug}}"></div>
           </div>
         {% endfor %}
       </div>
@@ -160,12 +166,21 @@ layout: home
     <div class="small-12 medium-6 small-centered columns">
 
       <h2>Get In Touch</h2>
-      <p>
+        <p>
-        If you would like to work with us, or find out more,
+            All the members of CoTech are available to hire, and each has different specialisms. We vary in size from 2 people to 40+ people, and use different technologies. If you know what <a href="#technologies">technology</a>  or <a href="#services">service</a>  you're looking, you can use this site to find suitable co-ops. If you're not sure what you're looking for you can browse the <a href="#members">members</a> and get in touch with one that you like the look of. We're all committed to being honest about our capabilites and capacities, and we'll refer you to a different co-op if we think they'll offer you better value.
-        <a href="{{ site.forum }}">get in touch on our forum</a>.
+        </p>
-        <br/> Not sure which tech coop, or coops, are right for you? Drop us a message on
+        <div class="row forum-links">
-        <a href="{{ site.forum }}">our forum</a>, and we will help you find the perfect match.
+            <div class="small-12 medium-6 columns">
-      </p>
+                    <a href="https://community.coops.tech/"><img src="/assets/img/discourse-300.png" /></a>
+            </div>
+            <div class="small-12 medium-6 columns">
+
+                <a href="https://community.coops.tech/"><img class="mx-auto"  src="/assets/img/cotech-300.png" /></a>
+            </div>
+        </div>
+        <p>
+            If you don't want to hire us but want to find out more about co-ops, find a job in a co-op or discuss how technology can help solve the world's myriad problems, please head over to our <a href="{{ site.forum }}">Discourse forum</a>.
+        </p>
 
     </div>
   </div>

join.md

@@ -15,7 +15,7 @@ We refer to these as tech co-ops, though many of us are focused mainly on design
 
 If you are already part of a tech co-op (or an organisation that is practising cooperative principles and in the process of formally becoming a co-op) then we've already tried to find you to invite you to the network.
 
-If you were hiding somewhere or missed our call then get in touch using the form below.
+If you were hiding somewhere or missed our call then [get in touch using our open Discourse forum](https://community.coops.tech/c/cotech).
 
 #### Existing tech/digital companies
 
@@ -29,7 +29,7 @@ Once you're on the path to becoming a co-op you can become a member of the netwo
 
 If you are an individual that would like to work for a tech co-op then you can either apply for a job at an existing member co-op or start your own.
 
-To apply for a job you can contact us using the form below or individually explaining about your skills/experience and why you want to work for a tech co-op.
+To express an interest in working for a tech co-op you can [contact us using the jobs board on our open Discourse forum](https://community.coops.tech/c/jobs) explaining about your skills/experience and why you want to work for a tech co-op.
 
 The majority of jobs in our network are for developers, designers, project managers, etc. but if you have some skills you think we need then let us know. If you would like to start a tech co-op then we'd love to help you.