Buildout

jaedb · Apr 16, 2016 · 0b1f88a · 0b1f88a
1 parent 5818c09
commit 0b1f88a
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 28 deletions.
diff --git a/mopidy_spotmop/static/app.js b/mopidy_spotmop/static/app.js
@@ -33821,7 +33821,7 @@ angular.module('spotmop.services.dialog', [])
 		replace: true,
 		transclude: true,
 		templateUrl: 'app/services/dialog/addtoplaylist.template.html',
-		controller: ['$scope', '$element', '$rootScope', '$filter', 'DialogService', 'SpotifyService', 'SettingsService', function( $scope, $element, $rootScope, $filter, DialogService, SpotifyService, SettingsService ){
+		controller: ['$scope', '$element', '$rootScope', '$filter', 'DialogService', 'SpotifyService', 'SettingsService', 'NotifyService', function( $scope, $element, $rootScope, $filter, DialogService, SpotifyService, SettingsService, NotifyService ){
 
 			$scope.playlists = [];
 			var spotifyUserID = SettingsService.getSetting('spotifyuser', {id: 'undefined'}).id;
@@ -33836,7 +33836,7 @@ angular.module('spotmop.services.dialog', [])
 			 **/
 			$scope.playlistSelected = function( playlist ){
 
-				var selectedTracks = $filter('filter')( $scope.$parent.tracklist.tracks, { selected: true } );				
+				var selectedTracks = $filter('filter')( $scope.$parent.tracks, { selected: true } );				
 				var selectedTracksUris = [];
 
 				// construct a flat array of track uris
@@ -33858,7 +33858,7 @@ angular.module('spotmop.services.dialog', [])
 						// remove this dialog, and initiate standard notification
 						DialogService.remove();
 						$rootScope.$broadcast('spotmop:tracklist:unselectAll');
-						$scope.$emit('spotmop:notifyUser', {id: 'adding-to-playlist', message: 'Added '+selectedTracksUris.length+' tracks', autoremove: true});
+						NotifyService.notify( selectedTracksUris.length +' tracks added to '+ playlist.name );
 					});
 			};
 		}]

diff --git a/mopidy_spotmop/static/app.min.js b/mopidy_spotmop/static/app.min.js
diff --git a/mopidy_spotmop/static/app/services/dialog/addtoplaylist.template.html b/mopidy_spotmop/static/app/services/dialog/addtoplaylist.template.html
@@ -3,13 +3,8 @@
 	<h4 class="section-title dialog-title">Select playlist</h4>
 
 	<div class="select-playlist">
-		<div class="square-panel playlist" ng-repeat="playlist in playlists" singleclick="playlistSelected( playlist )">
-			<div class="image-container">
-				<thumbnail images="playlist.images"></thumbnail>
-			</div>
-			<div class="info animate">
-				<div class="name" ng-bind="playlist.name"></div>
-			</div>
+		<div class="playlist-item" singleclick="playlistSelected( playlist )" ng-repeat="playlist in playlists">
+			<div class="name" ng-bind="playlist.name"></div>
 		</div>
 	</div>
 

diff --git a/mopidy_spotmop/static/app/settings/template.html b/mopidy_spotmop/static/app/settings/template.html
@@ -164,7 +164,7 @@ <h4 class="section-title underline">
                     </div>
 				</div>
 
-                <div class="field" ng-if="settings.advancedMode && spotifyOnline">
+                <div class="field" ng-if="settings.spotmop.advancedMode && spotifyOnline">
                     <div class="label">Spotify authentication</div>
                     <div class="input">
                         <a class="button" ng-click="refreshSpotifyToken()"><i class="fa fa-refresh"></i>&nbsp; Force token refresh</a>

diff --git a/mopidy_spotmop/static/assets/css/style.css b/mopidy_spotmop/static/assets/css/style.css
@@ -2590,17 +2590,23 @@ slider .item-container > .square-panel {
 
 .add-to-playlist-dialog .select-playlist {
 	padding-top: 15px;
-	margin: 0 -2%;
 }
-
-.add-to-playlist-dialog .playlist {
-	display: block;
+
+.add-to-playlist-dialog .playlist-item {
+	font-size: 16px;
+	padding: 10px 3%;
+	border-top: 1px solid #333333;
+	width: 42%;
 	float: left;
-	width: 12.6666%;
 }
-
-.add-to-playlist-dialog .square-panel .info {
-	height: 30px;
+
+.add-to-playlist-dialog .playlist-item:focus,
+.add-to-playlist-dialog .playlist-item:active {
+	background: #08d58f;
+}
+
+.add-to-playlist-dialog .playlist-item:nth-child(2n){
+	margin-left: 4%;
 }
 
 
@@ -3364,10 +3370,6 @@ slider .item-container > .square-panel {
 		padding-right: 15%;
 	}
 
-	.add-to-playlist-dialog .playlist {
-		width: 21%;
-	}
-
 
 	/** 
 	 * Full player (now playing)
@@ -3498,6 +3500,12 @@ slider .item-container > .square-panel {
 		width: 100%;
 	}
 
+	.add-to-playlist-dialog .playlist-item {
+		float: none;
+		width: 94%;
+		margin-left: 0 !important;
+	}
+
 	.edit-playlist-dialog .actions {
 		padding-left: 0;
 	}

diff --git a/mopidy_spotmop/static/assets/css/style.min.css b/mopidy_spotmop/static/assets/css/style.min.css