diff options
author | Adam Coldrick <adam@sotk.co.uk> | 2015-09-28 23:09:14 +0100 |
---|---|---|
committer | Adam Coldrick <adam@sotk.co.uk> | 2015-09-29 00:39:57 +0100 |
commit | 44c09319b4875425ea45c8cfb90f56e54d445d58 (patch) | |
tree | fa74e78ba357de61c9caff56197d9d57f90fbaf4 | |
parent | 178df59d37a1db0bb31615ba266c27b258f7c52f (diff) | |
download | ciat-ui-44c09319b4875425ea45c8cfb90f56e54d445d58.tar.gz |
First attempt at using $routeProvider
-rw-r--r-- | index.html | 27 | ||||
-rw-r--r-- | js/main.js | 18 |
2 files changed, 19 insertions, 26 deletions
@@ -4,35 +4,12 @@ <link href='https://fonts.googleapis.com/css?family=Sarpanch:800' rel='stylesheet' type='text/css'> <link href='style.css' rel='stylesheet' type='text/css'> <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.28/angular.min.js"></script> + <script src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.28/angular-route.min.js"></script> <script src="js/main.js"></script> </head> <body ng-app="ciat"> <h1><em>Baserock</em> <span>|</span> CIAT</h1> - <div class="container" ng-controller="VisualisationController" ng-click="select()"> - <div class="visualisation"> - <div class="box" - ng-class="{'pass': step.lastBuild.success, 'active': step.data.state == 'building', 'fail': step.lastBuild.failed}" - ng-repeat="step in steps" - ng-click="select(step, $event)"> - {{step.name}} - </div> - <br /> - <div class="detail" - ng-show="selected" - ng-click="$event.stopPropagation()"> - <h3>{{selected.name}}</h3> - <div class="detail-contents"> - <p><strong>State:</strong> {{selected.data.state}}</p> - <p><strong>Last Build:</strong> {{selected.lastBuild.number}} at {{selected.lastBuild.sourceStamps[0].changes[0].at}} - <p><strong>Logs for {{selected.lastBuild.number}}:</strong></p> - <ul> - <li ng-repeat="step in selected.lastBuild.steps"> - <a ng-href="{{step.logs[0][1]}}">{{step.name}} {{step.logs[0][0]}}</a> - </li> - </ul> - </div> - </div> - </div> + <div class="container" ng-view> </div> </body> </html> @@ -1,4 +1,4 @@ -var app = angular.module('ciat', []); +var app = angular.module('ciat', ['ngRoute']); app.config(['$httpProvider', function($httpProvider) { $httpProvider.defaults.useXDomain = true; @@ -6,6 +6,22 @@ app.config(['$httpProvider', function($httpProvider) { } ]); +app.config(['$routeProvider', function($routeProvider) { + $routeProvider.when('/', { + controller: 'VisualisationController', + templateUrl: 'partials/visualisation.html' + }) + .when('/builders/:name', { + controller: 'BuilderDetailController', + templateUrl: 'partials/builder_detail.html' + }) + .when('/builders/:name/build/:number', { + controller: 'BuildDetailController', + templateUrl: 'partials/build_detail.html' + }) + .otherwise({redirectTo: '/'}); +}]); + app.controller('VisualisationController', function($scope, $http, $q, $interval) { function checkInArray(array, key) { if (array) { |