Fix: #2521 - 'use silhouette' option should also apply to individual page

9 files changed, 64 insertions, 51 deletions

diff --git a/resources/views/family-page-menu.phtml b/resources/views/family-page-menu.phtml
index 9381ee73df..52e19ff3ab 100644
--- a/resources/views/family-page-menu.phtml
+++ b/resources/views/family-page-menu.phtml
@@ -47,8 +47,6 @@
         </a>
 
         <?php if (Auth::isAdmin() || $record->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>
diff --git a/resources/views/gedcom-record-page-menu.phtml b/resources/views/gedcom-record-page-menu.phtml
index 71752e4ec2..a21ee62edb 100644
--- a/resources/views/gedcom-record-page-menu.phtml
+++ b/resources/views/gedcom-record-page-menu.phtml
@@ -14,8 +14,6 @@
         </a>
 
         <?php if (Auth::isAdmin() || $record->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>
diff --git a/resources/views/icons/spacer.phtml b/resources/views/icons/spacer.phtml
new file mode 100644
index 0000000000..2a4dde6560
--- /dev/null
+++ b/resources/views/icons/spacer.phtml
@@ -0,0 +1 @@
+<i class="fas fa-fw" aria-hidden="true"></i>
diff --git a/resources/views/individual-page-menu.phtml b/resources/views/individual-page-menu.phtml
index b609b643de..0b94f0d1fa 100644
--- a/resources/views/individual-page-menu.phtml
+++ b/resources/views/individual-page-menu.phtml
@@ -18,6 +18,11 @@
                 <?= view('icons/reorder') ?>
                 <?= I18N::translate('Re-order names') ?>
             </a>
+        <?php else : ?>
+            <div class="dropdown-item disabled">
+                <?= view('icons/spacer') ?>
+                <?= I18N::translate('Re-order names') ?>
+            </div>
         <?php endif ?>
 
         <div class="dropdown-divider"></div>
@@ -27,18 +32,44 @@
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the gender') ?>
             </a>
+        <?php endif ?>
 
-            <div class="dropdown-divider"></div>
+        <?php foreach ($individual->facts(['SEX']) as $fact) : ?>
+            <?php if ($fact->canEdit()) : ?>
+                <a class="dropdown-item" href="<?= e(route('edit-fact', ['xref' => $individual->xref(), 'fact_id' => $fact->id(), 'ged' => $individual->tree()->name()])) ?>">
+                    <?= view('icons/edit') ?>
+                    <?= I18N::translate('Edit the gender') ?>
+                </a>
+            <?php endif ?>
+        <?php endforeach ?>
+
+        <div class="dropdown-divider"></div>
+
+        <a class="dropdown-item" href="<?= e(route('add-fact', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref(), 'fact' => 'OBJE'])) ?>">
+            <?= view('icons/add') ?>
+            <?= I18N::translate('Add a media object') ?>
+        </a>
+
+        <?php if ($individual->facts(['OBJE'])->count() > 1) : ?>
+            <a class="dropdown-item" href="<?= e(route('reorder-media', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
+                <?= view('icons/edit') ?>
+                <?= I18N::translate('Re-order media') ?>
+            </a>
+        <?php else : ?>
+            <div class="dropdown-item disabled">
+                <?= view('icons/spacer') ?>
+                <?= I18N::translate('Re-order media') ?>
+            </div>
         <?php endif ?>
 
+        <div class="dropdown-divider"></div>
+
         <a class="dropdown-item" href="#" data-confirm="<?= I18N::translate('Are you sure you want to delete “%s”?', strip_tags($individual->fullName())) ?>" onclick="return confirm(this.dataset.confirm) && delete_record('<?= e($individual->xref()) ?>', '<?= e($individual->tree()->name()) ?>');">
             <?= view('icons/delete') ?>
             <?= I18N::translate('Delete') ?>
         </a>
 
         <?php if (Auth::isAdmin() || $individual->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>
diff --git a/resources/views/individual-page.phtml b/resources/views/individual-page.phtml
index 40b6bd1936..20f02b020b 100644
--- a/resources/views/individual-page.phtml
+++ b/resources/views/individual-page.phtml
@@ -11,6 +11,7 @@ use Illuminate\Support\Collection;
  * @var string     $user_link
  * @var int        $count_names
  * @var Collection $sidebars
+ * @var Collection $individual_media
  * @var Collection $name_records
  * @var Collection $sex_records
  * @var Collection $tabs
@@ -50,54 +51,46 @@ use Illuminate\Support\Collection;
     <div class="<?= $sidebars->isEmpty() ? 'col-sm-12' : 'col-sm-8' ?>">
         <div class="row mb-4">
             <!-- Individual images -->
-            <div class="col-sm-3">
-                <?php if (empty($individual_media)) : ?>
-                    <i class="wt-individual-silhouette wt-individual-silhouette-<?= strtolower($individual->sex()) ?>"></i>
-                <?php elseif (count($individual_media) === 1) : ?>
-                    <?= $individual_media[0]->displayImage(200, 260, 'crop', ['class' => 'img-thumbnail img-fluid w-100']) ?>
-                <?php else : ?>
-                    <div id="individual-images" class="carousel slide" data-ride="carousel" data-interval="false">
-                        <div class="carousel-inner">
-                            <?php foreach ($individual_media as $n => $media_file) : ?>
-                                <div class="carousel-item <?= $n === 0 ? 'active' : '' ?>">
-                                    <?= $media_file->displayImage(200, 260, 'crop', ['class' => 'img-thumbnail img-fluid w-100']) ?>
-                                </div>
-                            <?php endforeach ?>
+            <?php if ($individual_media->isNotEmpty() || $tree->getPreference('USE_SILHOUETTE') === '1') : ?>
+                <div class="col-sm-3">
+                    <?php if ($individual_media->isEmpty()) : ?>
+                        <div class="img-thumbnail">
+                            <i class="wt-individual-silhouette wt-individual-silhouette-<?= strtolower($individual->sex()) ?>"></i>
                         </div>
-                        <a class="carousel-control-prev" href="#individual-images" role="button" data-slide="prev">
-                            <span class="carousel-control-prev-icon" aria-hidden="true"></span>
-                            <span class="sr-only"><?= I18N::translate('previous') ?></span>
-                        </a>
-                        <a class="carousel-control-next" href="#individual-images" role="button" data-slide="next">
-                            <span class="carousel-control-next-icon" aria-hidden="true"></span>
-                            <span class="sr-only"><?= I18N::translate('next') ?></span>
-                        </a>
-                    </div>
-
-                <?php endif ?>
-
-                <?php if (Auth::isEditor($individual->tree())) : ?>
-                    <?php if ($individual->facts(['OBJE'])->count() > 1) : ?>
-                        <div>
-                            <a href="<?= e(route('reorder-media', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref()])) ?>">
-                                <?= view('icons/reorder') ?>
-                                <?= I18N::translate('Re-order media') ?>
+                    <?php elseif ($individual_media->count() === 1) : ?>
+                        <?= $individual_media->first()->displayImage(200, 260, 'crop', ['class' => 'img-thumbnail img-fluid w-100']) ?>
+                    <?php else : ?>
+                        <div id="individual-images" class="carousel slide" data-ride="carousel" data-interval="false">
+                            <div class="carousel-inner">
+                                <?php foreach ($individual_media as $n => $media_file) : ?>
+                                    <div class="carousel-item <?= $n === 0 ? 'active' : '' ?>">
+                                        <?= $media_file->displayImage(200, 260, 'crop', ['class' => 'img-thumbnail img-fluid w-100']) ?>
+                                    </div>
+                                <?php endforeach ?>
+                            </div>
+                            <a class="carousel-control-prev" href="#individual-images" role="button" data-slide="prev">
+                                <span class="carousel-control-prev-icon" aria-hidden="true"></span>
+                                <span class="sr-only"><?= I18N::translate('previous') ?></span>
+                            </a>
+                            <a class="carousel-control-next" href="#individual-images" role="button" data-slide="next">
+                                <span class="carousel-control-next-icon" aria-hidden="true"></span>
+                                <span class="sr-only"><?= I18N::translate('next') ?></span>
                             </a>
                         </div>
                     <?php endif ?>
 
-                    <?php if ($individual->tree()->getPreference('MEDIA_UPLOAD') >= Auth::accessLevel($individual->tree())) : ?>
-                        <div>
+                    <?php if (Auth::isEditor($individual->tree())) : ?>
+                        <div class="text-center">
                             <a href="<?= e(route('add-fact', ['ged' => $individual->tree()->name(), 'xref' => $individual->xref(), 'fact' => 'OBJE'])) ?>">
                                 <?= I18N::translate('Add a media object') ?>
                             </a>
                         </div>
                     <?php endif ?>
-                <?php endif ?>
-            </div>
+                </div>
+            <?php endif ?>
 
             <!-- Name accordion -->
-            <div class="col-sm-9" id="individual-names" role="tablist">
+            <div class="col-sm" id="individual-names" role="tablist">
                 <?php foreach ($name_records as $name_record) : ?>
                     <?= $name_record ?>
                 <?php endforeach ?>
diff --git a/resources/views/media-page-menu.phtml b/resources/views/media-page-menu.phtml
index 9fd91b9845..7d63c99e0c 100644
--- a/resources/views/media-page-menu.phtml
+++ b/resources/views/media-page-menu.phtml
@@ -33,8 +33,6 @@
         </a>
 
         <?php if (Auth::isAdmin() || $record->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>
diff --git a/resources/views/note-page-menu.phtml b/resources/views/note-page-menu.phtml
index 1c793a3b53..a1db0cd297 100644
--- a/resources/views/note-page-menu.phtml
+++ b/resources/views/note-page-menu.phtml
@@ -14,8 +14,6 @@
         </a>
 
         <?php if (Auth::isAdmin() || $record->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>
diff --git a/resources/views/repository-page-menu.phtml b/resources/views/repository-page-menu.phtml
index 1c793a3b53..a1db0cd297 100644
--- a/resources/views/repository-page-menu.phtml
+++ b/resources/views/repository-page-menu.phtml
@@ -14,8 +14,6 @@
         </a>
 
         <?php if (Auth::isAdmin() || $record->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>
diff --git a/resources/views/source-page-menu.phtml b/resources/views/source-page-menu.phtml
index d1b9645549..76fddcc748 100644
--- a/resources/views/source-page-menu.phtml
+++ b/resources/views/source-page-menu.phtml
@@ -14,8 +14,6 @@
         </a>
 
         <?php if (Auth::isAdmin() || $record->tree()->getPreference('SHOW_GEDCOM_RECORD')) : ?>
-            <div class="dropdown-divider"></div>
-
             <a class="dropdown-item" href="<?= e(route('edit-raw-record', ['ged' => $record->tree()->name(), 'xref' => $record->xref()])) ?>">
                 <?= view('icons/edit') ?>
                 <?= I18N::translate('Edit the raw GEDCOM') ?>