Merge branch 'master' of git.coop:cotech/website

#41 Added word-break to links to ensure they don't overlap other elements and removed unused css map file
page.excerpt for service and technology pages
2019-04-25 14:31:22 +01:00 · 2019-04-25 14:30:30 +01:00 · 2019-04-25 14:30:24 +01:00 · 2019-04-25 14:20:35 +01:00 · 2019-04-25 14:08:52 +01:00 · 2019-04-25 14:05:09 +01:00
9 changed files with 84 additions and 5 deletions
--- a/README.md
+++ b/README.md
@ -65,11 +65,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
-[GitLab environments](https://git.coop/cotech/website/environments)
-to promote it to [www.coops.tech](https://www.coops.tech)
+### Production
+
+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

--- a/_includes/head.html
+++ b/_includes/head.html
@ -1,11 +1,19 @@
 <head>
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+{% if page.excerpt %}
+  <meta name="description" content="{{ page.excerpt | strip_html }}" />
+{% else %}
  <meta name="description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
+{% endif %}
  <meta charset="UTF-8">
  <title>{{ page.title }} &laquo; Cooperative Technologists</title>
  <meta property="og:type" content="website" />
  <meta property="og:title" content="{{ page.title }}" />
+{% if page.excerpt %}
+  <meta property="og:description" content="{{ page.excerpt | strip_html }}" />
+{% else %}
  <meta property="og:description" content="Building a tech industry that's better for its workers and customers through co-operation, democracy and worker ownership." />
+{% endif %}
  <meta property="og:site_name" content="Cooperative Technologists" />
  <meta property="og:image" content="/app/themes/coop-tech-oowp-theme/public/img/Cotech_512x512.png" />
  <meta property="og:locale" content="en_GB" />
--- a/_layouts/service.html
+++ b/_layouts/service.html
@ -17,6 +17,9 @@
        <div class="small-12 small-centered columns">
          <img src="/images/services/{{ page.slug }}.png" alt="">
          <h1>Coops that offer <span>{{ page.name }}</span></h1>
+{% if page.excerpt %}
+          <p>{{ page.excerpt }}</p>
+{% endif %}          
        </div>
      </div>
    </div>
--- a/_layouts/technology.html
+++ b/_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.excerpt %}
+          <p>{{ page.excerpt }}</p>
+{% endif %} 
        </div>
      </div>
    </div>
--- a/_services/virtual-servers.md
+++ b/_services/virtual-servers.md
@ -1,4 +1,5 @@
 ---
 title: Virtual Servers
 name: Virtual Servers
+excerpt: CoTech co-operatives who provide virtual servers to clients.
 ---
--- a/app/themes/coop-tech-oowp-theme/public/css/app.css
+++ b/app/themes/coop-tech-oowp-theme/public/css/app.css
@ -4179,7 +4179,8 @@ a {
  color: #2199e8;
  text-decoration: none;
  line-height: inherit;
-  cursor: pointer; }
+  cursor: pointer;
+  word-break: break-all; }
  a:hover, a:focus {
    color: #1585cf; }
  a img {
--- a/app/themes/coop-tech-oowp-theme/public/css/app.css.map
+++ b/app/themes/coop-tech-oowp-theme/public/css/app.css.map
--- a/images/coops/founders-and-coders.png
+++ b/images/coops/founders-and-coders.png
--- a/images/coops/founders-and-coders.svg
+++ b/images/coops/founders-and-coders.svg
Author	SHA1	Message	Date
Chris Croome	a3cc37053b	Merge branch 'master' of git.coop:cotech/website	2019-04-25 14:31:22 +01:00
Stephen Cox	45bc568a05	#41 Added word-break to links to ensure they don't overlap other elements and removed unused css map file	2019-04-25 14:30:30 +01:00
Chris Croome	89fca589e0	page.excerpt for service and technology pages	2019-04-25 14:30:24 +01:00
Chris Croome	6377580e94	whitespace, do'h!	2019-04-25 14:20:35 +01:00
Chris Croome	3f0f4dca05	optional page.excerpt for meta descriptions	2019-04-25 14:08:52 +01:00
Chris Croome	7a532078f1	Added excerpt to virtual-servers page	2019-04-25 14:05:09 +01:00
Chris Croome	50e157f2c0	Test adding page.excerpt to HTML <head>	2019-04-25 14:01:57 +01:00
Chris Roos	6f209445fc	Improve README instructions for deploying to production	2019-04-12 10:48:49 +01:00
Chris Croome	70cb438b36	New logo for Founders and Coders	2019-04-12 08:25:30 +01:00