From 162482dbc42aefe55a5f0541650199f9989aece3 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Mon, 5 Oct 2015 09:00:51 -0700
Subject: [PATCH 1/3] Adding ui router and perma links to certificates and
 authorities

---
 bower.json                                    |  3 ++-
 lemur/static/app/angular/app.js               | 14 ++++++------
 .../app/angular/authentication/login/login.js |  5 +++--
 .../angular/authentication/logout/logout.js   |  7 +++---
 .../app/angular/authorities/view/view.js      | 21 ++++++++++++------
 .../angular/authorities/view/view.tpl.html    |  3 +++
 .../app/angular/certificates/view/view.js     | 22 +++++++++++++------
 .../angular/certificates/view/view.tpl.html   |  4 ++++
 .../static/app/angular/dashboard/dashboard.js |  5 +++--
 .../app/angular/destinations/view/view.js     |  5 +++--
 lemur/static/app/angular/domains/view/view.js |  5 +++--
 .../app/angular/notifications/view/view.js    |  5 +++--
 lemur/static/app/angular/roles/view/view.js   |  5 +++--
 lemur/static/app/angular/sources/view/view.js |  5 +++--
 lemur/static/app/angular/users/view/view.js   |  5 +++--
 lemur/static/app/index.html                   | 22 +++++++++----------
 16 files changed, 84 insertions(+), 52 deletions(-)

diff --git a/bower.json b/bower.json
index e0a15d3f..ccb98a7a 100644
--- a/bower.json
+++ b/bower.json
@@ -30,7 +30,8 @@
     "angular-chart.js": "~0.7.1",
     "satellizer": "~0.9.4",
     "angularjs-toaster": "~0.4.14",
-    "ngletteravatar": "~3.0.1"
+    "ngletteravatar": "~3.0.1",
+    "angular-ui-router": "~0.2.15"
   },
   "devDependencies": {
     "angular-mocks": "~1.3",
diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js
index c00bb26d..1355cbc2 100644
--- a/lemur/static/app/angular/app.js
+++ b/lemur/static/app/angular/app.js
@@ -2,7 +2,7 @@
 
 var lemur = angular
   .module('lemur', [
-    'ngRoute',
+    'ui.router',
     'ngTable',
     'ngAnimate',
     'chart.js',
@@ -16,13 +16,13 @@ var lemur = angular
     'satellizer',
     'ngLetterAvatar'
   ])
-  .config(function ($routeProvider, $authProvider) {
-    $routeProvider
-      .when('/', {
+  .config(function ($stateProvider, $urlRouterProvider, $authProvider) {
+    $urlRouterProvider.otherwise("/welcome");
+
+    $stateProvider
+      .state('welcome', {
+        url: "/welcome",
         templateUrl: 'angular/welcome/welcome.html'
-      })
-      .otherwise({
-        redirectTo: '/'
       });
 
     $authProvider.oauth2({
diff --git a/lemur/static/app/angular/authentication/login/login.js b/lemur/static/app/angular/authentication/login/login.js
index b7cc7902..cfcd715c 100644
--- a/lemur/static/app/angular/authentication/login/login.js
+++ b/lemur/static/app/angular/authentication/login/login.js
@@ -1,8 +1,9 @@
 'use strict';
 
 angular.module('lemur')
-  .config(function config($routeProvider) {
-    $routeProvider.when('/login', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('login', {
+      url: '/login',
       templateUrl: '/angular/authentication/login/login.tpl.html',
       controller: 'LoginController'
     });
diff --git a/lemur/static/app/angular/authentication/logout/logout.js b/lemur/static/app/angular/authentication/logout/logout.js
index 18cbd489..b47d5075 100644
--- a/lemur/static/app/angular/authentication/logout/logout.js
+++ b/lemur/static/app/angular/authentication/logout/logout.js
@@ -1,9 +1,10 @@
 'use strict';
 
 angular.module('lemur')
-  .config(function config($routeProvider) {
-    $routeProvider.when('/logout', {
-      controller: 'LogoutCtrl'
+  .config(function config($stateProvider) {
+    $stateProvider.state('logout', {
+      controller: 'LogoutCtrl',
+      url: "/logout"
     });
   })
   .controller('LogoutCtrl', function ($scope, $location, lemurRestangular, userService) {
diff --git a/lemur/static/app/angular/authorities/view/view.js b/lemur/static/app/angular/authorities/view/view.js
index 71cdbb9a..dade31a4 100644
--- a/lemur/static/app/angular/authorities/view/view.js
+++ b/lemur/static/app/angular/authorities/view/view.js
@@ -2,15 +2,22 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/authorities', {
-      templateUrl: '/angular/authorities/view/view.tpl.html',
-      controller: 'AuthoritiesViewController'
-    });
+  .config(function config($stateProvider) {
+    $stateProvider
+      .state('authorities', {
+        url: "/authorities",
+        templateUrl: '/angular/authorities/view/view.tpl.html',
+        controller: 'AuthoritiesViewController'
+      })
+      .state('authority', {
+        url: "/authorities/:name",
+        templateUrl: '/angular/authorities/view/view.tpl.html',
+        controller: 'AuthoritiesViewController'
+      });
   })
 
-  .controller('AuthoritiesViewController', function ($scope, $q, $modal, AuthorityApi, AuthorityService, ngTableParams) {
-    $scope.filter = {};
+  .controller('AuthoritiesViewController', function ($scope, $q, $modal, $stateParams, AuthorityApi, AuthorityService, ngTableParams) {
+    $scope.filter = $stateParams;
     $scope.authoritiesTable = new ngTableParams({
       page: 1,            // show first page
       count: 10,          // count per page
diff --git a/lemur/static/app/angular/authorities/view/view.tpl.html b/lemur/static/app/angular/authorities/view/view.tpl.html
index d04bc750..5bbc2e30 100644
--- a/lemur/static/app/angular/authorities/view/view.tpl.html
+++ b/lemur/static/app/angular/authorities/view/view.tpl.html
@@ -34,6 +34,9 @@
                 </a>
               </div>
             </td>
+            <td data-title="''">
+                <a ui-sref="authority({'name': '{{ authority.name }}'})">Permalink</a>
+            </td>
             <td data-title="''">
               <div class="btn-group-vertical pull-right">
                 <button tooltip="Edit Authority" ng-click="edit(authority.id)" class="btn btn-sm btn-info">
diff --git a/lemur/static/app/angular/certificates/view/view.js b/lemur/static/app/angular/certificates/view/view.js
index caed61e8..03d382a5 100644
--- a/lemur/static/app/angular/certificates/view/view.js
+++ b/lemur/static/app/angular/certificates/view/view.js
@@ -2,15 +2,23 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/certificates', {
-      templateUrl: '/angular/certificates/view/view.tpl.html',
-      controller: 'CertificatesViewController'
-    });
+  .config(function config($stateProvider) {
+
+    $stateProvider
+      .state('certificates', {
+        url: "/certificates",
+        templateUrl: '/angular/certificates/view/view.tpl.html',
+        controller: 'CertificatesViewController'
+      })
+      .state('certificate', {
+        url: "/certificates/:name",
+        templateUrl: '/angular/certificates/view/view.tpl.html',
+        controller: 'CertificatesViewController'
+      });
   })
 
-  .controller('CertificatesViewController', function ($q, $scope, $modal, CertificateApi, CertificateService, MomentService, ngTableParams) {
-    $scope.filter = {};
+  .controller('CertificatesViewController', function ($q, $scope, $modal, $stateParams, CertificateApi, CertificateService, MomentService, ngTableParams) {
+    $scope.filter = $stateParams;
     $scope.certificateTable = new ngTableParams({
       page: 1,            // show first page
       count: 10,          // count per page
diff --git a/lemur/static/app/angular/certificates/view/view.tpl.html b/lemur/static/app/angular/certificates/view/view.tpl.html
index b19f14cd..479674c9 100644
--- a/lemur/static/app/angular/certificates/view/view.tpl.html
+++ b/lemur/static/app/angular/certificates/view/view.tpl.html
@@ -41,6 +41,9 @@
             <td data-title="'Common Name'" filter="{ 'cn': 'text'}">
               {{ certificate.cn }}
             </td>
+            <td data-title="''">
+              <a ui-sref="certificate({'name': '{{ certificate.name }}'})">Permalink</a>
+            </td>
             <td data-title="''">
               <div class="btn-group pull-right">
                   <button ng-model="certificate.toggle" class="btn btn-sm btn-info" btn-checkbox btn-checkbox-true="1" butn-checkbox-false="0">More</button>
@@ -122,6 +125,7 @@
                         </div>
                     </tab>
               </tabset>
+
               <tabset justified="true" class="col-md-6">
                 <tab heading="Chain">
                   <p>
diff --git a/lemur/static/app/angular/dashboard/dashboard.js b/lemur/static/app/angular/dashboard/dashboard.js
index 69cfd554..71f0f557 100644
--- a/lemur/static/app/angular/dashboard/dashboard.js
+++ b/lemur/static/app/angular/dashboard/dashboard.js
@@ -1,8 +1,9 @@
 'use strict';
 
 angular.module('lemur')
-  .config(function config($routeProvider) {
-    $routeProvider.when('/dashboard', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('dashboard', {
+      url: '/dashboard',
       templateUrl: '/angular/dashboard/dashboard.tpl.html',
       controller: 'DashboardController'
     });
diff --git a/lemur/static/app/angular/destinations/view/view.js b/lemur/static/app/angular/destinations/view/view.js
index cee6d691..c9a01505 100644
--- a/lemur/static/app/angular/destinations/view/view.js
+++ b/lemur/static/app/angular/destinations/view/view.js
@@ -2,8 +2,9 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/destinations', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('destinations', {
+      url: '/destinations',
       templateUrl: '/angular/destinations/view/view.tpl.html',
       controller: 'DestinationsViewController'
     });
diff --git a/lemur/static/app/angular/domains/view/view.js b/lemur/static/app/angular/domains/view/view.js
index 335b9c5a..269d0e84 100644
--- a/lemur/static/app/angular/domains/view/view.js
+++ b/lemur/static/app/angular/domains/view/view.js
@@ -2,8 +2,9 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/domains', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('domains', {
+      url: '/domains',
       templateUrl: '/angular/domains/view/view.tpl.html',
       controller: 'DomainsViewController'
     });
diff --git a/lemur/static/app/angular/notifications/view/view.js b/lemur/static/app/angular/notifications/view/view.js
index ae269e67..f037494e 100644
--- a/lemur/static/app/angular/notifications/view/view.js
+++ b/lemur/static/app/angular/notifications/view/view.js
@@ -2,8 +2,9 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/notifications', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('notifications', {
+      url: '/notifications',
       templateUrl: '/angular/notifications/view/view.tpl.html',
       controller: 'NotificationsViewController'
     });
diff --git a/lemur/static/app/angular/roles/view/view.js b/lemur/static/app/angular/roles/view/view.js
index 17d60ae4..4957f8b0 100644
--- a/lemur/static/app/angular/roles/view/view.js
+++ b/lemur/static/app/angular/roles/view/view.js
@@ -2,8 +2,9 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/roles', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('roles', {
+      url: '/roles',
       templateUrl: '/angular/roles/view/view.tpl.html',
       controller: 'RolesViewController'
     });
diff --git a/lemur/static/app/angular/sources/view/view.js b/lemur/static/app/angular/sources/view/view.js
index 031ea8d7..f125eb85 100644
--- a/lemur/static/app/angular/sources/view/view.js
+++ b/lemur/static/app/angular/sources/view/view.js
@@ -2,8 +2,9 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/sources', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('sources', {
+      url: '/sources',
       templateUrl: '/angular/sources/view/view.tpl.html',
       controller: 'SourcesViewController'
     });
diff --git a/lemur/static/app/angular/users/view/view.js b/lemur/static/app/angular/users/view/view.js
index 104fc245..1b60e048 100644
--- a/lemur/static/app/angular/users/view/view.js
+++ b/lemur/static/app/angular/users/view/view.js
@@ -2,8 +2,9 @@
 
 angular.module('lemur')
 
-  .config(function config($routeProvider) {
-    $routeProvider.when('/users', {
+  .config(function config($stateProvider) {
+    $stateProvider.state('users', {
+      url: '/users',
       templateUrl: '/angular/users/view/view.tpl.html',
       controller: 'UsersViewController'
     });
diff --git a/lemur/static/app/index.html b/lemur/static/app/index.html
index fa659d1e..b9df4202 100644
--- a/lemur/static/app/index.html
+++ b/lemur/static/app/index.html
@@ -49,24 +49,24 @@
             </div>
             <div class="navbar-collapse collapse" ng-controller="LoginController">
                 <ul class="nav navbar-nav navbar-left">
-                    <li><a href="/#/dashboard">Dashboard</a></li>
-                    <li><a href="/#/certificates">Certificates</a></li>
-                    <li><a href="/#/authorities">Authorities</a></li>
-                    <li><a href="/#/notifications">Notifications</a></li>
-                    <li><a href="/#/destinations">Destinations</a></li>
-                    <li><a href="/#/sources">Sources</a></li>
+                    <li><a ui-sref="dashboard">Dashboard</a></li>
+                    <li><a ui-sref="certificates">Certificates</a></li>
+                    <li><a ui-sref="authorities">Authorities</a></li>
+                    <li><a ui-sref="notifications">Notifications</a></li>
+                    <li><a ui-sref="destinations">Destinations</a></li>
+                    <li><a ui-sref="sources">Sources</a></li>
                     <li></li>
                     <li class="dropdown" dropdown on-toggle="toggled(open)">
                         <a href class="dropdown-toggle" dropdown-toggle>Settings <span class="caret"></span></a>
                         <ul class="dropdown-menu">
-                            <li><a href="/#/roles">Roles</a></li>
-                            <li><a href="/#/users">Users</a></li>
-                            <li><a href="/#/domains">Domains</a></li>
+                            <li><a ui-sref="roles">Roles</a></li>
+                            <li><a ui-sref="users">Users</a></li>
+                            <li><a ui-sref="domains">Domains</a></li>
                         </ul>
                     </li>
                 </ul>
                 <ul ng-show="!currentUser.username" class="nav navbar-nav navbar-right">
-                  <li><a href="/#/login">Login</a></li>
+                  <li><a ui-sref="login">Login</a></li>
                 </ul>
                 <ul ng-show="currentUser.username" class="nav navbar-nav navbar-right">
                     <li class="dropdown" dropdown on-toggle="toggled(open)">
@@ -88,7 +88,7 @@
     </div>
     <!-- Add your site or application content here -->
     <div class="container-fluid">
-      <div ng-view></div>
+      <div ui-view></div>
     </div>
     <footer class="footer">
       <div class="container">

From 8362a9289828a72343d755ea1d75318cc8068e67 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Mon, 5 Oct 2015 09:19:14 -0700
Subject: [PATCH 2/3] fixing double quotes

---
 lemur/static/app/angular/authentication/logout/logout.js | 2 +-
 lemur/static/app/angular/authorities/view/view.js        | 4 ++--
 lemur/static/app/angular/certificates/view/view.js       | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/lemur/static/app/angular/authentication/logout/logout.js b/lemur/static/app/angular/authentication/logout/logout.js
index b47d5075..a8acacfb 100644
--- a/lemur/static/app/angular/authentication/logout/logout.js
+++ b/lemur/static/app/angular/authentication/logout/logout.js
@@ -4,7 +4,7 @@ angular.module('lemur')
   .config(function config($stateProvider) {
     $stateProvider.state('logout', {
       controller: 'LogoutCtrl',
-      url: "/logout"
+      url: '/logout'
     });
   })
   .controller('LogoutCtrl', function ($scope, $location, lemurRestangular, userService) {
diff --git a/lemur/static/app/angular/authorities/view/view.js b/lemur/static/app/angular/authorities/view/view.js
index dade31a4..8ae7343b 100644
--- a/lemur/static/app/angular/authorities/view/view.js
+++ b/lemur/static/app/angular/authorities/view/view.js
@@ -5,12 +5,12 @@ angular.module('lemur')
   .config(function config($stateProvider) {
     $stateProvider
       .state('authorities', {
-        url: "/authorities",
+        url: '/authorities',
         templateUrl: '/angular/authorities/view/view.tpl.html',
         controller: 'AuthoritiesViewController'
       })
       .state('authority', {
-        url: "/authorities/:name",
+        url: '/authorities/:name',
         templateUrl: '/angular/authorities/view/view.tpl.html',
         controller: 'AuthoritiesViewController'
       });
diff --git a/lemur/static/app/angular/certificates/view/view.js b/lemur/static/app/angular/certificates/view/view.js
index 03d382a5..beedb618 100644
--- a/lemur/static/app/angular/certificates/view/view.js
+++ b/lemur/static/app/angular/certificates/view/view.js
@@ -6,12 +6,12 @@ angular.module('lemur')
 
     $stateProvider
       .state('certificates', {
-        url: "/certificates",
+        url: '/certificates',
         templateUrl: '/angular/certificates/view/view.tpl.html',
         controller: 'CertificatesViewController'
       })
       .state('certificate', {
-        url: "/certificates/:name",
+        url: '/certificates/:name',
         templateUrl: '/angular/certificates/view/view.tpl.html',
         controller: 'CertificatesViewController'
       });

From 867be09e29fcd81010750b44965f7afde76df28d Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Mon, 5 Oct 2015 09:24:11 -0700
Subject: [PATCH 3/3] more double quotes

---
 lemur/static/app/angular/app.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js
index 1355cbc2..386b696d 100644
--- a/lemur/static/app/angular/app.js
+++ b/lemur/static/app/angular/app.js
@@ -17,11 +17,11 @@ var lemur = angular
     'ngLetterAvatar'
   ])
   .config(function ($stateProvider, $urlRouterProvider, $authProvider) {
-    $urlRouterProvider.otherwise("/welcome");
+    $urlRouterProvider.otherwise('/welcome');
 
     $stateProvider
       .state('welcome', {
-        url: "/welcome",
+        url: '/welcome',
         templateUrl: 'angular/welcome/welcome.html'
       });