From 24ea0aff223eb207867e81db7d0d117d442a5947 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Wed, 3 Oct 2018 14:45:28 +0100 Subject: [PATCH 1/7] Add lang tag to default layout --- _layouts/default.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_layouts/default.html b/_layouts/default.html index 991e1f4..058726e 100644 --- a/_layouts/default.html +++ b/_layouts/default.html @@ -1,5 +1,5 @@ - + {% include head.html %} From 6703690ad8ff9bf80796fd4bcd097a36418d9416 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Wed, 3 Oct 2018 14:49:47 +0100 Subject: [PATCH 2/7] Add 'safe' to config and remove serving options --- _config.yml | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/_config.yml b/_config.yml index 16e88ce..944b02a 100644 --- a/_config.yml +++ b/_config.yml @@ -10,6 +10,8 @@ analytics: #Google analytics code in the format XX-nnnnnnnn-n baseurl: "" #important: start with / url: "http://apel.github.io" +safe: true + # Travis bundles gems in the vendor directory which Jekyll will fail on if it's not excluded. exclude: [vendor] @@ -26,13 +28,7 @@ colors: #in hex code if not noted else link_hover: "#01b2fe" footer_heading: "#ffffff" footer_content: "#bfc9d3" - -# Serving -detach: false -port: 8080 -host: 0.0.0.0 -baseurl: "" # does not include hostname - + ### CONTACT SETTINGS ### # Social networks usernames. Many more available: google-plus, flickr, linkedin, etc). Shown in footer. From 5079b8d117103ead69fe5b49af1b53ab17ea74b2 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Wed, 3 Oct 2018 14:55:57 +0100 Subject: [PATCH 3/7] Update Ruby version to match GH pages --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 5edb9b8..58a2335 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,5 @@ language: ruby -rvm: 2.4.2 +rvm: 2.5.1 sudo: false cache: bundler From b8827d5ef517ed7861f1107110072548d49f67ce Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Wed, 3 Oct 2018 16:22:35 +0100 Subject: [PATCH 4/7] Update badges --- index.md | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/index.md b/index.md index 65d6afe..3dc6265 100644 --- a/index.md +++ b/index.md @@ -18,15 +18,19 @@ Statistics are available for view in different detail by Users, VO Managers, Sit ##Software Status ###APEL -[![Build Status](https://travis-ci.org/apel/apel.svg?branch=dev)](https://travis-ci.org/apel/apel) -[![Coverage Status](https://coveralls.io/repos/apel/apel/badge.svg?branch=dev)](https://coveralls.io/r/apel/apel?branch=dev) -[![Code Health](https://landscape.io/github/apel/apel/dev/landscape.svg?style=flat)](https://landscape.io/github/apel/apel/dev) [![GitHub release](https://img.shields.io/github/release/apel/apel.svg)](https://github.com/apel/apel/releases/latest) [![GitHub issues](https://img.shields.io/github/issues-raw/apel/apel.svg)](https://github.com/apel/apel/issues) +[![Build Status](https://travis-ci.org/apel/apel.svg?branch=dev)](https://travis-ci.org/apel/apel) +[![Coverage Status](https://coveralls.io/repos/github/apel/apel/badge.svg?branch=dev)](https://coveralls.io/github/apel/apel?branch=dev) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/b614b03d576a4f5cbb6efa2e64e5f7ef)](https://www.codacy.com/app/apel/apel) +[![Maintainability](https://api.codeclimate.com/v1/badges/03094b74f5fc4f728bc7/maintainability)](https://codeclimate.com/github/apel/apel/maintainability) + ###SSM -[![Build Status](https://travis-ci.org/apel/ssm.svg?branch=dev)](https://travis-ci.org/apel/ssm) -[![Coverage Status](https://coveralls.io/repos/apel/ssm/badge.svg?branch=dev)](https://coveralls.io/r/apel/ssm?branch=dev) -[![Code Health](https://landscape.io/github/apel/ssm/dev/landscape.svg?style=flat)](https://landscape.io/github/apel/ssm/dev) [![GitHub release](https://img.shields.io/github/release/apel/ssm.svg)](https://github.com/apel/ssm/releases/latest) -[![GitHub issues](https://img.shields.io/github/issues-raw/apel/ssm.svg)](https://github.com/apel/ssm/issues) \ No newline at end of file +[![GitHub issues](https://img.shields.io/github/issues-raw/apel/ssm.svg)](https://github.com/apel/ssm/issues) + +[![Build Status](https://travis-ci.org/apel/ssm.svg?branch=dev)](https://travis-ci.org/apel/ssm) +[![Coverage Status](https://coveralls.io/repos/github/apel/ssm/badge.svg?branch=dev)](https://coveralls.io/github/apel/ssm?branch=dev) +[![Codacy Badge](https://api.codacy.com/project/badge/Grade/cc3e808664ee41638938aa5c660a88ae)](https://www.codacy.com/app/apel/ssm) +[![Maintainability](https://api.codeclimate.com/v1/badges/34aa04f3583afce2ceb2/maintainability)](https://codeclimate.com/github/apel/ssm/maintainability) From e3802d363e7ec1bf07d1b31f9810c21accafaea3 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Wed, 3 Oct 2018 17:37:31 +0100 Subject: [PATCH 5/7] Fix markdown --- index.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/index.md b/index.md index 3dc6265..71c7224 100644 --- a/index.md +++ b/index.md @@ -5,7 +5,7 @@ subheading: APEL project-url: https://github.com/apel --- -#Welcome to APEL +# Welcome to APEL This is the GitHub Page for the APEL project. @@ -15,9 +15,9 @@ The accounting information is gathered from different sensors into a central acc Statistics are available for view in different detail by Users, VO Managers, Site Administrators and anonymous users according to well defined access rights. -##Software Status +## Software Status -###APEL +### APEL [![GitHub release](https://img.shields.io/github/release/apel/apel.svg)](https://github.com/apel/apel/releases/latest) [![GitHub issues](https://img.shields.io/github/issues-raw/apel/apel.svg)](https://github.com/apel/apel/issues) @@ -26,7 +26,7 @@ Statistics are available for view in different detail by Users, VO Managers, Sit [![Codacy Badge](https://api.codacy.com/project/badge/Grade/b614b03d576a4f5cbb6efa2e64e5f7ef)](https://www.codacy.com/app/apel/apel) [![Maintainability](https://api.codeclimate.com/v1/badges/03094b74f5fc4f728bc7/maintainability)](https://codeclimate.com/github/apel/apel/maintainability) -###SSM +### SSM [![GitHub release](https://img.shields.io/github/release/apel/ssm.svg)](https://github.com/apel/ssm/releases/latest) [![GitHub issues](https://img.shields.io/github/issues-raw/apel/ssm.svg)](https://github.com/apel/ssm/issues) From 080ca59d09d086331a605ea812dc2af9c4cc427e Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Thu, 4 Oct 2018 08:38:10 +0100 Subject: [PATCH 6/7] Update URL in config to HTTPS --- _config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_config.yml b/_config.yml index 944b02a..f384ff5 100644 --- a/_config.yml +++ b/_config.yml @@ -8,7 +8,7 @@ subheading: APEL client and server source code description: "GitHub Page for the APEL project." analytics: #Google analytics code in the format XX-nnnnnnnn-n baseurl: "" #important: start with / -url: "http://apel.github.io" +url: "https://apel.github.io" safe: true From d5e48bfc2f74af3989d9d9e5045ad3410639e723 Mon Sep 17 00:00:00 2001 From: Adrian Coveney Date: Thu, 4 Oct 2018 13:31:39 +0100 Subject: [PATCH 7/7] Move style.css to main.css to avoid overwriting - Something seems to be overwriting style.css when Jekyll generates the site and replacing it with a version of normalized.css. This move means that it won't be overwritten, but the underlying problem is not solved. --- _includes/head.html | 2 +- assets/css/{style.css => main.css} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename assets/css/{style.css => main.css} (100%) diff --git a/_includes/head.html b/_includes/head.html index 42422a2..c8082df 100644 --- a/_includes/head.html +++ b/_includes/head.html @@ -10,7 +10,7 @@ - + diff --git a/assets/css/style.css b/assets/css/main.css similarity index 100% rename from assets/css/style.css rename to assets/css/main.css