Breadcrumbs on admin pages

4 files changed, 65 insertions, 20 deletions

diff --git a/modules_v3/faq/help_text.php b/modules_v3/faq/help_text.php
index 217e695b35..9f629a2188 100644
--- a/modules_v3/faq/help_text.php
+++ b/modules_v3/faq/help_text.php
@@ -45,16 +45,6 @@ case 'add_faq_visibility':
 	$text = WT_I18N::translate('A FAQ item can be displayed on just one of the family trees, or on all the family trees.');
 	break;
 
-case 'delete_faq_item':
-	$title = WT_I18N::translate('Delete FAQ item');
-	$text = WT_I18N::translate('This option will let you delete an item from the FAQ page');
-	break;
-
-case 'edit_faq_item':
-	$title = WT_I18N::translate('Edit FAQ item');
-	$text = WT_I18N::translate('This option will let you edit an item on the FAQ page.');
-	break;
-
 case 'movedown_faq_item':
 	$title = WT_I18N::translate('Move FAQ item down');
 	$text = WT_I18N::translate('This option will let you move an item downwards on the FAQ page.<br><br>Each time you use this option, the FAQ position number of this item is increased by one.  You can achieve the same effect by editing the item in question and changing the FAQ position field.  When more than one FAQ item has the same position number, only one of these items will be visible.');
diff --git a/modules_v3/faq/module.php b/modules_v3/faq/module.php
index b111994df5..5787bb7b8b 100644
--- a/modules_v3/faq/module.php
+++ b/modules_v3/faq/module.php
@@ -130,8 +130,16 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 				ckeditor_WT_Module::enableEditor($controller);
 			}
 
-			// "Help for this page" link
-			echo '<div id="page_help">', help_link('add_faq_item', $this->getName()), '</div>';
+			?>
+			<ol class="breadcrumb small">
+				<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
+				<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
+				<li><a href="module.php?mod=faq&mod_action=admin_config"><?php echo WT_I18N::translate('Frequently asked questions'); ?></a></li>
+				<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+			</ol>
+			<h2><?php echo $controller->getPageTitle(); ?></h2>
+			<?php
+
 			echo '<form name="faq" method="post" action="module.php?mod=', $this->getName(), '&amp;mod_action=admin_edit">';
 			echo WT_Filter::getCsrf();
 			echo '<input type="hidden" name="save" value="1">';
@@ -245,7 +253,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 		global $controller;
 		$controller = new WT_Controller_Page;
 		$controller
-			->setPageTitle($this->getTitle())
+			->setPageTitle(WT_I18N::translate('Frequently asked questions'))
 			->pageHeader();
 
 		$faqs = WT_DB::prepare(
@@ -262,6 +270,15 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			" ORDER BY block_order"
 		)->execute(array($this->getName(), WT_GED_ID, WT_GED_ID))->fetchAll();
 
+		?>
+		<ol class="breadcrumb small">
+			<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
+			<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
+			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+		</ol>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
+		<?php
+
 		// Define your colors for the alternating rows
 		echo '<h2 class="center">', WT_I18N::translate('Frequently asked questions'), '</h2>';
 		// Instructions
@@ -306,7 +323,7 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 
 		$controller = new WT_Controller_Page;
 		$controller
-			->setPageTitle($this->getTitle())
+			->setPageTitle(WT_I18N::translate('Frequently asked questions'))
 			->pageHeader();
 
 		$faqs = WT_DB::prepare(
@@ -329,8 +346,21 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			"SELECT MAX(block_order) FROM `##block` WHERE module_name=?"
 		)->execute(array($this->getName()))->fetchOne();
 
+		?>
+		<ol class="breadcrumb small">
+			<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
+			<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
+			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+		</ol>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
+		<p>
+			<?php echo WT_I18N::translate('FAQs are lists of questions and answers, which allow you to explain the site’s rules, policies, and procedures to your visitors.  Questions are typically concerned with privacy, copyright, user-accounts, unsuitable content, requirement for source-citations, etc.'); ?>
+			<?php echo WT_I18N::translate('You may use HTML to format the answer and to add links to other websites.'); ?>
+		</p>
+		<?php
+
 		echo
-			'<p><form method="get" action="', WT_SCRIPT_NAME, '">',
+			'<p><form>',
 			WT_I18N::translate('Family tree'), ' ',
 			'<input type="hidden" name="mod", value="', $this->getName(), '">',
 			'<input type="hidden" name="mod_action", value="admin_config">',
@@ -339,7 +369,6 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 			'</form></p>';
 
 		echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_edit">', WT_I18N::translate('Add an FAQ item'), '</a>';
-		echo help_link('add_faq_item', $this->getName());
 
 		echo '<table id="faq_edit">';
 		if (empty($faqs)) {
@@ -373,10 +402,8 @@ class faq_WT_Module extends WT_Module implements WT_Module_Menu, WT_Module_Confi
 				}
 				echo '</td><td>';
 				echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_edit&amp;block_id=', $faq->block_id, '">', WT_I18N::translate('Edit'), '</a>';
-				echo help_link('edit_faq_item', $this->getName());
 				echo '</td><td>';
 				echo '<a href="module.php?mod=', $this->getName(), '&amp;mod_action=admin_delete&amp;block_id=', $faq->block_id, '" onclick="return confirm(\'', WT_I18N::translate('Are you sure you want to delete this FAQ entry?'), '\');">', WT_I18N::translate('Delete'), '</a>';
-				echo help_link('delete_faq_item', $this->getName());
 				echo '</td></tr>';
 				// NOTE: Print the title text of the current item
 				echo '<tr><td colspan="5">';
diff --git a/modules_v3/sitemap/module.php b/modules_v3/sitemap/module.php
index 1c09c1f0ef..619fa1d585 100644
--- a/modules_v3/sitemap/module.php
+++ b/modules_v3/sitemap/module.php
@@ -275,8 +275,17 @@ class sitemap_WT_Module extends WT_Module implements WT_Module_Config {
 		}
 
 		$include_any = false;
+
+		?>
+		<ol class="breadcrumb small">
+			<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
+			<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
+			<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+		</ol>
+		<h2><?php echo $controller->getPageTitle(); ?></h2>
+		<?php
+
 		echo
-		'<h3>', $this->getTitle(), '</h3>',
 		'<p>',
 			/* I18N: The www.sitemaps.org site is translated into many languages (e.g. http://www.sitemaps.org/fr/) - choose an appropriate URL. */
 			WT_I18N::translate('Sitemaps are a way for webmasters to tell search engines about the pages on a website that are available for crawling.  All major search engines support sitemaps.  For more information, see <a href="http://www.sitemaps.org/">www.sitemaps.org</a>.') .
diff --git a/modules_v3/stories/module.php b/modules_v3/stories/module.php
index 4abb37b0d4..c7f778f7ab 100644
--- a/modules_v3/stories/module.php
+++ b/modules_v3/stories/module.php
@@ -197,6 +197,16 @@ class stories_WT_Module extends WT_Module implements WT_Module_Tab, WT_Module_Co
 					ckeditor_WT_Module::enableEditor($controller);
 				}
 
+				?>
+				<ol class="breadcrumb small">
+					<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
+					<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
+					<li><a href="module.php?mod=faq&mod_action=admin_config"><?php echo $this->getTitle(); ?></a></li>
+					<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+				</ol>
+				<h2><?php echo $controller->getPageTitle(); ?></h2>
+				<?php
+
 				echo '<form name="story" method="post" action="module.php?mod=', $this->getName(), '&amp;mod_action=admin_edit">';
 				echo WT_Filter::getCsrf();
 				echo '<input type="hidden" name="save" value="1">';
@@ -304,8 +314,17 @@ class stories_WT_Module extends WT_Module implements WT_Module_Tab, WT_Module_Co
 				" ORDER BY xref"
 			)->execute(array($this->getName(), WT_GED_ID))->fetchAll();
 
+			?>
+			<ol class="breadcrumb small">
+				<li><a href="admin.php"><?php echo WT_I18N::translate('Administration'); ?></a></li>
+				<li><a href="admin_modules.php"><?php echo WT_I18N::translate('Module administration'); ?></a></li>
+				<li class="active"><?php echo $controller->getPageTitle(); ?></li>
+			</ol>
+			<h2><?php echo $controller->getPageTitle(); ?></h2>
+			<?php
+
 			echo
-				'<form method="get" action="', WT_SCRIPT_NAME, '">',
+				'<form>',
 				WT_I18N::translate('Family tree'), ' ',
 				'<input type="hidden" name="mod" value="', $this->getName(), '">',
 				'<input type="hidden" name="mod_action" value="admin_config">',