Compare commits

..

229 Commits

Author SHA1 Message Date
ee8393e1ec Add clients, services & technologies for GFR coop 2020-10-11 14:06:34 +01:00
d18fd1672f Put clients in alphabetical order for go-free-range
This seems to be the approach we've taken for the majority of coops.
2020-10-11 12:49:10 +01:00
6757353a39 Remove trailing whitespace for go-free-range coop 2020-10-11 12:48:56 +01:00
265ddf5d93 Fix cast.png image
This seems to have been inadvertently broken in this commit [1]. Perhaps
even the GitLab Web IDE was confused by the "duplicate" image files...?

[1]: f0f0c3aea7
2020-10-11 12:22:21 +01:00
e1d8be7f5b Remove duplicate Power to Change client
Both Blake House and Open Data Services were already using lowercase
version of the Power to Change client markdown and image files, i.e.
`_clients/power-to-change.md` and `images/clients/power-to-change.png`.
So the uppercase versions of the files, i.e.
`_clients/Power-to-Change.md` and `images/clients/Power-to-Change.png`,
were effectively duplicates. 

This led to the following warning messages on case-insensitive
filesystems, making it hard to work on the project on such systems:

> warning: the following paths have collided (e.g. case-sensitive paths
> on a case-insensitive filesystem) and only one from the same colliding
> group is in the working tree

In this commit, I've added the website from `Power-to-Change.md` into
`power-to-change.md`, deleted `Power-to-Change.md` &
`Power-to-Change.png`, and changed the reference in `dot-project.md`
from `Power-to-Change` to `power-to-change`. I think this is the right
thing to do, because ideally all the markdown files should be lowercase
in case they are used in URL paths.
2020-10-10 15:05:03 +01:00
35c6bdc62b Remove duplicate Kaspersky client
Although no coops seem to be referencing this client, there were already
lowercase versions of the relevant files, i.e. `_clients/kaspersky.md`
and `images/clients/kaspersky.svg`. So the uppercase version,
`Kaspersky.md` was effectively a duplicate.

This led to the following warning messages on case-insensitive
filesystems, making it hard to work on the project on such systems:

> warning: the following paths have collided (e.g. case-sensitive paths
> on a case-insensitive filesystem) and only one from the same colliding
> group is in the working tree

In this commit, I've deleted `Kaspersky.md` which didn't contain
anything different to `kaspersky.md`. I think this is the right thing to
do, because ideally all the markdown files should be lowercase in case
they are used in URL paths.

There are other similar issues, but I plan to address them in separate
commits.
2020-10-10 14:58:32 +01:00
f0f0c3aea7 Remove duplicate CAST client
Both Blake House and InFact were already using lowercase version of the
CAST client markdown and image files, i.e. `_clients/cast.md` and
`images/clients/cast.png`. So the uppercase versions of the files, i.e.
`_clients/CAST.md` and `images/clients/CAST.png`, were effectively
duplicates.

This led to the following warning messages on case-insensitive
filesystems, making it hard to work on the project on such systems:

> warning: the following paths have collided (e.g. case-sensitive paths
> on a case-insensitive filesystem) and only one from the same colliding
> group is in the working tree

In this commit, I've added the website from `CAST.md` into `cast.md`,
deleted `CAST.md` & `CAST.png`, and changed the reference in
`dot-project.md` from `CAST` to `cast`. I think this is the right thing
to do, because ideally all the markdown files should be lowercase in
case they are used in URL paths.

There are other similar issues, but I plan to address them in separate
commits.
2020-10-10 14:49:39 +01:00
c57c3bb606 Added client logos for dotproject 2020-09-17 16:30:47 +01:00
379ae5bf9e Added clients for dotproject 2020-09-17 16:26:14 +01:00
86767b66e5 dot project image path fixed 2020-09-17 16:02:18 +01:00
6d81c59404 Revert "Image path fixed for dot project"
This reverts commit 3fcd541bf8
2020-09-17 16:01:53 +01:00
3fcd541bf8 Image path fixed for dot project 2020-09-17 15:57:18 +01:00
52911e8b41 Updated client list 2020-09-17 10:27:51 +01:00
9389210327 Update _coops/dot-project.md 2020-09-14 14:58:05 +01:00
c9f4d12110 Update _coops/dot-project.md 2020-09-14 14:57:43 +01:00
e7f7253011 Updates for dotproject 2020-09-14 14:52:17 +01:00
b51f670b33 Fix Grid/Map tab titles layout overspill
I think having the seperator is not properly supported by the
foundation CSS. I was a bit confused with app.css as some seems to
be vendor CSS and some custom CSS, so I left the original padding
rule, and added an override in what seems more like a "custom CSS"
section...

I don't know why they didn't all just float nicely
together in the first place though :/
2020-08-20 12:12:16 +02:00
d634816ef5 Fix bug with map display issue until resize
As the map tab is created hidden by default, leaflet seems unable
to deal with the sizing properly initially, but we can hook into
the "tab changed" event, and tell leaflet to recalculate the size
after switching tabs
2020-08-20 11:53:58 +02:00
4255eb049e List Dot Project under D not T 2020-08-14 12:55:01 +01:00
b7ac4bed44 Updates for https://community.coops.tech/t/2251 2020-08-14 12:51:28 +01:00
75cfc307cb Add Dandelion Collective 2020-07-23 11:07:01 +01:00
84d689ad65 Add Ruby technologies to Common Knowledge tech stack 2020-06-23 15:26:16 +01:00
c00130e258 Update common-knowledge.md 2020-06-22 12:55:51 +01:00
1513ccbb58 Update Common Knowledge 2020-06-19 14:59:03 +01:00
ca36057361 Add Common Knowledge 2020-06-19 14:15:41 +01:00
2d4480689d It is now 20202 2020-04-08 20:28:15 +01:00
da32e2feb4 https://git.coop/cotech/website/-/merge_requests/67/diffs 2020-04-08 20:24:34 +01:00
fc4263820b hyperlink colour made consistent 2020-04-05 10:33:21 +01:00
ca917656fa Hyperlink underline in light gray 2020-04-05 10:27:05 +01:00
3fccfb7abc Underline hyperlinks with a solid line on hover 2020-04-05 10:25:18 +01:00
cb6d7f2f47 test adding indication of hyperlinks 2020-04-05 10:21:34 +01:00
5dc69c576c Dash removed form co-operative for consistency 2020-04-05 10:16:41 +01:00
47eb616e9b description added 2020-04-05 10:15:50 +01:00
ef21a26e84 Spash page for https://community.coops.tech/t/1998 2020-04-05 10:03:10 +01:00
d91949666f jarrow tech added 2020-02-27 08:42:55 +00:00
23fcf3b1a0 Jarrow tech fxed 2020-02-27 08:38:08 +00:00
12106a09f2 Jarrow have two members 2020-02-27 08:28:57 +00:00
690d10f51e kaspersky title: added 2020-02-26 16:58:37 +00:00
33f1bbc3a7 Jarrow client added 2020-02-26 16:46:51 +00:00
53b21c258f file extension fixed 2020-02-26 16:44:47 +00:00
9adb60f228 Jarrow Insight updates 2020-02-26 16:38:38 +00:00
f0a08145c6 Clients and tech added for Jarrow Insights 2020-02-26 16:33:24 +00:00
cedf27d93a Initial Jarrow Insights commit 2020-02-26 15:49:38 +00:00
8c9dd1f4b3 NHS page corrected 2020-02-26 15:25:48 +00:00
d40113e543 NHS added 2020-02-26 15:21:27 +00:00
004b38b0d0 missing title: added 2020-02-26 15:17:13 +00:00
a4dd3bb156 Paper Rhino client pages added 2020-02-26 15:09:31 +00:00
fd51760575 tweak to see if page is rebuilt 2020-02-26 14:05:18 +00:00
4f17290add Paper Rhino client images added 2020-02-26 13:55:27 +00:00
9279ea09e3 Paper Rhino updates 2020-02-26 12:41:36 +00:00
a9db7c6cd1 paperrhino.png added 2020-02-26 12:25:32 +00:00
43df7a33fb Paper Rhino added 2020-02-26 12:05:41 +00:00
9da6524039 United Diversity phone number removed 2020-01-06 12:59:20 +00:00
1807c867ba Replace infact.png 2019-12-14 16:08:55 +00:00
e6449f7e00 Update images/clients/south-london-and-maudsley-nhs-trust.png, images/clients/guys-and-st-thomas-charity.png, images/clients/ava-against-violence-and-abuse.png files 2019-12-14 16:05:01 +00:00
723ef2aee3 Upload New File 2019-12-14 16:04:13 +00:00
3741424430 Upload New File 2019-12-14 16:02:58 +00:00
3f556901db Upload New File 2019-12-14 15:55:50 +00:00
c153b01cd0 Upload New File 2019-12-14 15:55:40 +00:00
8f50c7f540 Upload New File 2019-12-14 15:55:30 +00:00
344b72fb64 Upload New File 2019-12-14 15:55:20 +00:00
9f56929fa3 Upload New File 2019-12-14 15:55:12 +00:00
9a28177b84 Upload New File 2019-12-14 15:55:02 +00:00
ddcfe26a67 Upload New File 2019-12-14 15:54:51 +00:00
bcefdd4116 Upload New File 2019-12-14 15:54:33 +00:00
8e9b20ca7b Upload New File 2019-12-14 15:54:21 +00:00
06b8312329 Upload New File 2019-12-14 15:54:01 +00:00
7a957ab892 Update _clients/lancashire-womens-centres.md 2019-12-14 15:43:11 +00:00
c7d3247c0a Update _coops/infact.md 2019-12-14 15:39:52 +00:00
dcd996c374 Update _coops/infact.md, _clients/ava-against-violence-and-abuse.md files 2019-12-14 15:29:36 +00:00
0ea12c8ec4 add logos 2019-12-14 15:26:29 +00:00
72b07a1b1c add slam client 2019-12-14 15:23:29 +00:00
14b062197a update infactcoop 2019-12-14 15:19:56 +00:00
e43723a2a6 Update founders-and-coders.md 2019-12-14 15:13:57 +00:00
7d7489c0be adds infact clients 2019-12-14 15:13:57 +00:00
2f4cb1ac21 Merge branch 'master' of git.coop:cotech/website 2019-12-14 15:00:40 +00:00
cbc2f8e3ae Updating the join oage to offer clearer benefits of joining CoTech with links to more information in the wiki. 2019-12-14 15:00:29 +00:00
e85941af9c Fixed formatting errors in infact.md 2019-12-14 14:59:50 +00:00
d6f45ffc92 added logo files 2019-12-14 14:20:55 +00:00
7faac2891b Upload New File 2019-12-14 14:17:47 +00:00
caecfcf6fc addded infact details 2019-12-14 14:16:43 +00:00
46d1f37d17 removed gitlab link from dcdc 2019-07-18 19:48:52 +01:00
8a59e54ff6 Update dcdc.md 2019-07-18 19:45:11 +01:00
2b1988d86c Greenwich Co-operative Development Agency Added 2019-07-12 19:14:22 +01:00
3c96da26bc Added logo for https://community.coops.tech/t/our-new-www-coops-tech-jekyll-website/1167/20 2019-07-12 19:12:00 +01:00
f1b85f8a73 Update _coops/animorph.md 2019-07-06 14:41:32 +01:00
3f06a12945 Update dcdc.md webmarker 2019-07-06 13:41:20 +01:00
a79277c904 PNG version of DCDC image added 2019-07-05 23:00:08 +01:00
3a846fd9e8 typo fixed 2019-07-05 20:35:51 +01:00
02dc171130 typo fixed 2019-07-05 20:23:14 +01:00
a5f7e72571 missing latitude and longitude added 2019-07-05 19:21:46 +01:00
bad2ffab4b attempt to fix map markers 2019-07-05 19:13:18 +01:00
7c68a3d9a8 edits to try to fix map markers 2019-07-05 19:11:54 +01:00
10d1dbf623 Lang set to en and test of adding directory listings 2019-07-05 17:56:48 +01:00
24d05e6ca2 Oxford University Hospitals NSH logo added 2019-07-05 17:43:58 +01:00
dfa1654723 Centre for Sustainable Healthcare logo added 2019-07-05 17:36:30 +01:00
02cefe36b1 Merge branch 'JamesDCDC/website-master' into HEAD 2019-07-05 16:51:56 +01:00
1ed389423d Merge branch 'master' into 'master'
Master

See merge request JamesDCDC/website!1
2019-07-05 16:47:21 +01:00
7549095c74 Merge branch 'master' of git.coop:cotech/website 2019-07-05 16:35:13 +01:00
c33c6f67ef Sluth added 2019-07-05 16:34:59 +01:00
7d8155c61c improved metadata for dcdc 2019-07-05 16:26:15 +01:00
be091ce87b Update _coops/animorph.md 2019-07-05 16:13:06 +01:00
5de2fbf81f first work 2019-07-05 15:56:13 +01:00
a523a0896f animorph.svg added https://community.coops.tech/t/logos-on-www-coops-tech/553/21 2019-07-05 15:38:34 +01:00
641391facb duplicate bash sorted out 2019-07-05 15:01:40 +01:00
36939a406b added missing mhsgroup.org image 2019-07-05 14:48:34 +01:00
6738ea5e4c UD clients added from https://community.coops.tech/t/our-new-www-coops-tech-jekyll-website/1167/17 2019-07-05 14:45:04 +01:00
ac96faf6ba vertical align co-op images on technology pages 2019-07-05 13:36:13 +01:00
540911839d roll back image updates 2019-07-05 12:54:01 +01:00
e88dc2f257 graphics.coop replaced with formandfunction.coop 2019-07-05 12:45:47 +01:00
2061561186 svg added https://community.coops.tech/t/logos-on-www-coops-tech/553/16 2019-07-05 12:22:35 +01:00
0a09a0f6a5 svg added https://community.coops.tech/t/logos-on-www-coops-tech/553/17 2019-07-05 12:21:46 +01:00
72741d63fd mediablaze-hosts.svg https://community.coops.tech/t/logos-on-www-coops-tech/553/18 2019-07-05 12:20:55 +01:00
17c1ce602a open-data-services.svg https://community.coops.tech/t/logos-on-www-coops-tech/553/22 2019-07-05 12:19:40 +01:00
14af8ea79f Images from Hannah https://community.coops.tech/t/logos-on-www-coops-tech/553/24 2019-07-05 12:11:56 +01:00
6acd4c8d09 Update animorph.md info, add client mds and logos 2019-07-04 20:01:49 +01:00
0331264703 images etc for code-op clients 2019-07-03 20:21:01 +01:00
a158f375d4 Added the PNG back as it's needed by some clients. Thanks Chris :) 2019-06-25 17:51:18 +01:00
6be8dd2818 Swapped Outlandish's logo 2019-06-25 17:06:33 +01:00
f9b48b8ad3 Redirect for old URLs added 2019-06-20 17:47:38 +01:00
9657234d8e Agile updated 2019-06-20 17:42:58 +01:00
3737168a02 Agile description updated 2019-06-20 17:38:04 +01:00
c069879cf1 Agile services 2019-06-20 15:06:53 +01:00
4e795ff337 Analytics fix 2019-06-20 15:06:15 +01:00
2be398b3a1 add analytics 2019-06-20 15:04:40 +01:00
12895e8404 agile tech updated 2019-06-20 14:59:00 +01:00
5d6055a89e agile tech updated 2019-06-20 14:57:10 +01:00
d51a6b0f9e Agile services updated 2019-06-20 14:55:40 +01:00
d46b6f0735 Angular dupes removed 2019-06-20 14:51:26 +01:00
de04546792 angular logos added 2019-06-20 14:48:35 +01:00
1d27f30e9b ionic.png updated 2019-06-20 14:48:20 +01:00
1ad912b8cb missing tech logos added 2019-06-20 14:47:08 +01:00
e533438f3c service names fixed 2019-06-20 14:28:29 +01:00
e4579df97d Agile services and Oxford Council logo updated 2019-06-20 14:23:08 +01:00
a4d4547d96 Oxfam logo transparancy 2019-06-20 14:14:32 +01:00
aec1f09135 CSS fix for vertical align images on services page 2019-06-20 14:06:30 +01:00
a9398c8a90 frag id added for co-op services logo 2019-06-20 14:05:16 +01:00
75823e93d8 CSS tweak 2019-06-20 14:00:19 +01:00
9621d74f11 CSS test 2019-06-20 13:56:23 +01:00
ca2e633d27 CSS tweak 2019-06-20 13:54:45 +01:00
f641c889da test vertical align images 2019-06-20 13:53:21 +01:00
a31f65dba6 test vertical align co-op logos 2019-06-20 13:50:09 +01:00
6a8185d1fa added machine-learning.png 2019-06-20 13:43:10 +01:00
c60712bf4e transparancy added 2019-06-20 13:22:16 +01:00
ba0469154b Agile client list updated 2019-06-20 13:13:40 +01:00
c92de6e348 Logos added 2019-06-20 13:07:24 +01:00
2b9c06bd69 SGML .htaccess syntax fix for #57 2019-06-20 07:07:38 +01:00
f833c8f0cd mod_rewrite rule fixed #57 2019-06-20 07:05:19 +01:00
d84891f2ec .htaccess updated for #57 2019-06-20 07:03:25 +01:00
bf3289a6c9 centre client title text 2019-06-20 06:57:33 +01:00
fcd60f5e79 Additional clients for Agile.coop 2019-06-20 06:53:44 +01:00
32f2da7949 Agile use Debian 2019-06-19 16:29:52 +01:00
ae02954868 CSS padding for front page increased and use HTTPS for Agile 2019-06-19 16:25:30 +01:00
e75044d133 adde back code-operative as a dot file due to missing images 2019-06-19 16:22:49 +01:00
8496b18c32 CSS tweaks 2019-06-19 16:22:26 +01:00
5b05d6da2f test move co-operative to dot file to hide due to missing icons 2019-06-19 16:05:52 +01:00
b14b95a22a New logo for Agile Collective 2019-06-19 16:01:44 +01:00
4b72062704 Delete FriendsHouse.png 2019-06-18 17:46:44 +01:00
4ef0975c23 Friends House image 2019-06-18 17:09:18 +01:00
363de5dd03 Correctly named PLP image 2019-06-18 17:08:45 +01:00
cb095e3394 Delete plp.png 2019-06-18 17:07:58 +01:00
bdac0387f9 Merge branch 'emaw/website-master' into HEAD 2019-06-18 16:38:09 +01:00
9f1a53a1b3 Merge branch 'master' into emaw/website-master 2019-06-18 16:37:20 +01:00
5ef271cadf code operative updates 2019-06-18 16:01:41 +01:00
2b8d783267 added Code Operative logo 2019-06-18 15:58:14 +01:00
dfa28b9365 Update greennet.md 2019-06-18 11:54:59 +01:00
00cf887471 added markdown files for code-operative 2019-06-17 21:51:02 +01:00
c511bdd029 added DCDC 2019-06-13 16:16:10 +01:00
c759b48bed member total should be full time equivalent workers 2019-06-13 13:57:39 +01:00
c60bc316b0 It is 2019 and we use HTTPS these days! 2019-06-12 13:03:38 +01:00
adf75a55d2 Hyperlinks added back that were lost from WordPress migration, see https://coops.tech.archived.website/co-op/webarchitects.html 2019-06-12 12:11:01 +01:00
c7588748cf Upload GreenNet.md 2019-06-08 23:38:55 +01:00
2471d12887 Update public-law-project.md 2019-06-08 23:29:25 +01:00
3cc0985830 Update _clients/apc.md, _clients/friendshouse.md, _clients/ica.md, _clients/nswp.md, _clients/pbi.md, _clients/public-law-project.md, _clients/unesco.md, _clients/woodcraftfolk.md files 2019-06-08 23:25:14 +01:00
d985c5a5fc Deleted woodcraftfolk.md, nswp.md, pbi.md, public-law-project.md, unesco.md, privacy-international.md, apc.md, friendshouse.md, ica.md files 2019-06-08 23:23:45 +01:00
e5eb5c3bca Update apc.md, friendshouse.md, ica.md, nswp.md, pbi.md, privacy-international.md, unesco.md, woodcraftfolk.md, public-law-project.md files 2019-06-08 23:19:50 +01:00
c1407ef03b Update images/clients/apc.png, images/clients/ica.png, images/clients/plp.png, images/clients/unesco.png, images/clients/woodcraftfolk.png, images/clients/FriendsHouse.png, images/clients/pbi.png, images/clients/nswp.png files 2019-06-08 23:17:59 +01:00
6c51780cc8 Upload Broadband.md 2019-06-08 23:11:45 +01:00
4c8fac7224 Upload New File 2019-06-08 23:10:54 +01:00
15a0703bdd Upload New File 2019-06-08 23:09:25 +01:00
eada87f3dc Upload Clients 2019-06-08 23:08:16 +01:00
adaa27fecd Upload New File 2019-06-08 23:05:19 +01:00
b415d9dcd5 remove image extensions to enable SVG's to be served #54 2019-06-06 12:29:20 +01:00
7d71b467ac greenpeace.svg added from https://upload.wikimedia.org/wikipedia/commons/6/69/Greenpeace_logo.svg 2019-06-06 12:06:35 +01:00
4b62e5e88c Fix for https://community.coops.tech/t/which-co-ops-are-providing-hosting/1364/7 2019-06-06 10:06:49 +01:00
64a3e089eb Descriptions added 2019-06-05 12:03:36 +01:00
0aa46ea5f0 Fix for mistake in last commit #53 2019-06-05 11:55:33 +01:00
0a8dea4717 <title> metadata tweak for pages other than the home page #53 2019-06-05 11:51:17 +01:00
ab75dc95fb title metadata tweak for #53 2019-06-05 11:47:19 +01:00
0914a852d6 metadata tweaks for #53 2019-06-05 11:30:36 +01:00
cb60447433 descriptions added 2019-06-05 11:03:44 +01:00
acaac75768 title and abbr added to meta description 2019-06-05 10:21:29 +01:00
5b555cfac4 twitter:image is in the spec https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/markup 2019-06-05 09:07:43 +01:00
c3f638c54f fix for canonical url 2019-06-05 09:00:23 +01:00
00667c23c1 site variable fix, see https://jekyllrb.com/docs/variables/#site-variables 2019-06-05 08:58:53 +01:00
ab6e60649f Attempt to fix Twitter images for #53 2019-06-05 08:54:07 +01:00
5ae079ff92 Replace references to forms with links to Discourse 2019-05-11 17:35:23 +01:00
b0cefd265f Merge branch 'master' into coops_profile_updates 2019-04-26 15:00:03 +01:00
19292553da Merge branch 'master' into coops_profile_updates 2019-04-26 14:59:21 +01:00
a6b9011d2a Merge branch 'master' into docs-on-updating-website 2019-04-26 14:46:49 +01:00
99c7327755 Added 'Updating this site' section to README.md 2019-04-26 14:36:01 +01:00
a9b01448b5 Coops profile updates 2019-04-26 14:26:59 +01:00
7a47fd3030 Updated Agile Collective details. 2019-04-26 13:47:55 +01:00
b358f5adc7 Merged master 2019-04-26 13:18:52 +01:00
cd09cb2ec6 Fixed issue with menu links breaking in the header 2019-04-26 13:16:57 +01:00
b133a7094f Use PNG not conneg for OG metedata image #53 2019-04-25 18:59:05 +01:00
6de1586824 s/excerpt/description/ #53 2019-04-25 18:53:35 +01:00
12a7b251d6 test fix for #53 2019-04-25 18:47:48 +01:00
2576ab601f debug test 2019-04-25 18:43:43 +01:00
7c2701b97b Merge branch 'metadata' of git.coop:cotech/website into metadata 2019-04-25 18:40:13 +01:00
305365d2cf test fix for #53 2019-04-25 18:40:07 +01:00
0a8ee8ea3f still an issue with blank descriptions #53 2019-04-25 18:40:07 +01:00
a5a482ef7e test fix for #53 2019-04-25 18:39:12 +01:00
98f6b4068c fixed type 2019-04-25 18:08:35 +01:00
15c8ec657f added GFR to site credits 2019-04-25 17:54:36 +01:00
545211fd0e fixing footer links, and minor edit to summary text 2019-04-25 17:47:53 +01:00
be61bf2794 Merge branch 'master' into copy_change 2019-04-25 17:34:46 +01:00
48fd167a01 Merge branch 'master' of git.coop:cotech/website 2019-04-25 17:33:50 +01:00
e746d368d9 copy fix 2019-04-25 17:33:37 +01:00
c329f8534a WIP fixing discourse links 2019-04-25 17:22:16 +01:00
bddb855609 still an issue with blank descriptions #53 2019-04-25 16:59:30 +01:00
ad7c252a59 fix for pages without excerpt #53 2019-04-25 16:52:38 +01:00
efeccb222f Merge branch 'master' of git.coop:cotech/website 2019-04-25 16:48:19 +01:00
cfb5a106af Assets location change 2019-04-25 16:37:41 +01:00
387701a529 Assets location change 2019-04-25 16:30:35 +01:00
d731b794a3 test fix for #53 2019-04-25 16:25:55 +01:00
a0e79992c9 Merge branch 'master' of git.coop:cotech/website 2019-04-25 16:22:21 +01:00
79d4adc310 Fix for non-coop pages #53 2019-04-25 16:21:55 +01:00
a2d8d11813 assets location change 2019-04-25 15:50:34 +01:00
495 changed files with 6838 additions and 429 deletions

1
.gitignore vendored
View File

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

View File

@ -1,5 +1,5 @@
# Serve .html files without extensions
Options +MultiViews
# Serve .html files without extensions and allow directory listings
Options +MultiViews +Indexes
# If a SVG and a PNG exists the prefer the SVG
AddType image/svg+xml;qs=0.9 svg sgvz
AddType image/png;qs=0.8 png
@ -12,3 +12,31 @@ AddOutputFilter DEFLATE html
AddOutputFilter DEFLATE svg
AddOutputFilter DEFLATE css
AddOutputFilter DEFLATE js
# URL's that changed
Redirect /co-op/the-dot-project https://www.coops.tech/co-op/dot-project
Redirect /coops/ https://www.coops.tech/co-op/
Redirect /technology/gnu-bash https://www.coops.tech/technology/bash
Redirect /co-op/graphics-coop https://www.coops.tech/co-op/form-and-function
# Canonical URLs redirect to the domain with a www
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTP_HOST} ^coops\.tech$
RewriteRule ^/?(.*) https://www.coops.tech/$1 [R,L]
</IfModule>
# Redirect HTTP to HTTPS
# https://wiki.apache.org/httpd/RewriteHTTPToHTTPS
<IfModule mod_rewrite.c>
RewriteEngine on
RewriteCond %{HTTPS} !=on
RewriteRule ^/?(.*) https://%{SERVER_NAME}/$1 [R,L]
</IfModule>
# Strict Transport Security Header, this prevents clients
# with STS support from accessing the site using HTTP
# https://stackoverflow.com/questions/24144552/how-to-set-hsts-header-from-htaccess-only-on-https
Header set Strict-Transport-Security "max-age=31536000" env=HTTPS
# Directory Listings
HeaderName /top.html
ReadmeName /bot.html
IndexOptions FancyIndexing VersionSort HTMLTable NameWidth=* DescriptionWidth=*
IndexOptions Charset=UTF-8 SuppressHTMLPreamble XHTML TrackModified IconsAreLinks
IndexOptions SuppressDescription

View File

@ -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

4
_clients/1010uk.md Normal file
View File

@ -0,0 +1,4 @@
---
title: The 10:10 Foundation
website: https://1010uk.org/
---

View File

@ -0,0 +1,4 @@
---
title: British Tinnitus Association
website: https://www.tinnitus.org.uk/
---

4
_clients/Carefree.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Carefree
website: https://carefreespace.org/
---

View File

@ -0,0 +1,4 @@
---
title: Charity Digital
website: https://charitydigital.org.uk/
---

4
_clients/Cyfannol.md Normal file
View File

@ -0,0 +1,4 @@
---
title: British Tinnitus Association
website: https://cyfannol.org.uk/
---

View File

@ -0,0 +1,4 @@
---
title: Esmee Fairbairn
website: https://esmeefairbairn.org.uk/
---

4
_clients/Family-Lives.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Family Lives
website: https://www.familylives.org.uk/
---

4
_clients/Grassroots.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Grassroots
website: https://www.prevent-suicide.org.uk/
---

4
_clients/Make-a-Wish.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Make A Wish
website: https://www.make-a-wish.org.uk/
---

View File

@ -0,0 +1,4 @@
---
title: Parkinsons UK
website: https://www.parkinsons.org.uk/
---

4
_clients/SARSAS.md Normal file
View File

@ -0,0 +1,4 @@
---
title: SARSAS
website: https://www.sarsas.org.uk/
---

4
_clients/SWCTN.md Normal file
View File

@ -0,0 +1,4 @@
---
title: South West Creative Technology Network
website: https://www.swctn.org.uk/
---

View File

@ -0,0 +1,4 @@
---
title: Surviving Economic Abuse
website: https://survivingeconomicabuse.org/
---

4
_clients/TTC.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Tech Talent Charter
website: https://www.techtalentcharter.co.uk/
---

4
_clients/The-Catalyst.md Normal file
View File

@ -0,0 +1,4 @@
---
title: The Catalyst
website: https://www.thecatalyst.org.uk/
---

4
_clients/WECA.md Normal file
View File

@ -0,0 +1,4 @@
---
title: West of England Combined Authority
website: https://www.westofengland-ca.gov.uk/
---

3
_clients/acorn.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: Action for Children
website: https://www.actionforchildren.org.uk/
---

3
_clients/actionaid.md Normal file
View File

@ -0,0 +1,3 @@
---
title: Action Aid
---

View File

@ -0,0 +1,3 @@
---
title: Allia Future Business Centre
---

View File

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

View File

@ -0,0 +1,4 @@
---
title: Anna Freud Centre
website: https://www.annafreud.org/
---

3
_clients/apc.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: AVA Project
website: https://avaproject.org.uk/
---

4
_clients/barbourlogic.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Barbour Logic
website: http://www.barbourlogic.co.uk/
---

3
_clients/basw.md Normal file
View File

@ -0,0 +1,3 @@
---
title: The British Association of Social Workers (BASW)
---

3
_clients/bbc-ideas.md Normal file
View File

@ -0,0 +1,3 @@
---
title: BBC ideas
---

5
_clients/bhrrc.md Normal file
View File

@ -0,0 +1,5 @@
---
title: BHRRC
website: https://www.business-humanrights.org/
---

4
_clients/bioregional.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Bioregional
website: https://www.bioregional.com/
---

3
_clients/blake-house.md Normal file
View File

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

4
_clients/blue-cross.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Blue Cross
website: https://www.bluecross.org.uk/
---

View File

@ -1,3 +1,4 @@
---
title: Cairn Housing Association
website: https://www.cairnha.com/
---

3
_clients/cardinus.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: Carers support centre
website: https://www.carerssupportcentre.org.uk/
---

View File

@ -1,3 +1,4 @@
---
title: CAST
website: https://www.wearecast.org.uk/
---

4
_clients/catapillr.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Catapillr
website: https://www.catapillr.com
---

View File

@ -1,3 +1,4 @@
---
title: CDS Co-operatives
website: https://www.cds.coop/
---

View File

@ -0,0 +1,4 @@
---
title: Childrens Health Scotland
website: https://www.childrenshealthscotland.org/
---

View File

@ -0,0 +1,3 @@
---
title: Climate Outreach
---

4
_clients/comicrelief.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Comic Relief
website: https://www.comicrelief.com/
---

View File

@ -0,0 +1,4 @@
---
title: Common Futures
website: https://commonfutures.eu/
---

4
_clients/coopsUK.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Coops UK
website: https://www.uk.coop/uk
---

View File

@ -0,0 +1,5 @@
---
title: Crown Commercial Service
website: https://www.crowncommercial.gov.uk/
---

3
_clients/csh.md Normal file
View File

@ -0,0 +1,3 @@
---
title: The Centre for Sustainable Healthcare
---

4
_clients/dcms.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Department for Culture, Media and Sport
website: https://www.gov.uk/government/organisations/department-for-digital-culture-media-sport
---

3
_clients/deliveroo.md Normal file
View File

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

4
_clients/ecas.md Normal file
View File

@ -0,0 +1,4 @@
---
title: ECAS
website: https://www.ecas.scot/
---

3
_clients/eden-project.md Normal file
View File

@ -0,0 +1,3 @@
---
title: The Eden Project
---

4
_clients/en10ergy.md Normal file
View File

@ -0,0 +1,4 @@
---
title: en10ergy Limited
website: https://en10ergy.org.uk/
---

3
_clients/envirogen.md Normal file
View File

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

View File

@ -0,0 +1,3 @@
---
title: Ethical Consumer
---

3
_clients/feps.md Normal file
View File

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

View File

@ -0,0 +1,3 @@
---
title: Food Standards Agency
---

View File

@ -0,0 +1,4 @@
---
title: Founders and Coders
website: https://www.foundersandcoders.com/
---

View File

@ -0,0 +1,3 @@
---
title: Freedom from Torture
---

View File

@ -0,0 +1,4 @@
---
title: Friend Indeed
website: https://www.friendindeed.org.uk/
---

3
_clients/friendshouse.md Normal file
View File

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

3
_clients/froglife.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: The Fundraising Regulator
website: https://www.fundraisingregulator.org.uk/
---

4
_clients/gcda.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Greenwich Co-operative Development Agency
website: https://gcda.coop/
---

View File

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

View File

@ -1,3 +1,4 @@
---
title: Global Canopy Programme
website: https://www.globalcanopy.org/
---

View File

@ -0,0 +1,4 @@
---
title: Greener Kirkcaldy
website: https://www.greenerkirkcaldy.org.uk/
---

3
_clients/greenpeace.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: Guys and St Thomas' Charity
website: https://www.gsttcharity.org.uk/
---

View File

@ -0,0 +1,3 @@
---
title: Haircuts 4 Homeless
---

View File

@ -0,0 +1,3 @@
---
title: Health In Touch
---

5
_clients/hookline.md Normal file
View File

@ -0,0 +1,5 @@
---
title: Hookline
website: http://hookline.tv/
---

3
_clients/ica.md Normal file
View File

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

4
_clients/ideo.md Normal file
View File

@ -0,0 +1,4 @@
---
title: IDEO
website: https://www.ideo.com/
---

3
_clients/ifsw.md Normal file
View File

@ -0,0 +1,3 @@
---
title: International Federation of Social Workers
---

View File

@ -1,3 +1,4 @@
---
title: Information Architecture Institute
website: https://www.iainstitute.org/
---

3
_clients/invest-sk.md Normal file
View File

@ -0,0 +1,3 @@
---
title: Invest SK
---

3
_clients/isd.md Normal file
View File

@ -0,0 +1,3 @@
---
title: Institute for Strategic Dialogue
---

3
_clients/just-eat.md Normal file
View File

@ -0,0 +1,3 @@
---
title: Just Eat
---

4
_clients/kaizen.md Normal file
View File

@ -0,0 +1,4 @@
---
title: The Kaizen Partnership
website: http://wearekaizen.co.uk/
---

3
_clients/kaspersky.md Normal file
View File

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

View File

@ -0,0 +1,3 @@
---
title: Kindling Trust
---

3
_clients/labour.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: Lancashire Women's Centres
website: https://lancashirewomen.org/
---

View File

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

View File

@ -0,0 +1,4 @@
---
title: Law Centres Network
website: https://www.lawcentres.org.uk/
---

View File

@ -0,0 +1,4 @@
---
title: London Permaculture Network
website: https://www.londonpermaculture.com/
---

3
_clients/magpas.md Normal file
View File

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

5
_clients/makielab.md Normal file
View File

@ -0,0 +1,5 @@
---
title: MakieLab
website: https://twitter.com/makielab
---

View File

@ -0,0 +1,3 @@
---
title: Metal Culture
---

4
_clients/mhsgroup.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Muswell Hill Sustainability Group
website: https://mhsgroup.org/
---

View File

@ -0,0 +1,3 @@
---
title: Modern Art Oxford
---

4
_clients/mubi.md Normal file
View File

@ -0,0 +1,4 @@
---
title: MUBI
website: https://mubi.com/
---

4
_clients/mudlark.md Normal file
View File

@ -0,0 +1,4 @@
---
title: Mudlark
website: https://twitter.com/wearemudlark
---

3
_clients/mutuo.md Normal file
View File

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

View File

@ -0,0 +1,4 @@
---
title: National Lottery
website: https://www.national-lottery.co.uk/
---

4
_clients/neweconomics.md Normal file
View File

@ -0,0 +1,4 @@
---
title: New Economics Foundation
website: https://neweconomics.org/
---

3
_clients/nhs.md Normal file
View File

@ -0,0 +1,3 @@
---
title: National Health Service
---

View File

@ -0,0 +1,4 @@
---
title: North Bristol Advice Centre
website: http://www.northbristoladvice.org.uk/
---

3
_clients/nswp.md Normal file
View File

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

4
_clients/num.md Normal file
View File

@ -0,0 +1,4 @@
---
title: National Ugly Mugs
website: https://uglymugs.org/
---

Some files were not shown because too many files have changed in this diff Show More