diff options
| -rw-r--r-- | client/index.html | 1 | ||||
| -rw-r--r-- | client/js/app.js | 8 | ||||
| -rw-r--r-- | client/js/controllers/image/image.js | 9 | ||||
| -rw-r--r-- | client/partials/home/home.html (renamed from client/partials/home/main.html) | 0 | ||||
| -rw-r--r-- | client/partials/image/image.html | 8 | ||||
| -rw-r--r-- | client/partials/menu.html | 3 | ||||
| -rw-r--r-- | client/partials/network/network.html (renamed from client/partials/network/main.html) | 0 |
7 files changed, 26 insertions, 3 deletions
diff --git a/client/index.html b/client/index.html index 48ea4a0..a06994c 100644 --- a/client/index.html +++ b/client/index.html @@ -89,6 +89,7 @@ <script src="./js/controllers/home/home.js"></script> <script src="./js/controllers/home/machineDetails.js"></script> <script src="./js/controllers/network/network.js"></script> + <script src="./js/controllers/image/image.js"></script> diff --git a/client/js/app.js b/client/js/app.js index e2d5b9b..1602e65 100644 --- a/client/js/app.js +++ b/client/js/app.js @@ -13,12 +13,16 @@ mainApp.config(['$routeProvider', function($routeProvider){ $routeProvider. when('/home',{ - templateUrl: 'partials/home/main.html', + templateUrl: 'partials/home/home.html', controller: 'homeCtrl' }). when('/network',{ - templateUrl: 'partials/network/main.html', + templateUrl: 'partials/network/network.html', controller: 'networkCtrl' + }). + when('/image',{ + templateUrl: 'partials/image/image.html', + controller: 'imageCtrl' }).otherwise({ redirectTo: '/home' }); diff --git a/client/js/controllers/image/image.js b/client/js/controllers/image/image.js new file mode 100644 index 0000000..036dec3 --- /dev/null +++ b/client/js/controllers/image/image.js @@ -0,0 +1,9 @@ +/** + * The image controller + * + * @param {$scope} $scope The $scope service from angular + */ +mainApp.controller('imageCtrl', function ($scope) +{ + $scope.title="Test"; +}); diff --git a/client/partials/home/main.html b/client/partials/home/home.html index f9f8878..f9f8878 100644 --- a/client/partials/home/main.html +++ b/client/partials/home/home.html diff --git a/client/partials/image/image.html b/client/partials/image/image.html new file mode 100644 index 0000000..586f003 --- /dev/null +++ b/client/partials/image/image.html @@ -0,0 +1,8 @@ + <div class="panel panel-default"> + <div class="panel-heading"> + Image + </div> + <div class="panel-body"> + Main Content + </div> +</div> diff --git a/client/partials/menu.html b/client/partials/menu.html index dfd5842..a473fd8 100644 --- a/client/partials/menu.html +++ b/client/partials/menu.html @@ -1,4 +1,5 @@ <div class="list-group"> <a href="#/home" class="list-group-item">Home</a> <a href="#/network" class="list-group-item">Network</a> -</div>
\ No newline at end of file + <a href="#/image" class="list-group-item">Images</a> +</div> diff --git a/client/partials/network/main.html b/client/partials/network/network.html index 8b779be..8b779be 100644 --- a/client/partials/network/main.html +++ b/client/partials/network/network.html |