From 6e16e058ef70778cf67ee83a0c3fe31d51aa6c2a Mon Sep 17 00:00:00 2001
From: James Barnsley <james@barnsley.nz>
Date: Thu, 20 Apr 2017 16:50:35 +1200
Subject: [PATCH] Inherit standard input field styles; Version event

---
 src/js/components/Modal/EditRadioModal.js | 50 ++++++++++++++---------
 src/js/services/ui/middleware.js          | 11 +++--
 src/scss/components/_lists.scss           |  2 +-
 src/scss/components/_modal.scss           | 10 +----
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/js/components/Modal/EditRadioModal.js b/src/js/components/Modal/EditRadioModal.js
index d14a4d6a..2b08f44f 100755
--- a/src/js/components/Modal/EditRadioModal.js
+++ b/src/js/components/Modal/EditRadioModal.js
@@ -110,25 +110,37 @@ export default class EditRadioModal extends React.Component{
 			}
 		}
 
-		return (
-			<div>
-				<div className="list">
-					{
-						seeds.map((seed,index) => {
-							return (
-								<div className="list-item" key={seed.uri}>
-									{seed.unresolved ? <span className="grey-text">{seed.uri}</span> : <span>{seed.name}</span> }
-									<span className="grey-text">&nbsp;({seed.type})</span>
-									<button className="discrete remove-uri"  onClick={e => this.removeSeed(seed.uri)}>
-										<FontAwesome name="close" />&nbsp;Remove
-									</button>
-								</div>
-							)
-						})
-					}
+		if (seeds.length > 0){
+			return (
+				<div>
+					<div className="list">
+						{
+							seeds.map((seed,index) => {
+								return (
+									<div className="list-item" key={seed.uri}>
+										{seed.unresolved ? <span className="grey-text">{seed.uri}</span> : <span>{seed.name}</span> }
+										<span className="grey-text">&nbsp;({seed.type})</span>
+										<button className="discrete remove-uri"  onClick={e => this.removeSeed(seed.uri)}>
+											<FontAwesome name="close" />&nbsp;Remove
+										</button>
+									</div>
+								)
+							})
+						}
+					</div>
 				</div>
-			</div>
-		)
+			)
+		} else {
+			return (
+				<div>
+					<div className="list">
+						<div className="list-item no-click">
+							<span className="grey-text">No seeds</span>
+						</div>
+					</div>
+				</div>
+			)
+		}
 	}
 
 	render(){
@@ -139,7 +151,7 @@ export default class EditRadioModal extends React.Component{
 				<form>
 					{this.renderSeeds()}
 
-					<div className="field no-top-margin">
+					<div className="field">
 						<input 
 							type="text"
 							placeholder="Comma-separated URIs"
diff --git a/src/js/services/ui/middleware.js b/src/js/services/ui/middleware.js
index 9ea43811..03fc2b44 100755
--- a/src/js/services/ui/middleware.js
+++ b/src/js/services/ui/middleware.js
@@ -21,7 +21,7 @@ const UIMiddleware = (function(){
                 break
 
             case 'PUSHER_CONNECTED':
-                ReactGA.event({ category: 'Pusher', action: 'Connected', label: action.connection_id+'/'+action.username })
+                ReactGA.event({ category: 'Pusher', action: 'Connected', label: action.username })
                 next(action)
                 break
 
@@ -350,9 +350,12 @@ const UIMiddleware = (function(){
                 next(action)
                 break
 
-            case 'VERSION':
-                if( action.version.upgrade_available )
-                store.dispatch( uiActions.createNotification( 'Version '+action.version.latest+' is available. See settings to upgrade.' ) )
+            case 'PUSHER_VERSION':
+                ReactGA.event({ category: 'Pusher', action: 'Version', label: action.version.current })
+                
+                if (action.version.upgrade_available){
+                    store.dispatch( uiActions.createNotification( 'Version '+action.version.latest+' is available. See settings to upgrade.' ) )
+                }
                 next( action )
                 break
 
diff --git a/src/scss/components/_lists.scss b/src/scss/components/_lists.scss
index 18ee3786..fc6d4ea4 100755
--- a/src/scss/components/_lists.scss
+++ b/src/scss/components/_lists.scss
@@ -22,7 +22,7 @@
 			background: $yellow !important;
 		}
 
-		:root .notouch &:not(.header):hover {
+		:root .notouch &:not(.header):not(.no-click):hover {
 			background: rgba(150,150,150,0.1);
 			cursor: pointer;
 		}
diff --git a/src/scss/components/_modal.scss b/src/scss/components/_modal.scss
index b0541b5f..da2f416f 100755
--- a/src/scss/components/_modal.scss
+++ b/src/scss/components/_modal.scss
@@ -88,11 +88,6 @@
 					top: 18px;
 					left: 10px;
 				}
-
-				&:hover {
-					cursor: pointer;
-					background: rgba(255,255,255,0.1);
-				}
 			}
 
 			&.playlists {
@@ -136,11 +131,10 @@
 		form {
 			.field {
 				position: relative;
-				margin-top: 10px;
+				margin-top: 50px;
 
 				input[type="text"]{
-					font-size: 14px;
-					padding: 16px 18px;
+					padding-right: 80px;
 				}
 			}			
 		}