Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 25 Aug 2008 19:45:23 GMT
From:      Robert Watson <rwatson@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 148428 for review
Message-ID:  <200808251945.m7PJjNho079119@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=148428

Change 148428 by rwatson@rwatson_fledge on 2008/08/25 19:44:57

	More menu and image magic for the TrustedBSD page.  Well, sort
	of magic.

Affected files ...

.. //depot/projects/trustedbsd/www/Makefile#11 edit
.. //depot/projects/trustedbsd/www/extattr-selected.png#1 add
.. //depot/projects/trustedbsd/www/extattr.png#1 add
.. //depot/projects/trustedbsd/www/geom-selected.png#1 add
.. //depot/projects/trustedbsd/www/geom.png#1 add
.. //depot/projects/trustedbsd/www/heading.xsl#6 edit
.. //depot/projects/trustedbsd/www/openpam-selected.png#1 add
.. //depot/projects/trustedbsd/www/openpam.png#1 add
.. //depot/projects/trustedbsd/www/page.xsl#9 edit
.. //depot/projects/trustedbsd/www/privileges.page#4 edit

Differences ...

==== //depot/projects/trustedbsd/www/Makefile#11 (text+ko) ====

@@ -28,7 +28,7 @@
 # OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 # SUCH DAMAGE.
 # 
-# $P4: //depot/projects/trustedbsd/www/Makefile#10 $
+# $P4: //depot/projects/trustedbsd/www/Makefile#11 $
 
 STYLESHEET=	page.xsl
 
@@ -55,12 +55,15 @@
 IMGS+=		components.png components-selected.png
 IMGS+=		developers.png developers-selected.png
 IMGS+=		docs.png docs-selected.png
+IMGS+=		extattr.png extattr-selected.png
+IMGS+=		geom.png geom-selected.png
 IMGS+=		home.png home-selected.png
 IMGS+=		horizontalbar1.gif
 IMGS+=		mac.png mac-selected.png
 IMGS+=		mailinglists.png mailinglists-selected.png
 IMGS+=		minipemaquidlight.jpg pemaquidlight.jpg powerlogo.gif
 IMGS+=		openbsm.png openbsm-selected.png
+IMGS+=		openpam.png openpam-selected.png
 IMGS+=		privileges.png privileges-selected.png
 IMGS+=		resources.gif trustydibmed2.jpg trustyshadow.gif
 IMGS+=		sebsd.png sebsd-selected.png

==== //depot/projects/trustedbsd/www/heading.xsl#6 (text+ko) ====

@@ -31,11 +31,13 @@
       <tbody>
         <tr>
 	  <td valign="top" bgcolor="#000000" colspan="10">
-	    <img border="0" width="752" height="72" src="trustyheader.png" alt="www.TrustedBSD.org" />
+	    <a href="home.html"><img border="0" width="752" height="72"
+	      src="trustyheader.png" alt="www.TrustedBSD.org" /></a>
 	  </td>
 	</tr>
 	<tr>
-	    <xsl:call-template name="image-tab">
+
+            <xsl:call-template name="image-tab">
 	      <xsl:with-param name="type" select="'home'" />
 	      <xsl:with-param name="role" select="$role" />
 	      <xsl:with-param name="description" select="'Home'" />
@@ -60,6 +62,49 @@
 	    </xsl:call-template>
 
             <xsl:call-template name="image-tab">
+	      <xsl:with-param name="type" select="'acls'" />
+	      <xsl:with-param name="role" select="$role" />
+	      <xsl:with-param name="description" select="'ACLs'" />
+	      <xsl:with-param name="width" select="100" />
+	      <xsl:with-param name="height" select="22" />
+	    </xsl:call-template>
+
+            <xsl:call-template name="image-tab">
+	      <xsl:with-param name="type" select="'audit'" />
+	      <xsl:with-param name="role" select="$role" />
+	      <xsl:with-param name="description" select="'Audit'" />
+	      <xsl:with-param name="width" select="100" />
+	      <xsl:with-param name="height" select="22" />
+	    </xsl:call-template>
+
+            <xsl:call-template name="image-tab">
+	      <xsl:with-param name="type" select="'bsmtrace'" />
+	      <xsl:with-param name="role" select="$role" />
+	      <xsl:with-param name="description" select="'BSMtrace'" />
+	      <xsl:with-param name="width" select="100" />
+	      <xsl:with-param name="height" select="22" />
+	    </xsl:call-template>
+
+            <xsl:call-template name="image-tab">
+	      <xsl:with-param name="type" select="'extattr'" />
+	      <xsl:with-param name="role" select="$role" />
+	      <xsl:with-param name="description" select="'ExtAttr + UFS2'" />
+	      <xsl:with-param name="width" select="100" />
+	      <xsl:with-param name="height" select="22" />
+	    </xsl:call-template>
+
+            <xsl:call-template name="image-tab">
+	      <xsl:with-param name="type" select="'geom'" />
+	      <xsl:with-param name="role" select="$role" />
+	      <xsl:with-param name="description" select="'GEOM + GBDE'" />
+	      <xsl:with-param name="width" select="100" />
+	      <xsl:with-param name="height" select="22" />
+	    </xsl:call-template>
+
+	</tr>
+	<tr>
+
+            <xsl:call-template name="image-tab">
 	      <xsl:with-param name="type" select="'mailinglists'" />
 	      <xsl:with-param name="role" select="$role" />
 	      <xsl:with-param name="description" select="'Mailing Lists'" />
@@ -76,41 +121,49 @@
 	    </xsl:call-template>
 
             <xsl:call-template name="image-tab">
-	      <xsl:with-param name="type" select="'acls'" />
+	      <xsl:with-param name="type" select="'mac'" />
+	      <xsl:with-param name="role" select="$role" />
+	      <xsl:with-param name="description" select="'MAC Framework'" />
+	      <xsl:with-param name="width" select="100" />
+	      <xsl:with-param name="height" select="22" />
+	    </xsl:call-template>
+
+            <xsl:call-template name="image-tab">
+	      <xsl:with-param name="type" select="'openbsm'" />
 	      <xsl:with-param name="role" select="$role" />
-	      <xsl:with-param name="description" select="'ACLs'" />
+	      <xsl:with-param name="description" select="'OpenBSM'" />
 	      <xsl:with-param name="width" select="100" />
 	      <xsl:with-param name="height" select="22" />
 	    </xsl:call-template>
 
             <xsl:call-template name="image-tab">
-	      <xsl:with-param name="type" select="'audit'" />
+	      <xsl:with-param name="type" select="'openpam'" />
 	      <xsl:with-param name="role" select="$role" />
-	      <xsl:with-param name="description" select="'Audit'" />
+	      <xsl:with-param name="description" select="'OpenPAM'" />
 	      <xsl:with-param name="width" select="100" />
 	      <xsl:with-param name="height" select="22" />
 	    </xsl:call-template>
 
             <xsl:call-template name="image-tab">
-	      <xsl:with-param name="type" select="'bsmtrace'" />
+	      <xsl:with-param name="type" select="'privileges'" />
 	      <xsl:with-param name="role" select="$role" />
-	      <xsl:with-param name="description" select="'BSMtrace'" />
+	      <xsl:with-param name="description" select="'Privileges'" />
 	      <xsl:with-param name="width" select="100" />
 	      <xsl:with-param name="height" select="22" />
 	    </xsl:call-template>
 
             <xsl:call-template name="image-tab">
-	      <xsl:with-param name="type" select="'mac'" />
+	      <xsl:with-param name="type" select="'sebsd'" />
 	      <xsl:with-param name="role" select="$role" />
-	      <xsl:with-param name="description" select="'MAC Framework'" />
+	      <xsl:with-param name="description" select="'SEBSD'" />
 	      <xsl:with-param name="width" select="100" />
 	      <xsl:with-param name="height" select="22" />
 	    </xsl:call-template>
 
             <xsl:call-template name="image-tab">
-	      <xsl:with-param name="type" select="'openbsm'" />
+	      <xsl:with-param name="type" select="'sedarwin'" />
 	      <xsl:with-param name="role" select="$role" />
-	      <xsl:with-param name="description" select="'OpenBSM'" />
+	      <xsl:with-param name="description" select="'SEDarwin'" />
 	      <xsl:with-param name="width" select="100" />
 	      <xsl:with-param name="height" select="22" />
 	    </xsl:call-template>

==== //depot/projects/trustedbsd/www/page.xsl#9 (text+ko) ====

@@ -27,16 +27,25 @@
 
     <body xsl:use-attribute-sets="body-attributes">
 
+      <table border="0" width="800" cellpadding="0" cellspacing="0">
+      <tr>
+	<td>
+
       <!-- Generate Web page header. -->
       <xsl:call-template name="page-heading">
 	<xsl:with-param name="role" select="$role" />
       </xsl:call-template>
 
-      <table width="90%" border="0" cellspacing="1" cellpadding="2">
+	</td>
+      </tr>
+      <tr>
+	<td>
+	<table width="90%" border="0" cellspacing="1" cellpadding="2">
 	<tr>
 	  <td valign="top" width="100">
 	    <a href="beastie.html">
-	      <img src="trustyteenie.gif" alt="Trusty" border="0" />
+	      <img src="trustyteenie.gif" width="166" height="200"
+		alt="Trusty" border="0" />
 	    </a>
 	    <br />
 
@@ -100,6 +109,9 @@
 	  <xsl:value-of select="//cvs:keyword[@name='freebsd']" />
 	</small>
       </ul>
+	</td>
+      </tr>
+      </table>
     </body>
     </html>
   </xsl:template>

==== //depot/projects/trustedbsd/www/privileges.page#4 (text+ko) ====

@@ -24,12 +24,12 @@
      SUCH DAMAGE.
 -->
 
-<page role="components">
+<page role="privileges">
   <title>TrustedBSD POSIX.1e Privileges</title>
 
   <cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
     <cvs:keyword name="freebsd">
-      $P4: //depot/projects/trustedbsd/www/privileges.page#3 $
+      $P4: //depot/projects/trustedbsd/www/privileges.page#4 $
     </cvs:keyword>
   </cvs:keywords>
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200808251945.m7PJjNho079119>