From 71ebf2227f10f81bde4f3a5a4c02193380def0c1 Mon Sep 17 00:00:00 2001 From: pwalter Date: Wed, 22 Nov 2017 14:33:38 +0000 Subject: [PATCH 1/4] update for CDN --- README.txt | 2 +- template.php | 4 ++-- templates/html.tpl.php | 20 ++++++++++---------- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/README.txt b/README.txt index a0f426d..77986b6 100644 --- a/README.txt +++ b/README.txt @@ -23,4 +23,4 @@ TINYMCE ------- To integrate this theme with TinyMCE, configure your editor profile in Drupal by: 1) Under "Editor CSS" select "Define CSS" -2) Under "CSS path", use: //ebiwd.github.io/EBI-Framework/libraries/foundation-6/css/foundation.css,//ebiwd.github.io/EBI-Framework/css/ebi-global.css,//ebiwd.github.io/EBI-Framework/fonts/fonts.css,//ebiwd.github.io/EBI-Framework/css/theme-embl-petrol.css +2) Under "CSS path", use: https://ebi.emblstatic.net/web_guidelines/EBI-Framework/libraries/foundation-6/css/foundation.css,https://ebi.emblstatic.net/web_guidelines/EBI-Framework/css/ebi-global.css,https://ebi.emblstatic.net/web_guidelines/EBI-Framework/fonts/fonts.css,https://ebi.emblstatic.net/web_guidelines/EBI-Framework/css/theme-embl-petrol.css diff --git a/template.php b/template.php index bad9f51..7216a30 100644 --- a/template.php +++ b/template.php @@ -447,11 +447,11 @@ function ebi_framework_preprocess_html(&$variables) { // TODO: make use of user specified framework version theme_get_setting('ebi_framework_version') $framework_version_to_use = theme_get_setting('ebi_framework_version'); //1.1, etc - $framework_location = 'https://www.ebi.ac.uk/web_guidelines/EBI-Framework/' . 'v' . $framework_version_to_use; // todo: this should be configurable by the UI + $framework_location = 'https://ebi.emblstatic.net/web_guidelines/EBI-Framework/' . 'v' . $framework_version_to_use; // todo: this should be configurable by the UI drupal_add_css($framework_location . '/libraries/foundation-6/css/foundation.css', array('type' => 'external')); drupal_add_css($framework_location . '/css/ebi-global.css', array('type' => 'external')); - drupal_add_css('https://www.ebi.ac.uk/web_guidelines/EBI-Icon-fonts/v1.1/fonts.css', array('type' => 'external')); + drupal_add_css('https://ebi.emblstatic.net/web_guidelines/EBI-Icon-fonts/v1.1/fonts.css', array('type' => 'external')); if (theme_get_setting('ebi_framework_style') === 1) { // autodetect the appropriate theme by the url, /research /services, etc. $url_parts = explode('/', drupal_get_path_alias()); diff --git a/templates/html.tpl.php b/templates/html.tpl.php index 43ca9ad..a987973 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -93,19 +93,19 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) { - - - - - - - - + + + + + + + + - + - + From f5036a761c6c814112e427afa025387ec00ce407 Mon Sep 17 00:00:00 2001 From: pwalter Date: Wed, 22 Nov 2017 14:48:18 +0000 Subject: [PATCH 2/4] prevent http links in styles --- templates/html.tpl.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/html.tpl.php b/templates/html.tpl.php index a987973..7dd98e6 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -88,7 +88,7 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) { <?php print $head_title; ?> - + - - - - - - - - + + + + + + + + - + - + From 70f1cd7330971dd55744faa1794eb3c7e8e37ede Mon Sep 17 00:00:00 2001 From: pwalter Date: Wed, 22 Nov 2017 16:50:49 +0000 Subject: [PATCH 4/4] fix typo apple-touch-icon --- templates/html.tpl.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/html.tpl.php b/templates/html.tpl.php index 433a9e2..8069752 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -96,10 +96,10 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) { - - - - + + + +