Remove help text that doesn't really help ...

4 files changed, 10 insertions, 35 deletions

diff --git a/modules/todays_events/help_text.php b/modules/todays_events/help_text.php
index 47db285342..b289501282 100644
--- a/modules/todays_events/help_text.php
+++ b/modules/todays_events/help_text.php
@@ -31,14 +31,5 @@ if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='he
 }
 
 switch ($help) {
-case 'recent_changes':
-	$title=WT_I18N::translate('On This Day');
-	$text=WT_I18N::translate('The On This Day, in Your History... block shows anniversaries of events for today.  You can configure the amount of detail shown.');
-	$text.='<ul><li>';
-
-	// TODO: Other options of this block
-
-	$text.='</li></ul>';
-	break;
 }
-?>
\ No newline at end of file
+?>
diff --git a/modules/todays_events/module.php b/modules/todays_events/module.php
index c930a2a40c..dd7e942bf2 100644
--- a/modules/todays_events/module.php
+++ b/modules/todays_events/module.php
@@ -69,7 +69,7 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 			$title .= "<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
 			$title .= "<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>";
 		}
-		$title.=WT_I18N::translate('On This Day ...').help_link('index_onthisday');
+		$title.=WT_I18N::translate('On This Day ...');
 
 		$content = "";
 		switch ($infoStyle) {
@@ -141,16 +141,16 @@ class todays_events_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo WT_I18N::translate('Presentation style'), help_link('style');
+		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
-		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('List'), 'table'=>WT_I18N::translate('Table')), null, $infoStyle, '');
+		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('list'), 'table'=>WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
 		$sortStyle=get_block_setting($block_id, 'sortStyle',  'alpha');
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo WT_I18N::translate('Sort Style'), help_link('sort_style');
+		echo WT_I18N::translate('Sort Style');
 		echo '</td><td class="optionbox">';
-		echo select_edit_control('sortStyle', array('alpha'=>WT_I18N::translate('Alphabetically'), 'anniv'=>WT_I18N::translate('By Anniversary')), null, $sortStyle, '');
+		echo select_edit_control('sortStyle', array('alpha'=>WT_I18N::translate('alphabetically'), 'anniv'=>WT_I18N::translate('By Anniversary')), null, $sortStyle, '');
 		echo '</td></tr>';
 
 		$block=get_block_setting($block_id, 'block', true);
diff --git a/modules/upcoming_events/help_text.php b/modules/upcoming_events/help_text.php
index 7c8d175d6d..b289501282 100644
--- a/modules/upcoming_events/help_text.php
+++ b/modules/upcoming_events/help_text.php
@@ -31,21 +31,5 @@ if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME!='he
 }
 
 switch ($help) {
-case 'upcoming_events':
-	$title=WT_I18N::translate('Upcoming events block');
-	$text=WT_I18N::translate('This block shows you anniversaries of events that are coming up in the near future.<br /><br />The administrator determines how far ahead the block will look.  You can further refine the block\'s display of upcoming events through several configuration options.');
-	$text.='<ul><li>';
-	$text.=WT_I18N::translate('Number of days to show: This is the number of days that <b>webtrees</b> should use when searching for events');
-	$text.=' (<i>'.WT_I18N::plural('maximum %d day', 'maximum %d days', 30, 30).'</i>).';
-	$text.='</li><li>';
-	$text.=WT_I18N::translate('Show only events of living people?: Choose to show events of all people, or just those still living.');
-	$text.='</li><li>';
-	$text.=WT_I18N::translate('Show only births, deaths and marriages?: This option lets you eliminate some dated events.  For example, Divorce, Cremation, Graduation, Bar Mitzvah, First Communion, etc. should all be dated. When you select "Yes", only Births, Deaths, and Marriages will be shown. When you select "No", all dated events will be shown.');
-	$text.='</li><li>';
-	$text.=WT_I18N::translate('Presentation style: Either a simple text "List" or a "Table" format.');
-	$text.='</li><li>';
-	$text.=WT_I18N::translate('Sort style: "Alphabetically", or "By Anniversary" showing results in date order with the most recent first.');
-	$text.='</li></ul>';
-	break;
 }
-?>
\ No newline at end of file
+?>
diff --git a/modules/upcoming_events/module.php b/modules/upcoming_events/module.php
index e4c119d238..c50f8e172f 100644
--- a/modules/upcoming_events/module.php
+++ b/modules/upcoming_events/module.php
@@ -69,7 +69,7 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 			$title.="<a href=\"javascript: configure block\" onclick=\"window.open('index_edit.php?action=configure&amp;ctype={$ctype}&amp;block_id={$block_id}', '_blank', 'top=50,left=50,width=600,height=350,scrollbars=1,resizable=1'); return false;\">";
 			$title.="<img class=\"adminicon\" src=\"".$WT_IMAGES["admin"]."\" width=\"15\" height=\"15\" border=\"0\" alt=\"".WT_I18N::translate('Configure')."\" /></a>";
 		}
-		$title.= WT_I18N::translate('Upcoming Events').help_link('upcoming_events', $this->getName());
+		$title.= WT_I18N::translate('Upcoming Events');
 
 		$content = "";
 		switch ($infoStyle) {
@@ -152,14 +152,14 @@ class upcoming_events_WT_Module extends WT_Module implements WT_Module_Block {
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Presentation style');
 		echo '</td><td class="optionbox">';
-		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('List'), 'table'=>WT_I18N::translate('Table')), null, $infoStyle, '');
+		echo select_edit_control('infoStyle', array('list'=>WT_I18N::translate('list'), 'table'=>WT_I18N::translate('table')), null, $infoStyle, '');
 		echo '</td></tr>';
 
 		$sortStyle=get_block_setting($block_id, 'sortStyle',  'alpha');
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Sort Style');
 		echo '</td><td class="optionbox">';
-		echo select_edit_control('sortStyle', array('alpha'=>WT_I18N::translate('Alphabetically'), 'anniv'=>WT_I18N::translate('By Anniversary')), null, $sortStyle, '');
+		echo select_edit_control('sortStyle', array('alpha'=>WT_I18N::translate('alphabetically'), 'anniv'=>WT_I18N::translate('By Anniversary')), null, $sortStyle, '');
 		echo '</td></tr>';
 
 		$block=get_block_setting($block_id, 'block', true);