From 9965af9ccdeb6b410cdabb369521a815a32c2002 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Mon, 5 Oct 2015 09:48:52 -0700
Subject: [PATCH 1/3] fixing links, and adding zeroclipboard

---
 bower.json                                    |  3 ++-
 gulp/build.js                                 |  2 +-
 lemur/static/app/angular/app.js               | 10 ++++++++--
 lemur/static/app/angular/welcome/welcome.html |  6 +++---
 4 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/bower.json b/bower.json
index ccb98a7a..f2fdb903 100644
--- a/bower.json
+++ b/bower.json
@@ -31,7 +31,8 @@
     "satellizer": "~0.9.4",
     "angularjs-toaster": "~0.4.14",
     "ngletteravatar": "~3.0.1",
-    "angular-ui-router": "~0.2.15"
+    "angular-ui-router": "~0.2.15",
+    "angular-zeroclipboard": "~0.7.0"
   },
   "devDependencies": {
     "angular-mocks": "~1.3",
diff --git a/gulp/build.js b/gulp/build.js
index 07ad3c5f..7553f5a0 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -136,7 +136,7 @@ gulp.task('dev:scripts', function () {
 });
 
 gulp.task('build:extras', function () {
-  return gulp.src(['lemur/static/app/*.*', '!lemur/static/app/*.html'])
+  return gulp.src(['lemur/static/app/*.*', 'bower_components/zeroclipboard/dist/ZeroClipboard.swf', '!lemur/static/app/*.html'])
     .pipe(gulp.dest('lemur/static/dist'));
 });
 
diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js
index 386b696d..4eddecfd 100644
--- a/lemur/static/app/angular/app.js
+++ b/lemur/static/app/angular/app.js
@@ -14,9 +14,10 @@ var lemur = angular
     'uiSwitch',
     'mgo-angular-wizard',
     'satellizer',
-    'ngLetterAvatar'
+    'ngLetterAvatar',
+    'zeroclipboard'
   ])
-  .config(function ($stateProvider, $urlRouterProvider, $authProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $authProvider, uiZeroclipConfigProvider) {
     $urlRouterProvider.otherwise('/welcome');
 
     $stateProvider
@@ -36,6 +37,11 @@ var lemur = angular
       authorizationEndpoint: 'https://example.com/as/authorization.oauth2',
       requiredUrlParams: ['scope']
     });
+
+    // config ZeroClipboard
+    uiZeroclipConfigProvider.setZcConf({
+      swfPath: 'ZeroClipboard.swf'
+    });
   });
 
 lemur.service('MomentService', function () {
diff --git a/lemur/static/app/angular/welcome/welcome.html b/lemur/static/app/angular/welcome/welcome.html
index c6bcd03f..ec91b8b6 100644
--- a/lemur/static/app/angular/welcome/welcome.html
+++ b/lemur/static/app/angular/welcome/welcome.html
@@ -10,17 +10,17 @@
         <div class="col-lg-4">
             <h2>Create</h2>
             <p>With Lemur you can create certificates from any authority; internal or external! Lemur does not issue certificates itself. Instead it acts as a broker, creating private keys and CSRs that are sent to external services.</p>
-            <p><a class="btn btn-default" href="#" role="button">View certificates &raquo;</a></p>
+            <p><a class="btn btn-default" ui-sref="certifcates" role="button">View certificates &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
             <h2>Deploy</h2>
             <p>Once certificates have been created with Lemur, you can put them to use! Lemur has the ability to create destinations for certificates that allow them to be uploaded to and used by a variety of environments.</p>
-            <p><a class="btn btn-default" href="#" role="button">View Destinations &raquo;</a></p>
+            <p><a class="btn btn-default" ui-sref="destinations" role="button">View Destinations &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
             <h2>Authority</h2>
             <p>Have an internal Certificate Authority? Need an easy way to create an manage those authorities? Lemur has you covered!</p>
-            <p><a class="btn btn-default" href="#" role="button">View Authorities &raquo;</a></p>
+            <p><a class="btn btn-default" ui-sref="authorities">Dashboard role="button">View Authorities &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
     </div><!-- /.row -->
 </div>

From 63b7b71b491a57941d5d18ccc40dc788b0b59bdc Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Mon, 5 Oct 2015 16:06:56 -0700
Subject: [PATCH 2/3] adding clipboard functionality

---
 bower.json                                    |   4 +-
 gulp/build.js                                 |   6 +-
 lemur/static/app/angular/app.js               |   9 +-
 .../angular/certificates/view/view.tpl.html   | 196 ++++++++++--------
 lemur/static/app/angular/welcome/welcome.html |   4 +-
 lemur/static/app/styles/lemur.css             |  10 +
 6 files changed, 127 insertions(+), 102 deletions(-)

diff --git a/bower.json b/bower.json
index f2fdb903..4478b775 100644
--- a/bower.json
+++ b/bower.json
@@ -32,7 +32,9 @@
     "angularjs-toaster": "~0.4.14",
     "ngletteravatar": "~3.0.1",
     "angular-ui-router": "~0.2.15",
-    "angular-zeroclipboard": "~0.7.0"
+    "angular-zeroclipboard": "~0.7.0",
+    "clipboard": "~1.4.0",
+    "angular-clipboard": "~1.1.1"
   },
   "devDependencies": {
     "angular-mocks": "~1.3",
diff --git a/gulp/build.js b/gulp/build.js
index 7553f5a0..3bc41eaf 100644
--- a/gulp/build.js
+++ b/gulp/build.js
@@ -72,7 +72,6 @@ gulp.task('dev:styles', function () {
   };
 
   var fileList = [
-    'lemur/static/app/styles/lemur.css',
     'bower_components/bootswatch/sandstone/bootswatch.less',
     'bower_components/fontawesome/css/font-awesome.css',
     'bower_components/angular-spinkit/src/angular-spinkit.css',
@@ -81,7 +80,8 @@ gulp.task('dev:styles', function () {
     'bower_components/angular-ui-switch/angular-ui-switch.css',
     'bower_components/angular-wizard/dist/angular-wizard.css',
     'bower_components/ng-table/ng-table.css',
-    'bower_components/angularjs-toaster/toaster.css'
+    'bower_components/angularjs-toaster/toaster.css',
+    'lemur/static/app/styles/lemur.css'
   ];
 
   return gulp.src(fileList)
@@ -136,7 +136,7 @@ gulp.task('dev:scripts', function () {
 });
 
 gulp.task('build:extras', function () {
-  return gulp.src(['lemur/static/app/*.*', 'bower_components/zeroclipboard/dist/ZeroClipboard.swf', '!lemur/static/app/*.html'])
+  return gulp.src(['lemur/static/app/*.*', '!lemur/static/app/*.html'])
     .pipe(gulp.dest('lemur/static/dist'));
 });
 
diff --git a/lemur/static/app/angular/app.js b/lemur/static/app/angular/app.js
index 4eddecfd..a3e259d7 100644
--- a/lemur/static/app/angular/app.js
+++ b/lemur/static/app/angular/app.js
@@ -15,9 +15,9 @@ var lemur = angular
     'mgo-angular-wizard',
     'satellizer',
     'ngLetterAvatar',
-    'zeroclipboard'
+    'angular-clipboard'
   ])
-  .config(function ($stateProvider, $urlRouterProvider, $authProvider, uiZeroclipConfigProvider) {
+  .config(function ($stateProvider, $urlRouterProvider, $authProvider) {
     $urlRouterProvider.otherwise('/welcome');
 
     $stateProvider
@@ -37,11 +37,6 @@ var lemur = angular
       authorizationEndpoint: 'https://example.com/as/authorization.oauth2',
       requiredUrlParams: ['scope']
     });
-
-    // config ZeroClipboard
-    uiZeroclipConfigProvider.setZcConf({
-      swfPath: 'ZeroClipboard.swf'
-    });
   });
 
 lemur.service('MomentService', function () {
diff --git a/lemur/static/app/angular/certificates/view/view.tpl.html b/lemur/static/app/angular/certificates/view/view.tpl.html
index 479674c9..26aa2657 100644
--- a/lemur/static/app/angular/certificates/view/view.tpl.html
+++ b/lemur/static/app/angular/certificates/view/view.tpl.html
@@ -6,11 +6,11 @@
       <div class="panel-heading">
         <div class="btn-group pull-right">
           <button data-placement="left" data-title="Create Certificate" bs-tooltip ng-click="create()"
-             class="btn btn-primary">
+                  class="btn btn-primary">
             Create
           </button>
           <button data-placement="left" data-title="Import Certificate" bs-tooltip ng-click="import()"
-             class="btn btn-info">
+                  class="btn btn-info">
             Import
           </button>
         </div>
@@ -32,7 +32,8 @@
             </td>
             <td data-title="'Active'" filter="{ 'active': 'select' }" filter-data="getCertificateStatus()">
               <form>
-                <switch ng-change="certificateService.updateActive(certificate)" id="status" name="status" ng-model="certificate.active" class="green small"></switch>
+                <switch ng-change="certificateService.updateActive(certificate)" id="status" name="status"
+                        ng-model="certificate.active" class="green small"></switch>
               </form>
             </td>
             <td data-title="'Issuer'" sortable="'issuer'" filter="{ 'issuer': 'text' }">
@@ -46,104 +47,121 @@
             </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>
-                  <button class="btn btn-sm btn-warning" ng-click="edit(certificate.id)">Edit</button>
+                <button ng-model="certificate.toggle" class="btn btn-sm btn-info" btn-checkbox btn-checkbox-true="1"
+                        butn-checkbox-false="0">More
+                </button>
+                <button class="btn btn-sm btn-warning" ng-click="edit(certificate.id)">Edit</button>
               </div>
             </td>
           </tr>
           <tr class="warning" ng-show="certificate.toggle" ng-repeat-end>
             <td colspan="6">
-                <tabset justified="true" class="col-md-6">
-                    <tab heading="Basic Info">
-                        <ul class="list-group">
-                            <li class="list-group-item">
-                                <strong>Creator</strong>
-                                <span class="pull-right">
-                                  {{ certificate.creator.email }}
-                                </span>
-                            </li>
-                            <li class="list-group-item">
-                                <strong>Not Before</strong>
-                                <span class="pull-right" tooltip="{{ certificate.notBefore }}">
-                                  {{ momentService.createMoment(certificate.notBefore) }}
-                                </span>
-                            </li>
-                            <li class="list-group-item">
-                                <strong>Not After</strong>
-                                <span class="pull-right" tooltip="{{ certificate.notAfter }}">
-                                  {{ momentService.createMoment(certificate.notAfter) }}
-                                </span>
-                            </li>
-                            <li class="list-group-item">
-                                <strong>San</strong>
-                                <span class="pull-right">
-                                    <i class="glyphicon glyphicon-ok" ng-show="certificate.san"></i>
-                                    <i class="glyphicon glyphicon-remove" ng-show="!certificate.san"></i>
-                                </span>
-                                        </li>
-                                        <li class="list-group-item">
-                                            <strong>Bits</strong>
-                                            <span class="pull-right">{{ certificate.bits }}</span>
-                                        </li>
-                                        <li class="list-group-item">
-                                            <strong>Serial</strong>
-                                            <span class="pull-right">{{ certificate.serial }}</span>
-                                        </li>
-                                        <li tooltip="Lemur will attempt to check a certificates validity, this is used to track whether a certificate as been revoked" class="list-group-item">
-                                            <strong>Validity</strong>
-                                <span class="pull-right">
-                                  <span ng-show="!certificate.status" class="label label-warning">Unknown</span>
-                                  <span ng-show="certificate.status == 'revoked'" class="label label-danger">Revoked</span>
-                                  <span ng-show="certificate.status == 'valid'" class="label label-success">Valid</span>
-                                </span>
-                            </li>
-                            <li class="list-group-item">
-                                <strong>Description</strong>
-                                <span class="pull-right">{{ certificate.description }}</span>
-                            </li>
-                        </ul>
-                    </tab>
-                    <tab heading="Notifications">
-                        <ul class="list-group">
-                            <li class="list-group-item" ng-repeat="notification in certificate.notifications">
-                                <strong>{{ notification.label }}</strong>
-                                <span class="pull-right">{{ notification.description}}</span>
-                            </li>
-                        </ul>
-                    </tab>
-                    <tab heading="Destinations">
-                        <ul class="list-group">
-                            <li class="list-group-item" ng-repeat="destination in certificate.destinations">
-                                <strong>{{ destination.label }}</strong>
-                                <span class="pull-right">{{ destination.description }}</span>
-                            </li>
-                        </ul>
-                    </tab>
-                    <tab heading="Domains">
-                        <div class="list-group">
-                            <a href="#/domains/{{ domain.id }}" class="list-group-item" ng-repeat="domain in certificate.domains">{{ domain.name }}</a>
-                        </div>
-                    </tab>
-              </tabset>
-
               <tabset justified="true" class="col-md-6">
-                <tab heading="Chain">
-                  <p>
-                    <pre style="width: 550px">{{ certificate.chain }}</pre>
-                  </p>
+                <tab>
+                  <tab-heading>Basic Info</tab-heading>
+                  <ul class="list-group">
+                    <li class="list-group-item">
+                      <strong>Creator</strong>
+                        <span class="pull-right">
+                          {{ certificate.creator.email }}
+                        </span>
+                    </li>
+                    <li class="list-group-item">
+                      <strong>Not Before</strong>
+                        <span class="pull-right" tooltip="{{ certificate.notBefore }}">
+                          {{ momentService.createMoment(certificate.notBefore) }}
+                        </span>
+                    </li>
+                    <li class="list-group-item">
+                      <strong>Not After</strong>
+                        <span class="pull-right" tooltip="{{ certificate.notAfter }}">
+                          {{ momentService.createMoment(certificate.notAfter) }}
+                          </span>
+                    </li>
+                    <li class="list-group-item">
+                      <strong>San</strong>
+                      <span class="pull-right">
+                        <i class="glyphicon glyphicon-ok" ng-show="certificate.san"></i>
+                        <i class="glyphicon glyphicon-remove" ng-show="!certificate.san"></i>
+                      </span>
+                    </li>
+                    <li class="list-group-item">
+                      <strong>Bits</strong>
+                      <span class="pull-right">{{ certificate.bits }}</span>
+                    </li>
+                    <li class="list-group-item">
+                      <strong>Serial</strong>
+                      <span class="pull-right">{{ certificate.serial }}</span>
+                    </li>
+                    <li
+                      tooltip="Lemur will attempt to check a certificates validity, this is used to track whether a certificate as been revoked"
+                      class="list-group-item">
+                      <strong>Validity</strong>
+                      <span class="pull-right">
+                        <span ng-show="!certificate.status" class="label label-warning">Unknown</span>
+                        <span ng-show="certificate.status == 'revoked'" class="label label-danger">Revoked</span>
+                        <span ng-show="certificate.status == 'valid'" class="label label-success">Valid</span>
+                      </span>
+                    </li>
+                    <li class="list-group-item">
+                      <strong>Description</strong>
+                      <span class="pull-right">{{ certificate.description }}</span>
+                    </li>
+                  </ul>
                 </tab>
-                <tab heading="Public Certificate">
-                  <p>
-                    <pre style="width: 550px">{{ certificate.body }}</pre>
-                  </p>
+                <tab>
+                  <tab-heading>Notifications</tab-heading>
+                  <ul class="list-group">
+                    <li class="list-group-item" ng-repeat="notification in certificate.notifications">
+                      <strong>{{ notification.label }}</strong>
+                      <span class="pull-right">{{ notification.description}}</span>
+                    </li>
+                  </ul>
+                </tab>
+                <tab>
+                  <tab-heading>Destinations</tab-heading>
+                  <ul class="list-group">
+                    <li class="list-group-item" ng-repeat="destination in certificate.destinations">
+                      <strong>{{ destination.label }}</strong>
+                      <span class="pull-right">{{ destination.description }}</span>
+                    </li>
+                  </ul>
+                </tab>
+                <tab>
+                  <tab-heading>Domains</tab-heading>
+                  <div class="list-group">
+                    <a href="#/domains/{{ domain.id }}" class="list-group-item"
+                       ng-repeat="domain in certificate.domains">{{ domain.name }}</a>
+                  </div>
+                </tab>
+              </tabset>
+              <tabset justified="true" class="col-md-6">
+                <tab>
+                  <tab-heading>
+                    Chain
+                    <button class="btn btn-xs btn-default clipboard-btn glyphicon glyphicon-copy"
+                            tooltip="Copy chain to clipboard" tooltip-trigger="mouseenter" clipboard
+                            text="certificate.chain"></button>
+                  </tab-heading>
+                  <pre style="width: 100%">{{ certificate.chain }}</pre>
+                </tab>
+                <tab>
+                  <tab-heading>
+                    Public Certificate
+                    <button class="btn btn-xs btn-default clipboard-btn glyphicon glyphicon-copy"
+                            tooltip="Copy certificate to clipboard" tooltip-trigger="mouseenter" clipboard
+                            text="certificate.body"></button>
+                  </tab-heading>
+                  <pre style="width: 100%">{{ certificate.body }}</pre>
                 </tab>
                 <tab ng-click="certificateService.loadPrivateKey(certificate)">
                   <tab-heading>
                     Private Key
+                    <button class="btn btn-xs btn-default clipboard-btn glyphicon glyphicon-copy"
+                            tooltip="Copy key to clipboard" tooltip-trigger="mouseenter" clipboard
+                            text="certificate.privateKey"></button>
                   </tab-heading>
-                  <p>
-                    <pre style="width: 550px">{{ certificate.privateKey }}</pre>
-                  </p>
+                  <pre style="width: 100%">{{ certificate.privateKey }}</pre>
                 </tab>
               </tabset>
             </td>
diff --git a/lemur/static/app/angular/welcome/welcome.html b/lemur/static/app/angular/welcome/welcome.html
index ec91b8b6..99b9a803 100644
--- a/lemur/static/app/angular/welcome/welcome.html
+++ b/lemur/static/app/angular/welcome/welcome.html
@@ -10,7 +10,7 @@
         <div class="col-lg-4">
             <h2>Create</h2>
             <p>With Lemur you can create certificates from any authority; internal or external! Lemur does not issue certificates itself. Instead it acts as a broker, creating private keys and CSRs that are sent to external services.</p>
-            <p><a class="btn btn-default" ui-sref="certifcates" role="button">View certificates &raquo;</a></p>
+            <p><a class="btn btn-default" ui-sref="certificates" role="button">View certificates &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
         <div class="col-lg-4">
             <h2>Deploy</h2>
@@ -20,7 +20,7 @@
         <div class="col-lg-4">
             <h2>Authority</h2>
             <p>Have an internal Certificate Authority? Need an easy way to create an manage those authorities? Lemur has you covered!</p>
-            <p><a class="btn btn-default" ui-sref="authorities">Dashboard role="button">View Authorities &raquo;</a></p>
+            <p><a class="btn btn-default" ui-sref="authorities" role="button">View Authorities &raquo;</a></p>
         </div><!-- /.col-lg-4 -->
     </div><!-- /.row -->
 </div>
diff --git a/lemur/static/app/styles/lemur.css b/lemur/static/app/styles/lemur.css
index dfd45f03..6ff900c6 100644
--- a/lemur/static/app/styles/lemur.css
+++ b/lemur/static/app/styles/lemur.css
@@ -169,3 +169,13 @@ a {
     background-color: #FFFFFF !important;
 }
 
+.clipboard-btn {
+    border-width: 0;
+    background-color: transparent;
+    color: #777;
+    display: inline-block;
+    top: 0;
+    line-height: 1;
+}
+
+

From 3167ce97858c569246c2e48eb9c97c0cb99d91a3 Mon Sep 17 00:00:00 2001
From: kevgliss <kevgliss@gmail.com>
Date: Mon, 5 Oct 2015 16:08:12 -0700
Subject: [PATCH 3/3] removing unneeded dep

---
 bower.json | 2 --
 1 file changed, 2 deletions(-)

diff --git a/bower.json b/bower.json
index 4478b775..f2c6973d 100644
--- a/bower.json
+++ b/bower.json
@@ -32,8 +32,6 @@
     "angularjs-toaster": "~0.4.14",
     "ngletteravatar": "~3.0.1",
     "angular-ui-router": "~0.2.15",
-    "angular-zeroclipboard": "~0.7.0",
-    "clipboard": "~1.4.0",
     "angular-clipboard": "~1.1.1"
   },
   "devDependencies": {