Fix Bugzilla Bug 532724 - Feature: ESC Security officer work station should display % of operation complete for format SO card

git-svn-id: svn+ssh://svn.fedorahosted.org/svn/pki/trunk@1461 c9f7a03b-bd48-0410-a16d-cbbf54688b0b

13 files changed, 316 insertions, 16 deletions

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 ed38423f5..673035aeb 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/enroll.html
@@ -219,7 +219,7 @@ function onUserKeyUp(e)
 </div>
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
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 d74a89d8d..caa83fa19 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
@@ -192,7 +192,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
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 6cd0d2dc0..372737c7f 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/format.html
@@ -204,7 +204,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
@@ -214,7 +214,7 @@ function toggleButton(id, i)
     | <a href="/cgi-bin/sow/main.cgi">Main</a> |
     </div>
 <br/>
-<blockquote>This will erase the home phone URL and format the user token.</blockquote>
+<blockquote>This will erase the phone home URL and format the user token.</blockquote>
 <h3><span id="keytext">Please insert new smartcard now!</span></h3>
     <br/>
     <table width="100%">
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 1fa5f6ca8..38f6d509e 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/formatso.html
@@ -53,6 +53,14 @@ function updateKeyText(text)
   f.appendChild(text);
 }
 
+function UserOnCOOLKeyStatusUpdate(data)
+{
+  var progress = document.getElementById("progress");
+
+  if(progress)
+      progress.innerHTML = data + "%";
+}
+
 function UserSelectRowByKeyID(keyType, keyID)
 {
   DoCoolKeySetConfigValue("Operation-" + keyID, 
@@ -146,7 +154,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
@@ -164,6 +172,7 @@ function toggleButton(id, i)
 <td>
 <div id="ajax-pb" style="display:none;">
   <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/main.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
index 2143f664c..e7de688bc 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/main.html
@@ -28,7 +28,7 @@
 
 <div id="header">
   <div id="logo">
-     <center> <h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+     <h3>Security Officer Station</h3>
   </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 bf33051f4..1e660c84f 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/read.html
@@ -18,7 +18,7 @@
 <html>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel=stylesheet href="/esc/sow/style.css" type="text/css">
+<link rel=stylesheet href="/esc/sow/css/style.css" type="text/css">
 
 <title>Security Officer</title>
 <script type="text/javascript" src="/esc/sow/js/prototype.js"></script>
@@ -30,7 +30,7 @@
 
 <div id="header">
   <div id="logo">
-      <h3><img align=bottom src="/esc/sow/images/logo.gif">Security Officer Station</h3>
+      <h3>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 3658578e4..1e660c84f 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
@@ -18,19 +18,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/css/style.css" type="text/css">
 
 <title>Security Officer</title>
 <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">
+<link rel="stylesheet" href="/esc/sow/css/style.css" media="screen" type="text/css">
 </head>
 
 <body>
 
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </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 86670c1d1..789a4a015 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/search.html
@@ -28,7 +28,7 @@
 
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
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 635e419bf..507f223ef 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
@@ -28,7 +28,7 @@
 
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
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 b968f6587..3a25380b1 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/seturl.html
@@ -83,6 +83,14 @@ function UserOnDoneInitializeBindingTable()
   }
 }
 
+function UserOnCOOLKeyStatusUpdate(data)
+{
+  var progress = document.getElementById("progress");
+
+  if(progress)
+      progress.innerHTML = data + "%";
+}
+
 function UserOnCOOLKeyInserted(keyType, keyID)
 {
   var keyStatus = GetStatusForKeyID(keyType, keyID);
@@ -134,7 +142,7 @@ function toggleButton(id, i)
 </div>
 <div id="header">
   <div id="logo">
-     <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+     <h3>Security Officer Station</h3>
   </div>
 </div>
 
@@ -144,7 +152,7 @@ function toggleButton(id, i)
     | <a href="/cgi-bin/sow/main.cgi">Main</a> |
     </div>
 <br/>
-<blockquote>This will burn a home phone URL on the user token.</blockquote>
+<blockquote>This will burn a phone home URL on the user token.</blockquote>
 <h3><span id="keytext">Please insert new smartcard now!</span></h3>
     <br/>
     <table width="100%">
@@ -152,6 +160,7 @@ function toggleButton(id, i)
 <td>
 <div id="ajax-pb" style="display:none;">
   <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/welcome.html b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
index 0be39dd80..718dce94b 100755
--- a/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
+++ b/pki/dogtag/tps-ui/shared/cgi-bin/sow/welcome.html
@@ -28,7 +28,7 @@
 
 <div id="header">
   <div id="logo">
-      <center><h3><!--<img align=bottom src="/esc/sow/images/logo.gif">-->Security Officer Station</h3></center>
+      <h3>Security Officer Station</h3>
   </div>
 </div>
 
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 77065f92d..ccd81ee84 100755
--- a/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/so/util.js
@@ -1373,6 +1373,11 @@ function OnCOOLKeyStateError(keyType, keyID, keyState, errorCode)
   typeStr += " \n " + ErrorText;
   MyAlert(typeStr);
   ClearProgressBar(KeyToProgressBarID(keyType, keyID));
+
+  if (UserOnCOOLKeyStateError) {
+    UserOnCOOLKeyStateError(); // call user-level
+  }
+
 }
 
 function OnCOOLKeyStatusUpdate(progMeterID, statusUpdate)
diff --git a/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css b/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
new file mode 100644
index 000000000..c60e713d2
--- /dev/null
+++ b/pki/dogtag/tps-ui/shared/docroot/esc/sow/css/style.css
@@ -0,0 +1,277 @@
+html, body {

+	margin: 0; padding: 0;

+	text-align: center;

+	background-color: #A1B3C9;

+}

+

+h1,h3,h3 {

+	margin: 0; padding: 0;

+}

+

+#content {

+	width: 450px;

+/*

+	width: 760px;

+*/

+	text-align: center;

+	margin: auto;

+}

+

+#header{

+

+/*

+	width: 760px;

+	height: 50px;

+*/

+	width: 300px;

+	height: 30px;

+	text-align: left;

+	margin: auto;

+	}

+	

+#logo{

+	float: left;

+	height: auto;

+/*

+	width: 250px;

+*/

+	width: 450px;

+	margin: 5px;

+	padding-top: 10px;

+	padding-right: 0px;

+	padding-bottom: 0px;

+	font-size:1.5em;

+/*

+	padding-left: 10px;

+*/

+	padding-left: 5px;

+}

+	

+#topmenu{

+	width: 450px;

+	top: 5px;

+/*

+	width: 400px;

+	margin-left: 310px;

+*/

+	margin-left: 0px;

+	padding-top: 5px;

+	padding-right: 0px;

+	font-size:1.5em;

+/*

+	padding-left: 30px;

+*/

+	padding-left: 0px;

+	font-family:"Lucida Grande","Lucida Sans Unicode",arial,sans-serif;

+	font-size:1.0em;

+	color:#DBDFEE;

+	

+}

+

+#topmenu a{

+	text-decoration:none;

+	color:#DBDFEE;

+	

+}

+

+#topmenu a:hover{

+	color:#ffffff;

+	background-color:#939FB2;

+	

+}

+

+

+#content {

+/*

+	margin-top: 40px;

+*/

+	margin-top: 10px;

+	padding-bottom: 40px;

+}

+

+

+#maintext {

+	width: 450px;

+/*

+	width: 520px;

+	margin-left: 20px;

+*/

+	margin-left: 5px;

+	text-align:justify;

+} 

+

+#maintext a{

+	text-decoration:none;

+	color:#ffffff;

+	border-bottom:1px dotted #ffffff;

+}

+

+#maintext a:hover{

+	color:#ffffff;

+	background-color:#939FB2;

+	

+}

+

+#rightcol {

+/*

+	width: 168px;

+*/

+	width: 0px;

+	position: absolute;

+	top: 140px;

+	margin-left: 575px;

+	background: url(/esc/sow/images/right_bg.gif) no-repeat;

+}

+

+

+#introduction{

+	float:right;

+	width:150px;

+	padding: 8px 8px 8px 8px;

+	margin:auto;

+	

+	text-align:center;

+	line-height:1.5em;

+	color:#ffffff;

+	font-size:0.8em;

+	font-family:"Lucida Grande","Lucida Sans Unicode",arial,sans-serif;

+	letter-spacing:0px;

+}

+

+#introduction ul, #introduction li {

+	text-align:center;

+	list-style: none;

+	margin: 0;

+	padding: 0;

+}

+

+

+#introduction  a{

+	text-decoration:none;

+	color:#ffffff;

+	border-bottom: none;

+}

+

+#introduction a:hover{

+	color:#ffffff;

+	background-color:#939FB2;

+	

+}

+

+#introduction h3{

+	text-align: center;

+	position:static;

+}

+

+

+html, body {

+	font: .85em/1.6em Arial, Helvetica, sans-serif;

+/*

+	font: .95em/1.6em Arial, Helvetica, sans-serif;

+	color: #FFFFFF;

+*/

+}

+

+

+p {

+	margin-bottom: 1em;

+}

+

+#footer 

+{

+	width: 100%;

+	height: 60px;

+	clear: both;

+	padding-top: 8px;

+	text-align: center;

+	border-top: 1px solid #C6D4E6;

+	color: #000000;

+	font-size: .75em;

+	background-color: #414243;

+	background-image: url(/esc/sow/images/footer.gif);

+}

+

+#footer a {

+	color: #888888;

+	text-decoration:none;

+

+}

+

+#footer p {color: #888888;}

+

+html, body {

+	background: #A1B3C9 url(/esc/sow/images/bg_grad.gif) repeat-x;

+}

+

+#content {background: url(/esc/sow/images/main_grad.gif) repeat-x;}

+

+html>body #content {

+	margin-top: 40px;

+}

+

+h1{

+	font-family:"Trebuchet MS",arial,sans-serif;

+	font-size:2.6em;

+	font-weight:normal;

+	background:#fff url(/esc/sow/images/booksmall.gif) no-repeat bottom left;

+	padding:0 0 10px 50px;

+	margin:20px 5px 5px 5px;

+}

+

+h2{

+	font-family:"Lucida Grande","Lucida Sans Unicode",arial,sans-serif;

+	font-size:1.2em;

+	margin:auto;

+	text-transform:capitalize;

+	padding:0 2px;

+}

+

+h3{

+	color: #ffffff;

+	font-family:geneva,arial,sans-serif;

+	font-weight:normal;

+	text-transform:uppercase;

+	word-spacing:4px;

+	letter-spacing:3px;

+	font-size:0.9em;

+	font-weight:bold;

+	padding:0 2px;

+	margin:0;

+}

+

+.heading{

+	color: #ffffff;

+	font-family:geneva,arial,sans-serif;

+	font-weight:normal;

+	text-transform:uppercase;

+	word-spacing:4px;

+	letter-spacing:3px;

+	font-size:0.9em;

+	font-weight:bold;

+	padding:0 2px;

+	margin:0;

+}

+

+blockquote 

+{	

+	border-left: 4px #c7d2ea solid;

+	padding:  0 0 0 10px;

+/*

+	margin: 10px 20px 10px 20px;

+*/

+	margin: 5px 20px 10px 20px;

+	letter-spacing: 0px;

+	white-space:inherit;

+	font-size:1.3em;

+}

+

+h4 

+{

+	font-weight: bold;

+	font-size: 25px;

+	text-transform: capitalize;

+	color: #DBDFEE;

+	margin: 0;

+	padding: 0;

+	letter-spacing: 3px;

+}