From 0654d7ded2039f55e1187045cef484cee99d9dee Mon Sep 17 00:00:00 2001
From: juanmanuelr <noreply@pandorafms.org>
Date: Wed, 13 Apr 2011 17:11:10 +0000
Subject: [PATCH] 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
---
 pandora_console/ChangeLog                |  6 ++++
 pandora_console/include/functions.php    | 37 +++++++-----------------
 pandora_console/include/functions_ui.php | 16 ++++++++++
 3 files changed, 32 insertions(+), 27 deletions(-)

diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog
index 672962c1b7..d170fff9dc 100644
--- a/pandora_console/ChangeLog
+++ b/pandora_console/ChangeLog
@@ -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>
 
 	* pandoradb.postgreSQL.sql: Created the UNIX_TIMESTAMP function.
diff --git a/pandora_console/include/functions.php b/pandora_console/include/functions.php
index 2fe935da30..ec5a12d041 100644
--- a/pandora_console/include/functions.php
+++ b/pandora_console/include/functions.php
@@ -108,23 +108,6 @@ function safe_url_extraclean ($string, $default_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?
  * (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.
  *
  * Example:
-<code>
-echo format_integer_round (18);
-// Will return 20
-
-echo format_integer_round (21);
-// Will return 25
-
-echo format_integer_round (25, 10);
-// Will return 30
-</code>
+ * <code>
+ * echo format_integer_round (18);
+ * // Will return 20
+ *
+ * echo format_integer_round (21);
+ * // Will return 25
+ *
+ * echo format_integer_round (25, 10);
+ * // Will return 30
+ * </code>
  *
  * @param int Number to be rounded.
  * @param int Rounder number, default value is 5.
diff --git a/pandora_console/include/functions_ui.php b/pandora_console/include/functions_ui.php
index d1dc83136d..52086e67b9 100644
--- a/pandora_console/include/functions_ui.php
+++ b/pandora_console/include/functions_ui.php
@@ -1688,5 +1688,21 @@ function ui_print_page_header ($title, $icon = "", $return = false, $help = "",
 	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;
+}
+
 
 ?>