Author: jmagne
Update of /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2324
Modified Files:
ESC.js GenericAuth.xul MineOverlay.xul certManager.xul esc.css
Log Message:
Security Officer UI changes, #445274.
Index: ESC.js
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/ESC.js,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- ESC.js 4 Feb 2009 01:43:47 -0000 1.18
+++ ESC.js 26 Feb 2009 22:34:42 -0000 1.19
@@ -506,6 +506,9 @@
function GetAuthDataFromPopUp(aKeyType,aKeyID,aUiData)
{
+ if(!gAdminPage)
+ return;
+
keyUITable[aKeyID] = aUiData;
keyTypeTable[aKeyID] = aKeyType;
@@ -2227,7 +2230,7 @@
if(!keyStatus)
{
- DisableItem(viewcertsbtn);
+ EnableItem(viewcertsbtn);
DisableItem(enrollbtn);
if(adminkeymenu)
{
@@ -2293,7 +2296,7 @@
if(keyStatus == getBundleString("statusUninitialized"))
{
- DisableItem(viewcertsbtn);
+ EnableItem(viewcertsbtn);
if(isCool)
{
@@ -2335,7 +2338,7 @@
if(keyStatus == getBundleString("statusNoApplet"))
{
- DisableItem(viewcertsbtn);
+ EnableItem(viewcertsbtn);
DisableItem(enrollbtn);
DisableItem(resetpinbtn);
Index: GenericAuth.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/GenericAuth.xul,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- GenericAuth.xul 7 May 2007 23:49:23 -0000 1.4
+++ GenericAuth.xul 26 Feb 2009 22:34:43 -0000 1.5
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<?xml-stylesheet href="chrome://global/skin/"
type="text/css"?>
<?xml-stylesheet href="esc.css" type="text/css"?>
<!-- ***** BEGIN COPYRIGHT BLOCK *****
* This Program is free software; you can redistribute it and/or modify it under
@@ -20,8 +21,10 @@
<!DOCTYPE window SYSTEM "chrome://esc/locale/esc.dtd">
<window
class="escwindow"
- id="esc-auth-window"
+ id="esc-window"
title="&genericAuthTitle;"
+ width="400"
+ height="225"
onload="UiLoad();"
onunload="UiUnload();"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul...
@@ -29,8 +32,8 @@
<stringbundle id="esc_strings"
src="chrome://esc/locale/esc.properties"/>
<script src="GenericAuth.js"/>
- <grid >
- <rows >
+<grid>
+ <rows>
<row>
<image id="logoImage"/>
Index: MineOverlay.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/MineOverlay.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- MineOverlay.xul 4 Feb 2009 01:43:47 -0000 1.2
+++ MineOverlay.xul 26 Feb 2009 22:34:43 -0000 1.3
@@ -95,15 +95,15 @@
label="&certmgr.backupall2.label;"
accesskey="&certmgr.backupall2.accesskey;"
oncommand="backupAllCerts();"/>
- <button id="mine_restoreButton" class="normal"
+-->
+ <button id="mine_restoreButton" class="normal"
hidden="true"
label="&certmgr.restore2.label;"
accesskey="&certmgr.restore2.accesskey;"
oncommand="restoreCerts();"/>
- <button id="mine_deleteButton" class="normal"
+ <button id="mine_deleteButton" class="normal"
hidden="true"
label="&certmgr.delete2.label;"
accesskey="&certmgr.delete2.accesskey;"
disabled="true" oncommand="deleteCerts();"/>
--->
</hbox>
</vbox>
</overlay>
Index: certManager.xul
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/certManager.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- certManager.xul 4 Feb 2009 01:43:47 -0000 1.2
+++ certManager.xul 26 Feb 2009 22:34:43 -0000 1.3
@@ -62,12 +62,12 @@
<script type="application/x-javascript"
src="escCertManager.js"/>
<vbox flex="1">
- <tabbox id="certmanagertabs" flex="1"
style="margin:5px" persist="selectedIndex">
- <tabs id="certMgrTabbox">
+ <tabbox id="certmanagertabs" flex="1"
style="margin:5px">
+ <tabs id="certMgrTabbox"
onselect="CertsTabsSelected();">
<tab id="mine_tab" label="&certmgr.tab.mine;"
selected="true"/>
<tab id="others_tab" hidden="true"
label="&certmgr.tab.others2;"/>
<tab id="websites_tab" hidden="true"
label="&certmgr.tab.websites3;"/>
- <tab id="ca_tab" hidden="true"
label="&certmgr.tab.ca;"/>
+ <tab id="ca_tab" hidden="false"
label="&certmgr.tab.ca;"/>
<tab id="orphan_tab" hidden="true"
label="&certmgr.tab.orphan2;"/>
</tabs>
Index: esc.css
===================================================================
RCS file: /cvs/dirsec/esc/src/app/xul/esc/chrome/content/esc/esc.css,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- esc.css 7 May 2007 23:49:23 -0000 1.5
+++ esc.css 26 Feb 2009 22:34:43 -0000 1.6
@@ -26,7 +26,7 @@
}
.escwindow {
-background: #ffffff url(bg.jpg) repeat-x;
+/*background: #ffffff url(bg.jpg) repeat-x; */
font-family: arial;
font-size: 17pt;