From d74195649182c4a06881f91acf64c39d5cb5c3e0 Mon Sep 17 00:00:00 2001 From: Amauri CHAMPEAUX Date: Tue, 2 Dec 2014 23:30:09 +0100 Subject: [PATCH] Big banner modification - close if all services have been reviewed - possibility to choose the orientation (top or bottom) --- css/tarteaucitron.css | 9 ++++++++- tarteaucitron.js | 21 +++++++++++++++------ 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/css/tarteaucitron.css b/css/tarteaucitron.css index 07c1305..7e75ead 100644 --- a/css/tarteaucitron.css +++ b/css/tarteaucitron.css @@ -250,6 +250,14 @@ /*** * Big alert */ +.tarteaucitronAlertBigTop { + top: 0; +} + +.tarteaucitronAlertBigBottom { + bottom: 0; +} + #tarteaucitronAlertBig { background: #333; color: #fff !important; @@ -259,7 +267,6 @@ padding: 5px 5%; position: fixed; text-align: center; - top: 0; width: 90%; box-sizing: content-box; z-index: 2147483645; diff --git a/tarteaucitron.js b/tarteaucitron.js index 7695e5b..3ab2319 100644 --- a/tarteaucitron.js +++ b/tarteaucitron.js @@ -23,6 +23,7 @@ var tarteaucitron = { "autoOpen": false, "grayArea": false, "highPrivacy": false, + "orientation": "top", "showAlertSmall": true }; @@ -56,7 +57,8 @@ var tarteaucitron = { html = '', lastTitle, alert = false, - index; + index, + orientation = 'Top'; // dedup, clean and sort job[] function cleanArray(arr) { @@ -161,8 +163,13 @@ var tarteaucitron = { html += ' '; html += ''; + // get the banner orientation + if (default.orientation === 'bottom') { + orientation = 'Bottom'; + } + if (defaults.highPrivacy) { - html += '
'; + html += '
'; html += ' '; html += ' ' + tarteaucitron.lang.alertBigPrivacy; html += ' '; @@ -171,7 +178,7 @@ var tarteaucitron = { html += ' '; html += '
'; } else { - html += '
'; + html += '
'; html += ' '; html += ' ' + tarteaucitron.lang.alertBig; html += ' '; @@ -272,8 +279,6 @@ var tarteaucitron = { tarteaucitron.state[key] = status; tarteaucitron.cookie.create(key, status); tarteaucitron.userInterface.color(key, status); - - tarteaucitron.userInterface.closeAlert(); } }, "respond": function (el, status) { @@ -346,12 +351,16 @@ var tarteaucitron = { tarteaucitron.userInterface.css(c + 'AllAllowed', 'backgroundColor', gray); tarteaucitron.userInterface.css(c + 'AllDenied', 'backgroundColor', gray); } + + // close the alert if all service have been reviewed + if (nbPending === 0) { + tarteaucitron.userInterface.closeAlert(); + } }, "openPanel": function () { "use strict"; tarteaucitron.userInterface.css('tarteaucitron', 'display', 'block'); tarteaucitron.userInterface.css('tarteaucitronBack', 'display', 'block'); - tarteaucitron.userInterface.closeAlert(); // setting hash tag document.location.hash = 'tarteaucitron';