From 32c61539e58f894dd7720b75bc07d8e46b8037b2 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Tue, 26 Jul 2022 15:34:00 +0200
Subject: Removed id=modified in files app

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
---
 apps/files/templates/recentlist.php     | 2 +-
 apps/files/templates/simplelist.php     | 2 +-
 apps/files_trashbin/templates/index.php | 2 +-
 apps/systemtags/templates/list.php      | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'apps')

diff --git a/apps/files/templates/recentlist.php b/apps/files/templates/recentlist.php
index 9e91b1c442c..dba2221daf2 100644
--- a/apps/files/templates/recentlist.php
+++ b/apps/files/templates/recentlist.php
@@ -25,7 +25,7 @@
 			   data-sort="size"><span><?php p($l->t('Size')); ?></span></a>
 		</th>
 		<th class="hidden column-mtime">
-			<a id="modified" class="columntitle" href="#" onclick="event.preventDefault()"
+			<a class="columntitle" href="#" onclick="event.preventDefault()"
 			   data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span
 					class="sort-indicator"></span></a>
 			<span class="selectedActions">
diff --git a/apps/files/templates/simplelist.php b/apps/files/templates/simplelist.php
index 45c6f812501..4947d44e49f 100644
--- a/apps/files/templates/simplelist.php
+++ b/apps/files/templates/simplelist.php
@@ -25,7 +25,7 @@
 				<a class="size sort columntitle" onclick="event.preventDefault()" href="#" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th class="hidden column-mtime">
-				<a id="modified" class="columntitle" onclick="event.preventDefault()" href="#" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
+				<a class="columntitle" onclick="event.preventDefault()" href="#" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 				<span class="selectedActions">
 				    <a onclick="event.preventDefault()" href="#" class="delete-selected">
 					<img class="svg" alt=""
diff --git a/apps/files_trashbin/templates/index.php b/apps/files_trashbin/templates/index.php
index c134d2c75c6..8637a3579b0 100644
--- a/apps/files_trashbin/templates/index.php
+++ b/apps/files_trashbin/templates/index.php
@@ -39,7 +39,7 @@
 				</div>
 			</th>
 			<th class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a>
+				<a class="columntitle" data-sort="mtime"><span><?php p($l->t('Deleted')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>
diff --git a/apps/systemtags/templates/list.php b/apps/systemtags/templates/list.php
index cea67413327..b6298ef2d23 100644
--- a/apps/systemtags/templates/list.php
+++ b/apps/systemtags/templates/list.php
@@ -25,7 +25,7 @@
 				<a class="size sort columntitle" data-sort="size"><span><?php p($l->t('Size')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 			<th class="hidden column-mtime">
-				<a id="modified" class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
+				<a class="columntitle" data-sort="mtime"><span><?php p($l->t('Modified')); ?></span><span class="sort-indicator"></span></a>
 			</th>
 		</tr>
 	</thead>
-- 
cgit v1.2.3


From b896cd7f01f6fc6ddcaba2685d9f5fce4e7163f8 Mon Sep 17 00:00:00 2001
From: Vincent Petry <vincent@nextcloud.com>
Date: Tue, 26 Jul 2022 15:34:19 +0200
Subject: 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>
---
 apps/files_sharing/tests/js/publicAppSpec.js       | 1 +
 apps/files_trashbin/templates/index.php            | 2 +-
 apps/systemtags/tests/js/systemtagsfilelistSpec.js | 2 +-
 core/templates/layout.user.php                     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'apps')

diff --git a/apps/files_sharing/tests/js/publicAppSpec.js b/apps/files_sharing/tests/js/publicAppSpec.js
index b9d8cbe28e2..e8e5f0a5109 100644
--- 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 8637a3579b0..f25dd6a47c4 100644
--- 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 068eb0cbf5c..66272320e1d 100644
--- 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 63fb5c597f7..ebbef7bae51 100644
--- 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']) ?>
-- 
cgit v1.2.3