Add missing closing spans and avoid empty href

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

diff --git a/apps/files_sharing/tests/js/publicAppSpec.js b/apps/files_sharing/tests/js/publicAppSpec.js
index b9d8cbe28e2dc21b9ec3bb1ae8307e51b89a2e5f..e8e5f0a5109a67d43a6c88b5ae91b733daa897f6 100644 (file)
--- a/apps/files_sharing/tests/js/publicAppSpec.js
+++ b/apps/files_sharing/tests/js/publicAppSpec.js
@@ -74,6 +74,7 @@ describe('OCA.Sharing.PublicApp tests', function() {
                                '<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
                                '<span class="selectedActions hidden">' +
                                '<a href class="download">Download</a>' +
+                               '</span>' +
                                '</th>' +
                                '<th class="hidden column-size"><a class="columntitle" data-sort="size"><span class="sort-indicator"></span></a></th>' +
                                '<th class="hidden column-mtime"><a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a></th>' +

diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index 8637a3579b095e72c93433c756d174339db5e819..f25dd6a47c438a5f5f2b22c5a3eb91661b859d07 100644 (file)
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -31,7 +31,7 @@
                                <div class="column-name-container">
                                        <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a>
                                        <span class='selectedActions'>
-                                               <a href="" class="actions-selected">
+                                               <a href="#" class="actions-selected">
                                                        <span class="icon icon-more"></span>
                                                        <span><?php p($l->t('Actions'))?></span>
                                                </a>

diff --git a/apps/systemtags/tests/js/systemtagsfilelistSpec.js b/apps/systemtags/tests/js/systemtagsfilelistSpec.js
index 068eb0cbf5c1d8f4c6bad1491fa194abbbb4fb62..66272320e1d66418a445bed4f66918de1c2e2056 100644 (file)
--- a/apps/systemtags/tests/js/systemtagsfilelistSpec.js
+++ b/apps/systemtags/tests/js/systemtagsfilelistSpec.js
@@ -40,7 +40,7 @@ describe('OCA.SystemTags.FileList tests', function() {
                        '<th class="hidden column-name">' +
                        '<input type="checkbox" id="select_all_files" class="select-all">' +
                        '<a class="name columntitle" data-sort="name"><span>Name</span><span class="sort-indicator"></span></a>' +
-                       '<span class="selectedActions hidden">' +
+                       '<span class="selectedActions hidden"></span>' +
                        '</th>' +
                        '<th class="hidden column-mtime">' +
                        '<a class="columntitle" data-sort="mtime"><span class="sort-indicator"></span></a>' +

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 63fb5c597f75a5e9c0081ca4283d031ed066c9dc..ebbef7bae51e2319173806e18266b7c1384409e0 100644 (file)
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -175,7 +175,7 @@ $getUserAvatar = static function (int $size) use ($_): string {
                                        <ul>
                                        <?php foreach ($_['settingsnavigation'] as $entry):?>
                                                <li data-id="<?php p($entry['id']); ?>">
-                                                       <a href="<?php print_unescaped($entry['href']); ?>"
+                                                       <a href="<?php print_unescaped($entry['href'] !== '' ? $entry['href'] : '#'); ?>"
                                                                <?php if ($entry["active"]): ?> class="active"<?php endif; ?>>
                                                                <img alt="" src="<?php print_unescaped($entry['icon'] . '?v=' . $_['versionHash']); ?>">
                                                                <?php p($entry['name']) ?>