Bugzilla 484275 and 483304: TPS roles defined and error templates

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@261 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
author: alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> 2009-02-27 04:42:38 +0000
committer: alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> 2009-02-27 04:42:38 +0000
commit: e21ce46c60c96a38eab694502c6e428940a55098 (patch)
tree: 2a0d34b0191dd5e766aeace45909677a606fff41 /pki/dogtag/tps-ui/shared/docroot/tokendb
parent: 108e7ef39eda408d9ffca21c039fce0be86f2fc3 (diff)
download: pki-e21ce46c60c96a38eab694502c6e428940a55098.tar.gz
pki-e21ce46c60c96a38eab694502c6e428940a55098.tar.xz
pki-e21ce46c60c96a38eab694502c6e428940a55098.zip
7 files changed, 263 insertions, 248 deletions
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
index dc65bf20d..165467717 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/edit.template
@@ -90,6 +90,10 @@ function doSave(form) {
     }
     uri += "?op=save&tid="+results[0].cn;
 
+    if (results[0].tokenUserID != form.uid.value) {
+            uri += "&uid=" + form.uid.value;
+    }
+
     if (results[0].tokenPolicy != form.tokenPolicy.value) {
        uri += "&tokenPolicy=" + form.tokenPolicy.value;
     }
@@ -137,7 +141,7 @@ if (typeof(results) == "undefined" || results.length == 0) {
                    "User ID:&nbsp;</font>\n");
     document.write("</td>\n");
     document.write("<td>\n");
-    document.write(results[0].tokenUserID+"\n");
+    document.write("<input TYPE=TEXT NAME=uid SIZE=20 VALUE="+results[0].tokenUserID+">\n");
     document.write("</td>\n");
     document.write("</tr>\n");
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdmin.template
deleted file mode 100644
index c9db8bb09..000000000
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdmin.template
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- --- BEGIN COPYRIGHT BLOCK ---
-     This library is free software; you can redistribute it and/or
-     modify it under the terms of the GNU Lesser General Public
-     License as published by the Free Software Foundation; either
-     
-     This library is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-     Lesser General Public License for more details.
-     
-     You should have received a copy of the GNU Lesser General Public
-     License along with this library; if not, write to the Free Software
-     Foundation, Inc., 51 Franklin Street, Fifth Floor,
-     Boston, MA  02110-1301  USA 
-     
-     Copyright (C) 2007 Red Hat, Inc.
-     All rights reserved.
-     --- END COPYRIGHT BLOCK --- -->
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<HTML>
-<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
-<HEAD>
-<TITLE>TPS</Title>
-</HEAD>
-
-<table border="0" width="100%" cellspacing="0" cellpadding="6">
-  <tr bgcolor="#666699">
-    <td width=25%>
-      <table border="0" cellspacing="0" cellpadding="6">
-        <tr>
-          <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>&reg;<br>
-            Certificate<br>System</b></font> </td>
-        </tr>
-      </table>
-    </td>
-    <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td>
-    <td width="10%">&nbsp;</td>
-  </tr>
-</table>
-<p>
-
-<BODY>
-
-<CMS_TEMPLATE>
-
-<SCRIPT type="text/JavaScript">
-<!--
-var uri0 = "";
-if (typeof(uriBase) == "undefined") {
-    uri0 += "/tus";
-} else {
-    uri0 += uriBase;
-}
-
-document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
-               "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : Edit Token</font>\n");
-document.write("<table width=\"100%\"><tr><td align=\"right\">" +
-                "<b>UID:</b>" +
-                userid + "</td></tr></table>\n");
-document.write("<HR NOSHADE SIZE=1>\n");
-
-function trim(str) {
-    var i, k, newString;
-
-    for (i = 0; i < str.length; i++) {
-        if (str.charAt(i) != ' ' )
-            break;
-    }
-    for (k = str.length - 1; k >= i; k--) {
-        if (str.charAt(k) != ' ' ) {
-            k++;
-            break;
-        }
-    }
-
-    if (k > i)
-        newString = str.substring(i, k);
-    else
-        newString = null;
-
-    return  newString;
-}
-
-function doSave(form) {
-    if (form.uid.value.length > 0) {
-        var trimmedList = "";
-        var uids = form.uid.value.split(',');
-
-        for (var i=0; i < uids.length; i++) {
-            if (i > 0) trimmedList += ",";
-            trimmedList += trim(uids[i]);
-        }
-        form.uid.value = trimmedList;
-    }
-
-        var uri = "";
-        if (typeof(uriBase) == "undefined") {
-            uri += "/tus";
-        } else {
-            uri += uriBase;
-        }
-        uri += "?op=save_admin&tid="+results[0].cn;
-
-        if (results[0].tokenUserID != form.uid.value) {
-            uri += "&uid=" + form.uid.value;
-        }
-        if (results[0].tokenPolicy != form.tokenPolicy.value) {
-            uri += "&tokenPolicy=" + form.tokenPolicy.value;
-        }
-        if (results[0].tokenReason != form.tokenReason.value) {
-            uri += "&tokenReason=" + form.tokenReason.value;
-        }
-        uri += "&m=" + results[0].modified;
-        location.href = uri;
-}
-
-function doCancel() {
-    var uri = "";
-    if (typeof(uriBase) == "undefined") {
-        uri += "/tus";
-    } else {
-        uri += uriBase;
-    }
-    location.href = uri;
-}
-
-
-
-if (typeof(results) == "undefined" || results.length == 0) {
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Token Not Found</font>\n");
-} else if (results.length > 1) {
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Found too many tokens to edit</font>\n");
-} else {
-    document.write("<BR>");
-    document.write("<FORM NAME =\"editForm\" ACTION=\"\" METHOD=GET>");
-
-    document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>\n");
-    document.write("<tr>\n");
-    document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Token:&nbsp;</font>\n");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   results[0].cn+"</font>\n");
-    document.write("</td>\n");
-    document.write("</tr>\n");
-
-    document.write("<tr>\n");
-    document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "User ID:&nbsp;</font>\n");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<input TYPE=TEXT NAME=uid SIZE=20 VALUE="+results[0].tokenUserID+">\n");
-    document.write("</td>\n");
-    document.write("</tr>\n");
-
-    document.write("<tr>\n");
-    document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Status:&nbsp;</font>\n");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   results[0].tokenStatus+"</font>\n");
-    document.write("</td>\n");
-    document.write("</tr>\n");
-
-    document.write("<tr>\n");
-    document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Reason:&nbsp;</font>\n");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<input TYPE=TEXT NAME=tokenReason SIZE=20 VALUE="+results[0].tokenReason+">\n");
-    document.write("</td>\n");
-    document.write("</tr>\n");
-
-    document.write("<tr>\n");
-    document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Policy:&nbsp;</font>\n");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<input TYPE=TEXT NAME=tokenPolicy SIZE=20 VALUE="+results[0].tokenPolicy+">\n");
-    document.write("</td>\n");
-    document.write("</tr>\n");
-
-    document.write("<tr>\n");
-    document.write("<td ALIGN=LEFT width=30% bgcolor=#e5e5e5>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   "Token Type:&nbsp;</font>\n");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
-                   results[0].tokenType+"</font>\n");
-    document.write("</td>\n");
-    document.write("</tr>\n");
-
-    document.write("</table>\n");
-    document.write("<BR>\n<HR NOSHADE SIZE=1>\n");
-
-    document.write("<DIV ALIGN=RIGHT>\n");
-    document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0>\n");
-    document.write("<tr>\n");
-    document.write("<td>\n");
-    document.write("<input TYPE=button VALUE=Save onClick=\"doSave(editForm);\">");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<input TYPE=button VALUE=Cancel onClick=\"doCancel();\">");
-    document.write("</td>\n");
-    document.write("</form>\n");
-    document.write("</tr>\n");
-    document.write("</table>\n");
-
-}
-
-//-->
-</SCRIPT>
-
-</BODY>
-</HTML>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
index c77c624cb..6c5299a4f 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/index.template
@@ -109,9 +109,6 @@ document.write("</tr></table>");
     <td><li><a href="tus?op=search">Search Tokens</a></td>
   </tr>
   <tr>
-    <td><li><a href="tus?op=new">Add New Token</a></td>
-  </tr>
-  <tr>
     <td><i>Certificates</i></td>
   </tr>
   <tr>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
index ac25e4022..28dce4d5c 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/indexAdmin.template
@@ -110,6 +110,9 @@ document.write("</tr></table>");
   <tr>
     <td><li><a href="tus?op=search_admin">Search Tokens</a></td>
   </tr>
+   <tr>
+    <td><li><a href="tus?op=new">Add New Token</a></td>
+  </tr>
   <tr> 
     <td><i>Users</i></td>
   </tr>
@@ -126,10 +129,10 @@ document.write("</tr></table>");
     <td><i>Activities</i></td>
   </tr>
   <tr>
-    <td><li><a href="tus?op=view_activity">List Activities</a></td>
+    <td><li><a href="tus?op=view_activity_admin">List Activities</a></td>
   </tr>
   <tr>
-    <td><li><a href="tus?op=search_activity">Search Activities</a></td>
+    <td><li><a href="tus?op=search_activity_admin">Search Activities</a></td>
   </tr>
 </table>
 <HR NOSHADE SIZE=1>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
index 91d39babc..f503595ab 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/editAdminResults.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdmin.template
@@ -45,32 +45,76 @@
 
 <SCRIPT type="text/JavaScript">
 <!--
-var uri = "";
+var uri0 = "";
 if (typeof(uriBase) == "undefined") {
-    uri += "/tus";
+    uri0 += "/tus";
 } else {
-    uri += uriBase;
+    uri0 += uriBase;
 }
 
 document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
-               "<a href=\""+uri+"\">Main Menu</a></font>\n");
+               "<a href=\""+uri0+"\">Main Menu</a> : Administrator Operations : Search Activity</font>\n");
+
 document.write("<table width=\"100%\"><tr><td align=\"right\">" +
                 "<b>UID:</b>" +
                 userid + "</td></tr></table>\n");
 document.write("<HR NOSHADE SIZE=1>\n");
 
-if (typeof(tid) == "undefined") {
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">\n");
-    document.write("Missing "+ editType + " ID</font>\n");
-    document.write("<BR>\n<HR NOSHADE SIZE=1>\n");
-} else {
-    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">\n");
-    document.write(editType + " record "+tid+" has been updated.</font>\n");
-    document.write("<BR>\n<HR NOSHADE SIZE=1>\n");
+function doFind(form) {
+        var uri = "";
+        if (typeof(uriBase) == "undefined") {
+            uri += "/tus"
+        } else {
+            uri += uriBase;
+        }
+        uri += "?op=view_activity_admin";
+        uri += "&tid=" + form.tid.value;
+        uri += "&uid=" + form.uid.value;
+        uri += "&maxCount=" + form.maxCount.value;
+        if ((typeof(topLevel) != "undefined") && (topLevel == "operator")) {
+            uri += "top=operator";
+        }
+        location.href = uri;
 }
-
 //-->
 </SCRIPT>
 
+<FORM NAME ="findForm" ACTION="" METHOD=GET>
+<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>
+  <tr>
+    <td ALIGN=LEFT width=30%>
+      <font size=-1 face="PrimaSans BT, Verdana, sans-serif">
+        Token ID:
+      </font>
+    </td>
+    <td>
+      <input TYPE=TEXT NAME=tid SIZE=20>
+    </td>
+  </tr>
+  <tr>
+    <td ALIGN=LEFT width=30%>
+      <font size=-1 face="PrimaSans BT, Verdana, sans-serif">
+        User ID:
+      </font>
+    </td>
+    <td>
+      <input TYPE=TEXT NAME=uid SIZE=20>
+    </td>
+  </tr>
+  <tr>
+    <td ALIGN=LEFT width=30%>
+      <font size=-1 face="PrimaSans BT, Verdana, sans-serif">
+        Max Count:
+      </font>
+    </td>
+    <td>
+      <input TYPE=TEXT NAME=maxCount SIZE=4 value="20">
+    </td>
+  </tr>
+</table>
+<HR NOSHADE SIZE=1>
+<DIV ALIGN=RIGHT>
+<input TYPE=button VALUE=Find onClick="doFind(findForm);">
+</form>
 </BODY>
 </HTML>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
new file mode 100644
index 000000000..0135759ed
--- /dev/null
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/searchActivityAdminResults.template
@@ -0,0 +1,195 @@
+<!-- --- BEGIN COPYRIGHT BLOCK ---
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+     License as published by the Free Software Foundation; either
+     
+     This library is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+     Lesser General Public License for more details.
+     
+     You should have received a copy of the GNU Lesser General Public
+     License along with this library; if not, write to the Free Software
+     Foundation, Inc., 51 Franklin Street, Fifth Floor,
+     Boston, MA  02110-1301  USA 
+     
+     Copyright (C) 2007 Red Hat, Inc.
+     All rights reserved.
+     --- END COPYRIGHT BLOCK --- -->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<HTML>
+<meta HTTP-EQUIV="content-type" CONTENT="text/html; charset=UTF-8">
+<HEAD>
+<TITLE>TPS</Title>
+</HEAD>
+
+<table border="0" width="100%" cellspacing="0" cellpadding="6">
+  <tr bgcolor="#666699">
+    <td width=25%>
+      <table border="0" cellspacing="0" cellpadding="6">
+        <tr>
+          <td nowrap><font size="-1" face="PrimaSans BT, Verdana, sans-serif" color="white">Dogtag<b>&reg;<br>
+            Certificate<br>System</b></font> </td>
+        </tr>
+      </table>
+    </td>
+    <td align=right width=65% nowrap><font size="+1" face="PrimaSans BT, Verdana, sans-serif" color="white">TPS Services</font></td>
+    <td width="10%">&nbsp;</td>
+  </tr>
+</table>
+<p>
+
+<BODY>
+
+<CMS_TEMPLATE>
+
+<SCRIPT type="text/JavaScript">
+<!--
+function checkDate(str) {
+    var newString;
+
+    if (str.length == 15 && str.charAt(14) == 'Z') {
+        newString = str.substring(0, 4);
+        newString += '/';
+        newString += str.substring(4, 6);
+        newString += '/';
+        newString += str.substring(6, 8);
+        newString += ' ';
+        newString += str.substring(8, 10);
+        newString += ':';
+        newString += str.substring(10, 12);
+        newString += ':';
+        newString += str.substring(12, 14);
+    } else {
+        newString = str;
+    }
+
+    return newString;
+}
+
+var uri = "";
+if (typeof(uriBase) == "undefined") {
+    uri += "/tus";
+} else {
+    uri += uriBase;
+}
+
+document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"+1\">"+
+    "<a href=\""+uri+"\">Main Menu</a> : Administrator Operations : Search Activity Results</font>\n");
+uri += "?op=show_admin&tid=";
+
+document.write("<table width=\"100%\"><tr><td align=\"right\">" +
+		"<b>UID:</b>" +
+                userid + "</td></tr></table>\n");
+document.write("<HR NOSHADE SIZE=1>\n");
+
+if (typeof(results) == "undefined" || results.length == 0) {
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "Token Not Found</font>\n");
+} else {
+    document.write("<BR>");
+    document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0 width=100%>\n");
+    document.write("<tr bgcolor=#cccccc>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "Activity ID</font>\n");
+    document.write("</td>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "Token</font>\n");
+    document.write("</td>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "IP</font>\n");
+    document.write("</td>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "User ID</font>\n");
+    document.write("</td>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "Operation</font>\n");
+    document.write("</td>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "Result</font>\n");
+    document.write("</td>\n");
+    document.write("<td>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                   "Created</font>\n");
+    document.write("</td>\n");
+    document.write("</tr>\n");
+    document.write("<tr bgcolor=#cccccc>\n");
+    document.write("<td colspan=7>\n");
+    document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">");
+    document.write("Details");
+    document.write("</font>");
+    document.write("</td>\n");
+    document.write("</tr>\n");
+
+    for (var i = 0; i < results.length; i++) {
+        if (i % 2 == 0) {
+          document.write("<tr bgcolor='#eeeeee'>\n");
+        } else {
+          document.write("<tr >\n");
+        }
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                       
+                        results[i].cn+"</font>\n");
+        document.write("</td>\n");
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\"><a href=\"" + uri + 
+                        results[i].tokenID+"\">" + results[i].tokenID + "</a></font>\n");
+        document.write("</td>\n");
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                        results[i].tokenIP+"</font>\n");
+        document.write("</td>\n");
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                        results[i].tokenUserID+"</font>\n");
+        document.write("</td>\n");
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                        results[i].tokenOp+"</font>\n");
+        document.write("</td>\n");
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                        results[i].tokenResult+"</font>\n");
+        document.write("</td>\n");
+        document.write("<td>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+
+                        checkDate(results[i].dateOfCreate)+"</font>\n");
+        document.write("</td>\n");
+        document.write("</tr>\n");
+        if (i % 2 == 0) {
+          document.write("<tr bgcolor='#eeeeee'>\n");
+        } else {
+          document.write("<tr >\n");
+        }
+        document.write("<td colspan=7>\n");
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-1\">"+ results[i].tokenMsg+"</font>\n");
+        document.write("</td>\n");
+        document.write("</tr>\n");
+    }
+    document.write("</table>\n");
+    document.write("<BR>\n<HR NOSHADE SIZE=1>\n");
+    if (typeof(results) != "undefined" && results.length > 0) {
+        document.write("<font face=\"PrimaSans BT, Verdana, sans-serif\" size=\"-2\">");
+        if (typeof(results) != "undefined" || results.length == 0) {
+            if (typeof(limited) != "undefined" && typeof(total) != "undefined") {
+                document.write("<br>" + limited + " of " + total + "\n");
+            } else if (typeof(total) != "undefined") {
+                document.write("<br>Total: " + total + "\n");
+            }
+        }
+        document.write("</font>");
+    }
+}
+
+//-->
+</SCRIPT>
+
+</BODY>
+</HTML>
diff --git a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
index 04a61b1a7..d50dd6b0e 100644
--- a/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
+++ b/pki/dogtag/tps-ui/shared/docroot/tokendb/showAdmin.template
@@ -286,10 +286,7 @@ if (typeof(results) == "undefined" || results.length == 0) {
     document.write("<table BORDER=0 CELLSPACING=2 CELLPADDING=0>\n");
     document.write("<tr>\n");
     document.write("<td>\n");
-    document.write("<form method='get' action='tus'><input type=hidden name=op value=view_activity><input type=hidden name=tid value=" + results[0].cn + "><input TYPE=submit VALUE=\"Show Activities\"></form>");
-    document.write("</td>\n");
-    document.write("<td>\n");
-    document.write("<form method='get' action='tus'><input type=hidden name=op value=edit_admin><input type=hidden name=tid value=" + results[0].cn + "><input TYPE=submit VALUE=Edit></form>");
+    document.write("<form method='get' action='tus'><input type=hidden name=op value=view_activity_admin><input type=hidden name=tid value=" + results[0].cn + "><input TYPE=submit VALUE=\"Show Activities\"></form>");
     document.write("</td>\n");
     document.write("<td>\n");
     document.write("<form method='get' action='tus'><input type=hidden name=op value=confirm><input type=hidden name=tid value=" + results[0].cn + "><input TYPE=submit VALUE=Delete></form>");
author	alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>	2009-02-27 04:42:38 +0000
committer	alee <alee@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>	2009-02-27 04:42:38 +0000
commit	e21ce46c60c96a38eab694502c6e428940a55098 (patch)
tree	2a0d34b0191dd5e766aeace45909677a606fff41 /pki/dogtag/tps-ui/shared/docroot/tokendb
parent	108e7ef39eda408d9ffca21c039fce0be86f2fc3 (diff)
download	pki-e21ce46c60c96a38eab694502c6e428940a55098.tar.gz pki-e21ce46c60c96a38eab694502c6e428940a55098.tar.xz pki-e21ce46c60c96a38eab694502c6e428940a55098.zip