tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2013-10-02 Miguel de Dios <miguel.dedios@artica.es> 

* include/javascript/jquery.pandora.js, index.php,
	general/login_page.php: fixed the show the warning trial enterprise
	message when fail login.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@8841 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-10-02 10:08:45 +00:00
parent a72e3d3b43
commit d51cbff334
4 changed files with 42 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2013-10-02 Miguel de Dios <miguel.dedios@artica.es>
* include/javascript/jquery.pandora.js, index.php,
general/login_page.php: fixed the show the warning trial enterprise
message when fail login.
2013-10-01 Sergio Martin <sergio.martin@artica.es> 2013-10-01 Sergio Martin <sergio.martin@artica.es>
* include/styles/menu.css: Fixed menus item height to * include/styles/menu.css: Fixed menus item height to

2
pandora_console/general/login_page.php
View File

@ -104,7 +104,7 @@ echo '
html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login login_password"', false, true); html_print_input_text_extended ("pass", '', "pass", '', '', '' ,false, '', 'class="login login_password"', false, true);
echo '</div>'; echo '</div>';
echo '<div class="login_button">'; echo '<div class="login_button">';
html_print_submit_button(__("Login"), "login", false, 'class="sub next_login"'); html_print_submit_button(__("Login"), "login_button", false, 'class="sub next_login"');
echo '</div>'; echo '</div>';
break; break;
case 'logout': case 'logout':

55
pandora_console/include/javascript/jquery.pandora.js
View File

@ -85,32 +85,37 @@ $(document).ready (function () {
}); });
if ($('#license_error_msg_dialog').length) { if ($('#license_error_msg_dialog').length) {
if (typeof(process_login_ok) == "undefined")
process_login_ok = 0;
$( "#license_error_msg_dialog" ).dialog({ if (process_login_ok) {
dialogClass: "no-close",
resizable: true, $( "#license_error_msg_dialog" ).dialog({
draggable: true, dialogClass: "no-close",
modal: true, resizable: true,
height: 350, draggable: true,
width: 650, modal: true,
overlay: { height: 350,
opacity: 0.5, width: 610,
background: "black" overlay: {
}, opacity: 0.5,
open: function() { background: "black"
setTimeout(function(){ },
$("#spinner_ok").hide(); open: function() {
$("#ok_buttom").show(); setTimeout(function(){
}, $("#spinner_ok").hide();
10000 $("#ok_buttom").show();
); },
} 10000
}); );
}
$("#submit-hide-license-error-msg").click (function () { });
$("#license_error_msg_dialog" ).dialog('close')
}); $("#submit-hide-license-error-msg").click (function () {
$("#license_error_msg_dialog" ).dialog('close')
});
}
} }

8
pandora_console/index.php
View File

@ -68,7 +68,7 @@ session_start ();
require_once ("include/config.php"); require_once ("include/config.php");
// If metaconsole activated, redirect to it // If metaconsole activated, redirect to it
if($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) { if ($config['metaconsole'] == 1 && $config['enterprise_installed'] == 1) {
header ("Location: " . $config['homeurl'] . "enterprise/meta"); header ("Location: " . $config['homeurl'] . "enterprise/meta");
} }
@ -239,6 +239,8 @@ elseif (! isset ($config['id_user']) && isset ($_GET["login"])) {
//login ok and password has not expired //login ok and password has not expired
$process_login = true; $process_login = true;
echo "<script type='text/javascript'>var process_login_ok = 1;</script>";
unset ($_GET["sec2"]); unset ($_GET["sec2"]);
$_GET["sec"] = "general/logon_ok"; $_GET["sec"] = "general/logon_ok";
$home_page =''; $home_page ='';
@ -585,7 +587,7 @@ require('include/php_to_js_values.php');
(function() { (function() {
var oShow = jQuery.fn.show; var oShow = jQuery.fn.show;
var oHide = jQuery.fn.hide; var oHide = jQuery.fn.hide;
jQuery.fn.show = function () { jQuery.fn.show = function () {
var rv = oShow.apply(this, arguments); var rv = oShow.apply(this, arguments);
adjustFooter(); adjustFooter();
@ -611,7 +613,7 @@ require('include/php_to_js_values.php');
var h = $('#foot').height(); var h = $('#foot').height();
// new top value for div#foot // new top value for div#foot
var t = (ulim + $('#foot').outerHeight() > wh) ? ulim : wh - $('#foot').outerHeight(); var t = (ulim + $('#foot').outerHeight() > wh) ? ulim : wh - $('#foot').outerHeight();
if ($('#foot').position().top != t) { if ($('#foot').position().top != t) {
$('#foot').css({ position: "absolute", top: t, left: $('#foot').offset().left}); $('#foot').css({ position: "absolute", top: t, left: $('#foot').offset().left});
$('#foot').height(h); $('#foot').height(h);