github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-07-08 05:51:47 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fixed: UI fixes from Sonarr

Browse source 
Co-Authored-By: Mark McDowall <markus101@users.noreply.github.com>
This commit is contained in:
Qstick 2018-08-26 00:39:04 -04:00
parent 6eafffeb2c
commit b506fd3ab7
20 changed files with 117 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

3
frontend/src/AddArtist/AddNewArtist/AddNewArtistSearchResult.js
View file

@ -116,12 +116,13 @@ class AddNewArtistSearchResult extends Component {
{
isExistingArtist &&
<span title="Already in your library">
<Icon
className={styles.alreadyExistsIcon}
name={icons.CHECK_CIRCLE}
size={36}
title="Already in your library"
/>
</span>
}
</div>

3
frontend/src/Album/Details/AlbumDetailsMedium.js
View file

@ -134,12 +134,13 @@ class AlbumDetailsMedium extends Component {
className={styles.expandButton}
onPress={this.onExpandPress}
>
<span title={isExpanded ? 'Hide tracks' : 'Show tracks'}>
<Icon
className={styles.expandButtonIcon}
name={isExpanded ? icons.COLLAPSE : icons.EXPAND}
title={isExpanded ? 'Hide tracks' : 'Show tracks'}
size={24}
/>
</span>
{
!isSmallScreen &&
<span>&nbsp;</span>

15
frontend/src/Album/EpisodeStatus.js
View file

@ -48,10 +48,9 @@ function EpisodeStatus(props) {
if (grabbed) {
return (
<div className={styles.center}>
<div className={styles.center} title="Album is downloading">
<Icon
name={icons.DOWNLOADING}
title="Album is downloading"
/>
</div>
);
@ -75,10 +74,9 @@ function EpisodeStatus(props) {
if (!airDateUtc) {
return (
<div className={styles.center}>
<div className={styles.center} title="TBA">
<Icon
name={icons.TBA}
title="TBA"
/>
</div>
);
@ -86,10 +84,9 @@ function EpisodeStatus(props) {
if (!monitored) {
return (
<div className={styles.center}>
<div className={styles.center} title="Album is not monitored">
<Icon
name={icons.UNMONITORED}
title="Album is not monitored"
/>
</div>
);
@ -97,20 +94,18 @@ function EpisodeStatus(props) {
if (hasAired) {
return (
<div className={styles.center}>
<div className={styles.center} title="Track missing from disk">
<Icon
name={icons.MISSING}
title="Track missing from disk"
/>
</div>
);
}
return (
<div className={styles.center}>
<div className={styles.center} title="Album has not aired">
<Icon
name={icons.NOT_AIRED}
title="Album has not aired"
/>
</div>
);

4
frontend/src/AlbumStudio/AlbumStudioRow.js
View file

@ -39,12 +39,12 @@ class AlbumStudioRow extends Component {
/>
<TableRowCell className={styles.status}>
<span title={status === 'ended' ? 'Ended' : 'Continuing'}>
<Icon
className={styles.statusIcon}
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
title={status === 'ended' ? 'Ended' : 'Continuing'}
/>
</span>
</TableRowCell>
<TableRowCell className={styles.title}>

9
frontend/src/Artist/ArtistBanner.js
View file

@ -67,14 +67,11 @@ class ArtistBanner extends Component {
hasError: false,
isLoaded: true
});
}
// The banner could not be loaded..
if (!nextBanner && (this.props !== prevProps)) {
} else if (!nextBanner && banner) {
this.setState({
banner: undefined,
banner: nextBanner,
bannerUrl: bannerPlaceholder,
hasError: true
hasError: false
});
}
}

9
frontend/src/Artist/ArtistPoster.js
View file

@ -67,14 +67,11 @@ class ArtistPoster extends Component {
hasError: false,
isLoaded: true
});
}
// The poster could not be loaded..
if (!nextPoster && (this.props !== prevProps)) {
} else if (!nextPoster && poster) {
this.setState({
poster: undefined,
poster: nextPoster,
posterUrl: posterPlaceholder,
hasError: true
hasError: false
});
}
}

2
frontend/src/Artist/Delete/DeleteArtistModalContent.js
View file

@ -136,7 +136,9 @@ DeleteArtistModalContent.propTypes = {
};
DeleteArtistModalContent.defaultProps = {
statistics: {
trackFileCount: 0
}
};
export default DeleteArtistModalContent;

3
frontend/src/Artist/Details/ArtistDetailsSeason.js
View file

@ -150,12 +150,13 @@ class ArtistDetailsSeason extends Component {
</div>
<span title={isExpanded ? 'Hide albums' : 'Show albums'}>
<Icon
className={styles.expandButtonIcon}
name={isExpanded ? icons.COLLAPSE : icons.EXPAND}
title={isExpanded ? 'Hide albums' : 'Show albums'}
size={24}
/>
</span>
{
!isSmallScreen &&

7
frontend/src/Artist/Index/Table/ArtistStatusCell.js
View file

@ -19,18 +19,19 @@ function ArtistStatusCell(props) {
className={className}
{...otherProps}
>
<span title={monitored ? 'Artist is monitored' : 'Artist is unmonitored'}>
<Icon
className={styles.statusIcon}
name={monitored ? icons.MONITORED : icons.UNMONITORED}
title={monitored ? 'Artist is monitored' : 'Artist is unmonitored'}
/>
</span>
<span title={status === 'ended' ? 'Ended' : 'Continuing'}>
<Icon
className={styles.statusIcon}
name={status === 'ended' ? icons.ARTIST_ENDED : icons.ARTIST_CONTINUING}
title={status === 'ended' ? 'Ended' : 'Continuing'}
/>
</span>
</Component>
);
}

3
frontend/src/Calendar/Agenda/AgendaEvent.js
View file

@ -107,10 +107,11 @@ class AgendaEvent extends Component {
{
!queueItem && grabbed &&
<span title="Album is downloading">
<Icon
name={icons.DOWNLOADING}
title="Album is downloading"
/>
</span>
}
</Link>
</div>

3
frontend/src/Calendar/Events/CalendarEvent.js
View file

@ -91,11 +91,12 @@ class CalendarEvent extends Component {
{
!queueItem && grabbed &&
<span title="Album is downloading">
<Icon
className={styles.statusIcon}
name={icons.DOWNLOADING}
title="Album is downloading"
/>
</span>
}
</div>

5
frontend/src/Components/Icon.js
View file

@ -16,6 +16,10 @@ function Icon(props) {
...otherProps
} = props;
if (title && !window.Lidarr.isProduction) {
console.error('Icons cannot have a title');
}
return (
<FontAwesomeIcon
className={classNames(
@ -24,7 +28,6 @@ function Icon(props) {
)}
icon={name}
spin={isSpinning}
title={title}
style={{
fontSize: `${size}px`
}}

3
frontend/src/Components/Page/Sidebar/Messages/Message.js
View file

@ -45,10 +45,9 @@ function Message(props) {
styles[type]
)}
>
<div className={styles.iconContainer}>
<div className={styles.iconContainer} title={name}>
<Icon
name={getIconName(name)}
title={name}
/>
</div>

3
frontend/src/Settings/Profiles/Quality/QualityProfileItem.js
View file

@ -92,10 +92,9 @@ class QualityProfileItem extends Component {
{
connectDragSource(
<div className={styles.dragHandle}>
<div className={styles.dragHandle} title="Create group">
<Icon
className={styles.dragIcon}
title="Create group"
name={icons.REORDER}
/>
</div>

3
frontend/src/Settings/Profiles/Quality/QualityProfileItemGroup.js
View file

@ -129,11 +129,10 @@ class QualityProfileItemGroup extends Component {
{
connectDragSource(
<div className={styles.dragHandle}>
<div className={styles.dragHandle} title="Reorder">
<Icon
className={styles.dragIcon}
name={icons.REORDER}
title="Reorder"
/>
</div>
)

5
frontend/src/Store/Actions/calendarActions.js
View file

@ -45,7 +45,7 @@ export const defaultState = {
filters: [
{
key: 'monitored',
value: false,
value: false || true,
type: filterTypes.EQUAL
}
]
@ -192,7 +192,6 @@ export const clearCalendar = createAction(CLEAR_CALENDAR);
// Action Handlers
export const actionHandlers = handleThunks({
[FETCH_CALENDAR]: function(getState, payload, dispatch) {
const state = getState();
const unmonitored = state.calendar.selectedFilterKey === 'all';
@ -339,8 +338,8 @@ export const reducers = createHandleActions({
[CLEAR_CALENDAR]: (state) => {
const {
view,
showUpcoming,
selectedFilterKey,
showUpcoming,
...otherDefaultState
} = defaultState;

2
frontend/src/Store/Actions/queueActions.js
View file

@ -225,7 +225,7 @@ export const actionHandlers = handleThunks({
promise.done((data) => {
dispatch(batchActions([
dispatch(fetchQueue()),
fetchQueue(),
set({
section: paged,

3
frontend/src/System/Backup/BackupRow.js
View file

@ -87,10 +87,11 @@ class BackupRow extends Component {
<TableRow key={id}>
<TableRowCell className={styles.type}>
{
<span title={iconTooltip}>
<Icon
name={iconClassName}
title={iconTooltip}
/>
</span>
}
</TableRowCell>

3
frontend/src/System/Status/Health/Health.js
View file

@ -125,11 +125,12 @@ class Health extends Component {
return (
<TableRow key={`health${item.message}`}>
<TableRowCell>
<span title={titleCase(item.type)}>
<Icon
name={icons.DANGER}
kind={item.type.toLowerCase() === 'error' ? kinds.DANGER : kinds.WARNING}
title={titleCase(item.type)}
/>
</span>
</TableRowCell>
<TableRowCell>{item.message}</TableRowCell>

33
src/NzbDrone.Core/Music/Commands/BulkMoveArtistCommand.cs
View file

@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using NzbDrone.Core.Messaging.Commands;
@ -11,9 +12,39 @@ namespace NzbDrone.Core.Music.Commands
public override bool SendUpdatesToClient => true;
}
public class BulkMoveArtist
public class BulkMoveArtist : IEquatable<BulkMoveArtist>
{
public int ArtistId { get; set; }
public string SourcePath { get; set; }
public bool Equals(BulkMoveArtist other)
{
if (other == null)
{
return false;
}
return ArtistId.Equals(other.ArtistId);
}
public override bool Equals(object obj)
{
if (obj == null)
{
return false;
}
if (obj.GetType() != GetType())
{
return false;
}
return ArtistId.Equals(((BulkMoveArtist)obj).ArtistId);
}
public override int GetHashCode()
{
return ArtistId.GetHashCode();
}
}
}