Fix: pending changes block not shown when email disabled. Move more help text inline.

12 files changed, 92 insertions, 309 deletions

diff --git a/modules_v3/charts/help_text.php b/modules_v3/charts/help_text.php
deleted file mode 100644
index ae9b6a03d8..0000000000
--- a/modules_v3/charts/help_text.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-// Module help text.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-switch ($help) {
-case 'index_charts':
-	$title = WT_I18N::translate('Charts');
-	$text = WT_I18N::translate('This block allows a pedigree, descendancy, or hourglass chart to appear on your “My page” or the “Home page”.  Because of space limitations, the charts should be placed only on the left side of the page.<br><br>When this block appears on the “Home page”, the root individual and the type of chart to be displayed are determined by the administrator.  When this block appears on the user’s “My page”, these options are determined by the user.<br><br>The behavior of these charts is identical to their behavior when they are called up from the menus.  Click on the box of an individual to see more details about them.');
-	break;
-}
diff --git a/modules_v3/charts/module.php b/modules_v3/charts/module.php
index ed150141fa..1ba0e36577 100644
--- a/modules_v3/charts/module.php
+++ b/modules_v3/charts/module.php
@@ -195,16 +195,23 @@ class charts_WT_Module extends WT_Module implements WT_Module_Block {
 			->addExternalJavascript(WT_STATIC_URL . 'js/autocomplete.js')
 			->addInlineJavascript('autocomplete();');
 	?>
-		<tr><td class="descriptionbox wrap width33"><?php echo WT_I18N::translate('Chart type'); ?></td>
-		<td class="optionbox">
-			<?php echo select_edit_control('type',
-			array(
-				'pedigree'    => WT_I18N::translate('Pedigree'),
-				'descendants' => WT_I18N::translate('Descendants'),
-				'hourglass'   => WT_I18N::translate('Hourglass chart'),
-				'treenav'     => WT_I18N::translate('Interactive tree')),
-			null, $type); ?>
-		</td></tr>
+		<tr>
+			<td colspan="2">
+				<?php echo WT_I18N::translate('This block allows a pedigree, descendancy, or hourglass chart to appear on your “My page” or the “Home page”.  Because of space limitations, the charts should be placed only on the left side of the page.<br><br>When this block appears on the “Home page”, the root individual and the type of chart to be displayed are determined by the administrator.  When this block appears on the user’s “My page”, these options are determined by the user.<br><br>The behavior of these charts is identical to their behavior when they are called up from the menus.  Click on the box of an individual to see more details about them.'); ?>
+			</td>
+		</tr>
+		<tr>
+			<td class="descriptionbox wrap width33"><?php echo WT_I18N::translate('Chart type'); ?></td>
+			<td class="optionbox">
+				<?php echo select_edit_control('type',
+				array(
+					'pedigree'    => WT_I18N::translate('Pedigree'),
+					'descendants' => WT_I18N::translate('Descendants'),
+					'hourglass'   => WT_I18N::translate('Hourglass chart'),
+					'treenav'     => WT_I18N::translate('Interactive tree')),
+				null, $type); ?>
+			</td>
+		</tr>
 		<tr>
 			<td class="descriptionbox wrap width33"><?php echo WT_I18N::translate('Show details'); ?></td>
 		<td class="optionbox">
diff --git a/modules_v3/clippings/help_text.php b/modules_v3/clippings/help_text.php
deleted file mode 100644
index dd07257290..0000000000
--- a/modules_v3/clippings/help_text.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-// Module help text.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-switch ($help) {
-case 'add_by_id':
-	$title = WT_I18N::translate('Add by ID');
-	$text = WT_I18N::translate('This input box lets you enter an individual’s ID number so he can be added to the clippings cart.  Once added you’ll be offered options to link that individual’s relations to your clippings cart.<br><br>If you do not know an individual’s ID number, you can perform a search by name by pressing the individual icon next to the “Add” button.');
-	break;
-
-case 'empty_cart':
-	$title = WT_I18N::translate('Empty the clippings cart');
-	$text = WT_I18N::translate('When you click this link your clippings cart will be totally emptied.<br><br>If you don’t want to remove all individuals, families, etc. from the clippings cart, you can remove items individually by clicking the <b>Remove</b> link in the name boxes.  There is <u>no</u> confirmation dialog when you click either of these links;  the requested deletion takes place immediately.');
-	break;
-}
diff --git a/modules_v3/clippings/module.php b/modules_v3/clippings/module.php
index 04eb35682c..ce204e7e41 100644
--- a/modules_v3/clippings/module.php
+++ b/modules_v3/clippings/module.php
@@ -143,7 +143,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 					<table>
 					<tr>
 						<td colspan="2" class="topbottombar" style="text-align:center; ">
-							<?php echo WT_I18N::translate('Enter an individual, family, or source ID'), help_link('add_by_id', $this->getName()); ?>
+							<?php echo WT_I18N::translate('Enter an individual, family, or source ID'); ?>
 						</td>
 					</tr>
 					<tr>
@@ -226,7 +226,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 					<table>
 					<tr>
 						<td colspan="2" class="topbottombar" style="text-align:center; ">
-							<?php echo WT_I18N::translate('Enter an individual, family, or source ID'), help_link('add_by_id', $this->getName()); ?>
+							<?php echo WT_I18N::translate('Enter an individual, family, or source ID'); ?>
 						</td>
 					</tr>
 					<tr>
@@ -247,7 +247,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 
 
 				<?php } ?>
-				<br><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=empty"><?php echo WT_I18N::translate('Empty the clippings cart'); ?></a><?php echo help_link('empty_cart', $this->getName()); ?>
+				<br><a href="module.php?mod=clippings&amp;mod_action=index&amp;action=empty"><?php echo WT_I18N::translate('Empty the clippings cart'); ?></a>
 				</td></tr>
 
 				<tr><td class="topbottombar"><h2><?php echo WT_I18N::translate('Family tree clippings cart'); ?></h2></td></tr>
@@ -460,7 +460,7 @@ class clippings_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module
 			$out .=
 				'<br><a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;sb_action=clippings&amp;empty=true&amp;pid=' . $pid . '" class="remove_cart">' .
 				WT_I18N::translate('Empty the clippings cart') .
-				'</a>' . help_link('empty_cart', $this->getName()) .
+				'</a>' .
 				'<br>' .
 				'<a href="module.php?mod=' . $this->getName() . '&amp;mod_action=ajax&amp;sb_action=clippings&amp;download=true&amp;pid=' . $pid . '" class="add_cart">' .
 				WT_I18N::translate('Download') .
diff --git a/modules_v3/html/help_text.php b/modules_v3/html/help_text.php
deleted file mode 100644
index b43157861f..0000000000
--- a/modules_v3/html/help_text.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-// Help text for the HTML block.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-switch ($help) {
-case 'block_html_content':
-	$title = WT_I18N::translate('Content');
-	$text = WT_I18N::translate('As well as using the toolbar to apply HTML formatting, you can insert database fields which are updated automatically.  These special fields are marked with <b>#</b> characters.  For example <b>#totalFamilies#</b> will be replaced with the actual number of families in the database.  Advanced users may wish to apply CSS classes to their text, so that the formatting matches the currently selected theme.');
-	break;
-
-case 'block_html_template':
-	$title = WT_I18N::translate('Templates');
-	$text = WT_I18N::translate('To assist you in getting started with this block, we have created several standard templates.  When you select one of these templates, the text area will contain a copy that you can then alter to suit your site’s requirements.');
-	break;
-}
diff --git a/modules_v3/html/module.php b/modules_v3/html/module.php
index 2177b0c0e7..8b86905c1c 100644
--- a/modules_v3/html/module.php
+++ b/modules_v3/html/module.php
@@ -265,8 +265,7 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		// templates
 		echo '<tr><td class="descriptionbox wrap">',
 			WT_I18N::translate('Templates'),
-			help_link('block_html_template', $this->getName()),
-			'</td><td class="optionbox">';
+			'</td><td class="optionbox wrap">';
 		// The CK editor needs lots of help to load/save data :-(
 		if (array_key_exists('ckeditor', WT_Module::getActiveModules())) {
 			$ckeditor_onchange = 'CKEDITOR.instances.html.setData(document.block.html.value);';
@@ -278,7 +277,11 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 		foreach ($templates as $title=>$template) {
 			echo '<option value="', WT_Filter::escapeHtml($template), '">', $title, '</option>';
 		}
-		echo '</select></td></tr>';
+		echo '</select>';
+		if (!$html) {
+			echo '<p>', WT_I18N::translate('To assist you in getting started with this block, we have created several standard templates.  When you select one of these templates, the text area will contain a copy that you can then alter to suit your site’s requirements.'), '</p>';
+		}
+		echo '</td></tr>';
 
 		if (count(WT_Tree::getAll()) > 1) {
 			if ($gedcom == '__current__') {$sel_current = 'selected'; } else {$sel_current = ''; }
@@ -293,13 +296,17 @@ class html_WT_Module extends WT_Module implements WT_Module_Block {
 				if ($tree->tree_name == $gedcom) {$sel = 'selected'; } else {$sel = ''; }
 				echo '<option value="', $tree->tree_name, '" ', $sel, ' dir="auto">', $tree->tree_title_html, '</option>';
 			}
-			echo '</select></td></tr>';
+			echo '</select>';
+			echo '</td></tr>';
 		}
 
 		// html
 		echo '<tr><td colspan="2" class="descriptionbox">',
-			WT_I18N::translate('Content'),
-			help_link('block_html_content', $this->getName()),
+			WT_I18N::translate('Content');
+		if (!$html) {
+			echo '<p>', WT_I18N::translate('As well as using the toolbar to apply HTML formatting, you can insert database fields which are updated automatically.  These special fields are marked with <b>#</b> characters.  For example <b>#totalFamilies#</b> will be replaced with the actual number of families in the database.  Advanced users may wish to apply CSS classes to their text, so that the formatting matches the currently selected theme.'), '</p>';
+		}
+		echo
 			'</td></tr><tr>',
 			'<td colspan="2" class="optionbox">';
 		echo '<textarea name="html" class="html-edit" rows="10" style="width:98%;">', WT_Filter::escapeHtml($html), '</textarea>';
diff --git a/modules_v3/logged_in/help_text.php b/modules_v3/logged_in/help_text.php
deleted file mode 100644
index 55e78027c0..0000000000
--- a/modules_v3/logged_in/help_text.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-// Module help text.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-switch ($help) {
-}
diff --git a/modules_v3/review_changes/help_text.php b/modules_v3/review_changes/help_text.php
deleted file mode 100644
index f2ed645c71..0000000000
--- a/modules_v3/review_changes/help_text.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-// Module help text.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-switch ($help) {
-case 'review_changes':
-	$title = WT_I18N::translate('Pending Changes block');
-	$text = WT_I18N::translate('This block will show editors a list of records with pending changes that need to be approved by a moderator.  It also generates daily emails to moderators whenever pending changes exist.');
-
-	// TODO: Other options of this block
-
-	$text .= '</li></ul>';
-	break;
-}
-
diff --git a/modules_v3/review_changes/module.php b/modules_v3/review_changes/module.php
index 42399a56d0..3c414d7150 100644
--- a/modules_v3/review_changes/module.php
+++ b/modules_v3/review_changes/module.php
@@ -84,49 +84,49 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 				}
 				WT_Site::setPreference('LAST_CHANGE_EMAIL', WT_TIMESTAMP);
 			}
-			if (WT_USER_CAN_EDIT) {
-				$id = $this->getName() . $block_id;
-				$class = $this->getName() . '_block';
-				if ($ctype === 'gedcom' && WT_USER_GEDCOM_ADMIN || $ctype === 'user' && Auth::check()) {
-					$title = '<i class="icon-admin" title="' . WT_I18N::translate('Configure') . '" onclick="modalDialog(\'block_edit.php?block_id=' . $block_id . '\', \'' . $this->getTitle() . '\');"></i>';
-				} else {
-					$title = '';
-				}
-				$title .= $this->getTitle() . help_link('review_changes', $this->getName());
+		}
+		if (WT_USER_CAN_EDIT) {
+			$id = $this->getName() . $block_id;
+			$class = $this->getName() . '_block';
+			if ($ctype === 'gedcom' && WT_USER_GEDCOM_ADMIN || $ctype === 'user' && Auth::check()) {
+				$title = '<i class="icon-admin" title="' . WT_I18N::translate('Configure') . '" onclick="modalDialog(\'block_edit.php?block_id=' . $block_id . '\', \'' . $this->getTitle() . '\');"></i>';
+			} else {
+				$title = '';
+			}
+			$title .= $this->getTitle();
 
-				$content = '';
-				if (WT_USER_CAN_ACCEPT) {
-					$content .= "<a href=\"#\" onclick=\"window.open('edit_changes.php','_blank', chan_window_specs); return false;\">" . WT_I18N::translate('There are pending changes for you to moderate.') . "</a><br>";
-				}
-				if ($sendmail == "yes") {
-					$content .= WT_I18N::translate('Last email reminder was sent ') . format_timestamp(WT_Site::getPreference('LAST_CHANGE_EMAIL')) . "<br>";
-					$content .= WT_I18N::translate('Next email reminder will be sent after ') . format_timestamp(WT_Site::getPreference('LAST_CHANGE_EMAIL') + (60 * 60 * 24 * $days)) . "<br><br>";
-				}
-				$changes = WT_DB::prepare(
-					"SELECT xref" .
-					" FROM  `##change`" .
-					" WHERE status='pending'" .
-					" AND   gedcom_id=?" .
-					" GROUP BY xref"
-				)->execute(array(WT_GED_ID))->fetchAll();
-				foreach ($changes as $change) {
-					$record = WT_GedcomRecord::getInstance($change->xref);
-					if ($record->canShow()) {
-						$content .= '<b>' . $record->getFullName() . '</b>';
-						$content .= $block ? '<br>' : ' ';
-						$content .= '<a href="' . $record->getHtmlUrl() . '">' . WT_I18N::translate('View the changes') . '</a>';
-						$content .= '<br>';
-					}
+			$content = '';
+			if (WT_USER_CAN_ACCEPT) {
+				$content .= "<a href=\"#\" onclick=\"window.open('edit_changes.php','_blank', chan_window_specs); return false;\">" . WT_I18N::translate('There are pending changes for you to moderate.') . "</a><br>";
+			}
+			if ($sendmail == "yes") {
+				$content .= WT_I18N::translate('Last email reminder was sent ') . format_timestamp(WT_Site::getPreference('LAST_CHANGE_EMAIL')) . "<br>";
+				$content .= WT_I18N::translate('Next email reminder will be sent after ') . format_timestamp(WT_Site::getPreference('LAST_CHANGE_EMAIL') + (60 * 60 * 24 * $days)) . "<br><br>";
+			}
+			$changes = WT_DB::prepare(
+				"SELECT xref" .
+				" FROM  `##change`" .
+				" WHERE status='pending'" .
+				" AND   gedcom_id=?" .
+				" GROUP BY xref"
+			)->execute(array(WT_GED_ID))->fetchAll();
+			foreach ($changes as $change) {
+				$record = WT_GedcomRecord::getInstance($change->xref);
+				if ($record->canShow()) {
+					$content .= '<b>' . $record->getFullName() . '</b>';
+					$content .= $block ? '<br>' : ' ';
+					$content .= '<a href="' . $record->getHtmlUrl() . '">' . WT_I18N::translate('View the changes') . '</a>';
+					$content .= '<br>';
 				}
+			}
 
-				if ($template) {
-					if ($block) {
-						$class .= ' small_inner_block';
-					}
-					return Theme::theme()->formatBlock($id, $title, $class, $content);
-				} else {
-					return $content;
+			if ($template) {
+				if ($block) {
+					$class .= ' small_inner_block';
 				}
+				return Theme::theme()->formatBlock($id, $title, $class, $content);
+			} else {
+				return $content;
 			}
 		}
 	}
@@ -160,6 +160,14 @@ class review_changes_WT_Module extends WT_Module implements WT_Module_Block {
 		$days     = get_block_setting($block_id, 'days', '1');
 		$block    = get_block_setting($block_id, 'block', '1');
 
+	?>
+	<tr>
+		<td colspan="2">
+			<?php echo WT_I18N::translate('This block will show editors a list of records with pending changes that need to be approved by a moderator.  It also generates daily emails to moderators whenever pending changes exist.'); ?>
+		</td>
+	</tr>
+
+	<?php
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Send out reminder emails?');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/todo/help_text.php b/modules_v3/todo/help_text.php
deleted file mode 100644
index 75143ed770..0000000000
--- a/modules_v3/todo/help_text.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-// Module help text.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-switch ($help) {
-case 'todo':
-	$title = WT_I18N::translate('Research tasks');
-	$text = WT_I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research.  You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.') .
-		'</p><p class="ui-state-highlight">' .
-		WT_I18N::translate('To create new research tasks, you must first add “research task” to the list of facts and events in the family tree’s preferences.') .
-		'</p><p class="ui-state-highlight">' .
-		WT_I18N::translate('Research tasks are stored using the custom GEDCOM tag “_TODO”.  Other genealogy applications may not recognize this tag.') .
-		'</p>';
-	break;
-}
diff --git a/modules_v3/todo/module.php b/modules_v3/todo/module.php
index 413514afe8..111f3f7c6c 100644
--- a/modules_v3/todo/module.php
+++ b/modules_v3/todo/module.php
@@ -61,7 +61,7 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 		} else {
 			$title = '';
 		}
-		$title .= $this->getTitle() . help_link('todo', $this->getName());
+		$title .= $this->getTitle();
 
 		$table_id = Uuid::uuid4(); // create a unique ID
 
@@ -171,6 +171,16 @@ class todo_WT_Module extends WT_Module implements WT_Module_Block {
 		$show_future     = get_block_setting($block_id, 'show_future', '1');
 		$block           = get_block_setting($block_id, 'block', '1');
 
+		?>
+		<tr>
+			<td colspan="2">
+				<?php echo WT_I18N::translate('Research tasks are special events, added to individuals in your family tree, which identify the need for further research.  You can use them as a reminder to check facts against more reliable sources, to obtain documents or photographs, to resolve conflicting information, etc.'); ?>
+				<?php echo WT_I18N::translate('To create new research tasks, you must first add “research task” to the list of facts and events in the family tree’s preferences.'); ?>
+				<?php echo WT_I18N::translate('Research tasks are stored using the custom GEDCOM tag “_TODO”.  Other genealogy applications may not recognize this tag.'); ?>
+			</td>
+		</tr>
+		<?php
+
 		echo '<tr><td class="descriptionbox wrap width33">';
 		echo WT_I18N::translate('Show research tasks that are assigned to other users');
 		echo '</td><td class="optionbox">';
diff --git a/modules_v3/yahrzeit/help_text.php b/modules_v3/yahrzeit/help_text.php
deleted file mode 100644
index 78f354dac0..0000000000
--- a/modules_v3/yahrzeit/help_text.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-// Module help text.
-//
-// This file is included from the application help_text.php script.
-// It simply needs to set $title and $text for the help topic $help_topic
-//
-// webtrees: Web based Family History software
-// Copyright (C) 2014 webtrees development team.
-//
-// This program is free software; you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-if (!defined('WT_WEBTREES') || !defined('WT_SCRIPT_NAME') || WT_SCRIPT_NAME != 'help_text.php') {
-	header('HTTP/1.0 403 Forbidden');
-	exit;
-}
-
-switch ($help) {
-}