Skip to content

Commit

Permalink
Merge branch 'develop' into patch7
Browse files Browse the repository at this point in the history
  • Loading branch information
@lachlan-00
lachlan-00 committed May 13, 2024
2 parents 8193fab + 576f5e0 commit d5559a4
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 17 deletions.
6 changes: 3 additions & 3 deletions public/templates/show_album.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
<?php }
}
if (($owner_id > 0 && $owner_id == $current_user?->getId()) || Access::check(AccessTypeEnum::INTERFACE, AccessLevelEnum::CONTENT_MANAGER)) {
$saveorder = T_('Save Track Order');
$saveorder = "&nbsp;" . T_('Save Track Order');
if (AmpConfig::get('statistical_graphs') && is_dir(__DIR__ . '/../../vendor/szymach/c-pchart/src/Chart/')) { ?>
<li>
<a href="<?php echo $web_path; ?>/stats.php?action=graph&object_type=album&object_id=<?php echo $album->id; ?>">
Expand All @@ -217,8 +217,8 @@
</li>
<li>
<a href="javascript:NavigateTo('<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>');" onclick="return confirm('<?php echo T_('Do you really want to update from tags?'); ?>');">
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags')); ?>
<?php echo T_('Update from tags'); ?>
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags'));
echo "&nbsp;" . T_('Update from tags'); ?>
</a>
</li>
<?php
Expand Down
10 changes: 5 additions & 5 deletions public/templates/show_album_disk.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@
<?php } ?>
<?php } ?>
<?php if (($owner_id > 0 && $owner_id == $current_user->getId()) || $access50) {
$saveorder = T_('Save Track Order'); ?>
$saveorder = "&nbsp;" . T_('Save Track Order'); ?>
<?php if (AmpConfig::get('statistical_graphs') && is_dir(__DIR__ . '/../../vendor/szymach/c-pchart/src/Chart/')) { ?>
<li>
<a href="<?php echo $web_path; ?>/stats.php?action=graph&object_type=album_disk&object_id=<?php echo $albumDisk->id; ?>">
Expand All @@ -207,8 +207,8 @@
<?php } ?>
<li>
<a href="javascript:NavigateTo('<?php echo $web_path; ?>/albums.php?action=update_disk_from_tags&album_disk=<?php echo $albumDisk->id; ?>');" onclick="return confirm('<?php echo T_('Do you really want to update from tags?'); ?>');">
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags')); ?>
<?php echo T_('Update from tags'); ?>
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags'));
echo "&nbsp;" . T_('Update from tags'); ?>
</a>
</li>
<?php
Expand All @@ -225,8 +225,8 @@
<?php } ?>
<li>
<a id="<?php echo 'edit_album_' . $albumDisk->album_id; ?>" onclick="showEditDialog('album_row', '<?php echo $albumDisk->album_id; ?>', '<?php echo 'edit_album_' . $albumDisk->album_id; ?>', '<?php echo addslashes(T_('Album Edit')); ?>', '')">
<?php echo Ui::get_material_symbol('edit', T_('Edit')); ?>
<?php echo "&nbsp;" . T_('Edit Album'); ?>
<?php echo Ui::get_material_symbol('edit', T_('Edit'));
echo "&nbsp;" . T_('Edit Album'); ?>
</a>
</li>
<?php
Expand Down
4 changes: 2 additions & 2 deletions public/templates/show_album_group_disks.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -207,8 +207,8 @@
<?php } ?>
<li>
<a href="javascript:NavigateTo('<?php echo $web_path; ?>/albums.php?action=update_from_tags&album_id=<?php echo $album->id; ?>');" onclick="return confirm('<?php echo T_('Do you really want to update from tags?'); ?>');">
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags')); ?>
<?php echo T_('Update from tags'); ?>
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags'));
echo "&nbsp;" . T_('Update from tags'); ?>
</a>
</li>
<?php
Expand Down
8 changes: 4 additions & 4 deletions public/templates/show_artist.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -190,8 +190,8 @@
<?php if (Access::check(AccessTypeEnum::INTERFACE, AccessLevelEnum::CONTENT_MANAGER)) { ?>
<li>
<a href="javascript:NavigateTo('<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>');" onclick="return confirm('<?php echo T_('Do you really want to update from tags?'); ?>');">
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags')); ?>
<?php echo T_('Update from tags'); ?>
<?php echo Ui::get_material_symbol('sync_alt', T_('Update from tags'));
echo "&nbsp;" . T_('Update from tags'); ?>
</a>
</li>
<?php if (!empty($artist->mbid) && Preference::get_by_user($current_user->id, 'mb_overwrite_name')) { ?>
Expand Down Expand Up @@ -258,8 +258,8 @@
} ?>
<li>
<a id="<?php echo 'edit_artist_' . $artist->id; ?>" onclick="showEditDialog('artist_row', '<?php echo $artist->id; ?>', '<?php echo 'edit_artist_' . $artist->id; ?>', '<?php echo addslashes(T_('Artist Edit')); ?>', '')">
<?php echo Ui::get_material_symbol('edit', T_('Edit')); ?>
<?php echo "&nbsp;" . T_('Edit Artist'); ?>
<?php echo Ui::get_material_symbol('edit', T_('Edit'));
echo "&nbsp;" . T_('Edit Artist'); ?>
</a>
</li>
<?php }
Expand Down
6 changes: 3 additions & 3 deletions public/templates/show_playlist.inc.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,8 @@
<li>
<a onclick="submitNewItemsOrder('<?php echo $playlist->id; ?>', 'reorder_playlist_table', 'track_',
'<?php echo $web_path; ?>/playlist.php?action=set_track_numbers&playlist_id=<?php echo $playlist->id; ?>', '<?php echo RefreshPlaylistMediasAction::REQUEST_KEY; ?>')">
<?php echo Ui::get_material_symbol('save', T_('Save Track Order')); ?>
<?php echo T_('Save Track Order'); ?>
<?php echo Ui::get_material_symbol('save', T_('Save Track Order'));
echo "&nbsp;" . T_('Save Track Order'); ?>
</a>
</li>
<li>
Expand Down Expand Up @@ -105,7 +105,7 @@
<?php if (AmpConfig::get('share')) { ?>
<a onclick="showShareDialog(event, 'playlist', '<?php echo $playlist->id; ?>');">
<?php echo UI::get_material_symbol('share', T_('Share playlist')); ?>
&nbsp;&nbsp;<?php echo T_('Share playlist'); ?>
&nbsp;<?php echo T_('Share playlist'); ?>
</a>
<?php } ?>
<?php if (AmpConfig::get('directplay')) { ?>
Expand Down

0 comments on commit d5559a4

Please sign in to comment.