From 6745fae9fa58846bd62faaefd7b4bb0ab560608f Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Thu, 26 Jan 2017 14:45:38 +0000 Subject: [PATCH] updated css and gcube context's override of the XMLHttpRequest's send method to support EDISON case git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/liferay62-plugins/generic-configurable-theme@141819 82a268e6-3cf1-43bd-a215-b396298e98cf --- src/main/webapp/css/custom.css | 10 +++++----- src/main/webapp/js/gcube-context.js | 19 +++++++++++-------- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/src/main/webapp/css/custom.css b/src/main/webapp/css/custom.css index 9834ecd..63fbb33 100644 --- a/src/main/webapp/css/custom.css +++ b/src/main/webapp/css/custom.css @@ -12,13 +12,13 @@ $dockbarGradientStart: #FFF; $dockbarOpenGradientEnd: #0993DD; $dockbarOpenGradientStart: #0EA6F9; -$navbarGradientStart: #918f90; -$navbarGradientEnd: #918f90; +$navbarGradientStart: #0271BE; +$navbarGradientEnd: #0271BE; $footerFontColor: #FFF; -$navbarSelected: #f6871b; -$navbarHover: green; +$navbarSelected: #019AD3; +$navbarHover: #4CB5D2; $dockbarCustomColor: #FFF; /* --- Hide the My Calendars section in Calendar portlet **/ @@ -39,7 +39,7 @@ div#_1_WAR_calendarportlet_calendarListContainer > div:last-child { /* --- Custom vars, styles and mixins **/ @mixin navbarGradient($start, $end) { - background: #918f90; + background: #0271BE; } @mixin navbar-border-radius($radius) { diff --git a/src/main/webapp/js/gcube-context.js b/src/main/webapp/js/gcube-context.js index f3d7d1d..d512e7e 100644 --- a/src/main/webapp/js/gcube-context.js +++ b/src/main/webapp/js/gcube-context.js @@ -18,14 +18,17 @@ function injectClientContext() { //console.log('Not logged in, injecting groupId only'); } - XMLHttpRequest.prototype.realSend = XMLHttpRequest.prototype.send; - var newSend = function(vData) { - this.setRequestHeader("gcube-userId", userId); - this.setRequestHeader("gcube-vreid", groupId); - this.setRequestHeader("gcube-request-url", location.href); - this.realSend(vData); - }; - XMLHttpRequest.prototype.send = newSend; + var send = window.XMLHttpRequest.prototype.send; + function sendReplacement(data) { + this.setRequestHeader("gcube-userId", userId); + this.setRequestHeader("gcube-vreid", groupId); + this.setRequestHeader("gcube-request-url", location.href); + if(this.onreadystatechange) { + this._onreadystatechange = this.onreadystatechange; + } + return send.apply(this, arguments); + } + window.XMLHttpRequest.prototype.send = sendReplacement; } } /*