From f3de10c345cb02049e3623eee4a188888ee8a650 Mon Sep 17 00:00:00 2001
From: cesar991 <cesar.espinosa@artica.es>
Date: Thu, 29 Sep 2016 13:30:19 +0200
Subject: [PATCH 1/2] Repair test D

---
 tests/console/Network_components.py | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/tests/console/Network_components.py b/tests/console/Network_components.py
index a2c28c5af6..6778b34193 100644
--- a/tests/console/Network_components.py
+++ b/tests/console/Network_components.py
@@ -174,7 +174,7 @@ class Network_components(PandoraWebDriverTestCase):
 		"""
 
 		driver = self.driver
-		
+	
 		agent_name = gen_random_string(6)
 		plugin_component_name = gen_random_string(6)
 
@@ -207,14 +207,15 @@ class Network_components(PandoraWebDriverTestCase):
 		time.sleep(3)
 		
 		Select(driver.find_element_by_id("network_component")).select_by_visible_text(plugin_component_name)
-		
+			
+		self.assertEqual("80" in driver.page_source,True)
+	
 		driver.find_element_by_id("submit-crtbutton").click()
 		
-		search_module (driver,agent_name,plugin_component_name,go_to_module=True)
+		search_module (driver,agent_name,plugin_component_name)
 		
-		self.assertEqual("127.0.0.1" in driver.page_source,True)
+		self.assertEqual(plugin_component_name in driver.page_source,True)
 
-		self.assertEqual("80" in driver.page_source,True)
 
 if __name__ == "__main__":
 	unittest2.main()

From e48e1ddd7e0cfeb1b41d701e7441f98ffe18ed29 Mon Sep 17 00:00:00 2001
From: daniel <daniel.barbero@artica.es>
Date: Thu, 29 Sep 2016 14:30:07 +0200
Subject: [PATCH 2/2] ticket: 4069 add actions for defect in templates html
 #4069

---
 .../alerts/configure_alert_template.php       | 64 ++++++++++++++++---
 1 file changed, 55 insertions(+), 9 deletions(-)

diff --git a/pandora_console/godmode/alerts/configure_alert_template.php b/pandora_console/godmode/alerts/configure_alert_template.php
index 34476b996f..a10ebe9b02 100644
--- a/pandora_console/godmode/alerts/configure_alert_template.php
+++ b/pandora_console/godmode/alerts/configure_alert_template.php
@@ -632,11 +632,13 @@ if ($step == 2) {
 	$table->colspan['example'][1] = 4;
 }
 else if ($step == 3) {
-	$table->style[0] = 'font-weight: bold; vertical-align: top';
+	$table->style[0] = 'font-weight: bold; vertical-align: middle';
 	$table->style[1] = 'font-weight: bold; vertical-align: top';
 	$table->style[2] = 'font-weight: bold; vertical-align: top';
 	$table->size = array ();
-	$table->size[0] = '20%';
+	$table->size[0] = '10%';
+	$table->size[1] = '45%';
+	$table->size[2] = '45%';
 	
 	/* Alert recover */
 	if (! $recovery_notify) {
@@ -673,11 +675,36 @@ else if ($step == 3) {
 		
 		//$table->rowclass['field'.$i] = 'row_field';
 		
-		$table->data['field'.$i][0] = sprintf(__('Field %s'), $i) .
-			ui_print_help_icon ('alert_macros', true);
-		$table->data['field'.$i][1] = html_print_textarea('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true);
+		
+		$table->data['field'.$i][0] = sprintf(__('Field %s'), $i) . ui_print_help_icon ('alert_macros', true);
+		//TinyMCE	
+		//triggering fields
+			//basic
+			$table->data['field'.$i][1] = "<div style=\"padding: 4px 0px;\"><b><small>";
+			$table->data['field'.$i][1] .= __('Basic') . "&nbsp;&nbsp;";
+			$table->data['field'.$i][1] .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."')", '', true);
+			//Advanced
+			$table->data['field'.$i][1] .= "&nbsp;&nbsp;&nbsp;&nbsp;";
+			$table->data['field'.$i][1] .= __('Advanced') . "&nbsp;&nbsp;";
+			$table->data['field'.$i][1] .= html_print_radio_button_extended ('editor_type_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."')", '', true);
+			$table->data['field'.$i][1] .= "</small></b></div>";
+		
+			//Texarea
+			$table->data['field'.$i][1] .= html_print_textarea('field'.$i, 1, 1, isset($fields[$i]) ? $fields[$i] : '', 'style="min-height:40px;" class="fields"', true);
+		
 		// Recovery
-		$table->data['field'.$i][2] = html_print_textarea ('field'.$i.'_recovery', 1, 1, isset($fields_recovery[$i]) ? $fields_recovery[$i] : '', 'style="min-height:40px" class="fields"', true);
+			//basic
+			$table->data['field'.$i][2] = "<div style=\"padding: 4px 0px;\"><b><small>";
+			$table->data['field'.$i][2] .= __('Basic') . "&nbsp;&nbsp;";
+			$table->data['field'.$i][2] .= html_print_radio_button_extended ('editor_type_recovery_value_'.$i, 0, '', false, false, "removeTinyMCE('textarea_field".$i."_recovery')", '', true);
+			//advanced
+			$table->data['field'.$i][2] .= "&nbsp;&nbsp;&nbsp;&nbsp;";
+			$table->data['field'.$i][2] .= __('Advanced') . "&nbsp;&nbsp;";
+			$table->data['field'.$i][2] .= html_print_radio_button_extended ('editor_type_recovery_value_'.$i, 0, '', true, false, "addTinyMCE('textarea_field".$i."_recovery')", '', true);
+			$table->data['field'.$i][2] .= "</small></b></div>";
+
+			//Texarea
+			$table->data['field'.$i][2] .= html_print_textarea ('field'.$i.'_recovery', 1, 1, isset($fields_recovery[$i]) ? $fields_recovery[$i] : '', 'style="min-height:40px" class="fields"', true);
 	}
 }
 else {
@@ -804,6 +831,7 @@ enterprise_hook('close_meta_frame');
 ui_require_javascript_file ('pandora_alerts');
 ui_include_time_picker();
 ui_require_jquery_file("ui.datepicker-" . get_user_language(), "include/javascript/i18n/");
+ui_require_javascript_file('tiny_mce', 'include/javascript/tiny_mce/');
 ?>
 
 <script type="text/javascript">
@@ -813,13 +841,13 @@ var matches_not = <?php echo "\"" . __("The alert would fire when the value does
 var is = <?php echo "'" . __("The alert would fire when the value is <span id=\"value\"></span>") . "'";?>;
 var is_not = <?php echo "'" . __("The alert would fire when the value is not <span id=\"value\"></span>") . "'";?>;
 var between = <?php echo "'" . __("The alert would fire when the value is between <span id=\"min\"></span> and <span id=\"max\"></span>") . "'";?>;
-var between_not = <?php echo "'" . __("The alert would fire when the value is not between <span id=\"min\"></span> and <span id=\"max\"></span>") . "'";?>;
+var between_not = <?php echo "\"" . __("The alert would fire when the value is not between <span id=\'min\'></span> and <span id=\'max\'></span>") . "\"";?>;
 var under = <?php echo "'" . __("The alert would fire when the value is below <span id=\"min\"></span>") . "'";?>;
 var over = <?php echo "'" . __("The alert would fire when the value is above <span id=\"max\"></span>") . "'";?>;
 var warning = <?php echo "'" . __("The alert would fire when the module is in warning status") . "'";?>;
 var critical = <?php echo "'" . __("The alert would fire when the module is in critical status") . "'";?>;
-var onchange_msg = <?php echo "'" . __("The alert would fire when the module value changes") . "'";?>;
-var onchange_not = <?php echo "'" . __("The alert would fire when the module value does not change") . "'";?>;
+var onchange_msg = <?php echo "\"" . __("The alert would fire when the module value changes") . "\"";?>;
+var onchange_not = <?php echo "\"" . __("The alert would fire when the module value does not change") . "\"";?>;
 var unknown = <?php echo "'" . __("The alert would fire when the module is in unknown status") . "'";?>;
 var error_message_min_max_zero = <?php echo "'" . __("The alert template cannot have the same value for min and max thresholds.") . "'";?>;
 
@@ -1069,6 +1097,24 @@ elseif ($step == 3) {
 			$("#template-label_fields-2, #template-field1-2, #template-field2-2, #template-field3-2, #template-field4-2, #template-field5-2, #template-field6-2, #template-field7-2, #template-field8-2, #template-field9-2, #template-field10-2").hide ();
 		}
 	});
+
+	tinyMCE.init({
+		selector: 'textarea.tiny-mce-editor',
+		theme : "advanced",
+		plugins : "preview, print, table, searchreplace, nonbreaking, xhtmlxtras, noneditable",
+		theme_advanced_buttons1 : "bold,italic,underline,|,justifyleft,justifycenter,justifyright,justifyfull,|,formatselect,fontselect,fontsize,select",
+		theme_advanced_buttons2 : "search,replace,|,bullist,numlist,|,undo,redo,|,link,unlink,image,|,cleanup,code,preview,|,forecolor,backcolor",
+		theme_advanced_buttons3 : "",
+		theme_advanced_toolbar_location : "top",
+		theme_advanced_toolbar_align : "left",
+		theme_advanced_resizing : true,
+		theme_advanced_statusbar_location : "bottom",
+		force_p_newlines : false,
+		forced_root_block : '',
+		inline_styles : true,
+		valid_children : "+body[style]",
+		element_format : "html"
+	});
 <?php
 }
 ?>