From e8d7d07ebb16a1441b4253d2b0bafa5959957eb5 Mon Sep 17 00:00:00 2001 From: pwalter Date: Wed, 22 Nov 2017 14:26:05 +0000 Subject: [PATCH 1/4] update for CDN --- README.txt | 2 +- template.php | 4 ++-- templates/html.tpl.php | 18 +++++++++--------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.txt b/README.txt index 8c891f2..590fc41 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: //www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/ebi-global.css, //www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/libraries/foundation-6/css/foundation.css, //www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/css/ebi-global-drupal.css \ No newline at end of file +2) Under "CSS path", use: https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/css/ebi-global.css, https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/libraries/foundation-6/css/foundation.css, https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/css/ebi-global-drupal.css \ No newline at end of file diff --git a/template.php b/template.php index d0f9f44..7bcaae1 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.2/fonts.css', array('type' => 'external')); + drupal_add_css('https://ebi.emblstatic.net/web_guidelines/EBI-Icon-fonts/v1.2/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 7fa73a5..dca4d10 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -93,16 +93,16 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) { - - - - - - - - + + + + + + + + - + From 618777d5758b15d745d135cfafd385c0ba240d2e Mon Sep 17 00:00:00 2001 From: pwalter Date: Wed, 22 Nov 2017 14:35:15 +0000 Subject: [PATCH 2/4] update for CDN --- 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 dca4d10..d715e4a 100644 --- a/templates/html.tpl.php +++ b/templates/html.tpl.php @@ -105,7 +105,7 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) { - + From 8c351d98bb5a8d622accdc8d22ecdde012a48341 Mon Sep 17 00:00:00 2001 From: pwalter Date: Wed, 22 Nov 2017 14:57:51 +0000 Subject: [PATCH 3/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 d715e4a..13fabfa 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; ?> - + - - - - + + + +