From 5607a9205027dd341c44c962a3b6d4be887143c4 Mon Sep 17 00:00:00 2001
From: ashish <kumar.as@husky.neu.edu>
Date: Mon, 5 Dec 2016 03:06:19 -0500
Subject: [PATCH 1/2] MUS-279 : User Interface cleanup

adding tomato button style
---
 .../modules/arhome/components/arhome.template.html    | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html b/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
index 9adfc848..bd3e5cb3 100644
--- a/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
+++ b/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
@@ -1,3 +1,10 @@
+<div>
+
+
+
+
+</div>
+
 <div class='tabs'>
     <span ng-class="{'active': (ctrl.selected == '1')}" ng-click='ctrl.selected=1'>
       Your Playlists
@@ -25,11 +32,11 @@ <h1 ng-show="!ctrl.showPlaylist">Your Playlist is Empty</h1><br>
 				</div>
 <!--   				      	<a ng-click="ctrl.getPlayListId($index)">Delete</a> -->
 				
-				<button type="submit" ng-click="ctrl.addplaylist()" ng-show="ctrl.new_playlist_data1">add new playlist</button>
+				<button class='tomatobttn' type="submit" ng-click="ctrl.addplaylist()" ng-show="ctrl.new_playlist_data1">add new playlist</button>
 				
 				<div ng-show="ctrl.new_playlist_data" >        
 					<input type="text" placeholder="Enter Title" ng-model="ctrl.input" id="input" focus>
-					<button type="submit" ng-click ="ctrl.add()"> submit</button></div>
+					<button class='tomatobttn' type="submit" ng-click ="ctrl.add()"> submit</button></div>
 					
 				<div class="alert alert-danger" ng-show="ctrl.error_message" >{{ctrl.errormsg}}</div>
 		</div>

From 0296409805e6142bfed31a34a6fc9da562ac370f Mon Sep 17 00:00:00 2001
From: ashish <kumar.as@husky.neu.edu>
Date: Mon, 5 Dec 2016 03:21:18 -0500
Subject: [PATCH 2/2] MUS-253 : UI of single playlist

Added playlist name to the playlist .
---
 .../arhome/components/arhome.controller.js    | 21 ++++++++++---------
 .../arhome/components/arhome.template.html    |  2 +-
 .../modal/single-playlist.controller.js       |  6 +++---
 .../components/modal/single-playlist.html     |  2 +-
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/main/webapp/source/scripts/modules/arhome/components/arhome.controller.js b/src/main/webapp/source/scripts/modules/arhome/components/arhome.controller.js
index b30de395..ed7d1a0c 100644
--- a/src/main/webapp/source/scripts/modules/arhome/components/arhome.controller.js
+++ b/src/main/webapp/source/scripts/modules/arhome/components/arhome.controller.js
@@ -127,16 +127,17 @@
     	 getAllPlaylists();
     	 
     	 
-    	 ctrl.getPlayListId = function (id){
-     		console.log("PLAYLIST ID " + id)
- 		    $uibModal.open({
-  		      templateUrl: 'single-playlist.html',
-  		      controller: 'SinglePlaylistController',
-  		      controllerAs: 'model',
-  		      resolve: {
-  		        id: function () { return id; }
-  		      }
-  		    });
+    	 ctrl.getPlayListId = function (id,plname){
+      		console.log("PLAYLIST ID " + id)
+  		    $uibModal.open({
+   		      templateUrl: 'single-playlist.html',
+   		      controller: 'SinglePlaylistController',
+   		      controllerAs: 'model',
+   		      resolve: {
+   		        id: function () { return id; },
+  		        plname : function () {return plname;}
+   		      }
+   		    });
 
     	 }
  	}
diff --git a/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html b/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
index bd3e5cb3..a35ad431 100644
--- a/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
+++ b/src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
@@ -27,7 +27,7 @@ <h1 ng-show="!ctrl.showPlaylist">Your Playlist is Empty</h1><br>
 					<div class='item' ng-repeat="x in ctrl.myList" > 
 						<img src="dist/fonts/delete.png" class='delete' ng-click = "ctrl.deletePlayList(x.id)">
 						<img src="dist/fonts/share.png" class='share' ng-click = "ctrl.sharePlayList(x.id)">
-						<div class='pldiv' ng-click="ctrl.getPlayListId(x.id)">{{ x.playlistName }}</div>	
+						<div class='pldiv' ng-click="ctrl.getPlayListId(x.id,x.playlistName)">{{ x.playlistName }}</div>	
 					</div>
 				</div>
 <!--   				      	<a ng-click="ctrl.getPlayListId($index)">Delete</a> -->
diff --git a/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.controller.js b/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.controller.js
index 8b571fe4..d3349e0e 100644
--- a/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.controller.js
+++ b/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.controller.js
@@ -4,9 +4,9 @@
         .module("mllApp.arhome")
         .controller("SinglePlaylistController", SinglePlaylistController);
     
-    SinglePlaylistController.$inject = ['arHomeSerivce', 'authenticationService', 'id'];
+    SinglePlaylistController.$inject = ['arHomeSerivce', 'authenticationService', 'id','plname'];
 
-	function SinglePlaylistController(arHomeSerivce, authenticationService, id) {
+	function SinglePlaylistController(arHomeSerivce, authenticationService, id,plname) {
        this.authService = authenticationService;
        console.log("ID   " + id);
        var model = this;
@@ -15,7 +15,7 @@
        
        getSongsInPlaylist();       
        
-       
+       model.plname=plname;
        model.showPlaylist = function(){
     	   
        }
diff --git a/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.html b/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.html
index 9057e567..c9b57760 100644
--- a/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.html
+++ b/src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.html
@@ -1,4 +1,4 @@
-<h1>PLAY LIST</h1>
+<h1>{{model.plname}}</h1>
 
 <div>
 	<table