secstate/Iris
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Context menu icons

Browse Source
This commit is contained in:
James Barnsley
2018-05-19 11:15:10 +12:00
parent 17a1169fd2
commit 8bdb49b3d5
11 changed files with 25403 additions and 23489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/js/components/ContextMenu.js
View File

@ -3,7 +3,9 @@ import React, { PropTypes } from 'react'
import { Link, hashHistory } from 'react-router'
import { connect } from 'react-redux'
import { bindActionCreators } from 'redux'
import FontAwesome from 'react-fontawesome'
import TrackList from './TrackList'
import Icon from './Icon'
import * as helpers from '../helpers'
import * as coreActions from '../services/core/actions'
@ -12,7 +14,6 @@ import * as pusherActions from '../services/pusher/actions'
import * as mopidyActions from '../services/mopidy/actions'
import * as lastfmActions from '../services/lastfm/actions'
import * as spotifyActions from '../services/spotify/actions'
import TrackList from './TrackList'
class ContextMenu extends React.Component{
@ -353,9 +354,7 @@ class ContextMenu extends React.Component{
<span className="menu-item-wrapper">
<a className="menu-item close-submenu" onClick={e => this.setState({submenu_expanded: false})}>
<span className="label">
<FontAwesome name='caret-left' />
&nbsp;&nbsp;
Back
<Icon name="arrow_back" />Back
</span>
</a>
</span>
@ -491,7 +490,7 @@ class ContextMenu extends React.Component{
<span className="menu-item-wrapper has-submenu">
<a className="menu-item" onClick={e => this.setPlaylistSubmenu()}>
<span className="label">Add to playlist</span>
<FontAwesome className="submenu-icon" name='caret-right' />
<Icon className="submenu-icon" name="arrow_forward" />
</a>
{this.renderPlaylistSubmenu()}
</span>

4
src/js/components/Sidebar.js
View File

@ -91,8 +91,8 @@ class Sidebar extends React.Component{
<Link className={this.linkClassName('settings')} to={global.baseURL+"settings"}>
<Icon name="settings" type="material" />
Settings
{this.props.test_mode ? <span className="status has-tooltip right-tooltip"><FontAwesome name="info-circle" className="orange-text" /><span className="tooltip">Test mode active</span></span>: null}
{!this.props.mopidy_connected || !this.props.pusher_connected ? <span className="status has-tooltip right-tooltip"><FontAwesome name="exclamation-triangle" className="red-text" /><span className="tooltip">{!this.props.mopidy_connected ? <span>Mopidy not connected<br /></span> : null}{!this.props.pusher_connected ? <span>Pusher not connected<br /></span> : null}</span></span> : null}
{this.props.test_mode ? <span className="status has-tooltip right-tooltip"><Icon name="info" className="orange-text" /><span className="tooltip">Test mode active</span></span>: null}
{!this.props.mopidy_connected || !this.props.pusher_connected ? <span className="status has-tooltip right-tooltip"><Icon name="warning" className="red-text" /><span className="tooltip">{!this.props.mopidy_connected ? <span>Mopidy not connected<br /></span> : null}{!this.props.pusher_connected ? <span>Pusher not connected<br /></span> : null}</span></span> : null}
</Link>
</section>