diff --git a/data/interfaces/default/config.html b/data/interfaces/default/config.html index 6237444d..c241fb20 100644 --- a/data/interfaces/default/config.html +++ b/data/interfaces/default/config.html @@ -835,13 +835,13 @@ var configForm = $("#configUpdate"); $('.save-button').click(function() { if ($("#pms_identifier").val() == "") { - showMsg(' Please verify your server.',false,true,2000) + showMsg(' Please verify your server.',false,true,2000,true) } else { if (configForm.parsley().validate()) { doAjaxCall('configUpdate',$(this),'tabs',true); return false; } else { - showMsg(' Please verify your settings.',false,true,2000) + showMsg(' Please verify your settings.',false,true,2000,true) } } }); diff --git a/data/interfaces/default/css/style.css b/data/interfaces/default/css/style.css index a656d2cc..6a337da1 100644 --- a/data/interfaces/default/css/style.css +++ b/data/interfaces/default/css/style.css @@ -1,64 +1,32 @@ .ajaxMsg { - border: 1px solid #cccccc; - background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; - background-image: linear-gradient(#ffffff, #eeeeee) !important; - background-image: -webkit-linear-gradient(#ffffff, #eeeeee) !important; - background-image: -o-linear-gradient(#ffffff, #eeeeee) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff, endColorstr=#eeeeee) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff, endColorstr=#eeeeee) !important; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; + background-color: rgba(255,255,255,0.075); + color: #999999; display: none; font-size: 14px; right: 10px; - -moz-box-shadow: 0px 0px 2px #aaaaaa; - -webkit-box-shadow: 0px 0px 2px #aaaaaa; - -o-box-shadow: 0px 0px 2px #aaaaaa; - box-shadow: 0px 0px 2px #aaaaaa; - padding: 7px 10px; + padding: 10px 10px; position: fixed; text-align: center; bottom: 10px; - min-height: 22px; + min-height: 32px; width: 250px; z-index: 9999; - filter: alpha(opacity=85); - -moz-opacity: 0.8 !important; - -khtml-opacity: 0.8 !important; - -o-opacity: 0.8 !important; - opacity: 0.8 !important; } .ajaxMsg .msg { - font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; line-height: normal; padding-left: 20px; - color: #000; - text-shadow: 0 1px 0 #ddd; } .ajaxMsg .loader { position: relative; top: 2px; } .ajaxMsg .success { - background-image: -moz-linear-gradient(#d3ffd7, #c2edc6) !important; - background-image: linear-gradient(#d3ffd7, #c2edc6) !important; - background-image: -webkit-linear-gradient(#d3ffd7, #c2edc6) !important; - background-image: -o-linear-gradient(#d3ffd7, #c2edc6) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#d3ffd7, endColorstr=#c2edc6) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#d3ffd7, endColorstr=#c2edc6) !important; - padding: 15px 10px; text-align: left; } .ajaxMsg .error { - background-image: -moz-linear-gradient(#ffd3d3, #edc4c4) !important; - background-image: linear-gradient(#ffd3d3, #edc4c4) !important; - background-image: -webkit-linear-gradient(#ffd3d3, #edc4c4) !important; - background-image: -o-linear-gradient(#ffd3d3, #edc4c4) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffd3d3, endColorstr=#edc4c4) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffd3d3, endColorstr=#edc4c4) !important; - padding: 15px 10px; + background-color: rgba(255,0,0,0.5); + font-size: 20px; text-align: left; } .ajaxMsg .ui-icon { @@ -70,57 +38,25 @@ } .dataTables_processing { - border: 1px solid #cccccc; - background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; - background-image: linear-gradient(#ffffff, #eeeeee) !important; - background-image: -webkit-linear-gradient(#ffffff, #eeeeee) !important; - background-image: -o-linear-gradient(#ffffff, #eeeeee) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff, endColorstr=#eeeeee) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff, endColorstr=#eeeeee) !important; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; + background-color: grey; display: none; font-size: 14px; right: 10px; - -moz-box-shadow: 0px 0px 2px #aaaaaa; - -webkit-box-shadow: 0px 0px 2px #aaaaaa; - -o-box-shadow: 0px 0px 2px #aaaaaa; - box-shadow: 0px 0px 2px #aaaaaa; - padding: 7px 10px; + padding: 10px 10px; position: fixed; text-align: center; bottom: 10px; - min-height: 22px; + min-height: 32px; width: 250px; z-index: 9999; - filter: alpha(opacity=85); - -moz-opacity: 0.8 !important; - -khtml-opacity: 0.8 !important; - -o-opacity: 0.8 !important; - opacity: 0.8 !important; } #updatebar { - border: 1px solid #cccccc; - background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; - background-image: linear-gradient(#ffffff, #eeeeee) !important; - background-image: -webkit-linear-gradient(#ffffff, #eeeeee) !important; - background-image: -o-linear-gradient(#ffffff, #eeeeee) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff, endColorstr=#eeeeee) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffffff, endColorstr=#eeeeee) !important; - -moz-border-radius: 7px; - -webkit-border-radius: 7px; - border-radius: 7px; + background-color: rgba(255,255,255,0.075); + color: #999999; display: none; font-size: 14px; right: 10px; - color: #000; - text-shadow: 0 1px 0 #ddd; - -moz-box-shadow: 0px 0px 2px #aaaaaa; - -webkit-box-shadow: 0px 0px 2px #aaaaaa; - -o-box-shadow: 0px 0px 2px #aaaaaa; - box-shadow: 0px 0px 2px #aaaaaa; padding: 7px 10px; position: fixed; text-align: center; @@ -128,17 +64,9 @@ min-height: 22px; width: 250px; z-index: 9999; - filter: alpha(opacity=85); - -moz-opacity: 0.8 !important; - -khtml-opacity: 0.8 !important; - -o-opacity: 0.8 !important; - opacity: 0.8 !important; display: block; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fcf5c2, endColorstr=#fff6a9) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#fcf5c2, endColorstr=#fff6a9) !important; } #updatebar .msg { - font-family: "Trebuchet MS", Helvetica, Arial, sans-serif; line-height: normal; padding-left: 20px; } @@ -147,22 +75,10 @@ top: 2px; } #updatebar.success { - background-image: -moz-linear-gradient(#d3ffd7, #c2edc6) !important; - background-image: linear-gradient(#d3ffd7, #c2edc6) !important; - background-image: -webkit-linear-gradient(#d3ffd7, #c2edc6) !important; - background-image: -o-linear-gradient(#d3ffd7, #c2edc6) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#d3ffd7, endColorstr=#c2edc6) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#d3ffd7, endColorstr=#c2edc6) !important; padding: 15px 10px; text-align: left; } #updatebar.error { - background-image: -moz-linear-gradient(#ffd3d3, #edc4c4) !important; - background-image: linear-gradient(#ffd3d3, #edc4c4) !important; - background-image: -webkit-linear-gradient(#ffd3d3, #edc4c4) !important; - background-image: -o-linear-gradient(#ffd3d3, #edc4c4) !important; - filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffd3d3, endColorstr=#edc4c4) !important; - -ms-filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#ffd3d3, endColorstr=#edc4c4) !important; padding: 15px 10px; text-align: left; } @@ -173,11 +89,8 @@ position: relative; margin-right: 3px; } -#updatebar a:link { + +#updatebar a:hover { color: #F9AA03; } -#updatebar a:hover { - color: #000; -} - diff --git a/data/interfaces/default/js/script.js b/data/interfaces/default/js/script.js index 9a0a3061..a1cd9e60 100644 --- a/data/interfaces/default/js/script.js +++ b/data/interfaces/default/js/script.js @@ -23,7 +23,7 @@ function refreshTab() { }); } -function showMsg(msg,loader,timeout,ms) { +function showMsg(msg,loader,timeout,ms,error) { var feedback = $("#ajaxMsg"); update = $("#updatebar"); if ( update.is(":visible") ) { @@ -32,13 +32,18 @@ function showMsg(msg,loader,timeout,ms) { } else { feedback.removeAttr("style"); } - feedback.fadeIn(); var message = $("
" + msg + "
"); if (loader) { var message = $(" " + msg + ""); feedback.css("padding","14px 10px") } - $(feedback).prepend(message); + if (error) { + feedback.css("background-color", "rgba(255,0,0,0.5)"); + console.log('is error'); + } + $(feedback).html(message); + feedback.fadeIn(); + if (timeout) { setTimeout(function(){ message.fadeOut(function(){ diff --git a/data/interfaces/default/js/tables/history_table.js b/data/interfaces/default/js/tables/history_table.js index 8f81709f..3427ab34 100644 --- a/data/interfaces/default/js/tables/history_table.js +++ b/data/interfaces/default/js/tables/history_table.js @@ -167,11 +167,11 @@ history_table_options = { "drawCallback": function (settings) { // Jump to top of page // $('html,body').scrollTop(0); - $('#ajaxMsg').addClass('success').fadeOut(); + $('#ajaxMsg').fadeOut(); }, "preDrawCallback": function(settings) { - $('#ajaxMsg').html("
 Fetching rows...
"); - $('#ajaxMsg').addClass('success').fadeIn(); + var msg = "
 Fetching rows...
"; + showMsg(msg, false, false, 0) } } diff --git a/data/interfaces/default/js/tables/logs.js b/data/interfaces/default/js/tables/logs.js index f9abf837..b91ca56b 100644 --- a/data/interfaces/default/js/tables/logs.js +++ b/data/interfaces/default/js/tables/logs.js @@ -34,11 +34,11 @@ var log_table_options = { ], "drawCallback": function (settings) { // Jump to top of page - $('html,body').scrollTop(0); - $('#ajaxMsg').addClass('success').fadeOut(); + //$('html,body').scrollTop(0); + $('#ajaxMsg').fadeOut(); }, "preDrawCallback": function(settings) { - $('#ajaxMsg').html("
 Fetching rows...
"); - $('#ajaxMsg').addClass('success').fadeIn(); + var msg = "
 Fetching rows...
"; + showMsg(msg, false, false, 0) } } diff --git a/data/interfaces/default/js/tables/user_ips.js b/data/interfaces/default/js/tables/user_ips.js index 4a46bb9b..7d48ff1d 100644 --- a/data/interfaces/default/js/tables/user_ips.js +++ b/data/interfaces/default/js/tables/user_ips.js @@ -70,11 +70,11 @@ user_ip_table_options = { "drawCallback": function (settings) { // Jump to top of page // $('html,body').scrollTop(0); - $('#ajaxMsg').addClass('success').fadeOut(); + $('#ajaxMsg').fadeOut(); }, "preDrawCallback": function(settings) { - $('#ajaxMsg').html("
 Fetching rows...
"); - $('#ajaxMsg').addClass('success').fadeIn(); + var msg = "
 Fetching rows...
"; + showMsg(msg, false, false, 0) } } diff --git a/data/interfaces/default/js/tables/users.js b/data/interfaces/default/js/tables/users.js index cade9c53..8dcb9c96 100644 --- a/data/interfaces/default/js/tables/users.js +++ b/data/interfaces/default/js/tables/users.js @@ -68,11 +68,11 @@ users_list_table_options = { ], "drawCallback": function (settings) { // Jump to top of page - $('html,body').scrollTop(0); - $('#ajaxMsg').addClass('success').fadeOut(); + //$('html,body').scrollTop(0); + $('#ajaxMsg').fadeOut(); }, "preDrawCallback": function(settings) { - $('#ajaxMsg').html("
 Fetching rows...
"); - $('#ajaxMsg').addClass('success').fadeIn(); + var msg = "
 Fetching rows...
"; + showMsg(msg, false, false, 0) } }