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

8
pandora_console/include/functions_html.php
View File

@ -1207,6 +1207,9 @@ 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;
// If metaconsole is in use then don't use skins
if (!defined('METACONSOLE')) {
/* Checks if user's skin is available */ /* Checks if user's skin is available */
$isFunctionSkins = enterprise_include_once ('include/functions_skins.php'); $isFunctionSkins = enterprise_include_once ('include/functions_skins.php');
@ -1216,9 +1219,14 @@ function html_print_image ($src, $return = false, $options = false, $return_src
$src = $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;
} }

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

@ -86,6 +86,7 @@ $(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,
@ -104,6 +105,8 @@ $(document).ready (function () {
$("#license_error_msg_dialog" ).dialog('close') $("#license_error_msg_dialog" ).dialog('close')
}); });
}
$("a#dialog_license_info").click (function () { $("a#dialog_license_info").click (function () {
jQuery.get ("ajax.php", jQuery.get ("ajax.php",
@ -133,6 +136,8 @@ $(document).ready (function () {
return false; return false;
}); });
if ($('#msg_change_password').length) {
$( "#msg_change_password" ).dialog({ $( "#msg_change_password" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
@ -146,6 +151,10 @@ $(document).ready (function () {
bgiframe: jQuery.browser.msie bgiframe: jQuery.browser.msie
}); });
}
if ($('#login_blocked').length) {
$( "#login_blocked" ).dialog({ $( "#login_blocked" ).dialog({
resizable: true, resizable: true,
draggable: true, draggable: true,
@ -159,5 +168,6 @@ $(document).ready (function () {
bgiframe: jQuery.browser.msie bgiframe: jQuery.browser.msie
}); });
}
}); });