Changes related to Bug #587347: upcoming events--config

2 files changed, 11 insertions, 2 deletions

diff --git a/modules/yahrzeit/help_text.php b/modules/yahrzeit/help_text.php
index 4e67c6c2f7..f214fd5cfa 100644
--- a/modules/yahrzeit/help_text.php
+++ b/modules/yahrzeit/help_text.php
@@ -34,5 +34,13 @@ switch ($help) {
 case 'yahrzeit':
 	$title=i18n::translate('Yahrzeiten block');
 	$text=i18n::translate('This block shows you Yahrzeiten that are coming up in the near future.<br /><br />Yahrzeiten (singular: Yahrzeit) are anniversaries of a person\'s death.  These anniversaries are observed in the Jewish tradition; they are no longer in common use in other traditions.  «Yahrzeit» can also be spelled «Jahrzeit» or «Yartzeit».<br /><br />The Administrator determines how far ahead the block will look.  You can further refine the block\'s display of upcoming Yahrzeiten through configuration options.');
+	$text.='<ul><li>';
+	$text.=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>'.i18n::plural('maximum %d day', 'maximum %d days', 30, 30).'</i>).';
+	$text.='</li><li>';
+	$text.=i18n::translate('Presentation style: Either a simple text "List"or a "Table" format.');
+	$text.='</li><li>';
+	$text.=i18n::translate('Add a scrollbar when block contents grow: If set to "no" the block will expand vertically to display the full list. If set to "yes" the block will be the height set your theme\'s style sheet, with scroll bars to view long lists  ');
+	$text.='</li></ul>';
 	break;
 }
diff --git a/modules/yahrzeit/module.php b/modules/yahrzeit/module.php
index c941fcd2d3..22f0665172 100644
--- a/modules/yahrzeit/module.php
+++ b/modules/yahrzeit/module.php
@@ -232,14 +232,15 @@ class yahrzeit_WT_Module extends WT_Module implements WT_Module_Block {
 
 		$days=get_block_setting($block_id, 'days', 7);
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo i18n::translate('Number of days to show'), help_link('days_to_show');
+		echo i18n::translate('Number of days to show');
 		echo '</td><td class="optionbox">';
 		echo '<input type="text" name="days" size="2" value="'.$days.'" />';
+		echo ' <i>', i18n::plural('maximum %d day', 'maximum %d days', 30, 30) ,'</i>';
 		echo '</td></tr>';
 
 		$infoStyle=get_block_setting($block_id, 'infoStyle', 'table');
 		echo '<tr><td class="descriptionbox wrap width33">';
-		echo i18n::translate('Presentation style'), help_link('style');
+		echo i18n::translate('Presentation style');
 		echo '</td><td class="optionbox">';
 		echo select_edit_control('infoStyle', array('list'=>i18n::translate('List'), 'table'=>i18n::translate('Table')), null, $infoStyle, '');
 		echo '</td></tr>';