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

2012-07-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_html.php: Changed path to image in 
	html_print_image function if metaconsole is being using.
	
	* include/javascript/jquery.pandora.js: Added checks for jquery
	 dialog messages that avoid js warnings.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6737 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2012-07-05 09:31:12 +00:00
parent d48d55cb04
commit f30b0dac38
3 changed files with 71 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pandora_console/ChangeLog
View File

@ -1,3 +1,11 @@
2012-07-05 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_html.php: Changed path to image in
html_print_image function if metaconsole is being using.
* include/javascript/jquery.pandora.js: Added checks for jquery
dialog messages that avoid js warnings.
2012-07-05 Sergio Martin <sergio.martin@artica.es> 2012-07-05 Sergio Martin <sergio.martin@artica.es>
* include/functions_html.php * include/functions_html.php

20
pandora_console/include/functions_html.php
View File

@ -1207,18 +1207,26 @@ function html_print_checkbox ($name, $value, $checked = false, $return = false,
function html_print_image ($src, $return = false, $options = false, $return_src = false, $relative = false) { function html_print_image ($src, $return = false, $options = false, $return_src = false, $relative = false) {
global $config; global $config;
/* Checks if user's skin is available */ // If metaconsole is in use then don't use skins
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); if (!defined('METACONSOLE')) {
if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) { /* Checks if user's skin is available */
$skin_path = enterprise_hook('skins_get_image_path', array($src)); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
if ($skin_path)
$src = $skin_path; if ($isFunctionSkins !== ENTERPRISE_NOT_HOOK) {
$skin_path = enterprise_hook('skins_get_image_path',array($src));
if ($skin_path)
$src = $skin_path;
}
} }
if (!$relative) { if (!$relative) {
$urlImage = ui_get_full_url(false); $urlImage = ui_get_full_url(false);
if (defined('METACONSOLE'))
$urlImage .= ENTERPRISE_DIR . '/meta/';
// path to image // path to image
$src = $urlImage . $src; $src = $urlImage . $src;
} }

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

@ -86,23 +86,26 @@ $(document).ready (function () {
return false; return false;
}); });
if ($('#license_error_msg_dialog').length) {
$( "#license_error_msg_dialog" ).dialog({ $( "#license_error_msg_dialog" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 280, height: 280,
width: 600, width: 600,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, },
bgiframe: jQuery.browser.msie bgiframe: jQuery.browser.msie
}); });
$("#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')
});
$("a#dialog_license_info").click (function () { $("a#dialog_license_info").click (function () {
@ -133,31 +136,38 @@ $(document).ready (function () {
return false; return false;
}); });
$( "#msg_change_password" ).dialog({ if ($('#msg_change_password').length) {
resizable: true,
draggable: true,
modal: true,
height: 260,
width: 590,
overlay: {
opacity: 0.5,
background: "black"
},
bgiframe: jQuery.browser.msie
});
$( "#login_blocked" ).dialog({ $( "#msg_change_password" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
modal: true, modal: true,
height: 180, height: 260,
width: 400, width: 590,
overlay: { overlay: {
opacity: 0.5, opacity: 0.5,
background: "black" background: "black"
}, },
bgiframe: jQuery.browser.msie bgiframe: jQuery.browser.msie
}); });
}
if ($('#login_blocked').length) {
$( "#login_blocked" ).dialog({
resizable: true,
draggable: true,
modal: true,
height: 180,
width: 400,
overlay: {
opacity: 0.5,
background: "black"
},
bgiframe: jQuery.browser.msie
});
}
}); });