tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

2013-01-30 Sergio Martin <sergio.martin@artica.es>

Browse Source 
* include/functions_ui.php: Fixed help popups to 
	be used from metaconsole too

	* godmode/events/event_responses.editor.php: Added
	a little help tip in the windows type of event
	responses editor



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7548 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
zarzuelo 2013-01-30 08:18:40 +00:00
parent 3b22a943a8
commit 7503c5ca37
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pandora_console/ChangeLog
View File

@ -1,3 +1,12 @@
2013-01-30 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php: Fixed help popups to
be used from metaconsole too
* godmode/events/event_responses.editor.php: Added
a little help tip in the windows type of event
responses editor
2013-01-29 Miguel de Dios <miguel.dedios@artica.es> 2013-01-29 Miguel de Dios <miguel.dedios@artica.es>
* godmode/groups/group_list.php, include/ajax/events.php, * godmode/groups/group_list.php, include/ajax/events.php,

2
pandora_console/godmode/events/event_responses.editor.php
View File

@ -69,7 +69,7 @@ $data[1] = html_print_textarea('description',5,40,$event_response['description']
$table->data[1] = $data; $table->data[1] = $data;
$data = array(); $data = array();
$data[0] = __('Location'); $data[0] = __('Location') . ui_print_help_tip(__('In Command mode is enforced to Modal window'), true);
$locations = array(__('Modal window'), __('New window')); $locations = array(__('Modal window'), __('New window'));
$data[1] = html_print_select($locations,'new_window',$event_response['new_window'],'','','',true); $data[1] = html_print_select($locations,'new_window',$event_response['new_window'],'','','',true);

5
pandora_console/include/functions_ui.php
View File

@ -944,6 +944,11 @@ function ui_print_alert_template_example ($id_alert_template, $return = false, $
function ui_print_help_icon ($help_id, $return = false, $home_url = '') { function ui_print_help_icon ($help_id, $return = false, $home_url = '') {
if (empty($home_url)) if (empty($home_url))
$home_url = ""; $home_url = "";
if(defined('METACONSOLE')) {
$home_url = "../../" . $home_url;
}
$output = '&nbsp;'.html_print_image ("images/help.png", true, $output = '&nbsp;'.html_print_image ("images/help.png", true,
array ("class" => "img_help", array ("class" => "img_help",
"title" => __('Help'), "title" => __('Help'),