[Fedora-directory-commits] adminserver/admserv/cgi-src40 htmladmin.properties, 1.6, 1.7 viewdata.properties, 1.5, 1.6 viewlog.properties, 1.5, 1.6

Richard Allen Megginson (rmeggins) fedora-directory-commits at redhat.com
Fri Dec 7 17:43:52 UTC 2007 

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/cgi-src40
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14223/adminserver/admserv/cgi-src40

Modified Files:
	htmladmin.properties viewdata.properties viewlog.properties 
Log Message:
Resolves: bug 407011
Bug Description: GIF missing on the front page for admin web ui
Reviewed by: nhosoi (Thanks!)
Fix Description: Yet another carry over from the days when everything was under the single server root.  We should not use relative paths for the icons, but just use "/icons/" for the path, and let Apache map that to the real location of the icon files.
Platforms tested: RHEL5 x86_64
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none



Index: htmladmin.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/htmladmin.properties,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- htmladmin.properties	9 May 2007 00:26:30 -0000	1.6
+++ htmladmin.properties	7 Dec 2007 17:43:50 -0000	1.7
@@ -64,41 +64,41 @@
 //#/* html resource string - output_topology() */
 htmladmin60 { "<SCRIPT LANGUAGE=JavaScript>\n<!--\nfunction confirm_stop() {\n  if(confirm('%s'))\n    return true;\n  else\n    return false;\n}\n\nfunction confirm_admin_stop() {\n  if(confirm('%s'))\n    return true;\n  else\n    return false;\n}\nfunction confirm_directory_stop() {\n  if(confirm('%s'))\n    return true;\n  else\n    return false;\n}\n//-->\n</SCRIPT>\n\n" }
 htmladmin61 { "<table border=0 cellpadding=0 cellspacing=0 cols=2 width=100%% bgcolor=\"#CCCCCC\">\n" }
-htmladmin62 { "<tr>\n<td colspan=2 BGCOLOR=\"#666699\"><img src=\"../icons/domain16.gif\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font color=\"#FFFFFF\"><font size=-1> %s</font></font></font></td>\n</tr>\n\n" }
-htmladmin63 { "<tr>\n<td colspan=2 BGCOLOR=\"#999999\"><img src=\"../icons/host.gif\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font color=\"#FFFFFF\"><font size=-1> %s</font></font></font></td>\n</tr>\n\n" }
-htmladmin64 { "<tr>\n<td colspan=2><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=16><img src=\"../icons/group2.gif\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font color=\"#000000\"><font size=-1> %s</font></font></font></td>\n</tr>\n\n" }
-htmladmin65 { "<tr>\n<td colspan=2><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=32><img src=\"../icons/%s\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1> %s%s</font></font></td>\n</tr>\n\n" }
-htmladmin66 { "<tr>\n<td><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=48>\n<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font color=\"#666699\">*</font></b> <b>%s</b></font></font></td>\n<td><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1> <A HREF=\"%s\" target=_new>Server Manager</A></font></font></td>\n</tr>\n\n\"" }
-htmladmin67 { "<tr>\n<td><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=48>\n<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font color=\"#666699\">*</font></b> <b>%s</b></font></font></td>\n\n<td>\n<p align=\"right\">\n\n" }
-htmladmin68 { " <A HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin69 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin62 { "<tr>\n<td colspan=2 BGCOLOR=\"#666699\"><img src=\"/icons/domain16.gif\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font color=\"#FFFFFF\"><font size=-1> %s</font></font></font></td>\n</tr>\n\n" }
+htmladmin63 { "<tr>\n<td colspan=2 BGCOLOR=\"#999999\"><img src=\"/icons/host.gif\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font color=\"#FFFFFF\"><font size=-1> %s</font></font></font></td>\n</tr>\n\n" }
+htmladmin64 { "<tr>\n<td colspan=2><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=16><img src=\"/icons/group2.gif\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font color=\"#000000\"><font size=-1> %s</font></font></font></td>\n</tr>\n\n" }
+htmladmin65 { "<tr>\n<td colspan=2><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=32><img src=\"/icons/%s\" BORDER=0 height=16 width=16><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1> %s%s</font></font></td>\n</tr>\n\n" }
+htmladmin66 { "<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=48>\n<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font color=\"#666699\">*</font></b> <b>%s</b></font></font></td>\n<td><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1> <A HREF=\"%s\" target=_new>Server Manager</A></font></font></td>\n</tr>\n\n\"" }
+htmladmin67 { "<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=48>\n<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font color=\"#666699\">*</font></b> <b>%s</b></font></font></td>\n\n<td>\n<p align=\"right\">\n\n" }
+htmladmin68 { " <A HREF=\"%s/admin-serv/tasks/operation/Stop?return_format=html\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin69 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_admin_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
 htmladmin70 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin71 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin72 { "<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1>%s%s Status=<b>%s</b>%s</font></font>\n\n" }
 htmladmin73 { "On" }
 htmladmin74 { "Off" }
 htmladmin75 { "Unknown" }
-htmladmin76 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_directory_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin77 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin76 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_directory_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin77 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
 htmladmin78 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin79 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin80 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin81 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A>\n" }
 htmladmin82 { "<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1>%s%s</font></font>\n\n" }
-htmladmin83 { "<tr>\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0>\n<tr>\n<td><img src=\"../icons/16space.gif\" BORDER=0 height=16 width=64></td>\n\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH=\"100%%\">\n<tr>\n<td><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font color=\"#666699\">*</font></b>b <b>%s</b></font></font></td>\n</tr>\n</table>\n</td>\n\n" }
-htmladmin84 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin85 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin83 { "<tr>\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0>\n<tr>\n<td><img src=\"/icons/16space.gif\" BORDER=0 height=16 width=64></td>\n\n<td>\n<table BORDER=0 CELLSPACING=0 CELLPADDING=0 COLS=1 WIDTH=\"100%%\">\n<tr>\n<td><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><b><font color=\"#666699\">*</font></b>b <b>%s</b></font></font></td>\n</tr>\n</table>\n</td>\n\n" }
+htmladmin84 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin85 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
 htmladmin86 { "<font face=\"Helvetica, Arial, Sans-serif\"><font size=-1> Status=<b>%s</b>%s</font></font>\n\n" }
-htmladmin87 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin88 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin87 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin88 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
 htmladmin89 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin90 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font>\n" }
-htmladmin91 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin92 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin91 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin92 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
 htmladmin93 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> <font color=\"#FFFFFF\">|</font>\n" }
 htmladmin94 { "<A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font>\n" }
-htmladmin95 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"../icons/togon.gif\" border=0 align=ABSCENTER></A>" }
-htmladmin96 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"../icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin95 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\" onclick=\"return confirm_stop()\"><IMG SRC=\"/icons/togon.gif\" border=0 align=ABSCENTER></A>" }
+htmladmin96 { " <A HREF=\"HTMLAdmin?op=serveractivate&obj=%s%s\"><IMG SRC=\"/icons/togoff.gif\" border=0 align=ABSCENTER></A>" }
 htmladmin97 { "<td><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><A HREF=\"%s/admin-serv/tasks/configuration/ViewData?sie=%s\" target=\"main\">Server Info</A> <font color=\"#FFFFFF\">|</font></font></font></td>\n" }
 htmladmin98 { "<td><font face=\"Helvetica, Arial, Sans-serif\"><font size=-1><A HREF=\"%s/admin-serv/tasks/configuration/ViewLog?id=%s\" target=\"main\">Logs</A> <font color=\"#FFFFFF\">|</font></font></font></td>\n" }
 htmladmin99 { "</p>\n</td>\n</tr>\n\n" }


Index: viewdata.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewdata.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- viewdata.properties	18 Aug 2005 18:59:03 -0000	1.5
+++ viewdata.properties	7 Dec 2007 17:43:50 -0000	1.6
@@ -42,7 +42,7 @@
 viewdata30 { "<tr>\n<td>\n<div align=right><font face=\"helvetica, arial, sans-serif\"><font size=-1>Description:</font></font></div>\n</td>\n<td><font face=\"helvetica, arial, sans-serif\"><font size=-1>%s</font></font></td>\n</tr>\n" }
 viewdata31 { "<table BORDER=0 CELLSPACING=6 CELLPADDING=0>\n" }
 viewdata32 { "</table>\n" }
-viewdata33 { "<tr>\n<td><font size=+1 font face=\"helvetica, arial, sans-serif\"><b>%s</b></font></td>\n</tr>\n<tr>\n<td BACKGROUND=\"../icons/hr.gif\"><font face=\"Verdana\"> </font></td>\n</tr>\n<tr><td>" }
+viewdata33 { "<tr>\n<td><font size=+1 font face=\"helvetica, arial, sans-serif\"><b>%s</b></font></td>\n</tr>\n<tr>\n<td BACKGROUND=\"/icons/hr.gif\"><font face=\"Verdana\"> </font></td>\n</tr>\n<tr><td>" }
 viewdata34 { "<font face=\"helvetica, arial, sans-serif\"><font size=-1><A HREF=\"%s\" target=\"new\">Upgrade Available</A></font></font>\n" }
 viewdata35 { "<font face=\"helvetica, arial, sans-serif\"><font size=-1>No Upgrade Available</font></font>\n" }
 viewdata36 { "<font face=\"helvetica, arial, sans-serif\"><font size=-1><A HREF=\"%s\" target=\"new\">%s</A></font></font>\n" }


Index: viewlog.properties
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/cgi-src40/viewlog.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- viewlog.properties	27 Jun 2007 22:24:59 -0000	1.5
+++ viewlog.properties	7 Dec 2007 17:43:50 -0000	1.6
@@ -42,7 +42,7 @@
 viewlog23 { "<option value=No log files>No log files\n" }
 viewlog24 { "</select>" }
 viewlog25 { "<input type=\"hidden\" name=\"id\" value=\"%s\">\n" }
-viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%%\">\n<tr>\n<td><font size=+1 font face=\"helvetica, arial, sans-serif\"><b>%s Logs</b></font></td>\n</tr>\n<tr>\n<td BACKGROUND=\"../icons/hr.gif\"> </td>\n</tr>\n<tr><td></table>\n" }
+viewlog26 { "<table BORDER=0 CELLSPACING=2 CELLPADDING=2 WIDTH=\"100%%\">\n<tr>\n<td><font size=+1 font face=\"helvetica, arial, sans-serif\"><b>%s Logs</b></font></td>\n</tr>\n<tr>\n<td BACKGROUND=\"/icons/hr.gif\"> </td>\n</tr>\n<tr><td></table>\n" }
 viewlog27 { "<hr width=50%%>\n" }
 viewlog28 { "<table border=1 width=100%%><tr><th>%s</th></tr></table>\n" }

More information about the Fedora-directory-commits mailing list