Better disc subtitle

This commit is contained in:
Deluan 2020-05-23 15:33:29 -04:00
parent c13766bbc3
commit 5c46f7822f
3 changed files with 21 additions and 15 deletions

View File

@ -237,8 +237,6 @@
"note": "ATENÇÃO",
"transcodingDisabled": "Por questão de segurança, esta tela de configuração está desabilitada. Se você quiser alterar estas configurações, reinicie o servidor com a opção %{config}",
"transcodingEnabled": "Navidrome está sendo executado com a opção %{config}. Isto permite que potencialmente se execute comandos do sistema pela interface Web. É recomendado que vc mantenha esta opção desabilitada, e só a habilite quando precisar configurar opções de Conversão",
"discSubtitle": "%{subtitle} (disco %{number})",
"discWithoutSubtitle": "Disco %{number}",
"songsAddedToPlaylist": "Música adicionada à playlist |||| %{smart_count} músicas adicionadas à playlist"
},
"menu": {

View File

@ -1,7 +1,22 @@
import React, { useState, isValidElement, cloneElement } from 'react'
import { Datagrid, DatagridBody, DatagridRow, useTranslate } from 'react-admin'
import { Datagrid, DatagridBody, DatagridRow } from 'react-admin'
import { TableCell, TableRow, Typography } from '@material-ui/core'
import PropTypes from 'prop-types'
import { makeStyles } from '@material-ui/core/styles'
import AlbumIcon from '@material-ui/icons/Album'
const useStyles = makeStyles({
subtitle: {
whiteSpace: 'nowrap',
overflow: 'hidden',
textOverflow: 'ellipsis',
verticalAlign: 'middle',
},
discIcon: {
verticalAlign: 'text-top',
marginRight: '4px',
},
})
export const SongDatagridRow = ({
record,
@ -10,7 +25,7 @@ export const SongDatagridRow = ({
contextVisible,
...rest
}) => {
const translate = useTranslate()
const classes = useStyles()
const [visible, setVisible] = useState(false)
const childCount = React.Children.count(children)
return (
@ -19,15 +34,10 @@ export const SongDatagridRow = ({
<TableRow>
{record.trackNumber === 1 && (
<TableCell colSpan={children.length + 2}>
<Typography variant="h6">
{record.discSubtitle
? translate('message.discSubtitle', {
subtitle: record.discSubtitle,
number: record.discNumber,
})
: translate('message.discWithoutSubtitle', {
number: record.discNumber,
})}
<Typography variant="h6" className={classes.subtitle}>
<AlbumIcon className={classes.discIcon} fontSize={'small'} />
{record.discNumber}
{record.discSubtitle && `: ${record.discSubtitle}`}
</Typography>
</TableCell>
)}

View File

@ -238,8 +238,6 @@
"note": "NOTE",
"transcodingDisabled": "Changing the transcoding configuration through the web interface is disabled for security reasons. If you would like to change (edit or add) transcoding options, restart the server with the %{config} configuration option.",
"transcodingEnabled": "Navidrome is currently running with %{config}, making it possible to run system commands from the transcoding settings using the web interface. We recommend to disable it for security reasons and only enable it when configuring Transcoding options.",
"discSubtitle": "%{subtitle} (disc %{number})",
"discWithoutSubtitle": "Disc %{number}",
"songsAddedToPlaylist": "Added 1 song to playlist |||| Added %{smart_count} songs to playlist"
},
"menu": {