Remove broken GitHub link for Blake House

Added meta description to head (as well as og:description)

See merge request cotech/website!4

.gitlab-ci.yml

@@ -24,7 +24,7 @@ test:
   except:
   - master
 
-pages:
+deploy:production:
   stage: deploy
   script:
   - bundle exec jekyll build -d public
@@ -34,3 +34,15 @@ pages:
     - public
   only:
   - master
+
+
+deploy:dev:
+  stage: deploy
+  script:
+  - bundle exec jekyll build -d public
+  - rsync -aqz public/ cotech@webarch2.co.uk:sites/dev/
+  artifacts:
+    paths:
+    - public
+  only:
+  - dev

README.md

@@ -24,7 +24,7 @@ And visit [localhost:4000](http://localhost:4000) to view the site.
 
 ## Deploy CI
 
-When changes are committed the `.gitlab-ci.yml` file triggers the building of the site and then the copying of the results to https://static.coops.tech/
+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 https://static.coops.tech/ and when changes are committed to the `dev` branch the site at https://dev.static.coops.tech/ is updated.
 
 ## Contributing
 

_coops/agile-collective.md

@@ -4,7 +4,7 @@ name: Agile Collective
 website: http://agile.coop/
 email: info@agile.coop
 twitter: AgileCollective
-github: 
+github: agilecollective
 telephone: 01865 403 120
 address: Room 301,The Old Music Hall,106-108 Cowley Road,Oxford,United Kingdom,OX4 1JE
 latitude: 51.7483161

_coops/alpha-communication.md

@@ -7,8 +7,8 @@ twitter: alpha.coop
 github: AlphaCo_op
 telephone: +441912111938
 address: 6 Charlotte Square,Newcastle upon Tyne,United Kingdom,NE1 4XF
-latitude: 
+latitude: 54.97101
-longitude: 
+longitude: -1.61974
 clients:
 services:
 - animation

_coops/blake-house-filmmakers-co-op.md

@@ -4,7 +4,7 @@ name: Blake House Filmmakers Coop
 website: https://blake.house/
 email: hello@blake.house
 twitter: blake_house
-github: hello%40blake.html
+github:
 telephone: +447779 404510
 address: Unit 1H Clapham North Arts Centre,26-32 Voltaire Rd,London,SW4 6DH
 latitude: 51.46268029999999

_coops/outlandish.md

@@ -3,8 +3,8 @@ title: Outlandish
 name: Outlandish
 website: http://www.outlandish.com
 email: hello@outlandish.com
-twitter: outlandishideas
+twitter: outlandish
-github: hello%40outlandish.html
+github: outlandishideas
 telephone: +44 (0) 207 561 9968
 address: 3rd Floor,149 Fonthill Road,Finsbury Park,London,United Kingdom,N4 3HF
 latitude: 51.56372160000001
@@ -19,6 +19,7 @@ clients:
 - european-union
 - gender-action-for-peace-and-security
 - goethe-institut
+- greenpeace
 - hachette-uk
 - hotwire-pr
 - indie-training-fund

_coops/webarchitects.md

@@ -3,7 +3,7 @@ title: Webarchitects Co-operative
 name: Webarchitects Co-operative
 website: https://www.webarchitects.coop/
 email: info@webarch.net
-twitter: webarch-coop
+twitter: webarchcoop
 github: info%40webarch.html
 telephone: +44 114 276 9709
 address: Webarch Co-operative Limited,Harland Works,68a John Street,Sheffield,United Kingdom,S2 4QU

_includes/footer.html

@@ -5,9 +5,9 @@
 
         <div class="menu-centered">
           <ul class="menu">
-            <li><a href="{{ site.github.url }}/about">About <span>&#xbb;</span></a></li>
+            <li><a href="/about">About <span>&#xbb;</span></a></li>
-            <li><a href="{{ site.github.url }}/join">Join <span>&#xbb;</span></a></li>
+            <li><a href="/join">Join <span>&#xbb;</span></a></li>
-            <li><a href="{{ site.github.url }}/manifesto">Manifesto <span>&#xbb;</span></a></li>
+            <li><a href="/manifesto">Manifesto <span>&#xbb;</span></a></li>
           </ul>
         </div>
 
@@ -18,11 +18,29 @@
   <div class="footer-lower">
     <div class="row">
       <div class="small-12 columns">
-        <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/coop-logo.png" class="float-center" />
+        <img src="/app/themes/coop-tech-oowp-theme/public/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>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>
       </div>
     </div>
   </div>
+<!-- Matomo -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
+  _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
+  _paq.push(["setDomains", ["*.coops.tech","*.dev.coops.tech","*.static.coops.tech","*.www.coops.tech"]]);
+  _paq.push(["disableCookies"]);
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="https://stats.webarch.net/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', '223']);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<!-- End Matomo Code -->
 </footer>

_includes/head.html

@@ -1,5 +1,6 @@
 <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." />
   <meta charset="UTF-8">
   <title>{{ page.title }} &laquo; Cooperative Technologists</title>
   <meta property="og:type" content="website" />
@@ -12,12 +13,12 @@
   <meta name="twitter:site" content="@CotechUK" />
   <meta name="twitter:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
   <link rel="canonical" href="{{ page.url | absolute_url }}" />
-  <link rel='stylesheet' id='app-css' href='{{ site.github.url }}/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='/app/themes/coop-tech-oowp-theme/public/css/app.css?ver=4.8' type='text/css' media='all' />
-  <script type='text/javascript' src='{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/js/vendor.js?ver=4.8'></script>
+  <script type='text/javascript' src='/app/themes/coop-tech-oowp-theme/public/js/vendor.js?ver=4.8'></script>
-  <link rel="icon" href="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-32x32.png" sizes="32x32" />
+  <link rel="icon" href="/app/uploads/2017/02/cropped-cotech_512x512-32x32.png" sizes="32x32" />
-  <link rel="icon" href="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-192x192.png" sizes="192x192" />
+  <link rel="icon" href="/app/uploads/2017/02/cropped-cotech_512x512-192x192.png" sizes="192x192" />
-  <link rel="apple-touch-icon-precomposed" href="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-180x180.png" />
+  <link rel="apple-touch-icon-precomposed" href="/app/uploads/2017/02/cropped-cotech_512x512-180x180.png" />
-  <meta name="msapplication-TileImage" content="{{ site.github.url }}/app/uploads/2017/02/cropped-cotech_512x512-270x270.png" />
+  <meta name="msapplication-TileImage" content="/app/uploads/2017/02/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,
@@ -26,8 +27,8 @@
       color: white;
     }
   </style>
-  <link rel="stylesheet" href="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/foundation-icons/foundation-icons.css">
+  <link rel="stylesheet" href="/app/themes/coop-tech-oowp-theme/public/foundation-icons/foundation-icons.css">
-  <link rel="icon" type="image/x-icon" href="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">
+  <link rel="icon" type="image/x-icon" href="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">
   <script type="text/javascript">
     window.mapboxAccessToken = '{{ site.mapbox_access_token }}';
   </script>

_includes/header.html

@@ -3,11 +3,11 @@
     <div class="top-bar sticky iss-stuck is-at-top" data-sticky data-margin-top=0>
       <div class="top-bar-title">
         <strong>
-          <a id="logo" href="{{ site.github.url }}/">
+          <a id="logo" href="/">
-            <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
+            <img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
           </a>
         </strong>
-        <a class="back" href="{{ site.github.url }}/">&#8592; Go Back</a>
+        <a class="back" href="/">&#8592; Go Back</a>
       </div>
     </div>
   </div>

_includes/javascripts.html

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

_layouts/coop.html

@@ -16,7 +16,7 @@
       <div class="row">
         <div class="small-12 small-centered columns">
           <a href="{{ page.website }}" target="_blank">
-            <img src="{{ site.github.url }}/images/coops/{{ page.slug }}.png" alt="">
+            <img src="/images/coops/{{ page.slug }}.png" alt="">
           </a>
           <h2>{{ page.name }}</h2>
           <a href="{{ page.website }}" target="_blank">{{ page.website }}</a>
@@ -86,7 +86,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({{ site.github.url }}/images/services/{{ s.slug }}.png)"></div>
+                        <div class="service-thumb-img float-center" style="background-image: url(/images/services/{{ s.slug }}.png)"></div>
                         <h5>{{ s.name }}</h5>
                       </a>
                     </div>
@@ -104,7 +104,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({{ site.github.url }}/images/technologies/{{ t.slug }}.png)"></div>
+                        <div class="technology-thumb-img float-center" style="background-image: url(/images/technologies/{{ t.slug }}.png)"></div>
                         <h5>{{ t.name }}</h5>
                       </a>
                     </div>
@@ -121,7 +121,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({{ site.github.url }}/images/clients/{{ c.slug }}.png)"></div>
+                      <div class="client-thumb" style="background-image: url(/images/clients/{{ c.slug }}.png)"></div>
                       <h5 class="client-thumb-header">{{ c.title }}</h5>
                     </div>
                   {% endfor %}

_layouts/home.html

@@ -11,8 +11,8 @@
       <div class="top-bar sticky iss-stuck is-at-top" data-sticky data-margin-top=0>
         <div class="top-bar-title">
           <strong>
-            <a id="logo" href="{{ site.github.url }}/">
+            <a id="logo" href="/">
-              <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
+              <img src="/app/themes/coop-tech-oowp-theme/public/img/CoTech-logo.png">CoTech
             </a>
           </strong>
           <span data-responsive-toggle="responsive-menu" data-hide-for="medium">

_layouts/service.html

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

_layouts/technology.html

@@ -15,7 +15,7 @@
     <div id="page-banner">
       <div class="row">
         <div class="small-12 small-centered columns">
-          <img src="{{ site.github.url }}/images/technologies/{{ page.slug }}.png" alt="">
+          <img src="/images/technologies/{{ page.slug }}.png" alt="">
           <h2>Coops that use <span>{{ page.name }}</span></h2>
         </div>
       </div>
@@ -40,7 +40,7 @@
                 {% if coop.technologies contains page.slug %}
                   <div class="column">
                     <a href="{{ coop.url | relative_url }}" class="coop-thumb">
-                      <img src="{{ site.github.url }}/images/coops/{{ coop.slug }}.png" alt="">
+                      <img src="/images/coops/{{ coop.slug }}.png" alt="">
                     </a>
                   </div>
                 {% endif %}

about.md

@@ -22,6 +22,6 @@ Read [our manifesto][manifesto], [contact us if you want to work with us][contac
 [wiki]: https://wiki.coops.tech/
 [mailing-list]: https://www.email-lists.org/mailman/listinfo/tech-coops
 [wortley-hall]: https://www.wortleyhall.org.uk/
-[manifesto]: {{ site.github.url }}/manifesto
+[manifesto]: /manifesto
-[contact]: {{ site.github.url }}/#contact
+[contact]: /#contact
-[join]: {{ site.github.url }}/join
+[join]: /join

index.html

@@ -8,22 +8,22 @@ layout: home
     <div class="small-12 medium-10 large-8 small-centered columns">
 
       <div class="small-3 columns">
-        <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-coops.png" class="float-center">
+        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-coops.png" class="float-center">
         <h6>Co-ops</h6>
         <h5>{{ site.coops.size }}</h5>
       </div>
       <div class="small-3 columns">
-        <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-staff.png" class="float-center">
+        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-staff.png" class="float-center">
         <h6>Staff</h6>
-        <h5>159+</h5>
+        <h5>253+</h5>
       </div>
       <div class="small-3 columns">
-        <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-revenue.png" class="float-center">
+        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-revenue.png" class="float-center">
         <h6>Revenue</h6>
         <h5>£5.7m</h5>
       </div>
       <div class="small-3 columns">
-        <img src="{{ site.github.url }}/app/themes/coop-tech-oowp-theme/public/img/icon-clients.png" class="float-center">
+        <img src="/app/themes/coop-tech-oowp-theme/public/img/icon-clients.png" class="float-center">
         <h6>Clients</h6>
         <h5>{{ site.clients.size }}+</h5>
       </div>
@@ -55,7 +55,7 @@ layout: home
             {% for coop in site.coops %}
             <div class="column">
               <a class="coop-thumb" href="{{ coop.url | relative_url }}">
-                  <div class="coop-thumb-img has-tip tip-bottom radius" style="background-image: url({{ site.github.url }}/images/coops/{{ coop.slug }}.png)" data-tooltip aria-haspopup="true" title="{{ coop.name }}"></div>
+                  <div class="coop-thumb-img has-tip tip-bottom radius" style="background-image: url(/images/coops/{{ coop.slug }}.png)" data-tooltip aria-haspopup="true" title="{{ coop.name }}"></div>
                 </a>
             </div>
             {% endfor %}
@@ -101,7 +101,7 @@ layout: home
       <div class="row small-up-2 medium-up-3 large-up-6">
         {% for client in site.clients %}
           <div class="column">
-            <div class="client-thumb" style="background-image: url({{ site.github.url }}/images/clients/{{ client.slug }}.png)"></div>
+            <div class="client-thumb" style="background-image: url(/images/clients/{{ client.slug }}.png)"></div>
           </div>
         {% endfor %}
       </div>
@@ -120,7 +120,7 @@ layout: home
         {% for service in site.services %}
           <div class="column">
             <a href="{{ service.url | relative_url }}" class="service-thumb">
-              <div class="service-thumb-img float-center" style="background-image: url({{ site.github.url }}/images/services/{{ service.slug }}.png)"></div>
+              <div class="service-thumb-img float-center" style="background-image: url(/images/services/{{ service.slug }}.png)"></div>
               <h5>{{ service.name }}</h5>
             </a>
           </div>
@@ -140,7 +140,7 @@ layout: home
         {% for technology in site.technologies %}
           <div class="column">
             <a href="{{ technology.url | relative_url }}" class="technology-thumb">
-              <div class="technology-thumb-img" style="background-image: url({{ site.github.url }}/images/technologies/{{ technology.slug }}.png)"></div>
+              <div class="technology-thumb-img" style="background-image: url(/images/technologies/{{ technology.slug }}.png)"></div>
               <h5>{{ technology.name }}</h5>
             </a>
           </div>

join.md

@@ -45,5 +45,5 @@ We're still working our exactly what this entails but in essence you will provid
 
 If you'd like to find out more and help shape this official supporter role then please get in touch. You can also read more about us and check out our manifesto. You can also read more [about us][about] and check out our [manifesto][].
 
-[about]: {{ site.github.url }}/about
+[about]: /about
-[manifesto]: {{ site.github.url }}/manifesto
+[manifesto]: /manifesto

manifesto.md

@@ -16,5 +16,5 @@ We call upon consumers of digital products -- including trades unions, charities
 
 We hereby give notice to technology companies that do not treat their employees fairly, do not give their workers control of their businesses and do not seek to create a fairer world that your days are numbered. We are more creative, more committed and more resilient. [Join us][join].
 
-[Co-operative Technologists]: {{ site.github.url }}/about
+[Co-operative Technologists]: /about
-[join]: {{ site.github.url }}/join
+[join]: /join