From d5f26c191c7726042c97940d95236a084110ec39 Mon Sep 17 00:00:00 2001 From: khawkins98 <khawkins98@gmail.com> Date: Thu, 2 Nov 2017 14:30:16 +0000 Subject: [PATCH] EBI.ac.uk is https now --- .../script/4_ebiFrameworkContent.js | 28 +++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/js/ebi-global-includes/script/4_ebiFrameworkContent.js b/js/ebi-global-includes/script/4_ebiFrameworkContent.js index 80d8d1d8..a92a5733 100644 --- a/js/ebi-global-includes/script/4_ebiFrameworkContent.js +++ b/js/ebi-global-includes/script/4_ebiFrameworkContent.js @@ -65,7 +65,7 @@ function ebiFrameworkPopulateBlackBar() { var barContents = document.createElement("div"); barContents.innerHTML = '<nav class="row">'+ '<ul id="global-nav" class="menu global-nav text-right">'+ - '<li class="home-mobile"><a href="//www.ebi.ac.uk"></a></li>'+ + '<li class="home-mobile"><a href="https://www.ebi.ac.uk"></a></li>'+ '<li class="location embl hide"><a href="http://www.embl.org">EMBL</a></li>'+ '<li class="location barcelona hide"><a href="#">Barcelona</a></li>'+ '<li class="location hamburg hide"><a href="#">Hamburg</a></li>'+ @@ -80,10 +80,10 @@ function ebiFrameworkPopulateBlackBar() { '<div id="search-global-dropdown" class="dropdown-pane" data-dropdown data-options="closeOnClick:true;">'+ '</div>'+ '</li>'+ - '<li class="what about"><a href="//www.ebi.ac.uk/about">About us</a></li>'+ - '<li class="what training"><a href="//www.ebi.ac.uk/training">Training</a></li>'+ - '<li class="what research"><a href="//www.ebi.ac.uk/research">Research</a></li>'+ - '<li class="what services"><a href="//www.ebi.ac.uk/services">Services</a></li>'+ + '<li class="what about"><a href="https://www.ebi.ac.uk/about">About us</a></li>'+ + '<li class="what training"><a href="https://www.ebi.ac.uk/training">Training</a></li>'+ + '<li class="what research"><a href="https://www.ebi.ac.uk/research">Research</a></li>'+ + '<li class="what services"><a href="https://www.ebi.ac.uk/services">Services</a></li>'+ '<li class="location ebi"><a href="https://www.ebi.ac.uk">EMBL-EBI</a></li>'+ // '<li class="float-right embl-selector">'+ // '<a class="button float-right"> </a>'+ @@ -179,7 +179,7 @@ function ebiFrameworkInsertEMBLdropdown() { '<div class="column"><h5><a href="//www.embl-hamburg.de/">Hamburg</a></h5><p class="small">Structural biology</p></div>'+ '<div class="column"><h5><a href="//www.embl.de/">Heidelberg</a></h5><p class="small">Main laboratory</p></div>'+ '<div class="column">'+ - '<h5><a href="//www.ebi.ac.uk/">Hinxton</a></h5>'+ + '<h5><a href="https://www.ebi.ac.uk/">Hinxton</a></h5>'+ '<span class="tag "><i class="icon icon-generic" data-icon="["></i> you are here</span>'+ '<p class="small margin-bottom-none">Bioinformatiocs at the EBI</p>'+ '</div>'+ @@ -263,22 +263,22 @@ function ebiFrameworkInsertEMBLdropdown() { */ function ebiFrameworkUpdateFoot() { var html = '<div class="columns small-12">' + - '<h4 class="inline-block"><a href="//www.ebi.ac.uk" class="no-underline" title="EMBL-EBI">EMBL-EBI</a></h4>' + + '<h4 class="inline-block"><a href="https://www.ebi.ac.uk" class="no-underline" title="EMBL-EBI">EMBL-EBI</a></h4>' + '<span class="small inline-block padding-left-large"><a class="readmore" href="http://intranet.ebi.ac.uk"><span class="icon icon-functional" data-icon="L"></span> Intranet for staff</a></span>' + '</div>' + '<div class="medium-up-5 small-up-2">' + '<div class="column">' + - '<h5 class="services"><a class="services-color" href="//www.ebi.ac.uk/services">Services</a></h5><ul>' + ' <li class="first"><a href="//www.ebi.ac.uk/services">By topic</a></li> ' + ' <li><a href="//www.ebi.ac.uk/services/all">By name (A-Z)</a></li> ' + ' <li class="last"><a href="//www.ebi.ac.uk/support">Help & Support</a></li> ' + '</ul></div>' + + '<h5 class="services"><a class="services-color" href="https://www.ebi.ac.uk/services">Services</a></h5><ul>' + ' <li class="first"><a href="https://www.ebi.ac.uk/services">By topic</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/services/all">By name (A-Z)</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/support">Help & Support</a></li> ' + '</ul></div>' + '<div class="column">' + - '<h5 class="research"><a class="research-color" href="//www.ebi.ac.uk/research">Research</a></h5><ul>' + ' <li><a href="//www.ebi.ac.uk/research/publications">Publications</a></li> ' + ' <li><a href="//www.ebi.ac.uk/research/groups">Research groups</a></li> ' + ' <li class="last"><a href="//www.ebi.ac.uk/research/postdocs">Postdocs</a> & <a href="//www.ebi.ac.uk/research/eipp">PhDs</a></li> ' + + '<h5 class="research"><a class="research-color" href="https://www.ebi.ac.uk/research">Research</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/research/publications">Publications</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/research/groups">Research groups</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/research/postdocs">Postdocs</a> & <a href="https://www.ebi.ac.uk/research/eipp">PhDs</a></li> ' + '</ul></div>' + '<div class="column"> ' + - '<h5 class="training"><a class="training-color" href="//www.ebi.ac.uk/training">Training</a></h5><ul>' + ' <li><a href="//www.ebi.ac.uk/training/handson">Train at EBI</a></li> ' + ' <li><a href="//www.ebi.ac.uk/training/roadshow">Train outside EBI</a></li> ' + ' <li><a href="//www.ebi.ac.uk/training/online">Train online</a></li> ' + ' <li class="last"><a href="//www.ebi.ac.uk/training/contact-us">Contact organisers</a></li> ' + + '<h5 class="training"><a class="training-color" href="https://www.ebi.ac.uk/training">Training</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/training/handson">Train at EBI</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/roadshow">Train outside EBI</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/training/online">Train online</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/training/contact-us">Contact organisers</a></li> ' + '</ul></div> ' + '<div class="column"> ' + - '<h5 class="industry"><a class="industry-color" href="//www.ebi.ac.uk/industry">Industry</a></h5><ul>' + ' <li><a href="//www.ebi.ac.uk/industry/private">Members Area</a></li> ' + ' <li><a href="//www.ebi.ac.uk/industry/workshops">Workshops</a></li> ' + ' <li><a href="//www.ebi.ac.uk/industry/sme-forum"><abbr title="Small Medium Enterprise">SME</abbr> Forum</a></li> ' + ' <li class="last"><a href="//www.ebi.ac.uk/industry/contact">Contact Industry programme</a></li> ' + '</ul></div> ' + + '<h5 class="industry"><a class="industry-color" href="https://www.ebi.ac.uk/industry">Industry</a></h5><ul>' + ' <li><a href="https://www.ebi.ac.uk/industry/private">Members Area</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/industry/workshops">Workshops</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/industry/sme-forum"><abbr title="Small Medium Enterprise">SME</abbr> Forum</a></li> ' + ' <li class="last"><a href="https://www.ebi.ac.uk/industry/contact">Contact Industry programme</a></li> ' + '</ul></div> ' + '<div class="column"> ' + - '<h5 class="about"><a class="ebi-color" href="//www.ebi.ac.uk/about">About</a></h5><ul> ' + ' <li><a href="//www.ebi.ac.uk/about/contact">Contact us</a>' + '<li><a href="//www.ebi.ac.uk/about/events">Events</a></li> ' + ' <li><a href="//www.ebi.ac.uk/about/jobs" title="Jobs, postdocs, PhDs...">Jobs</a></li> ' + ' <li class="first"><a href="//www.ebi.ac.uk/about/news">News</a></li> ' + ' <li><a href="//www.ebi.ac.uk/about/people">People & groups</a></li> ' + + '<h5 class="about"><a class="ebi-color" href="https://www.ebi.ac.uk/about">About</a></h5><ul> ' + ' <li><a href="https://www.ebi.ac.uk/about/contact">Contact us</a>' + '<li><a href="https://www.ebi.ac.uk/about/events">Events</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/about/jobs" title="Jobs, postdocs, PhDs...">Jobs</a></li> ' + ' <li class="first"><a href="https://www.ebi.ac.uk/about/news">News</a></li> ' + ' <li><a href="https://www.ebi.ac.uk/about/people">People & groups</a></li> ' + '</ul></div>' + '</div>'; @@ -299,7 +299,7 @@ function ebiFrameworkUpdateFoot() { function ebiFrameworkUpdateFooterMeta() { var d = new Date(); var html = '<div class="columns">' + - '<p class="address">EMBL-EBI, Wellcome Genome Campus, Hinxton, Cambridgeshire, CB10 1SD, UK. +44 (0)1223 49 44 44</p> <p class="legal">Copyright © EMBL-EBI ' + d.getFullYear() + ' | EMBL-EBI is <a href="http://www.embl.org/">part of the European Molecular Biology Laboratory</a> | <a href="//www.ebi.ac.uk/about/terms-of-use">Terms of use</a>' + + '<p class="address">EMBL-EBI, Wellcome Genome Campus, Hinxton, Cambridgeshire, CB10 1SD, UK. +44 (0)1223 49 44 44</p> <p class="legal">Copyright © EMBL-EBI ' + d.getFullYear() + ' | EMBL-EBI is <a href="http://www.embl.org/">part of the European Molecular Biology Laboratory</a> | <a href="https://www.ebi.ac.uk/about/terms-of-use">Terms of use</a>' + // '<a class="readmore float-right" href="http://intranet.ebi.ac.uk">Intranet</a>' + '</p></div>'; @@ -313,7 +313,7 @@ function ebiFrameworkUpdateFooterMeta() { } function ebiFrameworkIncludeScripts() { - var downtimeScript = '//www.ebi.ac.uk/web_guidelines/js/downtime.js?' + Math.round(new Date().getTime() / 3600000); + var downtimeScript = 'https://www.ebi.ac.uk/web_guidelines/js/downtime.js?' + Math.round(new Date().getTime() / 3600000); putComment = document.createComment(downtimeScript + ' automatically inserted'); putScript = document.createElement('script'); putScript.type = 'text/javascript'; -- GitLab