diff --git a/client/app/components/navbar/navbar.html b/client/app/components/navbar/navbar.html
index 596d02a..1c96f7a 100755
--- a/client/app/components/navbar/navbar.html
+++ b/client/app/components/navbar/navbar.html
@@ -36,7 +36,7 @@
diff --git a/client/app/main.controller.js b/client/app/main.controller.js
index 984b63b..ca9da73 100755
--- a/client/app/main.controller.js
+++ b/client/app/main.controller.js
@@ -1,8 +1,8 @@
'use strict';
angular.module('dssWebApp')
- .controller('MainCtrl', function ($scope, $rootScope, $http, dialogs, logger, authService, SocketService, AudioService,
- UserModel, LoginService, Session, SERVER_CONFIG, CHAT_EVENTS, AUTH_EVENTS) {
+ .controller('MainCtrl', function ($scope, $rootScope, $http, $state, dialogs, logger, authService, SocketService, AudioService,
+ MixModel, UserModel, LoginService, Session, SERVER_CONFIG, CHAT_EVENTS, AUTH_EVENTS) {
$scope.isAuthorized = LoginService.isAuthorized;
$scope.isAuthenticated = LoginService.isAuthenticated;
$scope.currentPath = '';
@@ -127,4 +127,22 @@ angular.module('dssWebApp')
$scope.showChatbar = function () {
$scope.chatVisible = !$scope.chatVisible;
};
+
+ $scope.editMix = function (mix) {
+ $state.go('root.edit', {slug: mix.slug});
+ };
+
+ $scope.deleteMix = function (mix) {
+ var dlg = dialogs.create('app/dialogs/confirm/confirmDialog.html', 'confirmDialogCtrl', {
+ title: "Delete this mix?",
+ body: mix.title
+ });
+ dlg.result.then(function (result) {
+ if (result) {
+ MixModel.destroy(mix.slug).then(function () {
+ $state.go('root.mixes');
+ });
+ }
+ });
+ };
});
diff --git a/client/app/views/home/home.html b/client/app/views/home/home.html
index cccf438..0efe798 100755
--- a/client/app/views/home/home.html
+++ b/client/app/views/home/home.html
@@ -1,3 +1,5 @@
-
-
+
diff --git a/client/app/views/mixes/mixes.directive.html b/client/app/views/mixes/mixes.directive.html
index 58111e3..c80ad68 100755
--- a/client/app/views/mixes/mixes.directive.html
+++ b/client/app/views/mixes/mixes.directive.html
@@ -2,15 +2,12 @@
@@ -31,12 +28,24 @@
diff --git a/client/app/views/mixes/mixes.html b/client/app/views/mixes/mixes.html
index d432291..6b6e58f 100755
--- a/client/app/views/mixes/mixes.html
+++ b/client/app/views/mixes/mixes.html
@@ -1,5 +1,8 @@
-
\ No newline at end of file
+
+
+
+
diff --git a/client/app/views/templates/audioGallery.html b/client/app/views/templates/audioGallery.html
index 2edcd29..ac11dac 100644
--- a/client/app/views/templates/audioGallery.html
+++ b/client/app/views/templates/audioGallery.html
@@ -1,27 +1,23 @@
-