Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

7.x 1.2 cdn #3

Open
wants to merge 4 commits into
base: 7.x-1.2
Choose a base branch
from
+14 −14
Open

7.x 1.2 cdn #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e8d7d07
update for CDN
peter-walter Nov 22, 2017
618777d
update for CDN
peter-walter Nov 22, 2017
8c351d9
prevent http links in styles
peter-walter Nov 22, 2017
71ed124
fix typo apple-touch-icon
peter-walter Nov 22, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
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
4 changes: 2 additions & 2 deletions template.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand Down
22 changes: 11 additions & 11 deletions templates/html.tpl.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,24 +88,24 @@ function ebi_framework_tidy($buffer, $is_admin, $is_prod) {
<head>
<?php print $head; ?>
<title><?php print $head_title; ?></title>
<?php print preg_replace('#https?:#Usm', '', $styles); ?>
<?php print preg_replace('#http:#Usm', '', $styles); ?>
<?php print (ebi_framework_tidy($scripts, $is_admin, $is_prod)); ?>

<!-- If you have custom icon, replace these as appropriate.
You can generate them at realfavicongenerator.net -->
<link rel="icon" type="image/x-icon" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/favicon.ico" />
<link rel="icon" type="image/png" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="192×192" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/android-chrome-192x192.png" /> <!-- Android (192px) -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-icon-114x114.png" /> <!-- For iPhone 4 Retina display (114px) -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-icon-72x72.png" /> <!-- For iPad (72px) -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-icon-144x144.png" /> <!-- For iPad retinat (144px) -->
<link rel="apple-touch-icon-precomposed" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-icon-57x57.png" /> <!-- For iPhone (57px) -->
<link rel="mask-icon" href="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/safari-pinned-tab.svg" color="#ffffff" /> <!-- Safari icon for pinned tab -->
<link rel="icon" type="image/x-icon" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/favicon.ico" />
<link rel="icon" type="image/png" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/favicon-32x32.png" />
<link rel="icon" type="image/png" sizes="192×192" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/android-chrome-192x192.png" /> <!-- Android (192px) -->
<link rel="apple-touch-icon-precomposed" sizes="114x114" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-touch-icon-114x114.png" /> <!-- For iPhone 4 Retina display (114px) -->
<link rel="apple-touch-icon-precomposed" sizes="72x72" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-touch-icon-72x72.png" /> <!-- For iPad (72px) -->
<link rel="apple-touch-icon-precomposed" sizes="144x144" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-touch-icon-144x144.png" /> <!-- For iPad retinat (144px) -->
<link rel="apple-touch-icon-precomposed" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/apple-touch-icon-57x57.png" /> <!-- For iPhone (57px) -->
<link rel="mask-icon" href="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/safari-pinned-tab.svg" color="#ffffff" /> <!-- Safari icon for pinned tab -->
<meta name="msapplication-TileColor" content="#2b5797" /> <!-- MS Icons -->
<meta name="msapplication-TileImage" content="//www.ebi.ac.uk/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/mstile-144x144.png" />
<meta name="msapplication-TileImage" content="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.2/images/logos/EMBL-EBI/favicons/mstile-144x144.png" />

<!-- <meta name="ebi-localmasthead-color" content="#241a00"> -->
<!-- <meta name="ebi-localmasthead-image" content="https://ebiwd.github.io/EBI-Framework/images/backgrounds/training-yellow-2.jpg"> -->
<!-- <meta name="ebi-localmasthead-image" content="https://ebi.emblstatic.net/web_guidelines/EBI-Framework/images/backgrounds/training-yellow-2.jpg"> -->
<!--[if lt IE 9]>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<![endif]-->
Expand Down