Skip to content

Mus 253 #159

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Axeish wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Mus 253 #159

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5607a92
MUS-279 : User Interface cleanup
Dec 5, 2016
0296409
MUS-253 : UI of single playlist
Dec 5, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions src/main/webapp/source/scripts/modules/arhome/components/arhome.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;}
}
});

}
}
Expand Down
13 changes: 10 additions & 3 deletions src/main/webapp/source/scripts/modules/arhome/components/arhome.template.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
<div>




</div>

<div class='tabs'>
<span ng-class="{'active': (ctrl.selected == '1')}" ng-click='ctrl.selected=1'>
Your Playlists
Expand All @@ -20,16 +27,16 @@ <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> -->

<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>
Expand Down
6 changes: 3 additions & 3 deletions src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -15,7 +15,7 @@

getSongsInPlaylist();


model.plname=plname;
model.showPlaylist = function(){

}
Expand Down
2 changes: 1 addition & 1 deletion src/main/webapp/source/scripts/modules/arhome/components/modal/single-playlist.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<h1>PLAY LIST</h1>
<h1>{{model.plname}}</h1>

<div>
<table
Expand Down