diff options
| -rw-r--r-- | addmedia.php | 2 | ||||
| -rw-r--r-- | ancestry.php | 2 | ||||
| -rw-r--r-- | app/Controller/FamilyController.php | 3 | ||||
| -rw-r--r-- | app/Controller/FanchartController.php | 2 | ||||
| -rw-r--r-- | app/Module/ClippingsCartModule.php | 19 | ||||
| -rw-r--r-- | app/Module/NotesTabModule.php | 3 | ||||
| -rw-r--r-- | app/Module/SourcesTabModule.php | 3 | ||||
| -rw-r--r-- | edit_interface.php | 1 | ||||
| -rw-r--r-- | familybook.php | 4 | ||||
| -rw-r--r-- | fanchart.php | 2 | ||||
| -rw-r--r-- | help_text.php | 62 | ||||
| -rw-r--r-- | hourglass.php | 2 | ||||
| -rw-r--r-- | includes/functions/functions_print.php | 2 | ||||
| -rw-r--r-- | modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php | 2 | ||||
| -rw-r--r-- | placelist.php | 1 |
15 files changed, 24 insertions, 86 deletions
diff --git a/addmedia.php b/addmedia.php index 5721958b50..5ecd12f4f3 100644 --- a/addmedia.php +++ b/addmedia.php @@ -691,7 +691,7 @@ if (Auth::isAdmin()) { } else { echo '<input type="checkbox" name="preserve_last_changed">'; } - echo I18N::translate('Do not update the “last change” record'), help_link('no_update_CHAN'), '<br>'; + echo I18N::translate('Do not update the “last change” record'), '<br>'; echo '</td></tr>'; } echo '</table>'; diff --git a/ancestry.php b/ancestry.php index f9ca3686be..1cdb12f2d1 100644 --- a/ancestry.php +++ b/ancestry.php @@ -111,7 +111,7 @@ $controller <?php echo '<label>', I18N::translate('Show details'), '</label>'; ?> </td> <td class="optionbox"> - <?php echo two_state_checkbox('show_full', $controller->showFull());?> + <?php echo checkbox('show_full', $controller->showFull());?> </td> </tr> </table> diff --git a/app/Controller/FamilyController.php b/app/Controller/FamilyController.php index ae3ffcdf98..5f9504ea39 100644 --- a/app/Controller/FamilyController.php +++ b/app/Controller/FamilyController.php @@ -180,14 +180,12 @@ class FamilyController extends GedcomRecordController { echo I18N::translate('Note'); echo '</td><td class="optionbox">'; echo "<a href=\"#\" onclick=\"return add_new_record('" . $this->record->getXref() . "','NOTE');\">", I18N::translate('Add a new note'), '</a>'; - echo help_link('add_note'); echo '</td></tr>'; echo '<tr><td class="descriptionbox">'; echo I18N::translate('Shared note'); echo '</td><td class="optionbox">'; echo "<a href=\"#\" onclick=\"return add_new_record('" . $this->record->getXref() . "','SHARED_NOTE');\">", I18N::translate('Add a new shared note'), '</a>'; - echo help_link('add_shared_note'); echo '</td></tr>'; if ($WT_TREE->getPreference('MEDIA_UPLOAD') >= WT_USER_ACCESS_LEVEL) { @@ -205,7 +203,6 @@ class FamilyController extends GedcomRecordController { echo I18N::translate('Source'); echo '</td><td class="optionbox">'; echo "<a href=\"#\" onclick=\"return add_new_record('" . $this->record->getXref() . "','SOUR');\">", I18N::translate('Add a new source citation'), '</a>'; - echo help_link('add_source'); echo '</td></tr>'; } } diff --git a/app/Controller/FanchartController.php b/app/Controller/FanchartController.php index 56c89e18ba..4ef7da9f34 100644 --- a/app/Controller/FanchartController.php +++ b/app/Controller/FanchartController.php @@ -41,7 +41,7 @@ class FanchartController extends ChartController { // Extract the request parameters $this->fan_style = Filter::getInteger('fan_style', 2, 4, 3); - $this->fan_width = Filter::getInteger('fan_width', 50, 300, 100); + $this->fan_width = Filter::getInteger('fan_width', 50, 500, 100); $this->generations = Filter::getInteger('generations', 2, 9, $default_generations); if ($this->root && $this->root->canShowName()) { diff --git a/app/Module/ClippingsCartModule.php b/app/Module/ClippingsCartModule.php index 0a917b6f65..cde06851df 100644 --- a/app/Module/ClippingsCartModule.php +++ b/app/Module/ClippingsCartModule.php @@ -175,10 +175,19 @@ class ClippingsCartModule extends Module implements ModuleMenuInterface, ModuleS <input type="hidden" name="pid" value="<?php echo $pid; ?>"> <table> <tr><td colspan="2" class="topbottombar"><h2><?php echo I18N::translate('Download'); ?></h2></td></tr> - <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Zip file(s)'), help_link('zip'); ?></td> - <td class="optionbox"><input type="checkbox" name="Zip" value="yes"></td></tr> - - <tr><td class="descriptionbox width50 wrap"><?php echo I18N::translate('Include media (automatically zips files)'), help_link('include_media'); ?></td> + <tr> + <td class="descriptionbox width50 wrap"> + <?php echo I18N::translate('To reduce the size of the download, you can compress the data into a .ZIP file. You will need to uncompress the .ZIP file before you can use it.'); ?> + </td> + <td class="optionbox wrap"> + <input type="checkbox" name="Zip" value="yes"> + <?php echo I18N::translate('Zip file(s)'); ?> + </td> + </tr> + <tr> + <td class="descriptionbox width50 wrap"> + <?php echo I18N::translate('Include media (automatically zips files)'), help_link('include_media'); ?> + </td> <td class="optionbox"><input type="checkbox" name="IncludeMedia" value="yes"></td></tr> <?php if (WT_USER_GEDCOM_ADMIN) { ?> @@ -562,7 +571,7 @@ class ClippingsCartModule extends Module implements ModuleMenuInterface, ModuleS <input type="hidden" name="action" value="download"> <table> <tr><td colspan="2" class="topbottombar"><h2>'. I18N::translate('Download') . '</h2></td></tr> - <tr><td class="descriptionbox width50 wrap">'. I18N::translate('Zip file(s)') . help_link('zip') . '</td> + <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> diff --git a/app/Module/NotesTabModule.php b/app/Module/NotesTabModule.php index 5128cecf31..0860bb30fb 100644 --- a/app/Module/NotesTabModule.php +++ b/app/Module/NotesTabModule.php @@ -58,7 +58,6 @@ class NotesTabModule extends Module implements ModuleTabInterface { <td colspan="2" class="descriptionbox rela"> <input id="checkbox_note2" type="checkbox" <?php echo $WT_TREE->getPreference('SHOW_LEVEL2_NOTES') ? 'checked' : ''; ?> onclick="jQuery('tr.row_note2').toggle();"> <label for="checkbox_note2"><?php echo I18N::translate('Show all notes'); ?></label> - <?php echo help_link('show_fact_sources'); ?> </td> </tr> <?php @@ -86,7 +85,6 @@ class NotesTabModule extends Module implements ModuleTabInterface { <a href="#" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','NOTE'); return false;"> <?php echo I18N::translate('Add a new note'); ?> </a> - <?php echo help_link('add_note'); ?> </td> </tr> <tr> @@ -97,7 +95,6 @@ class NotesTabModule extends Module implements ModuleTabInterface { <a href="#" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','SHARED_NOTE'); return false;"> <?php echo I18N::translate('Add a new shared note'); ?> </a> - <?php echo help_link('add_shared_note'); ?> </td> </tr> <?php diff --git a/app/Module/SourcesTabModule.php b/app/Module/SourcesTabModule.php index 7d8ff57751..b12fac059f 100644 --- a/app/Module/SourcesTabModule.php +++ b/app/Module/SourcesTabModule.php @@ -57,7 +57,7 @@ class SourcesTabModule extends Module implements ModuleTabInterface { <tr> <td colspan="2" class="descriptionbox rela"> <input id="checkbox_sour2" type="checkbox" <?php echo $WT_TREE->getPreference('SHOW_LEVEL2_NOTES') ? 'checked' : ''; ?> onclick="jQuery('tr.row_sour2').toggle();"> - <label for="checkbox_sour2"><?php echo I18N::translate('Show all sources'), help_link('show_fact_sources'); ?></label> + <label for="checkbox_sour2"><?php echo I18N::translate('Show all sources'); ?></label> </td> </tr> <?php @@ -83,7 +83,6 @@ class SourcesTabModule extends Module implements ModuleTabInterface { <a href="#" onclick="add_new_record('<?php echo $controller->record->getXref(); ?>','SOUR'); return false;"> <?php echo I18N::translate('Add a new source citation'); ?> </a> - <?php echo help_link('add_source'); ?> </td> </tr> <?php diff --git a/edit_interface.php b/edit_interface.php index 986b3e68f3..f38581c41a 100644 --- a/edit_interface.php +++ b/edit_interface.php @@ -2323,7 +2323,6 @@ function keep_chan(GedcomRecord $record = null) { '</td><td class="optionbox wrap">' . '<input type="checkbox" name="keep_chan" value="1" ' . ($WT_TREE->getPreference('NO_UPDATE_CHAN') ? 'checked' : '') . '>' . I18N::translate('Do not update the “last change” record') . - help_link('no_update_CHAN') . $details . '</td></tr>'; } else { diff --git a/familybook.php b/familybook.php index 03b352e62b..0c4227731a 100644 --- a/familybook.php +++ b/familybook.php @@ -74,7 +74,7 @@ $controller </select> </td> <td rowspan="2" class="descriptionbox"> - <?php echo I18N::translate('Show spouses'), help_link('show_spouse'); ?> + <?php echo I18N::translate('Show spouses'); ?> </td> <td rowspan="2" class="optionbox"> <input type="checkbox" value="1" name="show_spouse" <?php if ($controller->show_spouse) echo " checked"; ?>> @@ -82,7 +82,7 @@ $controller </tr> <tr> <td class="descriptionbox"> - <?php echo I18N::translate('Descent steps'), help_link('fambook_descent'); ?> + <?php echo I18N::translate('Descent steps'); ?> </td> <td class="optionbox"> <input type="text" size="3" name="descent" value="<?php echo $controller->descent; ?>"> diff --git a/fanchart.php b/fanchart.php index 48111bb3ac..3e30a0cd13 100644 --- a/fanchart.php +++ b/fanchart.php @@ -103,7 +103,7 @@ $controller </td> <td class="descriptionbox"> <label for="fan_width"> - <?php echo I18N::translate('Width'), help_link('fan_width'); ?> + <?php echo I18N::translate('Width'); ?> </label> </td> <td class="optionbox"> diff --git a/help_text.php b/help_text.php index 788c182d35..b8de8e7f05 100644 --- a/help_text.php +++ b/help_text.php @@ -389,33 +389,6 @@ case '_PRIM': // This section contains all the other help items. ////////////////////////////////////////////////////////////////////////////// -case 'add_facts': - $title = I18N::translate('Add a fact'); - $text = I18N::translate('Here you can add a fact to the record being edited.<br><br>First choose a fact from the drop-down list, then click the <b>Add</b> button. All possible facts that you can add to the database are in that drop-down list.'); - $text .= '<br><br>'; - $text .= '<b>' . I18N::translate('Add from clipboard') . '</b>'; - $text .= '<br><br>'; - $text .= I18N::translate('webtrees allows you to copy up to 10 facts, with all their details, to a clipboard. This clipboard is different from the clippings cart that you can use to export portions of your database.<br><br>You can select any of the facts from the clipboard and copy the selected fact to the individual, family, media, source, or repository record currently being edited. However, you cannot copy facts of dissimilar record types. For example, you cannot copy a marriage fact to a source or an individual record since the marriage fact is associated only with family records.<br><br>This is very helpful when entering similar facts, such as census facts, for many individuals or families.'); - break; - -case 'add_note': - // This is a general help text for multiple pages - $title = I18N::translate('Add a new note'); - $text = I18N::translate('If you have a note to add to this record, this is the place to do so.<br><br>Just click the link, a window will open, and you can type your note. When you are finished typing, just click the button below the box, close the window, and that’s all.'); - break; - -case 'add_shared_note': - // This is a general help text for multiple pages - $title = I18N::translate('Add a new shared note'); - $text = I18N::translate('When you click the <b>Add a new shared note</b> link, a new window will open. You can choose to link to an existing shared note, or you can create a new shared note and at the same time create a link to it.'); - break; - -case 'add_source': - // This is a general help text for multiple pages - $title = I18N::translate('Add a new source citation'); - $text = I18N::translate('Here you can add a source <b>Citation</b> to this record.<br><br>Just click the link, a window will open, and you can choose the source from the list (Find ID) or create a new source and then add the citation.<br><br>Adding sources is an important part of genealogy because it allows other researchers to verify where you obtained your information.'); - break; - case 'annivers_year_select': $title = I18N::translate('Year input box'); $text = I18N::translate('This input box lets you change that year of the calendar. Type a year into the box and press <b>Enter</b> to change the calendar to that year.<br><br><b>Advanced features</b> for <b>View year</b><dl><dt><b>More than one year</b></dt><dd>You can search for dates in a range of years.<br><br>Year ranges are <u>inclusive</u>. This means that the date range extends from 1 January of the first year of the range to 31 December of the last year mentioned. Here are a few examples of year ranges:<br><br><b>1992-5</b> for all events from 1992 to 1995.<br><b>1972-89</b> for all events from 1972 to 1989.<br><b>1610-759</b> for all events from 1610 to 1759.<br><b>1880-1905</b> for all events from 1880 to 1905.<br><b>880-1105</b> for all events from 880 to 1105.<br><br>To see all the events in a given decade or century, you can use <b>?</b> in place of the final digits. For example, <b>197?</b> for all events from 1970 to 1979 or <b>16??</b> for all events from 1600 to 1699.<br><br>Selecting a range of years will change the calendar to the year view.</dd></dl>'); @@ -473,16 +446,6 @@ case 'edit_SOUR_EVEN': break; -case 'fambook_descent': - $title = I18N::translate('Descendant generations'); - $text = I18N::translate('This value determines the number of descendant generations of the root individual that will be printed in hourglass format.'); - break; - -case 'fan_width': - $title = I18N::translate('Width'); - $text = I18N::translate('Here you can change the diagram width from 50 percent to 300 percent. At 100 percent the output image is about 640 pixels wide.'); - break; - case 'gedcom_news_archive': $title = I18N::translate('View archive'); $text = I18N::translate('To reduce the height of the News block, the administrator has hidden some articles. You can reveal these hidden articles by clicking the <b>View archive</b> link.'); @@ -508,11 +471,6 @@ case 'include_media': $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 'no_update_CHAN': - $title = I18N::translate('Do not update the “last change” record'); - $text = I18N::translate('Administrators sometimes need to clean up and correct the data submitted by users. For example, they might need to correct the PLAC location to include the country. When administrators make such corrections, information about the original change is normally replaced. This may not be desirable.<br><br>When this option is selected, webtrees will retain the original change information instead of replacing it with that of the current session. With this option selected, administrators also have the ability to modify or delete the information associated with the original CHAN tag.'); - break; - case 'pending_changes': $title = I18N::translate('Pending changes'); $text = @@ -531,26 +489,6 @@ case 'pending_changes': } break; -case 'ppp_view_records': - $title = I18N::translate('View all records'); - $text = I18N::translate('Clicking on this link will show you a list of all of the individuals and families that have events occurring in this place. When you get to the end of a place hierarchy, which is normally a town or city, the name list will be shown automatically.'); - break; - -case 'show_fact_sources': - $title = I18N::translate('Show all sources'); - $text = I18N::translate('When this option is checked, you can see all source or note records for this individual. When this option is unchecked, source or note records that are associated with other facts for this individual will not be shown.'); - break; - -case 'show_spouse': - $title = I18N::translate('Show spouses'); - $text = I18N::translate('By default this chart does not show spouses for the descendants because it makes the chart harder to read and understand. Turning this option on will show spouses on the chart.'); - break; - -case 'zip': - $title = I18N::translate('Zip clippings'); - $text = I18N::translate('Select this option as to save your clippings in a ZIP file. For more information about ZIP files, please visit <a href="http://www.winzip.com" target="_blank">http://www.winzip.com</a>.'); - break; - default: $title = I18N::translate('Help'); $text = I18N::translate('The help text has not been written for this item.'); diff --git a/hourglass.php b/hourglass.php index 118e7b50f9..5658e1c02d 100644 --- a/hourglass.php +++ b/hourglass.php @@ -65,7 +65,7 @@ $controller <?php echo edit_field_integers('generations', $controller->generations, 2, $WT_TREE->getPreference('MAX_DESCENDANCY_GENERATIONS')); ?> </td> <td class="descriptionbox"> - <?php echo I18N::translate('Show spouses'), help_link('show_spouse'); ?> + <?php echo I18N::translate('Show spouses'); ?> </td> <td class="optionbox"> <input type="checkbox" value="1" name="show_spouse" <?php echo $controller->show_spouse ? 'checked' : ''; ?>> diff --git a/includes/functions/functions_print.php b/includes/functions/functions_print.php index 4f9615eede..2ac213a171 100644 --- a/includes/functions/functions_print.php +++ b/includes/functions/functions_print.php @@ -661,7 +661,7 @@ function print_add_new_fact($id, $usedfacts, $type) { }); echo '<tr><td class="descriptionbox">'; echo I18N::translate('Fact or event'); - echo help_link('add_facts'), '</td>'; + echo '</td>'; echo '<td class="optionbox wrap">'; echo '<form method="get" name="newfactform" action="?" onsubmit="return false;">'; echo '<select id="newfact" name="newfact">'; diff --git a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php index 463f65a340..94963ffc0d 100644 --- a/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php +++ b/modules_v3/GEDFact_assistant/_MEDIA/media_0_inverselink.php @@ -571,7 +571,7 @@ function shiftlinks() { } else { echo "<input type=\"checkbox\" name=\"preserve_last_changed\">"; } - echo I18N::translate('Do not update the “last change” record'), help_link('no_update_CHAN'); + echo I18N::translate('Do not update the “last change” record'); echo "</td></tr>"; } ?> diff --git a/placelist.php b/placelist.php index 60255973b3..593863c1a5 100644 --- a/placelist.php +++ b/placelist.php @@ -172,7 +172,6 @@ case 'hierarchy': } echo '>'; echo I18N::translate('View all records found in this place'); - echo help_link('ppp_view_records'); echo '</td></tr><tr><td class="list_value" '; if ($numfound > 20) { echo 'colspan="3"'; |
