Security Officer UI changes, #445274

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@252 c9f7a03b-bd48-0410-a16d-cbbf54688b0b
author: jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> 2009-02-26 21:57:32 +0000
committer: jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b> 2009-02-26 21:57:32 +0000
commit: 68fdfed0706f0623362e6a4f17f740cc809504f7 (patch)
tree: ae605c8b5d618f88cc9dfe649ad12a233402088d
parent: 656ad1320e327225813831ce98a1f320503f18da (diff)
download: pki-68fdfed0706f0623362e6a4f17f740cc809504f7.tar.gz
pki-68fdfed0706f0623362e6a4f17f740cc809504f7.tar.xz
pki-68fdfed0706f0623362e6a4f17f740cc809504f7.zip
20 files changed, 165 insertions, 96 deletions
diff --git a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
index 5c5dd204e..377dde067 100644
--- a/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
+++ b/pki/dogtag/tps-ui/dogtag-pki-tps-ui.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_ui_prefix}-%{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      6
+%define base_release      7
 %define base_group        System Environment/Base
 %define base_vendor       Red Hat, Inc.
 %define base_license      GPLv2 with exceptions
@@ -222,6 +222,8 @@ rm -rf ${RPM_BUILD_ROOT}
 ###############################################################################
 
 %changelog
+* Wed Feb 25 2009 Jack Magne <jmagne@redhat.com> 1.0.0-7
+- Bugzilla Bug #445274 - Make esc security officer mode work.
 * Wed Feb 11 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-6
 - Bugzilla Bug #467155 - Change "renameTo" to "cp -p "
 * Tue Jan 27 2009 Ade Lee <alee@redhat.com> 1.0.0-5
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
index 7980a9cf0..bd56efe45 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/so/Enroll.html
@@ -19,11 +19,11 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/so/style.css" type="text/css">
+<link rel=stylesheet href="/esc/so/style.css" type="text/css">
 
 <title>Enrollment</title>
 </head>
-<script type="text/JavaScript" src="/so/util.js">
+<script type="text/JavaScript" src="/esc/so/util.js">
 </script>
 
 <script type="text/javascript">
@@ -49,6 +49,30 @@ function UserOnDoneInitializeBindingTable()
   }
 }
 
+function UserOnCOOLKeyStateError()
+{
+  toggleAjaxProgress('ajax-pb', 'off');
+}
+
+
+function toggleAjaxProgress(id, i)
+{
+  var e = document.getElementById(id);
+  if (i == 'off') {
+    e.style.display = 'none';
+  } else {
+    e.style.display = 'block';
+  }
+}
+
+function UserOnCOOLKeyStatusUpdate(data)
+{
+  var progress = document.getElementById("progress");
+
+  if(progress)
+      progress.innerHTML = data + "%";
+}
+
 // -->
 </script>
 
@@ -58,18 +82,20 @@ function UserOnDoneInitializeBindingTable()
 <table width="100%" class="logobar">
   <tr>
     <td>
-<img alt="" src="/so/logo.jpg">
+<!--<img alt="" src="/esc/so/images/logo.gif"> -->
     </td>
-    <td>
+    <td align = "center">
       <p class="headerText">Security Officer Enrollment</p>
     </td>
   </tr>
 </table>
+  <div id="pb" style="display:none;">
   <table id="BindingTable" width="200px"align="center">
     <tr id="HeaderRow">
     </tr>
   </table>
-  <p class="bodyText">You have plugged in your smartcard! After answering a few easy questions, you will be able to use your smartcard.
+  </div>
+  <p class="bodyText">You have plugged in your smartcard! After answering a few easy questions, you will be able to enroll the smartcard for the Security Officer user.
   </p>
   <p class="bodyText"> 
       Now we would like you to identify yourself.
@@ -97,10 +123,16 @@ function UserOnDoneInitializeBindingTable()
         <td><input type="password" id="reenterpintf" name="reenterpintf" value=""></td>
     </table>
     <br>
+    <div id="ajax-pb" style="display:none;">
+       <img src="/esc/sow/images/indicator.gif">
+       <h2 id="progress" name="progress" value="0%" ></h2>
+    </table>
+    </div>
+
     <table width="100%">
       <tr>
         <td align="right">
-          <input type="button" id="enrollbtn" name="enrollbtn" value="Enroll My Smartcard" onClick="DoEnrollCOOLKey();">
+          <input type="button" id="enrollbtn" name="enrollbtn" value="Enroll My Smartcard" onClick="toggleAjaxProgress('ajax-pb','on');DoEnrollCOOLKey();">
         </td>
       </tr>
     </table>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
index 79c236bbd..6902ec9e3 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/cfg.pl
@@ -51,7 +51,7 @@ my $port = "7888";
 my $secure_port = "7889";
 my $host = "localhost";
 
-my $cfg = "/var/lib/rhpki-tps/conf/CS.cfg";
+my $cfg = "/var/lib/pki-tps/conf/CS.cfg";
 
 sub get_ldapsearch()
 {
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
index 605d2274e..0686e0ddf 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
@@ -19,13 +19,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Enrollment</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<script type="text/JavaScript" src="/sow/util.js"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<script type="text/JavaScript" src="/esc/sow/util.js"></script>
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 <script type="text/javascript">
 <!--
 function UserOnCOOLKeyStateError()
@@ -99,6 +99,13 @@ function UserOnCOOLKeyRemoved(keyType, keyID)
   updateKeyText('Please insert a blank smartcard now!');
 }
 
+function UserOnCOOLKeyStatusUpdate(data)
+{
+  var progress = document.getElementById("progress");
+  if(progress)
+      progress.innerHTML = data + "%";
+}
+
 function toggleAjaxProgress(id, i)
 {
   var e = document.getElementById(id);
@@ -155,7 +162,7 @@ function onUserKeyUp(e)
 </div>
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -166,20 +173,23 @@ function onUserKeyUp(e)
     </div>
   <blockquote><p>The security officer has identified the user as <strong>$cn</strong>. The User ID is <strong>$uid</strong>.</p>
 </blockquote>
-<h3><span id="keytext">Please insert new smartcard now!</span></h3>
+<h2><span id="keytext">Please insert new smartcard now!</span></h2>
       <blockquote><p>The user must provide a password to protect the smart card.</p> </blockquote>
-        <h3>New Token Password:</h3>
+        New Token Password:<br>
         <input type="password" id="pintf" name="pintf" value=""><br/>
-        <h3>Re-Enter Token Password:</h3>
+        Re-Enter Token Password:<br>
         <input type="password" id="reenterpintf" name="reenterpintf" value=""><br/>
         <input type="hidden" id="snametf"  value="$uid">
-        <h3>User Password:</h3>
-        <input type="password" id="snamepwd" value=""><br/>
+        User Password:<br>
+        <input type="password" id="snamepwd" value="">
     <table width="100%">
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/sow/images/indicator.gif">
+  <img src="/esc/sow/images/indicator.gif">
+  <h2 id="progress" name="progress" value="0%" ></h2>
+  </table>
+
 </div>
 </td>
         <td align="right">
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
index b72add5c5..8b472b9b6 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll_temp.html
@@ -19,13 +19,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Enrollment</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<script type="text/JavaScript" src="/sow/util.js"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<script type="text/JavaScript" src="/esc/sow/util.js"></script>
+<link rel="stylesheet" href="/esc/sow/style.css" media="screen" type="text/css">
 <script type="text/javascript">
 <!--
 function UserOnCOOLKeyStateError()
@@ -93,6 +93,14 @@ function UserOnCOOLKeyRemoved(keyType, keyID)
   updateKeyText('Please insert a blank smartcard now!');
 }
 
+function UserOnCOOLKeyStatusUpdate(data)
+{
+  var progress = document.getElementById("progress");
+  if(progress)
+      progress.innerHTML = data + "%";
+}
+
+
 function toggleAjaxProgress(id, i)
 {
   var e = document.getElementById(id);
@@ -128,7 +136,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -152,7 +160,8 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/sow/images/indicator.gif">
+  <img src="/esc/sow/images/indicator.gif">
+  <h2 id="progress" name="progress" value="0%" ></h2>
 </div>
 </td>
         <td align="right">
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
index 30989aa07..7b8d58637 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
@@ -19,13 +19,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Enrollment</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<script type="text/JavaScript" src="/sow/util.js"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<script type="text/JavaScript" src="/esc/sow/util.js"></script>
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 <script type="text/javascript">
 <!--
 function UserOnCOOLKeyStateError()
@@ -115,6 +115,14 @@ function UserOnCOOLKeyRemoved(keyType, keyID)
   updateKeyText('Please insert a blank smartcard now!');
 }
 
+function UserOnCOOLKeyStatusUpdate(data)
+{
+  var progress = document.getElementById("progress");
+
+  if(progress)
+      progress.innerHTML = data + "%";
+}
+
 function toggleAjaxProgress(id, i)
 {
   var e = document.getElementById(id);
@@ -138,19 +146,19 @@ function toggleButton(id, i)
 </script>
 </head>
 
-<body onload="InitializeBindingTable();" onunload=cleanup()>
+<body onload="InitializeBindingTable();" onunload="cleanup();">
 
-<progressmeter id="progress-id" hidden="true" align = "center"/>
+<progressmeter id="progress-id" hidden="true" align = "center"/> 
 
 <div id="pb" style="display:none;">
   <table id="BindingTable" width="200px" align="center">
-    <tr id="HeaderRow">
-    </tr>
+     <tr id="HeaderRow">
+     </tr>
   </table>
 </div>
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -167,7 +175,8 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/sow/images/indicator.gif">
+  <img src="/esc/sow/images/indicator.gif">
+  <h2 id="progress" name="progress" value="0%" ></h2>
 </div>
 </td>
         <td align="right">
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
index dcfae82d9..d029c0a65 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
@@ -19,13 +19,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Enrollment</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<script type="text/JavaScript" src="/sow/util.js"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<script type="text/JavaScript" src="/esc/sow/util.js"></script>
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 <script type="text/javascript">
 <!--
 function UserOnCOOLKeyStateError()
@@ -130,7 +130,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -147,7 +147,7 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/sow/images/indicator.gif">
+  <img src="/esc/sow/images/indicator.gif">
 </div>
 </td>
         <td align="right">
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
index c4e5fc081..9eb499428 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
@@ -19,17 +19,17 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Security Officer</title>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+     <center> <h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
index 640053364..7f369f303 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
@@ -19,19 +19,19 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Security Officer</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <h3><img align=bottom src="/esc/sow/images/logo.gif">Security Officer Station</h3>
   </div>
 </div>
 
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
index 640053364..c011cd7ee 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read_temp.html
@@ -22,16 +22,16 @@
 <link rel=stylesheet href="/sow/style.css" type="text/css">
 
 <title>Security Officer</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<link rel="stylesheet" href="/esc/sow/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
index b0d00f350..9cf2a697e 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
@@ -19,17 +19,17 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Security Officer</title>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -38,7 +38,7 @@
     <div id="topmenu">
     | <a href="/cgi-bin/sow/main.cgi">Main</a> |
     </div>
-  <blockquote><p>Please locate the user who is requesting for a new smart card.</p></blockquote>
+  <blockquote><p>Please locate the user who is requesting a new smart card.</p></blockquote>
 <form method=post action="read.cgi">
 <div style="font-size:0.8em;">
     <table>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
index 6f9b6d1d8..2f8f0d619 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search_temp.html
@@ -19,17 +19,17 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Security Officer</title>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -38,7 +38,7 @@
     <div id="topmenu">
     | <a href="/cgi-bin/sow/main.cgi">Main</a> |
     </div>
-  <blockquote><p>Please locate the user who is requesting for a temporary smart card.</p></blockquote>
+  <blockquote><p>Please locate the user who is requesting a temporary smart card.</p></blockquote>
 <form method=post action="read_temp.cgi">
 <div style="font-size:0.8em;">
     <table>
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
index 91ece7d6f..4cec98229 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
@@ -19,13 +19,13 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Enrollment</title>
-<script type="text/javascript" src="/sow/js/prototype.js"></script>
-<script type="text/javascript" src="/sow/js/scriptaculous.js?load=effects"></script>
-<script type="text/JavaScript" src="/sow/util.js"></script>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
+<script type="text/javascript" src="/esc/sow/js/scriptaculous.js?load=effects"></script>
+<script type="text/JavaScript" src="/esc/sow/util.js"></script>
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 <script type="text/javascript">
 <!--
 function UserOnCOOLKeyStateError()
@@ -135,7 +135,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+     <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -152,7 +152,7 @@ function toggleButton(id, i)
       <tr>
 <td>
 <div id="ajax-pb" style="display:none;">
-  <img src="/sow/images/indicator.gif">
+  <img src="/esc/sow/images/indicator.gif">
 </div>
 </td>
         <td align="right">
diff --git a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
index 1ede1edbf..9e5587469 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
@@ -19,17 +19,17 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
 
 <title>Security Officer</title>
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
index f4a854fd3..82ef1d9cd 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/demo/util.js
@@ -1487,7 +1487,7 @@ function refresh()
 
 function loadSuccessPage()
 {
-    window.location="/demo/EnrollSuccess.html";
+    window.location="/esc/demo/EnrollSuccess.html";
 }
 
 function ShowProgressBar(aKeyType,aKeyID, doShow)
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
index edfa30e6b..f6c71c6b9 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/EnrollSuccess.html
@@ -19,26 +19,28 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<link rel=stylesheet href="/home/style.css" type="text/css"> 
+<link rel=stylesheet href="/esc/so/style.css" type="text/css"> 
 <title>Success!</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body  leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
-<table width="100%" border="0" cellspacing="0" cellpadding="0" class="logobar">
-  <tr> 
-    <td bgcolor="#000000">&nbsp;&nbsp;&nbsp;<img src="/home/logo.jpg" width="250" height="50"></td>
-  </tr>
-</table>
+<div id="header">
+  <div id="logo">
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+  </div>
+</div>
 
-<p class="bodyText" >
-Congratulations! You have successfully Enrolled your Security Officer Smartcard! Now that you have enrolled, you will be able to access the Security Officer Workstation.
-
-</p>
-<p class="bodyText">
-
-</p>
+<div id="content">
+  <div id="maintext">
+     <div id="topmenu">
+    | <a href="/cgi-bin/sow/main.cgi">Main</a> |
+     </div>
+<blockquote><strong>Congratulations!</strong> You have successfully Enrolled your Security Officer Smartcard! Now that you have enrolled, you will be able to access the Security Officer Workstation.</blockquote>
+<br/>
 
+</div>
+</div>
 </body>
 
 </html>
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
index 76e14014c..561d1b8bc 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
@@ -1466,6 +1466,8 @@ function OnCOOLKeyStateChange(keyType, keyID, keyState, data,strData)
       break;
     case 1021: // OperationStatusUpdate
       OnCOOLKeyStatusUpdate(KeyToProgressBarID(keyType, keyID), data);
+      if(UserOnCOOLKeyStatusUpdate)
+          UserOnCOOLKeyStatusUpdate(data);
       break;
 
      case 1022: //Need Auth 
@@ -1490,7 +1492,7 @@ function refresh()
 
 function loadSuccessPage()
 {
-    window.location="/so/EnrollSuccess.html";
+    window.location="/esc/so/EnrollSuccess.html";
 }
 
 function ShowProgressBar(aKeyType,aKeyID, doShow)
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
index 3b2096308..73db7d464 100644
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/EnrollSuccess.html
@@ -19,10 +19,10 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 <html>
 <head>
-<link rel=stylesheet href="/sow/style.css" type="text/css"> 
+<link rel=stylesheet href="/esc/sow/style.css" type="text/css"> 
 <title>Success!</title>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link rel="stylesheet" href="/sow/css/style.css" media="screen" type="text/css">
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
@@ -30,7 +30,7 @@
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/sow/images/badget.png">Security Officer Station</h3>
+      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
   </div>
 </div>
 
@@ -49,4 +49,3 @@
 </body>
 
 </html>
-
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
index 2af341937..2d502762e 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/util.js
@@ -1635,6 +1635,8 @@ function OnCOOLKeyStateChange(keyType, keyID, keyState, data,strData)
       break;
     case 1021: // OperationStatusUpdate
       OnCOOLKeyStatusUpdate(KeyToProgressBarID(keyType, keyID), data);
+      if(UserOnCOOLKeyStatusUpdate)
+          UserOnCOOLKeyStatusUpdate(data);
       break;
 
      case 1022: //Need Auth 
@@ -1659,7 +1661,7 @@ function refresh()
 
 function loadSuccessPage()
 {
-    window.location="/sow/EnrollSuccess.html";
+    window.location="/esc/sow/EnrollSuccess.html";
 }
 
 function ShowProgressBar(aKeyType,aKeyID, doShow)
diff --git a/pki/dogtag/tps/pki-tps.spec b/pki/dogtag/tps/pki-tps.spec
index f16ca5b5f..4660f63a4 100644
--- a/pki/dogtag/tps/pki-tps.spec
+++ b/pki/dogtag/tps/pki-tps.spec
@@ -34,7 +34,7 @@
 ## Package Header Definitions
 %define base_name         %{base_prefix}-%{base_component}
 %define base_version      1.0.0
-%define base_release      24
+%define base_release      25
 %define base_group        System Environment/Daemons
 %define base_vendor       Red Hat, Inc.
 %define base_license      LGPLv2 with exceptions
@@ -308,6 +308,8 @@ fi
 ###############################################################################
 
 %changelog
+* Wed Feb 25 2009 Jack Magne <jmagne@redhat.com> 1.0.0-25
+- Bugzillw Bug #445274 - Make esc security officer mode work.
 * Tue Feb 24 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-24
 - Bugzilla Bug #485859 -  port separation for RA and TPS
 * Mon Feb 23 2009 Matthew Harmsen <mharmsen@redhat.com> 1.0.0-23
author	jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>	2009-02-26 21:57:32 +0000
committer	jmagne <jmagne@c9f7a03b-bd48-0410-a16d-cbbf54688b0b>	2009-02-26 21:57:32 +0000
commit	68fdfed0706f0623362e6a4f17f740cc809504f7 (patch)
tree	ae605c8b5d618f88cc9dfe649ad12a233402088d
parent	656ad1320e327225813831ce98a1f320503f18da (diff)
download	pki-68fdfed0706f0623362e6a4f17f740cc809504f7.tar.gz pki-68fdfed0706f0623362e6a4f17f740cc809504f7.tar.xz pki-68fdfed0706f0623362e6a4f17f740cc809504f7.zip