ATF-log archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
org.NetBSD.atf.htdocs.revamp: fc12a9f61bfbc71add72ff53be16d364c6bdda56
#
#
# add_file "styles/footer.css"
# content [5cdbe4185297cb41d2bdce58b6471a4b42284d12]
#
# add_file "styles/footer.xsl"
# content [50f0f39d7bf8405db5d344f33d6e764b3e513d12]
#
# add_file "styles/header.css"
# content [e0bdcd6ac469d6bf32490db7aba888d6e3a81bae]
#
# add_file "styles/header.xsl"
# content [111acbca80b775fac7d3521429cb2a0c3a1d1909]
#
# add_file "styles/navbar.css"
# content [ec5aeca98bb1eff803d30b5c784285c40a8b1353]
#
# add_file "styles/navbar.xsl"
# content [d0a5417538e5fe531b8dbbc0e88b098cd4151fbb]
#
# patch "Makefile"
# from [aeb66cd44dd16c3431a226bec216f3dc695e07e0]
# to [aba7291424e9e5ba385dec3a3704ff7e3a8b7455]
#
# patch "styles/style.css"
# from [b66d91f21655bf027098cf1c1c6b1572e5176cb9]
# to [00f37204b92c73f6c4a3986b948f1f9ba4e49533]
#
# patch "styles/style.xsl"
# from [09a8d802806f723e8df14013b07817ed5e9c71ee]
# to [6bc3fc8e095a4abfa8c9b1f6a1d4fe79d8b1ec15]
#
============================================================
--- styles/footer.css 5cdbe4185297cb41d2bdce58b6471a4b42284d12
+++ styles/footer.css 5cdbe4185297cb41d2bdce58b6471a4b42284d12
@@ -0,0 +1,9 @@
+div.footer {
+ text-align: right;
+ margin: 0pt;
+ padding: 10pt;
+}
+
+.footer p {
+ font-size: 8pt;
+}
============================================================
--- styles/footer.xsl 50f0f39d7bf8405db5d344f33d6e764b3e513d12
+++ styles/footer.xsl 50f0f39d7bf8405db5d344f33d6e764b3e513d12
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ - Automated Testing Framework (atf)
+ -
+ - Copyright (c) 2010 The NetBSD Foundation, Inc.
+ - All rights reserved.
+ -
+ - Redistribution and use in source and binary forms, with or without
+ - modification, are permitted provided that the following conditions
+ - are met:
+ - 1. Redistributions of source code must retain the above copyright
+ - notice, this list of conditions and the following disclaimer.
+ - 2. Redistributions in binary form must reproduce the above copyright
+ - notice, this list of conditions and the following disclaimer in the
+ - documentation and/or other materials provided with the distribution.
+ -
+ - THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+ - CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ - IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
+ - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ - IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ -->
+
+<!DOCTYPE xsl:stylesheet>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+<xsl:template name="footer-generate">
+ <div class="footer">
+ <p>Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
+ All rights reserved.<br />
+ Site revision: <a
+
href="http://mtn-host.prjek.net/viewmtn/atf/revision/info/{$revision}";><xsl:value-of
+ select="$revision" /></a></p>
+ </div>
+</xsl:template>
+
+</xsl:stylesheet>
============================================================
--- styles/header.css e0bdcd6ac469d6bf32490db7aba888d6e3a81bae
+++ styles/header.css e0bdcd6ac469d6bf32490db7aba888d6e3a81bae
@@ -0,0 +1,21 @@
+div.header {
+}
+
+.header a {
+ color: white;
+ text-decoration: none;
+}
+
+.header a:hover {
+ color: #00ff00;
+}
+
+.header p {
+ background: #70c070;
+ color: white;
+ margin: 0pt;
+ padding: 5pt 50pt 5pt 50pt;
+ font-family: Arial;
+ font-size: 18pt;
+ font-weight: bold;
+}
============================================================
--- styles/header.xsl 111acbca80b775fac7d3521429cb2a0c3a1d1909
+++ styles/header.xsl 111acbca80b775fac7d3521429cb2a0c3a1d1909
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ - Automated Testing Framework (atf)
+ -
+ - Copyright (c) 2010 The NetBSD Foundation, Inc.
+ - All rights reserved.
+ -
+ - Redistribution and use in source and binary forms, with or without
+ - modification, are permitted provided that the following conditions
+ - are met:
+ - 1. Redistributions of source code must retain the above copyright
+ - notice, this list of conditions and the following disclaimer.
+ - 2. Redistributions in binary form must reproduce the above copyright
+ - notice, this list of conditions and the following disclaimer in the
+ - documentation and/or other materials provided with the distribution.
+ -
+ - THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+ - CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ - IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
+ - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ - IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ -->
+
+<!DOCTYPE xsl:stylesheet>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+<xsl:template name="header-generate">
+ <div class="header">
+ <p><a href="index.html">ATF: Automated Testing Framework</a></p>
+ </div>
+</xsl:template>
+
+</xsl:stylesheet>
============================================================
--- styles/navbar.css ec5aeca98bb1eff803d30b5c784285c40a8b1353
+++ styles/navbar.css ec5aeca98bb1eff803d30b5c784285c40a8b1353
@@ -0,0 +1,43 @@
+div.navbar {
+ background: #70c070;
+ margin: 0pt;
+ padding: 0pt 50pt 0pt 50pt;
+ text-align: left;
+}
+
+.navbar table {
+ border-spacing: 0pt;
+ margin: 0pt;
+ padding: 0pt;
+}
+
+.navbar tr {
+ margin: 0pt;
+ padding: 0pt;
+}
+
+.navbar td {
+ color: white;
+ font-family: Arial, Helvetica;
+ font-size: 10pt;
+ margin: 0pt;
+ padding: 5pt 5pt 5pt 5pt;
+}
+
+.navbar td.active {
+ background: white;
+}
+
+.navbar a {
+ color: white;
+ text-decoration: none;
+}
+
+.navbar td.active a {
+ color: green;
+ text-decoration: none;
+}
+
+.navbar a:hover {
+ color: #00ff00;
+}
============================================================
--- styles/navbar.xsl d0a5417538e5fe531b8dbbc0e88b098cd4151fbb
+++ styles/navbar.xsl d0a5417538e5fe531b8dbbc0e88b098cd4151fbb
@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ - Automated Testing Framework (atf)
+ -
+ - Copyright (c) 2010 The NetBSD Foundation, Inc.
+ - All rights reserved.
+ -
+ - Redistribution and use in source and binary forms, with or without
+ - modification, are permitted provided that the following conditions
+ - are met:
+ - 1. Redistributions of source code must retain the above copyright
+ - notice, this list of conditions and the following disclaimer.
+ - 2. Redistributions in binary form must reproduce the above copyright
+ - notice, this list of conditions and the following disclaimer in the
+ - documentation and/or other materials provided with the distribution.
+ -
+ - THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND
+ - CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ - MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ - IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS BE LIABLE FOR ANY
+ - DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE
+ - GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+ - IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ - OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+ - IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ -->
+
+<!DOCTYPE xsl:stylesheet>
+
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
+
+<xsl:template name="navbar-generate">
+ <xsl:param name="page" />
+
+ <div class="navbar">
+ <xsl:apply-templates mode="navbar" select="/webpage/layout">
+ <xsl:with-param name="page" select="$page" />
+ </xsl:apply-templates>
+ </div>
+</xsl:template>
+
+<xsl:template mode="navbar" match="layout">
+ <xsl:param name="page" />
+
+ <table class="primary">
+ <tr>
+ <xsl:apply-templates mode="navbar" select="page">
+ <xsl:with-param name="page" select="$page" />
+ </xsl:apply-templates>
+ </tr>
+ </table>
+</xsl:template>
+
+<xsl:template mode="navbar" match="page">
+ <xsl:param name="page" />
+
+ <xsl:choose>
+ <xsl:when test="$page = @id">
+ <td class="active">
+ <a href="{@id}.html"><xsl:value-of select="caption" /></a>
+ </td>
+ </xsl:when>
+ <xsl:otherwise>
+ <td>
+ <a href="{@id}.html"><xsl:value-of select="caption" /></a>
+ </td>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:template>
+
+</xsl:stylesheet>
============================================================
--- Makefile aeb66cd44dd16c3431a226bec216f3dc695e07e0
+++ Makefile aba7291424e9e5ba385dec3a3704ff7e3a8b7455
@@ -84,13 +84,15 @@ XSLT = style.xsl
XMLS += repository.xml
XSLT = style.xsl
+XSLT_DEPS = styles/navbar.xsl
build: build-xmls
build-xmls:
.for xml in $(XMLS)
html_$(xml)= $(HTDOCS)/$(xml:S/.xml$/.html/)
build-xmls: $(html_$(xml))
-$(html_$(xml)): $(xml) styles/$(XSLT) $(HTDOCS)/revision.tag layout.xml
+$(html_$(xml)): $(xml) styles/$(XSLT) $(XSLT_DEPS) $(HTDOCS)/revision.tag \
+ layout.xml
@$(INFO_BUILD) $(html_$(xml))
@env XSLTPROC=$(XSLTPROC) ./scripts/build-xml.sh styles/$(XSLT) \
$(HTDOCS)/revision.tag $(xml) $(html_$(xml))
@@ -116,9 +118,12 @@ COPY_FILES += $(IMAGES)
# styles directory.
# -------------------------------------------------------------------------
-CSS = styles/style.css
+CSSS = styles/footer.css
+CSSS += styles/header.css
+CSSS += styles/navbar.css
+CSSS += styles/style.css
-COPY_FILES += $(CSS)
+COPY_FILES += $(CSSS)
# -------------------------------------------------------------------------
# rss directory.
============================================================
--- styles/style.css b66d91f21655bf027098cf1c1c6b1572e5176cb9
+++ styles/style.css 00f37204b92c73f6c4a3986b948f1f9ba4e49533
@@ -5,80 +5,6 @@ body {
}
/*
- * header
- */
-
-div.header {
-}
-
-.header a {
- color: white;
- text-decoration: none;
-}
-
-.header a:hover {
- color: #00ff00;
-}
-
-.header p {
- background: #70c070;
- color: white;
- margin: 0pt;
- padding: 5pt 50pt 5pt 50pt;
- font-family: Arial;
- font-size: 18pt;
- font-weight: bold;
-}
-
-/*
- * navbar
- */
-
-div.navbar {
- background: #70c070;
- margin: 0pt;
- padding: 0pt 50pt 0pt 50pt;
- text-align: left;
-}
-
-.navbar table {
- border-spacing: 0pt;
- margin: 0pt;
- padding: 0pt;
-}
-
-.navbar tr {
- margin: 0pt;
- padding: 0pt;
-}
-
-.navbar td {
- color: white;
- font-family: Arial, Helvetica;
- font-size: 10pt;
- margin: 0pt;
- padding: 5pt 5pt 5pt 5pt;
-}
-
-.navbar td.active {
- background: white;
-}
-
-.navbar a {
- color: white;
- text-decoration: none;
-}
-
-.navbar td.active a {
- color: green;
- text-decoration: none;
-}
-
-.navbar a:hover {
- color: #00ff00;
-}
-
-/*
* main
*/
@@ -163,21 +89,3 @@ div.main {
.main tt.filename {
color: green;
}
-
-/*
- * newsitem
- */
-
-/*
- * footer
- */
-
-div.footer {
- text-align: right;
- margin: 0pt;
- padding: 10pt;
-}
-
-.footer p {
- font-size: 8pt;
-}
============================================================
--- styles/style.xsl 09a8d802806f723e8df14013b07817ed5e9c71ee
+++ styles/style.xsl 6bc3fc8e095a4abfa8c9b1f6a1d4fe79d8b1ec15
@@ -65,21 +65,20 @@
<link rel="shortcut icon" href="images/favicon.ico"
type="image/x-icon" />
<link rel="made" href="mailto:atf-devel AT NetBSD DOT org" />
+ <link rel="stylesheet" type="text/css" href="styles/footer.css" />
+ <link rel="stylesheet" type="text/css" href="styles/header.css" />
+ <link rel="stylesheet" type="text/css" href="styles/navbar.css" />
<link rel="stylesheet" type="text/css" href="styles/style.css" />
<title>ATF - <xsl:value-of select="title" /></title>
</head>
<body>
- <div class="header">
- <p><a href="index.html">ATF: Automated Testing Framework</a></p>
- </div>
+ <xsl:call-template name="header-generate" />
- <div class="navbar">
- <xsl:apply-templates mode="navbar">
- <xsl:with-param name="page" select="@id" />
- </xsl:apply-templates>
- </div>
+ <xsl:call-template name="navbar-generate">
+ <xsl:with-param name="page" select="@id" />
+ </xsl:call-template>
<div class="main">
<xsl:apply-templates mode="main">
@@ -87,53 +86,12 @@
</xsl:apply-templates>
</div>
- <div class="footer">
- <p>Copyright (c) 2007, 2008, 2009, 2010 The NetBSD Foundation, Inc.
- All rights reserved.<br />
- Site revision: <a
-
href="http://mtn-host.prjek.net/viewmtn/atf/revision/info/{$revision}";><xsl:value-of
- select="$revision" /></a></p>
- </div>
+ <xsl:call-template name="footer-generate" />
</body>
</html>
</xsl:template>
<!--
- ** navbar mode.
- -->
-
- <xsl:template mode="navbar" match="*" />
-
- <xsl:template mode="navbar" match="layout">
- <xsl:param name="page" />
-
- <table class="primary">
- <tr>
- <xsl:apply-templates mode="navbar" select="page">
- <xsl:with-param name="page" select="$page" />
- </xsl:apply-templates>
- </tr>
- </table>
- </xsl:template>
-
- <xsl:template mode="navbar" match="page">
- <xsl:param name="page" />
-
- <xsl:choose>
- <xsl:when test="$page = @id">
- <td class="active">
- <a href="{@id}.html"><xsl:value-of select="caption" /></a>
- </td>
- </xsl:when>
- <xsl:otherwise>
- <td>
- <a href="{@id}.html"><xsl:value-of select="caption" /></a>
- </td>
- </xsl:otherwise>
- </xsl:choose>
- </xsl:template>
-
- <!--
** main mode.
-->
@@ -556,4 +514,9 @@
</p>
</xsl:template>
+ <!-- Pull in modules -->
+ <xsl:include href="footer.xsl" />
+ <xsl:include href="header.xsl" />
+ <xsl:include href="navbar.xsl" />
+
</xsl:stylesheet>
Home |
Main Index |
Thread Index |
Old Index