Browse Source

Merge pull request #33361 from nextcloud/techdebt/noid/further-cleanup

Further markup cleanup
pull/33316/head
Vincent Petry 4 years ago
committed by GitHub
parent
commit
ac4e60e6f4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      apps/files/templates/recentlist.php
  2. 2
      apps/files/templates/simplelist.php
  3. 1
      apps/files_sharing/tests/js/publicAppSpec.js
  4. 4
      apps/files_trashbin/templates/index.php
  5. 2
      apps/systemtags/templates/list.php
  6. 2
      apps/systemtags/tests/js/systemtagsfilelistSpec.js
  7. 2
      core/templates/layout.user.php

2
apps/files/templates/recentlist.php

@ -24,7 +24,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">

2
apps/files/templates/simplelist.php

@ -23,7 +23,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=""

1
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>' +

4
apps/files_trashbin/templates/index.php

@ -30,7 +30,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>
@ -38,7 +38,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>

2
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>

2
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>' +

2
core/templates/layout.user.php

@ -172,7 +172,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']) ?>

Loading…
Cancel
Save