summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/Module/ClippingsCartModule.php20
-rw-r--r--app/Module/GoogleMapsModule.php2
-rw-r--r--app/Stats.php4
-rw-r--r--edit_interface.php26
-rw-r--r--help_text.php10
-rw-r--r--lifespan.php2
6 files changed, 25 insertions, 39 deletions
diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php
index d0cab8d1d6..66dffedca9 100644
--- a/app/Module/ClippingsCartModule.php
+++ b/app/Module/ClippingsCartModule.php
@@ -336,12 +336,12 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
</tr>
<tr>
<td class="descriptionbox width50 wrap">
- <?php echo I18N::translate('Include media (automatically zips files)'), help_link('include_media'); ?>
+ <?php echo I18N::translate('Include media (automatically zips files)'); ?>
</td>
<td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes"></td></tr>
<?php if (Auth::isManager($WT_TREE)) { ?>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'), help_link('apply_privacy'); ?></td>
+ <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'); ?></td>
<td class="optionbox">
<input type="radio" name="privatize_export" value="none" checked> <?php echo I18N::translate('None'); ?><br>
<input type="radio" name="privatize_export" value="gedadmin"> <?php echo I18N::translate('Manager'); ?><br>
@@ -349,17 +349,17 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
<input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
</td></tr>
<?php } elseif (Auth::isMember($WT_TREE)) { ?>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'), help_link('apply_privacy'); ?></td>
+ <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Apply privacy settings'); ?></td>
<td class="optionbox">
<input type="radio" name="privatize_export" value="user" checked> <?php echo I18N::translate('Member'); ?><br>
<input type="radio" name="privatize_export" value="visitor"> <?php echo I18N::translate('Visitor'); ?>
</td></tr>
<?php } ?>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Convert from UTF-8 to ISO-8859-1'), help_link('utf8_ansi'); ?></td>
+ <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Convert from UTF-8 to ISO-8859-1'); ?></td>
<td class="optionbox"><input type="checkbox" name="convert" value="yes"></td></tr>
- <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Add the GEDCOM media path to filenames'), help_link('GEDCOM_MEDIA_PATH'); ?></td>
+ <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Add the GEDCOM media path to filenames'); ?></td>
<td class="optionbox">
<input type="checkbox" name="conv_path" value="<?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?>">
<span dir="auto"><?php echo Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')); ?></span>
@@ -653,13 +653,13 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
<tr><td class="descriptionbox width50 wrap">'. I18N::translate('Zip file(s)') . '</td>
<td class="optionbox"><input type="checkbox" name="Zip" value="yes" checked></td></tr>
- <tr><td class="descriptionbox width50 wrap">'. I18N::translate('Include media (automatically zips files)') . help_link('include_media') . '</td>
+ <tr><td class="descriptionbox width50 wrap">'. I18N::translate('Include media (automatically zips files)') . '</td>
<td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes" checked></td></tr>
';
if (Auth::isManager($WT_TREE)) {
$out .=
- '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . help_link('apply_privacy') . '</td>' .
+ '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' .
'<td class="optionbox">' .
' <input type="radio" name="privatize_export" value="none" checked> ' . I18N::translate('None') . '<br>' .
' <input type="radio" name="privatize_export" value="gedadmin"> ' . I18N::translate('Manager') . '<br>' .
@@ -668,7 +668,7 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
'</td></tr>';
} elseif (Auth::isMember($WT_TREE)) {
$out .=
- '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . help_link('apply_privacy') . '</td>' .
+ '<tr><td class="descriptionbox width50 wrap">' . I18N::translate('Apply privacy settings') . '</td>' .
'<td class="list_value">' .
' <input type="radio" name="privatize_export" value="user" checked> ' . I18N::translate('Member') . '<br>' .
' <input type="radio" name="privatize_export" value="visitor"> ' . I18N::translate('Visitor') .
@@ -676,11 +676,11 @@ class ClippingsCartModule extends AbstractModule implements ModuleMenuInterface,
}
$out .= '
- <tr><td class="descriptionbox width50 wrap">'. I18N::translate('Convert from UTF-8 to ISO-8859-1') . help_link('utf8_ansi') . '</td>
+ <tr><td class="descriptionbox width50 wrap">'. I18N::translate('Convert from UTF-8 to ISO-8859-1') . '</td>
<td class="optionbox"><input type="checkbox" name="convert" value="yes"></td></tr>
<tr>
- <td class="descriptionbox width50 wrap">'. I18N::translate('Add the GEDCOM media path to filenames') . help_link('GEDCOM_MEDIA_PATH') . '</td>
+ <td class="descriptionbox width50 wrap">'. I18N::translate('Add the GEDCOM media path to filenames') . '</td>
<td class="optionbox">
<input type="checkbox" name="conv_path" value="' . Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')) . '">
<span dir="auto">' . Filter::escapeHtml($WT_TREE->getPreference('GEDCOM_MEDIA_PATH')) . '</span></td>
diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index 5feb583223..f65de7b409 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -484,7 +484,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
</tr>
<tr>
<th>
- <?php echo I18N::translate('Display short placenames'), help_link('GM_DISP_SHORT_PLACE', 'googlemap'); ?>
+ <?php echo I18N::translate('Display short placenames'); ?>
</th>
<td>
<?php echo edit_field_yes_no('GM_DISP_SHORT_PLACE', $this->getSetting('GM_DISP_SHORT_PLACE'), 'class="radio-inline"'); ?>
diff --git a/app/Stats.php b/app/Stats.php
index e7fcf321cd..93e6548056 100644
--- a/app/Stats.php
+++ b/app/Stats.php
@@ -140,10 +140,6 @@ class Stats {
if (method_exists($this, $tags[$i])) {
$new_tags[] = "#{$full_tag}#";
$new_values[] = call_user_func_array(array($this, $tags[$i]), array($params));
- } elseif ($tags[$i] == 'help') {
- // re-merge, just in case
- $new_tags[] = "#{$full_tag}#";
- $new_values[] = help_link(implode(':', $params));
}
}
diff --git a/edit_interface.php b/edit_interface.php
index 97228b46a6..75e102824a 100644
--- a/edit_interface.php
+++ b/edit_interface.php
@@ -1014,7 +1014,9 @@ case 'addfamlink':
</td>
<td class="facts_value">
<?php echo edit_field_pedi('PEDI', '', '', $person); ?>
- <?php echo help_link('PEDI'); ?>
+ <p class="small text-muted">
+ <?php echo I18N::translate('A child may have more than one set of parents. The relationship between the child and the parents can be biological, legal, or based on local culture and tradition. If no pedigree is specified, then a biological relationship will be assumed.'); ?>
+ </p>
</td>
</tr>
<?php echo keep_chan($person); ?>
@@ -1227,11 +1229,11 @@ case 'addnewsource':
<tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ABBR'); ?></td>
<td class="optionbox wrap"><input type="text" name="ABBR" id="ABBR" value="" size="40" maxlength="255"> <?php echo print_specialchar_link('ABBR'); ?></td></tr>
<?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "_HEB") !== false) { ?>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'), help_link('_HEB'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'); ?></td>
<td class="optionbox wrap"><input type="text" name="_HEB" id="_HEB" value="" size="60"> <?php echo print_specialchar_link('_HEB'); ?></td></tr>
<?php } ?>
<?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "ROMN") !== false) { ?>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'), help_link('ROMN'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'); ?></td>
<td class="optionbox wrap"><input type="text" name="ROMN" id="ROMN" value="" size="60"> <?php echo print_specialchar_link('ROMN'); ?></td></tr>
<?php } ?>
<tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('AUTH'); ?></td>
@@ -1369,7 +1371,7 @@ case 'addnewnote':
echo '<table class="facts_table">';
echo '<tr>';
echo '<td class="descriptionbox nowrap">';
- echo I18N::translate('Shared note'), help_link('SHARED_NOTE');
+ echo I18N::translate('Shared note');
echo '</td>';
echo '<td class="optionbox wrap"><textarea name="NOTE" id="NOTE" rows="15" cols="87"></textarea>';
echo print_specialchar_link('NOTE');
@@ -1479,7 +1481,7 @@ case 'editnote':
<?php echo Filter::getCsrf(); ?>
<table class="facts_table">
<tr>
- <td class="descriptionbox wrap width25"><?php echo I18N::translate('Shared note'), help_link('SHARED_NOTE'); ?></td>
+ <td class="descriptionbox wrap width25"><?php echo I18N::translate('Shared note'); ?></td>
<td class="optionbox wrap">
<textarea name="NOTE" id="NOTE" rows="15" cols="90"><?php echo Filter::escapeHtml($note->getNote()); ?></textarea>
<br>
@@ -1563,22 +1565,20 @@ case 'addnewrepository':
<tr><td class="descriptionbox wrap width25"><?php echo I18N::translate('Repository name'); ?></td>
<td class="optionbox wrap"><input type="text" name="REPO_NAME" id="REPO_NAME" value="" size="40" maxlength="255"> <?php echo print_specialchar_link('REPO_NAME'); ?></td></tr>
<?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "_HEB") !== false) { ?>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'), help_link('_HEB'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('_HEB'); ?></td>
<td class="optionbox wrap"><input type="text" name="_HEB" id="_HEB" value="" size="40" maxlength="255"> <?php echo print_specialchar_link('_HEB'); ?></td></tr>
<?php } ?>
<?php if (strstr($WT_TREE->getPreference('ADVANCED_NAME_FACTS'), "ROMN") !== false) { ?>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'), help_link('ROMN'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ROMN'); ?></td>
<td class="optionbox wrap"><input type="text" name="ROMN" id="ROMN" value="" size="40" maxlength="255"> <?php echo print_specialchar_link('ROMN'); ?></td></tr>
<?php } ?>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ADDR'), help_link('ADDR'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('ADDR'); ?></td>
<td class="optionbox wrap"><textarea name="ADDR" id="ADDR" rows="5" cols="60"></textarea><?php echo print_specialchar_link('ADDR'); ?> </td></tr>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('PHON'), help_link('PHON'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('PHON'); ?></td>
<td class="optionbox wrap"><input type="text" name="PHON" id="PHON" value="" size="40" maxlength="255"> </td></tr>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('FAX'), help_link('FAX'); ?></td>
- <td class="optionbox wrap"><input type="text" name="FAX" id="FAX" value="" size="40"></td></tr>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('EMAIL'), help_link('EMAIL'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('EMAIL'); ?></td>
<td class="optionbox wrap"><input type="text" name="EMAIL" id="EMAIL" value="" size="40" maxlength="255"></td></tr>
- <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('WWW'), help_link('URL'); ?></td>
+ <tr><td class="descriptionbox wrap width25"><?php echo GedcomTag::getLabel('WWW'); ?></td>
<td class="optionbox wrap"><input type="text" name="WWW" id="WWW" value="" size="40" maxlength="255"> </td></tr>
<?php echo keep_chan(); ?>
</table>
diff --git a/help_text.php b/help_text.php
index 1465bc14d1..7b5a7fd3d8 100644
--- a/help_text.php
+++ b/help_text.php
@@ -279,11 +279,6 @@ case 'PAGE':
$text = I18N::translate('In the citation details field you would enter the page number or other information that might help someone find the information in the source.');
break;
-case 'PEDI':
- $title = GedcomTag::getLabel('PEDI');
- $text = I18N::translate('A child may have more than one set of parents. The relationship between the child and the parents can be biological, legal, or based on local culture and tradition. If no pedigree is specified, then a biological relationship will be assumed.');
- break;
-
case 'PLAC':
$title = GedcomTag::getLabel('PLAC');
$text = I18N::translate('Places should be entered according to the standards for genealogy. In genealogy, places are recorded with the most specific information about the place first and then working up to the least specific place last, using commas to separate the different place levels. The level at which you record the place information should represent the levels of government or church where vital records for that place are kept.<br><br>For example, a place like Salt Lake City would be entered as “Salt Lake City, Salt Lake, Utah, USA”.<br><br>Let’s examine each part of this place. The first part, “Salt Lake City,” is the city or township where the event occurred. In some countries, there may be municipalities or districts inside a city which are important to note. In that case, they should come before the city. The next part, “Salt Lake,” is the county. “Utah” is the state, and “USA” is the country. It is important to note each place because genealogy records are kept by the governments of each level.<br><br>If a level of the place is unknown, you should leave a space between the commas. Suppose, in the example above, you didn’t know the county for Salt Lake City. You should then record it like this: “Salt Lake City, , Utah, USA”. Suppose you only know that an individual was born in Utah. You would enter the information like this: “, , Utah, USA”. <br><br>You can use the <b>Find Place</b> link to help you find places that already exist in the database.');
@@ -380,11 +375,6 @@ case 'google_chart_surname':
$text = I18N::translate('The number of occurrences of the specified name will be shown on the map. If you leave this field empty, the most common surname will be used.');
break;
-case 'include_media':
- $title = I18N::translate('Include media (automatically zips files)');
- $text = I18N::translate('Select this option to include the media files associated with the records in your clippings cart. Choosing this option will automatically zip the files during download.');
- break;
-
case 'pending_changes':
$title = I18N::translate('Pending changes');
$text =
diff --git a/lifespan.php b/lifespan.php
index cfceb8706c..28e485ca7b 100644
--- a/lifespan.php
+++ b/lifespan.php
@@ -132,7 +132,7 @@ $people = count($controller->people);
?>
<div id="lifespan-page">
-<h2><?php echo I18N::translate('Lifespans'), help_link('lifespan_chart'); ?></h2>
+<h2><?php echo I18N::translate('Lifespans'); ?></h2>
<table>
<tr>
<td>