Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop'

Ent 3699 descuadre visual recuperar password

See merge request artica/pandorafms!2336
This commit is contained in:
Daniel Rodriguez 2019-06-25 14:26:57 +02:00
commit 01514ba5b6
2 changed files with 360 additions and 339 deletions

View File

@ -1,49 +1,59 @@
(function($) { (function($) {
$.fn.check = function () { $.fn.check = function() {
return this.each (function () { return this.each(function() {
this.checked = true; this.checked = true;
});}; });
};
$.fn.uncheck = function () { $.fn.uncheck = function() {
return this.each (function () { return this.each(function() {
this.checked = false; this.checked = false;
});}; });
$.fn.enable = function () {
return $(this).removeAttr ("disabled");
}; };
$.fn.disable = function () { $.fn.enable = function() {
return $(this).attr ("disabled", "disabled"); return $(this).removeAttr("disabled");
}; };
$.fn.pulsate = function () { $.fn.disable = function() {
return $(this).attr("disabled", "disabled");
};
$.fn.pulsate = function() {
var i = 0; var i = 0;
for (i = 0; i <= 2; i++) { for (i = 0; i <= 2; i++) {
$(this).fadeOut ("slow").fadeIn ("slow"); $(this)
.fadeOut("slow")
.fadeIn("slow");
} }
}; };
$.fn.showMessage = function (msg) { $.fn.showMessage = function(msg) {
return $(this).hide ().empty () return (
$(this)
.hide()
.empty()
// here, previously .text (msg) // here, previously .text (msg)
.html (msg) .html(msg)
.slideDown (); .slideDown()
);
}; };
}) (jQuery); })(jQuery);
$(document).ready (function () { $(document).ready(function() {
$("a#show_messages_dialog").click (function () { $("a#show_messages_dialog").click(function() {
jQuery.post ("ajax.php", jQuery.post(
"ajax.php",
{ {
"page": "operation/messages/message_list" page: "operation/messages/message_list"
}, },
function (data, status) { function(data, status) {
$("#dialog_messages").hide () $("#dialog_messages")
.empty () .hide()
.append (data) .empty()
.dialog ({ .append(data)
title: $("a#show_messages_dialog").attr ("title"), .dialog({
title: $("a#show_messages_dialog").attr("title"),
resizable: false, resizable: false,
modal: true, modal: true,
overlay: { overlay: {
@ -52,7 +62,8 @@ $(document).ready (function () {
}, },
width: 700, width: 700,
height: 300 height: 300
}).show (); })
.show();
}, },
"html" "html"
); );
@ -60,37 +71,47 @@ $(document).ready (function () {
return false; return false;
}); });
$("a.show_systemalert_dialog").click (function () { $("a.show_systemalert_dialog").click(function() {
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" ); $("body").append(
$("#opacidad").css('opacity', 0.5); "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>"
);
$("#opacidad").css("opacity", 0.5);
jQuery.post ("ajax.php", jQuery.post(
"ajax.php",
{ {
"page": "operation/system_alert"}, page: "operation/system_alert"
function (data, status) { },
function(data, status) {
$("#alert_messages").show(); $("#alert_messages").show();
$("#alert_messages").empty ().append (data); $("#alert_messages")
$("#alert_messages").css('opacity', 1); .empty()
.append(data);
$("#alert_messages").css("opacity", 1);
}, },
"html" "html"
); );
}); });
$("a.modalpopup").click (function () { $("a.modalpopup").click(function() {
var elem = $(this).attr("id"); var elem = $(this).attr("id");
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" ); $("body").append(
$("#opacidad").css('opacity', 0.5); "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>"
);
$("#opacidad").css("opacity", 0.5);
jQuery.post ("ajax.php", jQuery.post(
"ajax.php",
{ {
"page": "general/alert_enterprise", page: "general/alert_enterprise",
"message": elem message: elem
}, },
function (data, status) { function(data, status) {
$("#alert_messages").show(); $("#alert_messages").show();
$("#alert_messages").empty ().append (data); $("#alert_messages")
$("#alert_messages").css('opacity', 1); .empty()
.append(data);
$("#alert_messages").css("opacity", 1);
}, },
"html" "html"
); );
@ -98,65 +119,69 @@ $(document).ready (function () {
}); });
// Creacion de ventana modal y botones // Creacion de ventana modal y botones
$(".publienterprise").click (function () { $(".publienterprise").click(function() {
var elem = $(this).attr("id"); var elem = $(this).attr("id");
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" ); $("body").append(
$("#opacidad").css('opacity', 0.5); "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>"
);
$("#opacidad").css("opacity", 0.5);
jQuery.post ("ajax.php", jQuery.post(
"ajax.php",
{ {
"page": "general/alert_enterprise", page: "general/alert_enterprise",
"message": elem message: elem
}, },
function (data, status) { function(data, status) {
$("#alert_messages").show(); $("#alert_messages").show();
$("#alert_messages").empty ().append (data); $("#alert_messages")
$("#alert_messages").css('opacity', 1); .empty()
.append(data);
$("#alert_messages").css("opacity", 1);
}, },
"html" "html"
); );
return false; return false;
}); });
$(".publienterprisehide").click(function() {
$(".publienterprisehide").click (function () {
var elem = $(this).attr("id"); var elem = $(this).attr("id");
$('body').append( "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>" ); $("body").append(
$("#opacidad").css('opacity', 0.5); "<div id='opacidad' style='position:fixed;background:black;z-index:1'></div>"
);
$("#opacidad").css("opacity", 0.5);
jQuery.post ("ajax.php", jQuery.post(
"ajax.php",
{ {
"page": "general/alert_enterprise", page: "general/alert_enterprise",
"message": elem message: elem
}, },
function (data, status) { function(data, status) {
$("#alert_messages").show(); $("#alert_messages").show();
$("#alert_messages").empty ().append (data); $("#alert_messages")
$("#alert_messages").css('opacity', 1); .empty()
.append(data);
$("#alert_messages").css("opacity", 1);
}, },
"html" "html"
); );
return false; return false;
}); });
if ($("#license_error_msg_dialog").length) {
if (typeof process_login_ok == "undefined") process_login_ok = 0;
if (typeof show_error_license == "undefined") show_error_license = 0;
if ($('#license_error_msg_dialog').length) {
if (typeof(process_login_ok) == "undefined")
process_login_ok = 0;
if (typeof(show_error_license) == "undefined")
show_error_license = 0;
if (process_login_ok || show_error_license) { if (process_login_ok || show_error_license) {
$("#license_error_msg_dialog").dialog({
$( "#license_error_msg_dialog" ).dialog({
dialogClass: "no-close", dialogClass: "no-close",
closeOnEscape: false, closeOnEscape: false,
resizable: false, resizable: false,
draggable: true, draggable: true,
modal: true, modal: true,
height: 450, height: 470,
width: 850, width: 850,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
@ -175,39 +200,34 @@ $(document).ready (function () {
$("#ok_buttom").show(); $("#ok_buttom").show();
clearInterval(count); clearInterval(count);
} }
} };
setInterval(count, 1000); setInterval(count, 1000);
} }
}); });
$("#submit-hide-license-error-msg").click (function () { $("#submit-hide-license-error-msg").click(function() {
$("#license_error_msg_dialog" ).dialog('close') $("#license_error_msg_dialog").dialog("close");
}); });
} }
} }
if ($("#msg_change_password").length) {
if ($('#msg_change_password').length) { $("#msg_change_password").dialog({
$( "#msg_change_password" ).dialog({
resizable: false, resizable: false,
draggable: true, draggable: true,
modal: true, modal: true,
height: 350, height: 450,
width: 620, width: 620,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
} }
}); });
} }
if ($('#login_blocked').length) { if ($("#login_blocked").length) {
$("#login_blocked").dialog({
$( "#login_blocked" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
@ -218,12 +238,10 @@ $(document).ready (function () {
background: "black" background: "black"
} }
}); });
} }
if ($('#login_correct_pass').length) { if ($("#login_correct_pass").length) {
$("#login_correct_pass").dialog({
$( "#login_correct_pass" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
@ -234,40 +252,40 @@ $(document).ready (function () {
background: "black" background: "black"
} }
}); });
} }
forced_title_callback(); forced_title_callback();
$(document).on("scroll", function() {
$(document).on("scroll", function(){ if (
document.documentElement.scrollTop != 0 ||
if(document.documentElement.scrollTop != 0 || document.body.scrollTop != 0){ document.body.scrollTop != 0
if($('#head').css('position') =='fixed'){ ) {
if($('#menu').css('position') =='fixed'){ if ($("#head").css("position") == "fixed") {
$('#menu').css('top','80px'); if ($("#menu").css("position") == "fixed") {
$("#menu").css("top", "80px");
} else { } else {
$('#menu').css('top','60px'); $("#menu").css("top", "60px");
} }
} else { } else {
if($('#menu').css('position') =='fixed'){ if ($("#menu").css("position") == "fixed") {
$('#menu').css('top','20px'); $("#menu").css("top", "20px");
} else { } else {
$('#menu').css('top','80px'); $("#menu").css("top", "80px");
} }
} }
} else { } else {
if($('#head').css('position') =='fixed'){ if ($("#head").css("position") == "fixed") {
if($('#menu').css('position') =='fixed'){ if ($("#menu").css("position") == "fixed") {
$('#menu').css('top','80px'); $("#menu").css("top", "80px");
} else { } else {
$('#menu').css('top','60px'); $("#menu").css("top", "60px");
} }
} else { } else {
if($('#menu').css('position') =='fixed'){ if ($("#menu").css("position") == "fixed") {
$('#menu').css('top','80px'); $("#menu").css("top", "80px");
} else { } else {
$('#menu').css('top','80px'); $("#menu").css("top", "80px");
} }
} }
} }
@ -296,21 +314,22 @@ $(document).ready (function () {
}); });
$("#alert_messages").draggable(); $("#alert_messages").draggable();
$("#alert_messages").css({'left':+parseInt(screen.width/2)-parseInt($("#alert_messages").css('width'))/2+'px'}); $("#alert_messages").css({
left:
+parseInt(screen.width / 2) -
parseInt($("#alert_messages").css("width")) / 2 +
"px"
});
}); });
function forced_title_callback() { function forced_title_callback() {
// Forced title code // Forced title code
$('body').on('mouseenter', '.forced_title', function() { $("body").on("mouseenter", ".forced_title", function() {
/////////////////////////////////////////// ///////////////////////////////////////////
// Put the layer in the left-top corner to fill it // Put the layer in the left-top corner to fill it
/////////////////////////////////////////// ///////////////////////////////////////////
$('#forced_title_layer').css('left', 0); $("#forced_title_layer").css("left", 0);
$('#forced_title_layer').css('top', 0); $("#forced_title_layer").css("top", 0);
/////////////////////////////////////////// ///////////////////////////////////////////
// Get info of the image // Get info of the image
@ -319,8 +338,8 @@ function forced_title_callback() {
var img_top = $(this).offset().top; var img_top = $(this).offset().top;
var img_width = $(this).width(); var img_width = $(this).width();
var img_height = $(this).height(); var img_height = $(this).height();
var img_id = $(this).attr('id'); var img_id = $(this).attr("id");
var img_left_mid = $(this).offset().left + (img_width / 2); var img_left_mid = $(this).offset().left + img_width / 2;
/////////////////////////////////////////// ///////////////////////////////////////////
// Put title in the layer // Put title in the layer
@ -331,19 +350,18 @@ function forced_title_callback() {
// content. // content.
if ($(this).data("use_title_for_force_title")) { if ($(this).data("use_title_for_force_title")) {
var title = $(this).data("title"); var title = $(this).data("title");
} } else {
else { var title = $("#forced_title_" + img_id).html();
var title = $('#forced_title_'+img_id).html();
} }
$('#forced_title_layer').html(title); $("#forced_title_layer").html(title);
/////////////////////////////////////////// ///////////////////////////////////////////
// Get info of the layer // Get info of the layer
/////////////////////////////////////////// ///////////////////////////////////////////
var layer_width = $('#forced_title_layer').width(); var layer_width = $("#forced_title_layer").width();
var layer_height = $('#forced_title_layer').height(); var layer_height = $("#forced_title_layer").height();
/////////////////////////////////////////// ///////////////////////////////////////////
// Obtain the new position of the layer // Obtain the new position of the layer
@ -353,18 +371,18 @@ function forced_title_callback() {
var layer_padding = 4; var layer_padding = 4;
// Deduct padding of both sides // Deduct padding of both sides
var layer_top = img_top - layer_height - (layer_padding * 2) - 5; var layer_top = img_top - layer_height - layer_padding * 2 - 5;
if (layer_top < 0) { if (layer_top < 0) {
layer_top = img_top + img_height + (layer_padding * 2); layer_top = img_top + img_height + layer_padding * 2;
} }
// Deduct padding of one side // Deduct padding of one side
var layer_left = img_left_mid - (layer_width / 2) - layer_padding; var layer_left = img_left_mid - layer_width / 2 - layer_padding;
if (layer_left < 0) { if (layer_left < 0) {
layer_left = 0; layer_left = 0;
} }
var real_layer_width = layer_width + (layer_padding * 2) + 5; var real_layer_width = layer_width + layer_padding * 2 + 5;
var layer_right = layer_left + real_layer_width; var layer_right = layer_left + real_layer_width;
var screen_width = $(window).width(); var screen_width = $(window).width();
if (screen_width < layer_right) { if (screen_width < layer_right) {
@ -375,12 +393,13 @@ function forced_title_callback() {
// Set the layer position and show // Set the layer position and show
/////////////////////////////////////////// ///////////////////////////////////////////
$('#forced_title_layer').css('left', layer_left); $("#forced_title_layer").css("left", layer_left);
$('#forced_title_layer').css('top', layer_top); $("#forced_title_layer").css("top", layer_top);
$('#forced_title_layer').show(); $("#forced_title_layer").show();
}); });
$('body').on('mouseout', '.forced_title', function () { $("body").on("mouseout", ".forced_title", function() {
$('#forced_title_layer').hide().empty(); $("#forced_title_layer")
.hide()
.empty();
}); });
} }

View File

@ -406,6 +406,8 @@ div.form_message_alert ul li input {
} }
div.form_message_alert ul li label { div.form_message_alert ul li label {
display: inline-block;
width: 145px;
font-size: 10pt; font-size: 10pt;
padding-right: 20px; padding-right: 20px;
} }