6 files changed, 33 insertions, 2 deletions
diff --git a/base/tps/shared/webapps/tps/index.html b/base/tps/shared/webapps/tps/index.html
index c48da3307..71d333450 100644
--- a/base/tps/shared/webapps/tps/index.html
+++ b/base/tps/shared/webapps/tps/index.html
@@ -17,6 +17,7 @@
      --- END COPYRIGHT BLOCK --- -->
 <html>
 <head>
+    <title>Token Processing System</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="/pki/css/patternfly.css" rel="stylesheet" media="screen, print">
     <script src="/pki/js/jquery.js"></script>
diff --git a/base/tps/shared/webapps/tps/js/cert.js b/base/tps/shared/webapps/tps/js/cert.js
index 016b56ee0..c8e8d5d02 100644
--- a/base/tps/shared/webapps/tps/js/cert.js
+++ b/base/tps/shared/webapps/tps/js/cert.js
@@ -90,9 +90,18 @@ var CertificatesPage = Page.extend({
     load: function() {
         var self = this;
 
+        if (self.collection && self.collection.options && self.collection.options.tokenID) {
+            $(".pki-breadcrumb-tokens").show();
+            $(".pki-breadcrumb-token a")
+                .attr("href", "#tokens/" + self.collection.options.tokenID)
+                .text("Token " + self.collection.options.tokenID);
+            $(".pki-breadcrumb-token").show();
+            $(".pki-title").text("Certificates for Token " + self.collection.options.tokenID);
+        }
+
         var table = new CertificatesTable({
             el: $("table[name='certificates']"),
-            collection: new CertificateCollection()
+            collection: self.collection
         });
 
         table.render();
diff --git a/base/tps/shared/webapps/tps/js/token.js b/base/tps/shared/webapps/tps/js/token.js
index 2ea17714e..c1f27b132 100644
--- a/base/tps/shared/webapps/tps/js/token.js
+++ b/base/tps/shared/webapps/tps/js/token.js
@@ -153,6 +153,14 @@ var TokenPage = EntryPage.extend({
 
             dialog.open();
         });
+
+        self.showCertsLink = $("a[name='showCerts']", self.menu);
+
+        self.showCertsLink.click(function(e) {
+
+            e.preventDefault();
+            window.location.hash = window.location.hash + "/certs";
+        });
     },
     renderContent: function() {
         var self = this;
diff --git a/base/tps/shared/webapps/tps/ui/certs.html b/base/tps/shared/webapps/tps/ui/certs.html
index a87c2dd32..52e229f7b 100644
--- a/base/tps/shared/webapps/tps/ui/certs.html
+++ b/base/tps/shared/webapps/tps/ui/certs.html
@@ -18,6 +18,8 @@
 <div class="pki-header">
 <ol class="breadcrumb">
     <li><a href="#">Home</a></li>
+    <li class="pki-breadcrumb-tokens" style="display: none;"><a href="#tokens">Tokens</a></li>
+    <li class="pki-breadcrumb-token" style="display: none;"><a href="#tokens/${tokenID}">Token ${id}</a></li>
     <li class="active"><strong>Certificates</strong></li>
 </ol>
 
diff --git a/base/tps/shared/webapps/tps/ui/index.html b/base/tps/shared/webapps/tps/ui/index.html
index eddceefd7..74adeadd1 100644
--- a/base/tps/shared/webapps/tps/ui/index.html
+++ b/base/tps/shared/webapps/tps/ui/index.html
@@ -17,6 +17,7 @@
      --- END COPYRIGHT BLOCK --- -->
 <html>
 <head>
+    <title>Token Processing System</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <link href="/pki/css/patternfly.css" rel="stylesheet" media="screen, print">
     <link href="/pki/css/pki-ui.css" rel="stylesheet" type="text/css">
@@ -117,7 +118,8 @@ $(function() {
     router.route("certs", "certs", function() {
         new CertificatesPage({
             el: content,
-            url: "certs.html"
+            url: "certs.html",
+            collection: new CertificateCollection()
         }).open();
     });
 
@@ -276,6 +278,14 @@ $(function() {
         }).open();
     });
 
+    router.route("tokens/:id/certs", "certs", function(id) {
+        new CertificatesPage({
+            el: content,
+            url: "certs.html",
+            collection: new CertificateCollection({ tokenID: id })
+        }).open();
+    });
+
     router.route("new-token", "new-token", function() {
         new TokenPage({
             el: content,
diff --git a/base/tps/shared/webapps/tps/ui/token.html b/base/tps/shared/webapps/tps/ui/token.html
index 78384acfe..8be08f09a 100644
--- a/base/tps/shared/webapps/tps/ui/token.html
+++ b/base/tps/shared/webapps/tps/ui/token.html
@@ -29,6 +29,7 @@
 <span class="pki-menu" style="display: none;">
 <a name="edit" href="#">Edit</a><br>
 <a name="changeStatus" href="#">Change Status</a><br>
+<a name="showCerts" href="#">Show Certificates</a><br>
 </span>
 
 <span class="pki-buttons" style="display: none;">