Merge branch 'release/1.0.2'

Release 1.0.1

app/app.js

@@ -4,7 +4,6 @@ angular.module('uifordocker', [
   'ui.router',
   'ui.select',
   'ngCookies',
-  'ngRoute',
   'ngSanitize',
   'dockerui.services',
   'dockerui.filters',
@@ -31,7 +30,7 @@ angular.module('uifordocker', [
 
     $urlRouterProvider.otherwise('/');
 
-    $stateProvider
+    $stateProvider
     .state('index', {
       url: '/',
       templateUrl: 'app/components/dashboard/dashboard.html',
@@ -92,7 +91,8 @@ angular.module('uifordocker', [
     $httpProvider.interceptors.push(function() {
       return {
         'response': function(response) {
-          if (typeof(response.data) === 'string' && response.data.startsWith('Conflict.')) {
+          if (typeof(response.data) === 'string' &&
+                  (response.data.startsWith('Conflict.') || response.data.startsWith('conflict:'))) {
             $.gritter.add({
               title: 'Error',
               text: $('<div>').text(response.data).html(),
@@ -113,4 +113,4 @@ angular.module('uifordocker', [
   // You need to set this to the api endpoint without the port i.e. http://192.168.1.9
   .constant('DOCKER_ENDPOINT', 'dockerapi')
   .constant('DOCKER_PORT', '') // Docker port, leave as an empty string if no port is requred.  If you have a port, prefix it with a ':' i.e. :4243
-  .constant('UI_VERSION', 'v1.0.0');
+  .constant('UI_VERSION', 'v1.0.2');

app/components/container/container.html

@@ -1,3 +1,11 @@
+<rd-header>
+  <rd-header-title title="Container details"></rd-header-title>
+  <rd-header-content>
+    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a>
+  </rd-header-content>
+</rd-header>
+
+
 <div class="row">
   <div class="col-lg-6 col-md-12 col-xs-12">
     <rd-widget>
@@ -53,8 +61,8 @@
             <button class="btn btn-danger" ng-click="remove()" ng-disabled="container.State.Running">Remove</button>
           </div>
           <div class="btn-group" role="group" aria-label="...">
-            <a class="btn btn-default" type="button" href="#/containers/{{ container.Id }}/stats">Stats</a>
-            <a class="btn btn-default" type="button" href="#/containers/{{ container.Id }}/logs">Logs</a>
+            <a class="btn btn-default" type="button" ui-sref="stats({id: container.Id})">Stats</a>
+            <a class="btn btn-default" type="button" ui-sref="logs({id: container.Id})">Logs</a>
           </div>
         </div>
         <div class="comment">
@@ -161,7 +169,7 @@
             </tr>
             <tr>
               <td>Image</td>
-              <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
+              <td><a ui-sref="image({id: container.Image})">{{ container.Image }}</a></td>
             </tr>
           </tbody>
         </table>

app/components/containerLogs/containerlogs.html

@@ -1,3 +1,10 @@
+<rd-header>
+  <rd-header-title title="Container logs"></rd-header-title>
+  <rd-header-content>
+    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Logs
+  </rd-header-content>
+</rd-header>
+
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>

app/components/containers/containers.html

@@ -1,5 +1,14 @@
 <div ng-include="template" ng-controller="StartContainerController"></div>
 
+<rd-header>
+  <rd-header-title title="Container list">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="containers" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+  <rd-header-content>Containers</rd-header-content>
+</rd-header>
+
 <div class="col-lg-12">
   <rd-widget>
     <rd-widget-header icon="fa-tasks" title="Containers">
@@ -29,35 +38,35 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()" /> Select</label></th>
               <th>
-                <a href="#/containers/" ng-click="order('Names')">
+                <a ui-sref="containers" ng-click="order('Names')">
                   Name
                   <span ng-show="sortType == 'Names' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Names' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Image')">
+                <a ui-sref="containers" ng-click="order('Image')">
                   Image
                   <span ng-show="sortType == 'Image' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Image' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Command')">
+                <a ui-sref="containers" ng-click="order('Command')">
                   Command
                   <span ng-show="sortType == 'Command' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Command' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Created')">
+                <a ui-sref="containers" ng-click="order('Created')">
                   Created
                   <span ng-show="sortType == 'Created' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Created' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/containers/" ng-click="order('Status')">
+                <a ui-sref="containers" ng-click="order('Status')">
                   Status
                   <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
@@ -68,8 +77,8 @@
           <tbody>
             <tr ng-repeat="container in (state.filteredContainers = ( containers | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="container.Checked" ng-change="selectItem(container)"/></td>
-              <td><a href="#/containers/{{ container.Id }}">{{ container|containername}}</a></td>
-              <td><a href="#/images/{{ container.Image }}/">{{ container.Image }}</a></td>
+              <td><a ui-sref="container({id: container.Id})">{{ container|containername}}</a></td>
+              <td><a ui-sref="image({id: container.Image})">{{ container.Image }}</a></td>
               <td>{{ container.Command|truncate:40 }}</td>
               <td>{{ container.Created|getdate }}</td>
               <td><span class="label label-{{ container.Status|statusbadge }}">{{ container.Status }}</span></td>

app/components/dashboard/dashboard.html

@@ -1,3 +1,8 @@
+<rd-header>
+  <rd-header-title title="Home"></rd-header-title>
+  <rd-header-content>Dashboard</rd-header-content>
+</rd-header>
+
 <div class="row">
   <div class="col-lg-3 col-md-6 col-xs-12">
     <rd-widget>

app/components/image/image.html

@@ -1,3 +1,11 @@
+<rd-header>
+  <rd-header-title title="Image details"></rd-header-title>
+  <rd-header-content>
+    Images > <a ui-sref="image({id: id})">{{ id }}</a>
+  </rd-header-content>
+</rd-header>
+
+
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -53,7 +61,7 @@
             </tr>
             <tr>
               <td>Parent</td>
-              <td><a href="#/images/{{ image.Parent }}/">{{ image.Parent }}</a></td>
+              <td><a ui-sref="image({id: image.Parent})">{{ image.Parent }}</a></td>
             </tr>
             <tr>
               <td>Size (Virtual Size)</td>

app/components/images/images.html

@@ -1,5 +1,15 @@
 <div ng-include="template" ng-controller="PullImageController"></div>
 
+<rd-header>
+  <rd-header-title title="Image list">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="images" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+
+  <rd-header-content>Images</rd-header-content>
+</rd-header>
+
 <div class="col-lg-12">
   <rd-widget>
     <rd-widget-header icon="fa-clone" title="Images">
@@ -22,28 +32,28 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()" /> Select</label></th>
               <th>
-                <a href="#/images/" ng-click="order('Id')">
+                <a ui-sref="images" ng-click="order('Id')">
                   Id
                   <span ng-show="sortType == 'Id' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Id' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/images/" ng-click="order('RepoTags')">
+                <a ui-sref="images" ng-click="order('RepoTags')">
                   Repository
                   <span ng-show="sortType == 'RepoTags' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'RepoTags' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/images/" ng-click="order('VirtualSize')">
+                <a ui-sref="images" ng-click="order('VirtualSize')">
                   VirtualSize
                   <span ng-show="sortType == 'VirtualSize' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'VirtualSize' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/images/" ng-click="order('Created')">
+                <a ui-sref="images" ng-click="order('Created')">
                   Created
                   <span ng-show="sortType == 'Created' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Created' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
@@ -54,7 +64,7 @@
           <tbody>
             <tr ng-repeat="image in (state.filteredImages = (images | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="image.Checked" ng-change="selectItem(image)" /></td>
-              <td><a href="#/images/{{ image.Id }}/?tag={{ image|repotag }}">{{ image.Id|truncate:20}}</a></td>
+              <td><a ui-sref="image({id: image.Id})">{{ image.Id|truncate:20}}</a></td>
               <td>{{ image|repotag }}</td>
               <td>{{ image.VirtualSize|humansize }}</td>
               <td>{{ image.Created|getdate }}</td>

app/components/network/network.html

@@ -1,3 +1,10 @@
+<rd-header>
+  <rd-header-title title="Network details"></rd-header-title>
+  <rd-header-content>
+    Networks > <a ui-sref="network({id: network.Id})">{{ network.Name }}</a>
+  </rd-header-content>
+</rd-header>
+
 <div class="row">
   <div class="col-lg-9 col-md-9 col-xs-9">
     <rd-widget>
@@ -73,7 +80,7 @@
                 <table class="table table-striped" ng-repeat="(Id, container) in network.Containers">
                   <tr>
                     <td>Id</td>
-                    <td><a href="#/containers/{{ Id }}">{{ Id }}</a></td>
+                    <td><a ui-sref="container({id: Id})">{{ Id }}</a></td>
                   </tr>
                   <tr>
                     <td>EndpointID</td>

app/components/network/networkController.js

@@ -1,5 +1,5 @@
-angular.module('network', []).config(['$routeProvider', function ($routeProvider) {
-}]).controller('NetworkController', ['$scope', 'Network', 'ViewSpinner', 'Messages', '$state', '$stateParams', 'errorMsgFilter',
+angular.module('network', [])
+.controller('NetworkController', ['$scope', 'Network', 'ViewSpinner', 'Messages', '$state', '$stateParams', 'errorMsgFilter',
 function ($scope, Network, ViewSpinner, Messages, $state, $stateParams, errorMsgFilter) {
 
   $scope.disconnect = function disconnect(networkId, containerId) {

app/components/networks/networks.html

@@ -1,5 +1,15 @@
 <div ng-include="template" ng-controller="CreateNetworkController"></div>
 
+<rd-header>
+  <rd-header-title title="Network list">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="networks" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+  <rd-header-content>Networks</rd-header-content>
+</rd-header>
+
+
 <div class="col-lg-12">
   <rd-widget>
     <rd-widget-header icon="fa-sitemap" title="Networks">
@@ -22,49 +32,49 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()"/> Select</label></th>
               <th>
-                <a href="#/networks/" ng-click="order('Name')">
+                <a ui-sref="networks" ng-click="order('Name')">
                   Name
                   <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('Id')">
+                <a ui-sref="networks" ng-click="order('Id')">
                   Id
                   <span ng-show="sortType == 'Id' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Id' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('Scope')">
+                <a ui-sref="networks" ng-click="order('Scope')">
                   Scope
                   <span ng-show="sortType == 'Scope' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Scope' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('Driver')">
+                <a ui-sref="networks" ng-click="order('Driver')">
                   Driver
                   <span ng-show="sortType == 'Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('IPAM.Driver')">
+                <a ui-sref="networks" ng-click="order('IPAM.Driver')">
                   IPAM Driver
                   <span ng-show="sortType == 'IPAM.Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IPAM.Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('IPAM.Config[0].Subnet')">
+                <a ui-sref="networks" ng-click="order('IPAM.Config[0].Subnet')">
                   IPAM Subnet
                   <span ng-show="sortType == 'IPAM.Config[0].Subnet' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IPAM.Config[0].Subnet' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/networks/" ng-click="order('IPAM.Config[0].Gateway')">
+                <a ui-sref="networks" ng-click="order('IPAM.Config[0].Gateway')">
                   IPAM Gateway
                   <span ng-show="sortType == 'IPAM.Config[0].Gateway' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IPAM.Config[0].Gateway' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
@@ -75,7 +85,7 @@
           <tbody>
             <tr ng-repeat="network in ( state.filteredNetworks = (networks | filter:state.filter | orderBy:sortType:sortReverse))">
               <td><input type="checkbox" ng-model="network.Checked" ng-change="selectItem(network)"/></td>
-              <td><a href="#/networks/{{ network.Id }}/">{{ network.Name|truncate:20}}</a></td>
+              <td><a ui-sref="network({id: network.Id})">{{ network.Name|truncate:20}}</a></td>
               <td>{{ network.Id }}</td>
               <td>{{ network.Scope }}</td>
               <td>{{ network.Driver }}</td>

app/components/stats/stats.html

@@ -1,3 +1,10 @@
+<rd-header>
+  <rd-header-title title="Container stats"></rd-header-title>
+  <rd-header-content>
+    Containers > <a ui-sref="container({id: container.Id})">{{ container.Name|trimcontainername }}</a> > Stats
+  </rd-header-content>
+</rd-header>
+
 <div class="row">
   <div class="col-lg-12 col-md-12 col-xs-12">
     <rd-widget>
@@ -5,7 +12,7 @@
         <div class="widget-icon grey pull-left">
           <i class="fa fa-tasks"></i>
         </div>
-        <div class="title">{{ containerName }}</div>
+        <div class="title">{{ container.Name|trimcontainername }}</div>
         <div class="comment">
           Name
         </div>

app/components/stats/statsController.js

@@ -186,7 +186,7 @@ function (Settings, $scope, Messages, $timeout, Container, ContainerTop, $stateP
   });
 
   Container.get({id: $stateParams.id}, function (d) {
-    $scope.containerName = d.Name.substring(1);
+    $scope.container = d;
   }, function (e) {
     Messages.error("Failure", e.data);
   });

app/components/swarm/swarm.html

@@ -1,3 +1,12 @@
+<rd-header>
+  <rd-header-title title="Cluster overview">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="swarm" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+  <rd-header-content>Swarm</rd-header-content>
+</rd-header>
+
 <div class="row">
   <div class="col-lg-3 col-md-6 col-xs-12">
     <rd-widget>
@@ -86,28 +95,28 @@
           <thead>
             <tr>
               <th>
-                <a href="#/swarm/" ng-click="order('Name')">
+                <a ui-sref="swarm" ng-click="order('Name')">
                   Name
                   <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/swarm/" ng-click="order('IP')">
+                <a ui-sref="swarm" ng-click="order('IP')">
                   IP
                   <span ng-show="sortType == 'IP' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'IP' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/swarm/" ng-click="order('Containers')">
+                <a ui-sref="swarm" ng-click="order('Containers')">
                   Containers
                   <span ng-show="sortType == 'Containers' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Containers' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/swarm/" ng-click="order('Status')">
+                <a ui-sref="swarm" ng-click="order('Status')">
                   Status
                   <span ng-show="sortType == 'Status' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Status' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>

app/components/volumes/volumes.html

@@ -1,5 +1,14 @@
 <div ng-include="template" ng-controller="CreateVolumeController"></div>
 
+<rd-header>
+  <rd-header-title title="Volume list">
+    <a data-toggle="tooltip" title="Refresh" ui-sref="volumes" ui-sref-opts="{reload: true}">
+      <i class="fa fa-refresh" aria-hidden="true"></i>
+    </a>
+  </rd-header-title>
+  <rd-header-content>Volumes</rd-header-content>
+</rd-header>
+
 <div class="col-lg-12">
   <rd-widget>
     <rd-widget-header icon="fa-cubes" title="Volumes">
@@ -22,21 +31,21 @@
             <tr>
               <th><label><input type="checkbox" ng-model="state.toggle" ng-change="toggleSelectAll()"/> Select</label></th>
               <th>
-                <a href="#/volumes/" ng-click="order('Name')">
+                <a ui-sref="volumes" ng-click="order('Name')">
                   Name
                   <span ng-show="sortType == 'Name' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Name' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/volumes/" ng-click="order('Driver')">
+                <a ui-sref="volumes" ng-click="order('Driver')">
                   Driver
                   <span ng-show="sortType == 'Driver' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Driver' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>
                 </a>
               </th>
               <th>
-                <a href="#/volumes/" ng-click="order('Mountpoint')">
+                <a ui-sref="volumes" ng-click="order('Mountpoint')">
                   Mountpoint
                   <span ng-show="sortType == 'Mountpoint' && !sortReverse" class="glyphicon glyphicon-chevron-down"></span>
                   <span ng-show="sortType == 'Mountpoint' && sortReverse" class="glyphicon glyphicon-chevron-up"></span>

app/components/volumes/volumesController.js

@@ -1,6 +1,6 @@
 angular.module('volumes', [])
-.controller('VolumesController', ['$scope', 'Volume', 'ViewSpinner', 'Messages', '$route', 'errorMsgFilter',
-function ($scope, Volume, ViewSpinner, Messages, $route, errorMsgFilter) {
+.controller('VolumesController', ['$scope', 'Volume', 'ViewSpinner', 'Messages', 'errorMsgFilter',
+function ($scope, Volume, ViewSpinner, Messages, errorMsgFilter) {
   $scope.state = {};
   $scope.state.toggle = false;
   $scope.state.selectedItemCount = 0;

app/directives/header-content.js

@@ -0,0 +1,11 @@
+angular
+.module('uifordocker')
+.directive('rdHeaderContent', function rdHeaderContent() {
+  var directive = {
+    requires: '^rdHeader',
+    transclude: true,
+    template: '<div class="breadcrumb-links" ng-transclude></div>',
+    restrict: 'E'
+  };
+  return directive;
+});

app/directives/header-title.js

@@ -0,0 +1,14 @@
+angular
+.module('uifordocker')
+.directive('rdHeaderTitle', function rdHeaderTitle() {
+  var directive = {
+    requires: '^rdHeader',
+    scope: {
+      title: '@'
+    },
+    transclude: true,
+    template: '<div class="page">{{title}}<span class="header_title_content" ng-transclude><span></div>',
+    restrict: 'E'
+  };
+  return directive;
+});

app/directives/header.js

@@ -0,0 +1,13 @@
+angular
+.module('uifordocker')
+.directive('rdHeader', function rdHeader() {
+  var directive = {
+    scope: {
+      "ngModel": "="
+    },
+    transclude: true,
+    template: '<div class="row header"><div class="col-xs-12"><div class="meta" ng-transclude></div></div></div>',
+    restrict: 'EA'
+  };
+  return directive;
+});

assets/css/app.css

@@ -139,3 +139,7 @@
   display: inline;
   font-size: 18px;
 }
+
+.header_title_content {
+  margin-left: 5px;
+}

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "uifordocker",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "homepage": "https://github.com/kevana/ui-for-docker",
   "authors": [
     "Michael Crosby <crosbymichael@gmail.com>",
@@ -32,7 +32,6 @@
     "angular-mocks": "~1.5.0",
     "angular-oboe": "*",
     "angular-resource": "~1.5.0",
-    "angular-route": "~1.5.0",
     "angular-ui-select": "~0.17.1",
     "bootstrap": "~3.3.6",
     "font-awesome": "~4.5.0",

gruntFile.js

@@ -65,12 +65,12 @@ module.exports = function (grunt) {
             js: ['app/**/*.js', '!app/**/*.spec.js'],
             jsTpl: ['<%= distdir %>/templates/**/*.js'],
             jsVendor: [
-                'bower_components/jquery/dist/jquery.js',
+                'bower_components/jquery/dist/jquery.min.js',
                 'assets/js/jquery.gritter.js', // Using custom version to fix error in minified build due to "use strict"
-                'bower_components/bootstrap/dist/js/bootstrap.js',
+                'bower_components/bootstrap/dist/js/bootstrap.min.js',
                 'bower_components/spin.js/spin.js',
-                'bower_components/Chart.js/Chart.js',
-                'bower_components/lodash/dist/lodash.js',
+                'bower_components/Chart.js/Chart.min.js',
+                'bower_components/lodash/dist/lodash.min.js',
                 'bower_components/oboe/dist/oboe-browser.js',
                 'assets/js/legend.js' // Not a bower package
             ],
@@ -83,8 +83,8 @@ module.exports = function (grunt) {
                 'bower_components/bootstrap/dist/css/bootstrap.css',
                 'bower_components/jquery.gritter/css/jquery.gritter.css',
                 'bower_components/font-awesome/css/font-awesome.min.css',
-                'bower_components/rdash-ui/dist/css/rdash.css',
-                'bower_components/angular-ui-select/dist/select.css'
+                'bower_components/rdash-ui/dist/css/rdash.min.css',
+                'bower_components/angular-ui-select/dist/select.min.css'
             ]
         },
         clean: {
@@ -135,11 +135,11 @@ module.exports = function (grunt) {
                     process: true
                 },
                 src: ['<%= src.js %>', '<%= src.jsTpl %>'],
-                dest: '<%= distdir %>/<%= pkg.name %>.js'
+                dest: '<%= distdir %>/js/<%= pkg.name %>.js'
             },
             vendor: {
                 src: ['<%= src.jsVendor %>'],
-                dest: '<%= distdir %>/vendor.js'
+                dest: '<%= distdir %>/js/vendor.js'
             },
             index: {
                 src: ['index.html'],
@@ -149,16 +149,15 @@ module.exports = function (grunt) {
                 }
             },
             angular: {
-                src: ['bower_components/angular/angular.js',
-                    'bower_components/angular-sanitize/angular-sanitize.js',
-                    'bower_components/angular-cookies/angular-cookies.js',
-                    'bower_components/angular-route/angular-route.js',
-                    'bower_components/angular-ui-router/release/angular-ui-router.js',
-                    'bower_components/angular-resource/angular-resource.js',
-                    'bower_components/angular-bootstrap/ui-bootstrap-tpls.js',
-                    'bower_components/angular-oboe/dist/angular-oboe.js',
-                    'bower_components/angular-ui-select/dist/select.js'],
-                dest: '<%= distdir %>/angular.js'
+                src: ['bower_components/angular/angular.min.js',
+                    'bower_components/angular-sanitize/angular-sanitize.min.js',
+                    'bower_components/angular-cookies/angular-cookies.min.js',
+                    'bower_components/angular-ui-router/release/angular-ui-router.min.js',
+                    'bower_components/angular-resource/angular-resource.min.js',
+                    'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
+                    'bower_components/angular-oboe/dist/angular-oboe.min.js',
+                    'bower_components/angular-ui-select/dist/select.min.js'],
+                dest: '<%= distdir %>/js/angular.js'
             }
         },
         uglify: {
@@ -167,28 +166,28 @@ module.exports = function (grunt) {
                     banner: "<%= banner %>"
                 },
                 src: ['<%= src.js %>', '<%= src.jsTpl %>'],
-                dest: '<%= distdir %>/<%= pkg.name %>.js'
+                dest: '<%= distdir %>/js/<%= pkg.name %>.js'
             },
             vendor: {
                 options: {
                     preserveComments: 'some' // Preserve license comments
                 },
                 src: ['<%= src.jsVendor %>'],
-                dest: '<%= distdir %>/vendor.js'
+                dest: '<%= distdir %>/js/vendor.js'
             },
             angular: {
                 options: {
                     preserveComments: 'some' // Preserve license comments
                 },
                 src: ['<%= concat.angular.src %>'],
-                dest: '<%= distdir %>/angular.js'
+                dest: '<%= distdir %>/js/angular.js'
             }
         },
         recess: { // TODO: not maintained, unable to preserve license comments, switch out for something better.
             build: {
                 files: {
-                    '<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'],
-                    '<%= distdir %>/vendor.css': ['<%= src.cssVendor %>']
+                    '<%= distdir %>/css/<%= pkg.name %>.css': ['<%= src.css %>'],
+                    '<%= distdir %>/css/vendor.css': ['<%= src.cssVendor %>']
                 },
                 options: {
                     compile: true,
@@ -197,8 +196,8 @@ module.exports = function (grunt) {
             },
             min: {
                 files: {
-                    '<%= distdir %>/<%= pkg.name %>.css': ['<%= src.css %>'],
-                    '<%= distdir %>/vendor.css': ['<%= src.cssVendor %>']
+                    '<%= distdir %>/css/<%= pkg.name %>.css': ['<%= src.css %>'],
+                    '<%= distdir %>/css/vendor.css': ['<%= src.cssVendor %>']
                 },
                 options: {
                     compile: true,

index.html

@@ -7,17 +7,17 @@
   <meta name="description" content="">
   <meta name="author" content="<%= pkg.author %>">
 
-  <link href="vendor.css" rel="stylesheet">
-  <link href="<%= pkg.name %>.css" rel="stylesheet">
+  <link href="css/vendor.css" rel="stylesheet">
+  <link href="css/<%= pkg.name %>.css" rel="stylesheet">
 
   <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
   <!--[if lt IE 9]>
   <script src="//html5shim.googlecode.com/svn/trunk/html5.js"></script>
   <![endif]-->
 
-  <script src="angular.js"></script>
-  <script src="vendor.js"></script>
-  <script src="<%= pkg.name %>.js"></script>
+  <script src="js/angular.js"></script>
+  <script src="js/vendor.js"></script>
+  <script src="js/<%= pkg.name %>.js"></script>
 
   <!-- Fav and touch icons -->
   <link rel="shortcut icon" href="ico/favicon.ico">
@@ -38,22 +38,22 @@
         </li>
         <li class="sidebar-title"><span>NAVIGATION</span></li>
         <li class="sidebar-list">
-          <a href="#">Dashboard <span class="menu-icon fa fa-tachometer"></span></a>
+          <a ui-sref="index">Dashboard <span class="menu-icon fa fa-tachometer"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/containers/">Containers <span class="menu-icon fa fa-server"></span></a>
+          <a ui-sref="containers">Containers <span class="menu-icon fa fa-server"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/images/">Images <span class="menu-icon fa fa-clone"></span></a>
+          <a ui-sref="images">Images <span class="menu-icon fa fa-clone"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/networks/">Networks <span class="menu-icon fa fa-sitemap"></span></a>
+          <a ui-sref="networks">Networks <span class="menu-icon fa fa-sitemap"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/volumes/">Volumes <span class="menu-icon fa fa-cubes"></span></a>
+          <a ui-sref="volumes">Volumes <span class="menu-icon fa fa-cubes"></span></a>
         </li>
         <li class="sidebar-list">
-          <a href="#/swarm/">Swarm <span class="menu-icon fa fa-object-group"></span></a>
+          <a ui-sref="swarm">Swarm <span class="menu-icon fa fa-object-group"></span></a>
         </li>
       </ul>
       <div class="sidebar-footer">
@@ -67,21 +67,6 @@
     <div id="content-wrapper">
       <div class="page-content">
 
-        <!-- Header Bar -->
-        <div class="row header">
-          <div class="col-xs-12">
-            <div class="meta">
-              <div class="page">
-                Dashboard
-              </div>
-              <div class="breadcrumb-links">
-                Home / Dashboard
-              </div>
-            </div>
-          </div>
-        </div>
-        <!-- End Header Bar -->
-
         <!-- Main Content -->
         <div id="view" ui-view></div>
 

package.json

@@ -2,7 +2,7 @@
   "author": "Michael Crosby & Kevan Ahlquist",
   "name": "uifordocker",
   "homepage": "https://github.com/kevana/ui-for-docker",
-  "version": "1.0.0",
+  "version": "1.0.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:kevana/ui-for-docker.git"