diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Module/CensusAssistantModule.php | 18 | ||||
| -rw-r--r-- | app/Module/ClippingsCartModule.php | 2 | ||||
| -rw-r--r-- | app/Module/FamilyTreeNewsModule.php | 1 | ||||
| -rw-r--r-- | app/Module/FrequentlyAskedQuestionsModule.php | 9 |
4 files changed, 15 insertions, 15 deletions
diff --git a/app/Module/CensusAssistantModule.php b/app/Module/CensusAssistantModule.php index 942f77ec03..e2e9cc082a 100644 --- a/app/Module/CensusAssistantModule.php +++ b/app/Module/CensusAssistantModule.php @@ -417,7 +417,7 @@ class CensusAssistantModule extends AbstractModule { * @return string */ public static function censusNavigatorFamily(CensusInterface $census, Family $family, Individual $head) { - $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Click to choose individual as head of family.') . '"></i>'; + $headImg2 = '<i class="icon-button_head" title="' . I18N::translate('Head of household') . '"></i>'; foreach ($family->getSpouses() as $spouse) { $menu = new Menu(Functions::getCloseRelationshipName($head, $spouse)); @@ -446,9 +446,11 @@ class CensusAssistantModule extends AbstractModule { </a> </td> <td class="facts_value"> - <a href="edit_interface.php?action=addnewnote_assisted&noteid=newnote&xref=<?php echo $spouse->getXref(); ?>&gedcom=<?php echo $spouse->getTree()->getNameUrl(); ?>&census=<?php echo get_class($census); ?>"> - <?php echo $headImg2; ?> - </a> + <?php if ($head !== $spouse): ?> + <a href="edit_interface.php?action=addnewnote_assisted&noteid=newnote&xref=<?php echo $spouse->getXref(); ?>&gedcom=<?php echo $spouse->getTree()->getNameUrl(); ?>&census=<?php echo get_class($census); ?>"> + <?php echo $headImg2; ?> + </a> + <?php endif; ?> </td> </tr> <?php @@ -494,9 +496,11 @@ class CensusAssistantModule extends AbstractModule { </a> </td> <td class="facts_value"> - <a href="edit_interface.php?action=addnewnote_assisted&noteid=newnote&xref=<?php echo $child->getXref(); ?>&gedcom=<?php echo $child->getTree()->getNameUrl(); ?>&census=<?php echo get_class($census); ?>"> - <?php echo $headImg2; ?> - </a> + <?php if ($head !== $child): ?> + <a href="edit_interface.php?action=addnewnote_assisted&noteid=newnote&xref=<?php echo $child->getXref(); ?>&gedcom=<?php echo $child->getTree()->getNameUrl(); ?>&census=<?php echo get_class($census); ?>"> + <?php echo $headImg2; ?> + </a> + <?php endif; ?> </td> </tr> <?php diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php index ad8a20dbc3..6a870724b9 100644 --- a/app/Module/ClippingsCartModule.php +++ b/app/Module/ClippingsCartModule.php @@ -308,7 +308,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface, if (!$cart[$WT_TREE->getTreeId()]) { if ($clip_ctrl->action != 'add') { - echo I18N::translate('The clippings cart allows you to take extracts (“clippings”) from this family tree and bundle them up into a single file for downloading and subsequent importing into your own genealogy program. The downloadable file is recorded in GEDCOM format.<br><ul><li>How to take clippings?<br>This is really simple. Whenever you see a clickable name (individual, family, or source) you can go to the Details page of that name. There you will see the <b>Add to clippings cart</b> option. When you click that link you will be offered several options to download.</li><li>How to download?<br>Once you have items in your cart, you can download them just by clicking the “Download” link. Follow the instructions and links.</li></ul>'); + echo I18N::translate('The clippings cart allows you to take extracts from this family tree and download them as a GEDCOM file.'); ?> <form method="get" name="addin" action="module.php"> <input type="hidden" name="mod" value="clippings"> diff --git a/app/Module/FamilyTreeNewsModule.php b/app/Module/FamilyTreeNewsModule.php index 646cc946cb..5b86a6d984 100644 --- a/app/Module/FamilyTreeNewsModule.php +++ b/app/Module/FamilyTreeNewsModule.php @@ -153,7 +153,6 @@ class FamilyTreeNewsModule extends AbstractModule implements ModuleBlockInterfac $content .= ' | '; } $content .= '<a href="index.php?gedcom_news_archive=yes&ctype=' . $ctype . '&ged=' . $WT_TREE->getNameHtml() . '">' . I18N::translate('View the archive') . "</a>"; - $content .= FunctionsPrint::helpLink('gedcom_news_archive') . '<br>'; } if ($template) { diff --git a/app/Module/FrequentlyAskedQuestionsModule.php b/app/Module/FrequentlyAskedQuestionsModule.php index 6d54291fdf..e31de2716e 100644 --- a/app/Module/FrequentlyAskedQuestionsModule.php +++ b/app/Module/FrequentlyAskedQuestionsModule.php @@ -360,14 +360,11 @@ class FrequentlyAskedQuestionsModule extends AbstractModule implements ModuleMen 'tree_id_2' => $WT_TREE->getTreeId(), ))->fetchAll(); - // Define your colors for the alternating rows - echo '<h2 class="center">', I18N::translate('Frequently asked questions'), '</h2>'; - // Instructions - echo '<div class="faq_italic">', I18N::translate('Click on a title to go straight to it, or scroll down to read them all.'); + echo '<h2 class="center">', I18N::translate('Frequently asked questions'); if (Auth::isManager($WT_TREE)) { - echo '<div class="faq_edit"><a href="module.php?mod=', $this->getName(), '&mod_action=admin_config">', I18N::translate('Click here to add, edit, or delete'), '</a></div>'; + echo ' — <a href="module.php?mod=', $this->getName(), '&mod_action=admin_config">', I18N::translate('edit'), '</a>'; } - echo '</div>'; + echo '</h2>'; $row_count = 0; echo '<table class="faq">'; // List of titles |