Various 1.3 references

.gitlab-ci.yml

@@ -22,6 +22,7 @@ deploy_aws_dev:
     - v1.1-lite
     - v1.2
     - v1.3
+    - v1.4
 
 deploy_aws_live:
   image: ebiwd/alpine-ssh

js/ebi-global-includes/script/5_ebiFrameworkNotificationBanner.js

@@ -114,7 +114,7 @@ var dataProtectionSettings =  new Object();
 /**
  * The main 'brain' of the EBI Data Protection banner.
  * Further documentation at https://www.ebi.ac.uk/style-lab/websites/patterns/banner-data-protection.html
- * @param {string} [targetedFrameworkVersion=generic] targeted Framework version; options: 1.1, 1.2, 1.3, compliance, other
+ * @param {string} [targetedFrameworkVersion=generic] targeted Framework version; options: 1.1, 1.2, 1.3, 1.4, compliance, other
  */
 function ebiFrameworkRunDataProtectionBanner(targetedFrameworkVersion) {
   try {
@@ -158,6 +158,7 @@ function ebiFrameworkRunDataProtectionBanner(targetedFrameworkVersion) {
         document.body.style.paddingBottom = 0;
         break;
       case '1.3':
+      case '1.4':
         // cookie banner really shouldn't be here, but just in case
         if (document.getElementById("cookie-banner") != null) {
           document.getElementById("cookie-banner").remove();
@@ -171,11 +172,11 @@ function ebiFrameworkRunDataProtectionBanner(targetedFrameworkVersion) {
         document.body.appendChild(compatibilityStyles);
         break;
       case 'other':
-        // If you're not using any fomally supported framework, we'll do our best to help out
+        // If you're not using any formally supported framework, we'll do our best to help out
         document.body.appendChild(compatibilityStyles);
         break;
       default:
-        console.warn('You should specify the targeted FrameworkVersion (allowed values: 1.1, 1.2, 1.3, compliance, other). You sent: ' + targetedFrameworkVersion);
+        console.warn('You should specify the targeted FrameworkVersion (allowed values: 1.1, 1.2, 1.3, 1.4, compliance, other). You sent: ' + targetedFrameworkVersion);
     }
 
     // Default global values
@@ -212,7 +213,7 @@ function ebiFrameworkRunDataProtectionBanner(targetedFrameworkVersion) {
  */
 function resetDataProtectionBanner() {
   document.cookie = dataProtectionSettings.cookieName + "=; expires=Thu, 01 Jan 1970 00:00:00 GMT;domain=" + document.domain + ";path=/";
-  ebiFrameworkRunDataProtectionBanner('1.3');
+  ebiFrameworkRunDataProtectionBanner('1.4');
 }
 
 /**
@@ -221,8 +222,8 @@ function resetDataProtectionBanner() {
  */
 function ebiFrameworkCookieBanner() {
   console.warn('You are calling an old function name, update it to ebiFrameworkRunDataProtectionBanner();')
-  ebiFrameworkRunDataProtectionBanner('1.3');
+  ebiFrameworkRunDataProtectionBanner('1.4');
 }
 
 // execute
-// ebiFrameworkRunDataProtectionBanner('1.3');
+// ebiFrameworkRunDataProtectionBanner('1.4');

js/ebi-global-includes/script/6_ebiFrameworkInvokeScripts.js

@@ -16,7 +16,7 @@ function ebiFrameworkInvokeScripts() {
   ebiFrameworkUpdateFoot();
   ebiFrameworkUpdateFooterMeta();
   ebiFrameworkIncludeAnnouncements();
-  ebiFrameworkRunDataProtectionBanner('1.3');
+  ebiFrameworkRunDataProtectionBanner('1.4');
 }
 
 document.addEventListener("DOMContentLoaded", function(event) {

js/elixirBanner.js

@@ -25,7 +25,7 @@ function elixirBanner() {
         defaultName = divElixirBanner.dataset.name;
       }
       if (divElixirBanner.dataset.useCdrLogo == "true") {
-        defaultLogo = 'https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/images/logos/ELIXIR/elixir-cdr.gif';
+        defaultLogo = 'https://ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.4/images/logos/ELIXIR/elixir-cdr.gif';
       }
       if (typeof divElixirBanner.dataset.description !== "undefined") {
         defaultDescription = divElixirBanner.dataset.description;

package.json

@@ -38,7 +38,7 @@
     "tablesorter": "wget https://github.com/Mottie/tablesorter/archive/master.zip -d ./libraries/tablesorter.zip && extract-zip ./libraries/tablesorter.zip ./libraries/ && del ./libraries/tablesorter && mve ./libraries/tablesorter-master ./libraries/tablesorter && del ./libraries/tablesorter.zip && del ./libraries/tablesorter/package.json",
     "foundation-update": "npm install foundation-sites && echo \"Latest version of foundation downloaded, you'll need to run 'npm run scss' and 'npm run js' to build\"",
     "motion-ui-update": "wget https://github.com/zurb/motion-ui/archive/v1.2.2.zip -d ./libraries/motion-ui.zip && del ./libraries/motion-ui && extract-zip ./libraries/motion-ui.zip ./libraries/motion-ui/ && del ./libraries/motion-ui.zip && echo \"Copying Motion UI files one level up as they've moved...\" && ncp ./libraries/motion-ui/motion-ui-1.2.2/ ./libraries/motion-ui/ && del ./libraries/motion-ui/motion-ui-master/ && echo \"Latest version of Motion UI downloaded, you'll need to run 'npm run scss' to build\"",
-    "documentation": " ./node_modules/documentation/bin/documentation.js build ./js/** -f md -o js/documenation.md -g && echo \"Updated JS docs.\" && kss --source ./css --destination ./css/styleguide --css https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.3/css/ebi-global.css && echo \"Updated CSS docs.\"",
+    "documentation": " ./node_modules/documentation/bin/documentation.js build ./js/** -f md -o js/documenation.md -g && echo \"Updated JS docs.\" && kss --source ./css --destination ./css/styleguide --css https://dev.ebi.emblstatic.net/web_guidelines/EBI-Framework/v1.4/css/ebi-global.css && echo \"Updated CSS docs.\"",
     "message_finished": "echo \"All done\""
   },
   "description": "Homed here are the various assets that make the EBI Visual Framework (CSS, JS, and a few images and build scripts).",