github/plexpy
1
0
Fork 0
mirror of https://github.com/Tautulli/Tautulli.git synced 2025-07-06 21:21:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Start to fix some styling mismatches.

Browse source
This commit is contained in:
Tim 2015-07-19 01:01:27 +02:00
parent 2b118304f0
commit 19d5eb9abb
7 changed files with 37 additions and 119 deletions
Download patch file Download diff file Expand all files Collapse all files

4
data/interfaces/default/config.html
View file

@ -835,13 +835,13 @@
var configForm = $("#configUpdate"); var configForm = $("#configUpdate");
$('.save-button').click(function() { $('.save-button').click(function() {
if ($("#pms_identifier").val() == "") { if ($("#pms_identifier").val() == "") {
showMsg('<i class="fa fa-exclamation-circle"></i>&nbspPlease verify your server.',false,true,2000) showMsg('<i class="fa fa-exclamation-circle"></i>&nbspPlease verify your server.',false,true,2000,true)
} else { } else {
if (configForm.parsley().validate()) { if (configForm.parsley().validate()) {
doAjaxCall('configUpdate',$(this),'tabs',true); doAjaxCall('configUpdate',$(this),'tabs',true);
return false; return false;
} else { } else {
showMsg('<i class="fa fa-exclamation-circle"></i>&nbspPlease verify your settings.',false,true,2000) showMsg('<i class="fa fa-exclamation-circle"></i>&nbspPlease verify your settings.',false,true,2000,true)
} }
} }
}); });

113
data/interfaces/default/css/style.css
View file

@ -1,64 +1,32 @@
.ajaxMsg { .ajaxMsg {
border: 1px solid #cccccc; background-color: rgba(255,255,255,0.075);
background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; color: #999999;
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;
display: none; display: none;
font-size: 14px; font-size: 14px;
right: 10px; right: 10px;
-moz-box-shadow: 0px 0px 2px #aaaaaa; padding: 10px 10px;
-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; position: fixed;
text-align: center; text-align: center;
bottom: 10px; bottom: 10px;
min-height: 22px; min-height: 32px;
width: 250px; width: 250px;
z-index: 9999; 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 { .ajaxMsg .msg {
font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
line-height: normal; line-height: normal;
padding-left: 20px; padding-left: 20px;
color: #000;
text-shadow: 0 1px 0 #ddd;
} }
.ajaxMsg .loader { .ajaxMsg .loader {
position: relative; position: relative;
top: 2px; top: 2px;
} }
.ajaxMsg .success { .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; text-align: left;
} }
.ajaxMsg .error { .ajaxMsg .error {
background-image: -moz-linear-gradient(#ffd3d3, #edc4c4) !important; background-color: rgba(255,0,0,0.5);
background-image: linear-gradient(#ffd3d3, #edc4c4) !important; font-size: 20px;
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; text-align: left;
} }
.ajaxMsg .ui-icon { .ajaxMsg .ui-icon {
@ -70,57 +38,25 @@
} }
.dataTables_processing { .dataTables_processing {
border: 1px solid #cccccc; background-color: grey;
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;
display: none; display: none;
font-size: 14px; font-size: 14px;
right: 10px; right: 10px;
-moz-box-shadow: 0px 0px 2px #aaaaaa; padding: 10px 10px;
-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; position: fixed;
text-align: center; text-align: center;
bottom: 10px; bottom: 10px;
min-height: 22px; min-height: 32px;
width: 250px; width: 250px;
z-index: 9999; 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 { #updatebar {
border: 1px solid #cccccc; background-color: rgba(255,255,255,0.075);
background-image: -moz-linear-gradient(#ffffff, #eeeeee) !important; color: #999999;
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;
display: none; display: none;
font-size: 14px; font-size: 14px;
right: 10px; 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; padding: 7px 10px;
position: fixed; position: fixed;
text-align: center; text-align: center;
@ -128,17 +64,9 @@
min-height: 22px; min-height: 22px;
width: 250px; width: 250px;
z-index: 9999; 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; 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 { #updatebar .msg {
font-family: "Trebuchet MS", Helvetica, Arial, sans-serif;
line-height: normal; line-height: normal;
padding-left: 20px; padding-left: 20px;
} }
@ -147,22 +75,10 @@
top: 2px; top: 2px;
} }
#updatebar.success { #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; padding: 15px 10px;
text-align: left; text-align: left;
} }
#updatebar.error { #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; padding: 15px 10px;
text-align: left; text-align: left;
} }
@ -173,11 +89,8 @@
position: relative; position: relative;
margin-right: 3px; margin-right: 3px;
} }
#updatebar a:link {
#updatebar a:hover {
color: #F9AA03; color: #F9AA03;
} }
#updatebar a:hover {
color: #000;
}

11
data/interfaces/default/js/script.js
View file

@ -23,7 +23,7 @@ function refreshTab() {
}); });
} }
function showMsg(msg,loader,timeout,ms) { function showMsg(msg,loader,timeout,ms,error) {
var feedback = $("#ajaxMsg"); var feedback = $("#ajaxMsg");
update = $("#updatebar"); update = $("#updatebar");
if ( update.is(":visible") ) { if ( update.is(":visible") ) {
@ -32,13 +32,18 @@ function showMsg(msg,loader,timeout,ms) {
} else { } else {
feedback.removeAttr("style"); feedback.removeAttr("style");
} }
feedback.fadeIn();
var message = $("<div class='msg'>" + msg + "</div>"); var message = $("<div class='msg'>" + msg + "</div>");
if (loader) { if (loader) {
var message = $("<i class='fa fa-refresh fa-spin'></i> " + msg + "</div>"); var message = $("<i class='fa fa-refresh fa-spin'></i> " + msg + "</div>");
feedback.css("padding","14px 10px") 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) { if (timeout) {
setTimeout(function(){ setTimeout(function(){
message.fadeOut(function(){ message.fadeOut(function(){

6
data/interfaces/default/js/tables/history_table.js
View file

@ -167,11 +167,11 @@ history_table_options = {
"drawCallback": function (settings) { "drawCallback": function (settings) {
// Jump to top of page // Jump to top of page
// $('html,body').scrollTop(0); // $('html,body').scrollTop(0);
$('#ajaxMsg').addClass('success').fadeOut(); $('#ajaxMsg').fadeOut();
}, },
"preDrawCallback": function(settings) { "preDrawCallback": function(settings) {
$('#ajaxMsg').html("<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>"); var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
$('#ajaxMsg').addClass('success').fadeIn(); showMsg(msg, false, false, 0)
} }
} }

8
data/interfaces/default/js/tables/logs.js
View file

@ -34,11 +34,11 @@ var log_table_options = {
], ],
"drawCallback": function (settings) { "drawCallback": function (settings) {
// Jump to top of page // Jump to top of page
$('html,body').scrollTop(0); //$('html,body').scrollTop(0);
$('#ajaxMsg').addClass('success').fadeOut(); $('#ajaxMsg').fadeOut();
}, },
"preDrawCallback": function(settings) { "preDrawCallback": function(settings) {
$('#ajaxMsg').html("<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>"); var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
$('#ajaxMsg').addClass('success').fadeIn(); showMsg(msg, false, false, 0)
} }
} }

6
data/interfaces/default/js/tables/user_ips.js
View file

@ -70,11 +70,11 @@ user_ip_table_options = {
"drawCallback": function (settings) { "drawCallback": function (settings) {
// Jump to top of page // Jump to top of page
// $('html,body').scrollTop(0); // $('html,body').scrollTop(0);
$('#ajaxMsg').addClass('success').fadeOut(); $('#ajaxMsg').fadeOut();
}, },
"preDrawCallback": function(settings) { "preDrawCallback": function(settings) {
$('#ajaxMsg').html("<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>"); var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
$('#ajaxMsg').addClass('success').fadeIn(); showMsg(msg, false, false, 0)
} }
} }

8
data/interfaces/default/js/tables/users.js
View file

@ -68,11 +68,11 @@ users_list_table_options = {
], ],
"drawCallback": function (settings) { "drawCallback": function (settings) {
// Jump to top of page // Jump to top of page
$('html,body').scrollTop(0); //$('html,body').scrollTop(0);
$('#ajaxMsg').addClass('success').fadeOut(); $('#ajaxMsg').fadeOut();
}, },
"preDrawCallback": function(settings) { "preDrawCallback": function(settings) {
$('#ajaxMsg').html("<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>"); var msg = "<div class='msg'><i class='fa fa-refresh fa-spin'></i>&nbspFetching rows...</div>";
$('#ajaxMsg').addClass('success').fadeIn(); showMsg(msg, false, false, 0)
} }
} }