diff --git a/client/index.html b/client/index.html index ba183df..8d81ac3 100644 --- a/client/index.html +++ b/client/index.html @@ -26,6 +26,9 @@
+ +
+
@@ -81,7 +84,9 @@ + + diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js new file mode 100644 index 0000000..43cfe07 --- /dev/null +++ b/client/js/controllers/home/machineDetails.js @@ -0,0 +1,21 @@ +/** + * The home controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('machineDetailsCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope) +{ + + + + + $scope.$on('showMachineDetailsEvent', function(eventName ,machine){ + $scope.machine=machine; + $('#machineDetailsModal').modal({backdrop: false, keyboard: true}); + }); + + + + + +}]); diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 27de5f3..3d57f8d 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -3,7 +3,7 @@ * * @param {$scope} $scope The $scope service from angular */ -mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute) +mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($scope, Compute, $rootScope) { var updatePage=function(){ @@ -12,5 +12,10 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', function ($scope, Compute) // Retrieve all Data Compute.pullData(updatePage); + + $scope.raiseShowMachineDetailsEvent=function(){ + var machine={name: "Machine 1"}; + $rootScope.$broadcast("showMachineDetailsEvent", machine); + } }]); diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html new file mode 100644 index 0000000..9da131e --- /dev/null +++ b/client/partials/home/machineDetails.html @@ -0,0 +1,38 @@ + diff --git a/client/partials/home/main.html b/client/partials/home/main.html index 7a5045a..e3611e5 100644 --- a/client/partials/home/main.html +++ b/client/partials/home/main.html @@ -1,8 +1,9 @@ -
+
Home
Main Content +
-
\ No newline at end of file +