PERFORCE change 148422 for review
Robert Watson
rwatson at FreeBSD.org
Mon Aug 25 19:09:48 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=148422
Change 148422 by rwatson at rwatson_fledge on 2008/08/25 19:09:45
Add more menu bar icons for components.
Affected files ...
.. //depot/projects/trustedbsd/www/Makefile#10 edit
.. //depot/projects/trustedbsd/www/acls-selected.png#1 add
.. //depot/projects/trustedbsd/www/acls.page#2 edit
.. //depot/projects/trustedbsd/www/acls.png#1 add
.. //depot/projects/trustedbsd/www/audit-selected.png#1 add
.. //depot/projects/trustedbsd/www/audit.page#7 edit
.. //depot/projects/trustedbsd/www/audit.png#1 add
.. //depot/projects/trustedbsd/www/bsmtrace-selected.png#1 add
.. //depot/projects/trustedbsd/www/bsmtrace.page#3 edit
.. //depot/projects/trustedbsd/www/bsmtrace.png#1 add
.. //depot/projects/trustedbsd/www/components-selected.png#2 edit
.. //depot/projects/trustedbsd/www/components.png#2 edit
.. //depot/projects/trustedbsd/www/developers-selected.png#2 edit
.. //depot/projects/trustedbsd/www/developers.png#2 edit
.. //depot/projects/trustedbsd/www/docs-selected.png#2 edit
.. //depot/projects/trustedbsd/www/docs.png#2 edit
.. //depot/projects/trustedbsd/www/heading.xsl#5 edit
.. //depot/projects/trustedbsd/www/home-selected.png#2 edit
.. //depot/projects/trustedbsd/www/home.png#2 edit
.. //depot/projects/trustedbsd/www/mac-selected.png#1 add
.. //depot/projects/trustedbsd/www/mac.page#4 edit
.. //depot/projects/trustedbsd/www/mac.png#1 add
.. //depot/projects/trustedbsd/www/mailinglists-selected.png#2 edit
.. //depot/projects/trustedbsd/www/mailinglists.png#2 edit
.. //depot/projects/trustedbsd/www/openbsm-selected.png#1 add
.. //depot/projects/trustedbsd/www/openbsm.page#30 edit
.. //depot/projects/trustedbsd/www/openbsm.png#1 add
.. //depot/projects/trustedbsd/www/privileges-selected.png#1 add
.. //depot/projects/trustedbsd/www/privileges.png#1 add
.. //depot/projects/trustedbsd/www/sebsd-selected.png#1 add
.. //depot/projects/trustedbsd/www/sebsd.png#1 add
.. //depot/projects/trustedbsd/www/sedarwin-selected.png#1 add
.. //depot/projects/trustedbsd/www/sedarwin.png#1 add
.. //depot/projects/trustedbsd/www/trustyheader.png#2 edit
Differences ...
==== //depot/projects/trustedbsd/www/Makefile#10 (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#9 $
+# $P4: //depot/projects/trustedbsd/www/Makefile#10 $
STYLESHEET= page.xsl
@@ -49,12 +49,22 @@
SRCS+= acls.page
SRCS+= bsmtrace.page
-IMGS= components.png components-selected.png
-IMGS+= developers.png developers-selected.png docs.png
-IMGS+= docs-selected.png home.png home-selected.png
-IMGS+= horizontalbar1.gif mailinglists.png mailinglists-selected.png
+IMGS= acls.png acls-selected.png
+IMGS+= audit.png audit-selected.png
+IMGS+= bsmtrace.png bsmtrace-selected.png
+IMGS+= components.png components-selected.png
+IMGS+= developers.png developers-selected.png
+IMGS+= docs.png docs-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+= privileges.png privileges-selected.png
IMGS+= resources.gif trustydibmed2.jpg trustyshadow.gif
+IMGS+= sebsd.png sebsd-selected.png
+IMGS+= sedarwin.png sedarwin-selected.png
IMGS+= trustyteenie.gif verticalbar1.gif wwwheader.gif
IMGS+= trustyheader.png
==== //depot/projects/trustedbsd/www/acls.page#2 (text+ko) ====
@@ -24,12 +24,12 @@
SUCH DAMAGE.
-->
-<page role="components">
+<page role="acls">
<title>TrustedBSD Access Control Lists (ACLs)</title>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $P4: //depot/projects/trustedbsd/www/acls.page#1 $
+ $P4: //depot/projects/trustedbsd/www/acls.page#2 $
</cvs:keyword>
</cvs:keywords>
==== //depot/projects/trustedbsd/www/audit.page#7 (text+ko) ====
@@ -24,12 +24,12 @@
SUCH DAMAGE.
-->
-<page role="components">
+<page role="audit">
<title>Security Event Audit</title>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $P4: //depot/projects/trustedbsd/www/audit.page#6 $
+ $P4: //depot/projects/trustedbsd/www/audit.page#7 $
</cvs:keyword>
</cvs:keywords>
==== //depot/projects/trustedbsd/www/bsmtrace.page#3 (text+ko) ====
@@ -26,12 +26,12 @@
SUCH DAMAGE.
-->
-<page role="components">
+<page role="bsmtrace">
<title>BSMtrace</title>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $P4: //depot/projects/trustedbsd/www/bsmtrace.page#2 $
+ $P4: //depot/projects/trustedbsd/www/bsmtrace.page#3 $
</cvs:keyword>
</cvs:keywords>
==== //depot/projects/trustedbsd/www/components-selected.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/components.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/developers-selected.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/developers.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/docs-selected.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/docs.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/heading.xsl#5 (text+ko) ====
@@ -5,24 +5,23 @@
<xsl:param name="role" />
<xsl:param name="width" />
<xsl:param name="height" />
-
<!-- This forces the main page for the main page of each section to match
the name of the section as seen in the role attribute of the page
- tag. -->
- <a href="{$type}.html">
-
- <!-- "Grey out" the image that corresponds with this page's section. -->
+ tag. Use a "selected" version of the image when on a page. -->
<xsl:choose>
<xsl:when test="$role = $type">
- <img border="0" src="{$type}-selected.png" alt="{$description}"
- height="{$height}" width="{$width}" />
+ <td valign="top">
+ <a href="{$type}.html"><img border="0" src="{$type}-selected.png"
+ alt="{$description}" height="{$height}" width="{$width}" /></a>
+ </td>
</xsl:when>
<xsl:otherwise>
- <img border="0" src="{$type}.png" alt="{$description}"
- height="{$height}" width="{$width}" />
+ <td valign="top">
+ <a href="{$type}.html"><img border="0" src="{$type}.png"
+ alt="{$description}" height="{$height}" width="{$width}" /></a>
+ </td>
</xsl:otherwise>
</xsl:choose>
- </a>
</xsl:template>
<xsl:template name="page-heading">
@@ -31,62 +30,92 @@
<table border="0" bgcolor="#000000" cellspacing="0" cellpadding="0" width="100%">
<tbody>
<tr>
- <td valign="top" bgcolor="#000000" colspan="6">
- <img border="0" src="trustyheader.png" alt="www.TrustedBSD.org" />
+ <td valign="top" bgcolor="#000000" colspan="10">
+ <img border="0" width="752" height="72" src="trustyheader.png" alt="www.TrustedBSD.org" />
</td>
</tr>
<tr>
- <td valign="top">
<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'" />
- <xsl:with-param name="width" select="144" />
- <xsl:with-param name="height" select="32" />
+ <xsl:with-param name="width" select="100" />
+ <xsl:with-param name="height" select="22" />
</xsl:call-template>
- </td>
- <td valign="top">
<xsl:call-template name="image-tab">
<xsl:with-param name="type" select="'developers'" />
<xsl:with-param name="role" select="$role" />
<xsl:with-param name="description" select="'Developers'" />
- <xsl:with-param name="width" select="144" />
- <xsl:with-param name="height" select="32" />
+ <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="'docs'" />
+ <xsl:with-param name="role" select="$role" />
+ <xsl:with-param name="description" select="'Documentation'" />
+ <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="'mailinglists'" />
+ <xsl:with-param name="role" select="$role" />
+ <xsl:with-param name="description" select="'Mailing Lists'" />
+ <xsl:with-param name="width" select="100" />
+ <xsl:with-param name="height" select="22" />
</xsl:call-template>
- </td>
- <td valign="top">
<xsl:call-template name="image-tab">
<xsl:with-param name="type" select="'components'" />
<xsl:with-param name="role" select="$role" />
<xsl:with-param name="description" select="'Components'" />
- <xsl:with-param name="width" select="144" />
- <xsl:with-param name="height" select="32" />
+ <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="'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>
- </td>
- <td valign="top">
<xsl:call-template name="image-tab">
- <xsl:with-param name="type" select="'docs'" />
+ <xsl:with-param name="type" select="'mac'" />
<xsl:with-param name="role" select="$role" />
- <xsl:with-param name="description" select="'Documentation'" />
- <xsl:with-param name="width" select="144" />
- <xsl:with-param name="height" select="32" />
+ <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>
- </td>
- <td valign="top">
<xsl:call-template name="image-tab">
- <xsl:with-param name="type" select="'mailinglists'" />
+ <xsl:with-param name="type" select="'openbsm'" />
<xsl:with-param name="role" select="$role" />
- <xsl:with-param name="description" select="'Mailing Lists'" />
- <xsl:with-param name="width" select="144" />
- <xsl:with-param name="height" select="32" />
+ <xsl:with-param name="description" select="'OpenBSM'" />
+ <xsl:with-param name="width" select="100" />
+ <xsl:with-param name="height" select="22" />
</xsl:call-template>
- </td>
- <td valign="top" width="100%">
- </td>
+
+ <td width="100%"></td>
</tr>
</tbody>
</table>
==== //depot/projects/trustedbsd/www/home-selected.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/home.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/mac.page#4 (text+ko) ====
@@ -32,12 +32,12 @@
SUCH DAMAGE.
-->
-<page role="components">
+<page role="mac">
<title>TrustedBSD Mandatory Access Control (MAC) Framework</title>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $P4: //depot/projects/trustedbsd/www/mac.page#3 $
+ $P4: //depot/projects/trustedbsd/www/mac.page#4 $
</cvs:keyword>
</cvs:keywords>
==== //depot/projects/trustedbsd/www/mailinglists-selected.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/mailinglists.png#2 (binary) ====
==== //depot/projects/trustedbsd/www/openbsm.page#30 (text+ko) ====
@@ -24,12 +24,12 @@
SUCH DAMAGE.
-->
-<page role="components">
+<page role="openbsm">
<title>OpenBSM</title>
<cvs:keywords xmlns:cvs="http://www.FreeBSD.org/XML/CVS" version="1.0">
<cvs:keyword name="freebsd">
- $P4: //depot/projects/trustedbsd/www/openbsm.page#29 $
+ $P4: //depot/projects/trustedbsd/www/openbsm.page#30 $
</cvs:keyword>
</cvs:keywords>
==== //depot/projects/trustedbsd/www/trustyheader.png#2 (binary) ====
More information about the p4-projects
mailing list