Skip to content
Snippets Groups Projects
Commit d5f26c19 authored by khawkins98's avatar khawkins98
Browse files

EBI.ac.uk is https now

parent 06a9bbd6
No related branches found
No related tags found
No related merge requests found
...@@ -65,7 +65,7 @@ function ebiFrameworkPopulateBlackBar() { ...@@ -65,7 +65,7 @@ function ebiFrameworkPopulateBlackBar() {
var barContents = document.createElement("div"); var barContents = document.createElement("div");
barContents.innerHTML = '<nav class="row">'+ barContents.innerHTML = '<nav class="row">'+
'<ul id="global-nav" class="menu global-nav text-right">'+ '<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 embl hide"><a href="http://www.embl.org">EMBL</a></li>'+
'<li class="location barcelona hide"><a href="#">Barcelona</a></li>'+ '<li class="location barcelona hide"><a href="#">Barcelona</a></li>'+
'<li class="location hamburg hide"><a href="#">Hamburg</a></li>'+ '<li class="location hamburg hide"><a href="#">Hamburg</a></li>'+
...@@ -80,10 +80,10 @@ function ebiFrameworkPopulateBlackBar() { ...@@ -80,10 +80,10 @@ function ebiFrameworkPopulateBlackBar() {
'<div id="search-global-dropdown" class="dropdown-pane" data-dropdown data-options="closeOnClick:true;">'+ '<div id="search-global-dropdown" class="dropdown-pane" data-dropdown data-options="closeOnClick:true;">'+
'</div>'+ '</div>'+
'</li>'+ '</li>'+
'<li class="what about"><a href="//www.ebi.ac.uk/about">About us</a></li>'+ '<li class="what about"><a href="https://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 training"><a href="https://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 research"><a href="https://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 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="location ebi"><a href="https://www.ebi.ac.uk">EMBL-EBI</a></li>'+
// '<li class="float-right embl-selector">'+ // '<li class="float-right embl-selector">'+
// '<a class="button float-right">&nbsp;</a>'+ // '<a class="button float-right">&nbsp;</a>'+
...@@ -179,7 +179,7 @@ function ebiFrameworkInsertEMBLdropdown() { ...@@ -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-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.embl.de/">Heidelberg</a></h5><p class="small">Main laboratory</p></div>'+
'<div class="column">'+ '<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>'+ '<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>'+ '<p class="small margin-bottom-none">Bioinformatiocs at the EBI</p>'+
'</div>'+ '</div>'+
...@@ -263,22 +263,22 @@ function ebiFrameworkInsertEMBLdropdown() { ...@@ -263,22 +263,22 @@ function ebiFrameworkInsertEMBLdropdown() {
*/ */
function ebiFrameworkUpdateFoot() { function ebiFrameworkUpdateFoot() {
var html = '<div class="columns small-12">' + 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>' + '<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>' +
'<div class="medium-up-5 small-up-2">' + '<div class="medium-up-5 small-up-2">' +
'<div class="column">' + '<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 &amp; 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 &amp; Support</a></li> ' + '</ul></div>' +
'<div class="column">' + '<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> &amp; <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> &amp; <a href="https://www.ebi.ac.uk/research/eipp">PhDs</a></li> ' +
'</ul></div>' + '</ul></div>' +
'<div class="column"> ' + '<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> ' + '</ul></div> ' +
'<div class="column"> ' + '<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"> ' + '<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 &amp; 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 &amp; groups</a></li> ' +
'</ul></div>' + '</ul></div>' +
'</div>'; '</div>';
...@@ -299,7 +299,7 @@ function ebiFrameworkUpdateFoot() { ...@@ -299,7 +299,7 @@ function ebiFrameworkUpdateFoot() {
function ebiFrameworkUpdateFooterMeta() { function ebiFrameworkUpdateFooterMeta() {
var d = new Date(); var d = new Date();
var html = '<div class="columns">' + 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 &copy; 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 &copy; 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>' + // '<a class="readmore float-right" href="http://intranet.ebi.ac.uk">Intranet</a>' +
'</p></div>'; '</p></div>';
...@@ -313,7 +313,7 @@ function ebiFrameworkUpdateFooterMeta() { ...@@ -313,7 +313,7 @@ function ebiFrameworkUpdateFooterMeta() {
} }
function ebiFrameworkIncludeScripts() { 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'); putComment = document.createComment(downtimeScript + ' automatically inserted');
putScript = document.createElement('script'); putScript = document.createElement('script');
putScript.type = 'text/javascript'; putScript.type = 'text/javascript';
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment