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

2011-04-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es> 

* include/functions_ui.php
	include/functions.php: Removed function popup_help from functions.php
	and added in function_ui.php under ui_popup_help name.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@4215 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
juanmanuelr 2011-04-13 17:11:10 +00:00
parent d0092aa6f2
commit 50cc94d201
3 changed files with 32 additions and 27 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 @@
2011-04-13 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_ui.php
include/functions.php: Removed function popup_help from functions.php
and added in function_ui.php under ui_popup_help name.
2011-04-13 Ramon Novoa <rnovoa@artica.es> 2011-04-13 Ramon Novoa <rnovoa@artica.es>
* pandoradb.postgreSQL.sql: Created the UNIX_TIMESTAMP function. * pandoradb.postgreSQL.sql: Created the UNIX_TIMESTAMP function.

37
pandora_console/include/functions.php
View File

@ -108,23 +108,6 @@ function safe_url_extraclean ($string, $default_string = '') {
return $string; return $string;
} }
/**
* Add a help link to show help in a popup window.
*
* TODO: Get this merged with the other help function(s)
*
* @param string $help_id Help id to be shown when clicking.
* @param bool $return Whether to print this (false) or return (true)
*
* @return string Link with the popup.
*/
function popup_help ($help_id, $return = false) {
$output = "&nbsp;<a href='javascript:help_popup(".$help_id.")'>[H]</a>";
if ($return)
return $output;
echo $output;
}
/** /**
* DEPRECATED: This function is not used anywhere. Remove it? * DEPRECATED: This function is not used anywhere. Remove it?
* (use general/noaccess.php followed by exit instead) * (use general/noaccess.php followed by exit instead)
@ -263,16 +246,16 @@ function format_for_graph ($number , $decimals = 1, $dec_point = ".", $thousands
* Rounds an integer to a multiple of 5. * Rounds an integer to a multiple of 5.
* *
* Example: * Example:
<code> * <code>
echo format_integer_round (18); * echo format_integer_round (18);
// Will return 20 * // Will return 20
*
echo format_integer_round (21); * echo format_integer_round (21);
// Will return 25 * // Will return 25
*
echo format_integer_round (25, 10); * echo format_integer_round (25, 10);
// Will return 30 * // Will return 30
</code> * </code>
* *
* @param int Number to be rounded. * @param int Number to be rounded.
* @param int Rounder number, default value is 5. * @param int Rounder number, default value is 5.

16
pandora_console/include/functions_ui.php
View File

@ -1688,5 +1688,21 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
return $buffer; return $buffer;
} }
/**
* Add a help link to show help in a popup window.
*
*
* @param string $help_id Help id to be shown when clicking.
* @param bool $return Whether to print this (false) or return (true)
*
* @return string Link with the popup.
*/
function ui_popup_help ($help_id, $return = false) {
$output = "&nbsp;<a href='javascript:help_popup(".$help_id.")'>[H]</a>";
if ($return)
return $output;
echo $output;
}
?> ?>