diff options
| -rw-r--r-- | app/Functions/FunctionsPrintFacts.php | 35 | ||||
| -rw-r--r-- | app/Schema/SeedGedcomSettingTable.php | 2 | ||||
| -rw-r--r-- | resources/views/family-page.phtml | 11 | ||||
| -rw-r--r-- | resources/views/media-page.phtml | 10 | ||||
| -rw-r--r-- | resources/views/modules/notes/tab.phtml | 10 |
5 files changed, 5 insertions, 63 deletions
diff --git a/app/Functions/FunctionsPrintFacts.php b/app/Functions/FunctionsPrintFacts.php index ace63fb20f..0ef892eff5 100644 --- a/app/Functions/FunctionsPrintFacts.php +++ b/app/Functions/FunctionsPrintFacts.php @@ -795,11 +795,11 @@ class FunctionsPrintFacts if ($level < 2) { if ($note instanceof Note) { echo '<a href="' . e($note->url()) . '">'; - echo GedcomTag::getLabel('SHARED_NOTE'); + echo I18N::translate('Shared note'); echo view('icons/note'); echo '</a>'; } else { - echo GedcomTag::getLabel('NOTE'); + echo I18N::translate('Note'); } echo '<div class="editfacts nowrap">'; echo view('edit/icon-fact-edit', ['fact' => $fact]); @@ -810,9 +810,9 @@ class FunctionsPrintFacts } else { if ($level < 2) { if ($note) { - echo GedcomTag::getLabel('SHARED_NOTE'); + echo I18N::translate('Shared note'); } else { - echo GedcomTag::getLabel('NOTE'); + echo I18N::translate('Note'); } } $factlines = explode("\n", $factrec); // 1 BIRT Y\n2 NOTE ... @@ -848,33 +848,6 @@ class FunctionsPrintFacts echo '<td class="', $styleadd, ' wrap">'; echo $text; - - // 2 RESN tags. Note, there can be more than one, such as "privacy" and "locked" - if (preg_match_all("/\n2 RESN (.+)/", $factrec, $rmatches)) { - foreach ($rmatches[1] as $rmatch) { - echo '<br><span class="label">', GedcomTag::getLabel('RESN'), ':</span> <span class="field">'; - switch ($rmatch) { - case 'none': - // Note: "2 RESN none" is not valid gedcom, and the GUI will not let you add it. - // However, webtrees privacy rules will interpret it as "show an otherwise private fact to public". - echo '<i class="icon-resn-none"></i> ', I18N::translate('Show to visitors'); - break; - case 'privacy': - echo '<i class="icon-resn-privacy"></i> ', I18N::translate('Show to members'); - break; - case 'confidential': - echo '<i class="icon-resn-confidential"></i> ', I18N::translate('Show to managers'); - break; - case 'locked': - echo '<i class="icon-resn-locked"></i> ', I18N::translate('Only managers can edit'); - break; - default: - echo $rmatch; - break; - } - echo '</span>'; - } - } echo '</td></tr>'; } } diff --git a/app/Schema/SeedGedcomSettingTable.php b/app/Schema/SeedGedcomSettingTable.php index 432a28ffd9..151d10bcd3 100644 --- a/app/Schema/SeedGedcomSettingTable.php +++ b/app/Schema/SeedGedcomSettingTable.php @@ -93,7 +93,7 @@ class SeedGedcomSettingTable implements SeedInterface 'SHOW_PRIVATE_RELATIONSHIPS' => '1', 'SHOW_RELATIVES_EVENTS' => '_BIRT_CHIL,_BIRT_SIBL,_MARR_CHIL,_MARR_PARE,_DEAT_CHIL,_DEAT_PARE,_DEAT_GPAR,_DEAT_SIBL,_DEAT_SPOU', 'SOURCE_ID_PREFIX' => 'S', - 'SOUR_FACTS_ADD' => 'NOTE,REPO,SHARED_NOTE,RESN', + 'SOUR_FACTS_ADD' => 'NOTE,REPO,RESN', 'SOUR_FACTS_QUICK' => 'TEXT,NOTE,REPO', 'SOUR_FACTS_UNIQUE' => 'AUTH,ABBR,TITL,PUBL,TEXT', 'SUBLIST_TRIGGER_I' => '200', diff --git a/resources/views/family-page.phtml b/resources/views/family-page.phtml index 2a63e5d61c..8a1fb4470a 100644 --- a/resources/views/family-page.phtml +++ b/resources/views/family-page.phtml @@ -77,17 +77,6 @@ use Illuminate\Support\Collection; </td> </tr> - <tr> - <th scope="row"> - <?= I18N::translate('Shared note') ?> - </th> - <td> - <a href="<?= e(route(AddNewFact::class, ['tree' => $record->tree()->name(), 'xref' => $record->xref(), 'fact' => 'SHARED_NOTE'])) ?>"> - <?= I18N::translate('Add a shared note') ?> - </a> - </td> - </tr> - <?php if ($record->tree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($record->tree())) : ?> <tr> <th scope="row"> diff --git a/resources/views/media-page.phtml b/resources/views/media-page.phtml index 2593c61a71..f0475b7f8c 100644 --- a/resources/views/media-page.phtml +++ b/resources/views/media-page.phtml @@ -179,16 +179,6 @@ use League\Flysystem\FilesystemOperator; </tr> <tr> <th scope="row"> - <?= I18N::translate('Shared note') ?> - </th> - <td> - <a href="<?= e(route(AddNewFact::class, ['tree' => $media->tree()->name(), 'xref' => $media->xref(), 'fact' => 'SHARED_NOTE'])) ?>"> - <?= I18N::translate('Add a shared note') ?> - </a> - </td> - </tr> - <tr> - <th scope="row"> <?= I18N::translate('Restriction') ?> </th> <td> diff --git a/resources/views/modules/notes/tab.phtml b/resources/views/modules/notes/tab.phtml index 0fa1971d36..a3acc5af2a 100644 --- a/resources/views/modules/notes/tab.phtml +++ b/resources/views/modules/notes/tab.phtml @@ -56,16 +56,6 @@ use Illuminate\Support\Collection; </a> </td> </tr> - <tr> - <th scope="row"> - <?= I18N::translate('Shared note') ?> - </th> - <td> - <a href="<?= e(route(AddNewFact::class, ['tree' => $individual->tree()->name(), 'xref' => $individual->xref(), 'fact' => 'SHARED_NOTE'])) ?>"> - <?= I18N::translate('Add a shared note') ?> - </a> - </td> - </tr> <?php endif ?> </table> </div> |