[Fedora-directory-commits] adminserver/admserv/html admserv_dsgw.html, NONE, 1.1 admserv_orgchart.html, NONE, 1.1 admserv_phonebook.html, NONE, 1.1 admserv.html, 1.1, 1.2

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/html
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv27530/adminserver/admserv/html

Modified Files:
	admserv.html 
Added Files:
	admserv_dsgw.html admserv_orgchart.html admserv_phonebook.html 
Log Message:
Resolves: bug 383301
Bug Description: Admin Server main html page refers to dsgw, org
Reviewed by: nhosoi (Thanks!)
Fix Description: Introduce a new directive - INCLUDEIFEXISTS.  This will include the html file specified if it exists, or just skip it if not found.  When dsgw, org, etc. are ready, we can just plug in the appropriate html file.
I added the html excerpts to the data directory so we can have them in case we want to use them - just copy them to the html directory and reload the main admin server page.
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



--- NEW FILE admserv_dsgw.html ---
        <tr valign="top"> 
          <td><img src="../icons/goto.gif" width="10" height="15"> </td>
          <td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=dsgw">
            Directory Server Gateway</a></font><font size="-1" face="Verdana, sans-serif"><br>
            Search for and edit directory entries.</font><font size="-1" face="Verdana, sans-serif"> 
            </font></td>
        </tr>
        <tr valign="top"> 
          <td> </td>
          <td> </td>
        </tr>


--- NEW FILE admserv_orgchart.html ---
        <tr valign="top"> 
          <td><img src="../icons/goto.gif" width="10" height="15"> </td>
          <td><font face="Verdana, sans-serif"><a href="/clients/orgchart/html/index.html">
            Directory Server Org Charts</a></font><font size="-1" face="Verdana, sans-serif"><br>
            Browse org charts of your organization.</font><font size="-1" face="Verdana, sans-serif"> 
            </font></td>
        </tr>
        <tr valign="TOP"> 
          <td> </td>
          <td> </td>
        </tr>


--- NEW FILE admserv_phonebook.html ---
        <tr valign="top"> 
          <td><img src="../icons/goto.gif" width="10" height="15"> </td>
          <td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=pb">
            Directory Server Express</a></font><font size="-1" face="Verdana, sans-serif"><br>
            Search for users by name, user ID or extension.</font><font size="-1" face="Verdana, sans-serif"> 
            </font></td>
        </tr>
        <tr valign="top"> 
          <td> </td>
          <td> </td>
        </tr>


Index: admserv.html
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/html/admserv.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- admserv.html	9 May 2007 00:26:31 -0000	1.1
+++ admserv.html	15 Nov 2007 17:02:02 -0000	1.2
@@ -49,28 +49,8 @@
           <td><img src="../icons/spacer.gif" width="6" height="6"></td>
           <td></td>
         </tr>
-        <tr valign="top"> 
-          <td><img src="../icons/goto.gif" width="10" height="15"> </td>
-          <td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=pb">
-            Directory Server Express</a></font><font size="-1" face="Verdana, sans-serif"><br>
-            Search for users by name, user ID or extension.</font><font size="-1" face="Verdana, sans-serif"> 
-            </font></td>
-        </tr>
-        <tr valign="top"> 
-          <td> </td>
-          <td> </td>
-        </tr>
-        <tr valign="top"> 
-          <td><img src="../icons/goto.gif" width="10" height="15"> </td>
-          <td><font face="Verdana, sans-serif"><a href="/clients/orgchart/html/index.html">
-            Directory Server Org Charts</a></font><font size="-1" face="Verdana, sans-serif"><br>
-            Browse org charts of your organization.</font><font size="-1" face="Verdana, sans-serif"> 
-            </font></td>
-        </tr>
-        <tr valign="TOP"> 
-          <td> </td>
-          <td> </td>
-        </tr>
+<!-- INCLUDEIFEXISTS admserv_phonebook.html -->
+<!-- INCLUDEIFEXISTS admserv_orgchart.html -->
       </table>
     </td>
     <td> </td>
@@ -89,17 +69,7 @@
           <td><img src="../icons/spacer.gif" width="6" height="6"></td>
           <td></td>
         </tr>
-        <tr valign="top"> 
-          <td><img src="../icons/goto.gif" width="10" height="15"> </td>
-          <td><font face="Verdana, sans-serif"><a href="/clients/dsgw/bin/lang?context=dsgw">
-            Directory Server Gateway</a></font><font size="-1" face="Verdana, sans-serif"><br>
-            Search for and edit directory entries.</font><font size="-1" face="Verdana, sans-serif"> 
-            </font></td>
-        </tr>
-        <tr valign="top"> 
-          <td> </td>
-          <td> </td>
-        </tr>
+<!-- INCLUDEIFEXISTS admserv_dsgw.html -->
         <tr valign="TOP"> 
           <td><img src="../icons/goto.gif" width="10" height="15"> </td>
           <td><font face="Verdana, sans-serif"><a href='http://fedora.redhat.com/'>Fedora Home Page</a></font><font size="-1" face="Verdana, sans-serif"><br>