cziegeler 2003/06/25 01:23:17
Modified: src/blocks/portal/samples/skins/common/styles tab.xsl
window.xsl
src/blocks/portal/samples sitemap.xmap
Added: src/blocks/portal/samples/skins/common/styles
portal-page.xsl
src/blocks/portal/samples/skins/basic/styles tab.xsl
window.xsl login-html.xsl column.xsl row.xsl
portal-page.xsl
src/blocks/portal/samples/skins/basic/images maximize.gif
delete.gif space.gif minimize.gif show.gif
customize.gif
src/blocks/portal/samples/skins/common/css page.css
src/blocks/portal/samples/skins/basic/css page.css
Removed: src/blocks/portal/samples/skins/common/styles header.xsl
Log:
Adding second skin
Revision Changes Path
1.4 +21 -14 cocoon-2.1/src/blocks/portal/samples/skins/common/styles/tab.xsl
Index: tab.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/samples/skins/common/styles/tab.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- tab.xsl 28 May 2003 07:14:40 -0000 1.3
+++ tab.xsl 25 Jun 2003 08:23:16 -0000 1.4
@@ -6,8 +6,11 @@
<!-- Process a tab -->
<xsl:template match="tab-layout">
<!-- ~~~~~ Begin body table ~~~~~ -->
-<table summary="tab bar" border="0" cellpadding="0" cellspacing="0" width="100%">
+<table border="0" cellpadding="0" cellspacing="0" width="100%">
<!-- ~~~~~ Begin tab row ~~~~~ -->
+ <tr>
+ <td>
+ <table summary="tab bar" border="0" cellpadding="0" cellspacing="0" width="100%">
<tr vAlign="top">
<xsl:for-each select="named-item">
<xsl:choose>
@@ -15,7 +18,7 @@
<!-- ~~~~~ begin selected tab ~~~~~ -->
<!-- ~~~~~ begin spacer between tabs ~~~~~ -->
<td width="5" Valign="bottom" bgcolor="#294563">
- <table summary="non selected tab" style="height:
1.8em" border="0" cellpadding="0" cellspacing="0">
+ <table summary="spacer" style="height: 1.8em"
border="0" cellpadding="0" cellspacing="0">
<tr>
<td height="99%"><img height="5"
src="space.gif" width="5"/></td>
</tr>
@@ -25,8 +28,8 @@
</table>
</td>
<!-- ~~~~~ end spacer between tabs ~~~~~ -->
- <td width="1">
- <table summary="selected tab" style="height: 2.0em"
border="0" cellpadding="0" cellspacing="0">
+ <td width="1" Valign="bottom" bgcolor="#294563">
+ <table summary="selected tab" style="height: 1.8em"
border="0" cellpadding="0" cellspacing="0">
<tr>
<td valign="top" width="5"
bgcolor="#FFFFFF">
<img height="5" width="5"
alt="" src="tabSel-left.gif"/>
@@ -89,31 +92,35 @@
</xsl:choose>
</xsl:for-each>
<td width="99%" bgcolor="#294563">
- <!-- ~~~~~ last "blank" tab, contains logout button ~~~~~ -->
+ <!-- ~~~~~ last "blank" tab~~~~~ -->
<table style="height: 2.0em" border="0" cellpadding="0"
cellspacing="0" width="100%">
<tr>
<td height="99%" bgcolor="#294563" width="99%"
align="right" valign="center">
- <a href="logout"><img src="logout-door.gif"
width="18" height="22" border="0"/></a><img height="10" src="sunspotdemoimg-space.gif"
width="5"/>
- </td>
- <td height="99%" bgcolor="#294563" width="1%"
align="right" valign="center">
- <a href="logout"
style="color:#4C6C8F;font-size:75%;">Logout</a>
+ <img height="10" src="space.gif" width="1"/>
</td>
</tr>
<tr>
<td height="1" bgcolor="#4C6C8F" width="99%">
<img height="10" src="space.gif" width="1"/>
</td>
- <td height="1" bgcolor="#4C6C8F" width="1%">
- <img height="10" src="space.gif" width="1"/>
- </td>
</tr>
</table>
</td>
</tr>
+ </table>
+ </td>
+ </tr>
<!-- ~~~~~ End tab row ~~~~~ -->
<tr>
- <td colSpan="{count(named-item)*2+1}" bgcolor="#FFFFFF">
- <xsl:apply-templates select="named-item"/>
+ <td bgcolor="#FFFFFF">
+ <table cellpadding="0" cellspacing="0" width="100%"
+
style="border-width:2px;border-style:solid;border-color:#294563;border-top-width:0px">
+ <tr>
+ <td>
+ <xsl:apply-templates select="named-item"/>
+ </td>
+ </tr>
+ </table>
</td>
</tr>
</table>
1.4 +2 -2
cocoon-2.1/src/blocks/portal/samples/skins/common/styles/window.xsl
Index: window.xsl
===================================================================
RCS file:
/home/cvs/cocoon-2.1/src/blocks/portal/samples/skins/common/styles/window.xsl,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- window.xsl 23 Jun 2003 07:22:43 -0000 1.3
+++ window.xsl 25 Jun 2003 08:23:16 -0000 1.4
@@ -65,10 +65,10 @@
<tr>
<td width="5"
style="background-image:url(window-border-left.gif);"><img src="space.gif" border="0"
width="5" height="5" alt="space"/></td>
<td colSpan="2">
- <xsl:apply-templates select="content"/>
+ <xsl:apply-templates select="content"/>
</td>
<td width="5"
style="background-image:url(window-border-right.gif);"><img src="space.gif" border="0"
width="5" height="5" alt="space"/></td>
- </tr>
+ </tr>
<tr>
<td width="5"><img src="window-bottom-left.gif" border="0" width="5"
height="5" alt="top-left"/></td>
<td colspan="2"
style="background-image:url(window-border-bottom.gif);"></td>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/common/styles/portal-page.xsl
Index: portal-page.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="/">
<html>
<head>
<link type="text/css" rel="stylesheet" href="page.css"/>
</head>
<body>
<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0"
width="100%"><tbody>
<!-- header row -->
<tr>
<td colspan="2">
<table border="0" cellPadding="0" cellSpacing="0" width="100%">
<tbody>
<tr>
<td colspan="2" noWrap="" height="1%"
bgcolor="#294563">
<img height="5" src="space.gif" width="100%"/>
</td>
</tr>
<tr>
<td colspan="2" bgcolor="#294563" height="98%"
align="center" valign="middle" width="100%">
<img src="portal-logo.gif" width="250"
height="90" />
</td>
</tr>
<tr valign="bottom">
<td height="99%" bgcolor="#294563" width="99%"
align="right">
<a href="logout"><img src="logout-door.gif"
width="18" height="22" border="0"/></a>
<img height="5" src="space.gif" width="5"/>
</td>
<td height="99%" bgcolor="#294563" width="1%"
align="right">
<a href="logout"
style="color:#CFDCED;font-size:75%;">Logout</a> 
<img height="5" src="space.gif" width="5"/>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<!-- end header row -->
<!-- content/tab row -->
<tr>
<td>
<xsl:apply-templates/>
</td>
</tr>
<!-- end content/tab row -->
<!-- footer row -->
<tr>
<td colspan="2">
<table border="0" cellPadding="0" cellSpacing="0" width="100%">
<tbody>
<tr>
<td colspan="2" noWrap="" height="10" bgcolor="#CFDCED">
<img height="1" src="space.gif" width="1"/>
</td>
</tr>
<tr>
<td colspan="2" noWrap="" height="30" bgcolor="#294563">
<img height="1" src="space.gif" width="1"/>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<!-- end of footer row -->
</tbody>
</table>
</body>
</html>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1 cocoon-2.1/src/blocks/portal/samples/skins/basic/styles/tab.xsl
Index: tab.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- Process a tab -->
<xsl:template match="tab-layout">
<!-- ~~~~~ Begin body table ~~~~~ -->
<table border="2" cellpadding="0" cellspacing="0" width="100%">
<!-- ~~~~~ Begin tab row ~~~~~ -->
<tr>
<td>
<table summary="tab bar" border="2" cellpadding="0" cellspacing="0" width="100%">
<tr vAlign="top">
<xsl:for-each select="named-item">
<xsl:choose>
<xsl:when test="@selected">
<!-- ~~~~~ begin selected tab ~~~~~ -->
<td valign="middle" bgcolor="#DDDDDD">
<b>
<a href="[EMAIL PROTECTED]">
<font color="#000000">
<xsl:value-of
select="@name"/>
</font>
</a>
</b>
</td>
<!-- ~~~~~ end selected tab ~~~~~ -->
</xsl:when>
<xsl:otherwise>
<!-- ~~~~~ begin non selected tab ~~~~~ -->
<td valign="middle" bgcolor="#CCCCCC" >
<div class="tab">
<a href="[EMAIL PROTECTED]">
<xsl:value-of
select="@name"/>
</a>
</div>
</td>
<!-- ~~~~~ end non selected tab ~~~~~ -->
</xsl:otherwise>
</xsl:choose>
</xsl:for-each>
<!-- ~~~~~ last "blank" tab ~~~~~ -->
<td width="99%" bgcolor="#CCCCCC" align="right">
</td>
</tr>
</table>
</td>
</tr>
<!-- ~~~~~ End tab row ~~~~~ -->
<!-- ~~~~~ Begin content row ~~~~~ -->
<tr>
<td bgcolor="#FFFFFF">
<xsl:apply-templates/>
</td>
</tr>
<!-- ~~~~~ End content row ~~~~~ -->
</table>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/styles/window.xsl
Index: window.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="window">
<xsl:variable name="bgColor">
<xsl:choose>
<xsl:when test="@bgColor">
<xsl:value-of select="@bgColor" />
</xsl:when>
<xsl:otherwise>
<xsl:text>#CCCCCC</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<table border="2" cellSpacing="0" cellpadding="0" width="100%">
<tr vAlign="top">
<td bgColor="{$bgColor}" valign="middle">
<font>
<xsl:attribute name="color">#ffffff</xsl:attribute>
<xsl:attribute name="face">Arial</xsl:attribute>
<xsl:attribute name="size">2</xsl:attribute>
<xsl:choose>
<xsl:when test="@title">
<b><xsl:value-of select="@title"/></b>
</xsl:when>
<xsl:otherwise>
<b><xsl:value-of select="title"/></b>
</xsl:otherwise>
</xsl:choose>
</font>
</td>
<td align="right" bgColor="{$bgColor}">
<xsl:if test="fullscreen-uri">
<a href="{fullscreen-uri}">
<img src="customize.gif" border="0" alt="Full
Screen"/>
</a>
</xsl:if>
<xsl:if test="maxpage-uri">
<a href="{maxpage-uri}">
<img src="show.gif" border="0" alt="Max Page"/>
</a>
</xsl:if>
<xsl:if test="maximize-uri">
<a href="{maximize-uri}">
<img src="maximize.gif" border="0" alt="Maximize"/>
</a>
</xsl:if>
<xsl:if test="minimize-uri">
<a href="{minimize-uri}">
<img src="minimize.gif" border="0" alt="Minimize"/>
</a>
</xsl:if>
<xsl:if test="remove-uri">
<a href="{remove-uri}">
<img src="delete.gif" border="0" alt="Delete"/>
</a>
</xsl:if>
</td>
</tr>
<tr>
<td colSpan="2">
<xsl:apply-templates select="content"/>
</td>
</tr>
</table>
</xsl:template>
<xsl:template match="content">
<xsl:apply-templates/>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/styles/login-html.xsl
Index: login-html.xsl
===================================================================
<?xml version="1.0"?>
<!--+ $Id: login-html.xsl,v 1.1 2003/06/25 08:23:16 cziegeler Exp $
|
| Description: Login page to HTML
|
+-->
<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="content">
<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0"
width="100%"><tbody>
<tr>
<td bgColor="#ffffff" align="center">
<br/>
<xsl:apply-templates/>
<br/>
</td>
</tr>
<tr>
<td bgColor="#ffffff" width="15">
<img height="1" src="sunspotdemoimg-space.gif" width="15"/>
</td>
</tr>
<tr>
<td bgColor="#ffffff" align="center">
<br/>
If you are not already registered, use this guest login:
<br/><br/>
User: <b>guest</b>
Password:
<b>guest</b>
<br/><br/>Or use this administrator login:<br/>
User:
<b>cocoon</b>
Password:
<b>cocoon</b>
<br/><br/>
</td>
</tr>
</tbody></table>
</xsl:template>
<xsl:template match="form">
<form method="post" target="_top">
<xsl:attribute name="action"><xsl:value-of
select="normalize-space(url)"/></xsl:attribute>
<table>
<xsl:apply-templates select="field"/><br/>
</table>
<input type="submit" value="Login"></input>
</form>
</xsl:template>
<xsl:template match="field">
<tr>
<td>
<xsl:value-of select="@description"/>:
</td>
<td>
<input>
<xsl:attribute name="name"><xsl:value-of
select="@name"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of
select="@type"/></xsl:attribute>
<xsl:attribute name="size"><xsl:value-of
select="@length"/></xsl:attribute>
</input>
</td>
</tr>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/styles/column.xsl
Index: column.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- Process a Column -->
<xsl:template match="column-layout">
<xsl:variable name="border">
<xsl:choose>
<xsl:when test="@border">
<xsl:value-of select="@border" />
</xsl:when>
<xsl:otherwise>
<xsl:text>0</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<table border="{$border}" cellSpacing="0" cellpadding="0" width="100%">
<xsl:if test="@bgcolor">
<xsl:attribute name="bgcolor">
<xsl:value-of select="@bgcolor" />
</xsl:attribute>
</xsl:if>
<tr vAlign="top">
<xsl:for-each select="item">
<td>
<xsl:if test="@bgcolor">
<xsl:attribute name="bgcolor">
<xsl:value-of select="@bgcolor" />
</xsl:attribute>
</xsl:if>
<xsl:if test="@width">
<xsl:attribute name="width">
<xsl:value-of select="@width" />
</xsl:attribute>
</xsl:if>
<xsl:apply-templates />
</td>
</xsl:for-each>
</tr>
</table>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1 cocoon-2.1/src/blocks/portal/samples/skins/basic/styles/row.xsl
Index: row.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<!-- Process a row -->
<xsl:template match="row-layout">
<xsl:variable name="border">
<xsl:choose>
<xsl:when test="@border">
<xsl:value-of select="@border" />
</xsl:when>
<xsl:otherwise>
<xsl:text>0</xsl:text>
</xsl:otherwise>
</xsl:choose>
</xsl:variable>
<table border="{$border}" cellSpacing="10" width="100%">
<xsl:if test="@bgcolor">
<xsl:attribute name="bgcolor">
<xsl:value-of select="@bgcolor" />
</xsl:attribute>
</xsl:if>
<xsl:for-each select="item">
<tr vAlign="top">
<xsl:if test="@bgcolor">
<xsl:attribute name="bgcolor">
<xsl:value-of select="@bgcolor" />
</xsl:attribute>
</xsl:if>
<td>
<xsl:apply-templates />
</td>
</tr>
</xsl:for-each>
</table>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/styles/portal-page.xsl
Index: portal-page.xsl
===================================================================
<?xml version="1.0"?>
<xsl:stylesheet version="1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform";>
<xsl:template match="/">
<html>
<head>
<link type="text/css" rel="stylesheet" href="page.css"/>
</head>
<body>
<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0"
width="100%">
<tbody>
<!-- header row -->
<tr>
<td colspan="2">
<table border="2" cellPadding="0" cellSpacing="0" width="100%">
<tbody>
<tr>
<td colspan="2" noWrap="" height="10"
bgcolor="#DDDDDD">
</td>
</tr>
<tr>
<td bgcolor="#CCCCCC" height="100" align="center"
valign="middle" width="100%">
<font size="80pt">Cocoon Portal</font>
</td>
</tr>
<tr>
<td colspan="2" noWrap="" height="10"
bgcolor="#DDDDDD" align="right">
<a href="logout"
style="color:#4C6C8F;font-size:75%;">
Logout
</a>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<!-- end header row -->
<!-- content/tab row -->
<tr>
<td>
<xsl:apply-templates/>
</td>
</tr>
<!-- end content/tab row -->
<!-- footer row -->
<tr>
<td colspan="2">
<table border="2" cellPadding="0" cellSpacing="0" width="100%">
<tbody>
<tr>
<td colspan="2" noWrap="" height="10" bgcolor="#DDDDDD">
<img height="1" src="sunspotdemoimg-space.gif"
width="1"/>
</td>
</tr>
<tr>
<td colspan="2" noWrap="" height="30" bgcolor="#CCCCCC">
<img height="1" src="sunspotdemoimg-space.gif"
width="1"/>
</td>
</tr>
</tbody>
</table>
</td>
</tr>
<!-- end footer row -->
</tbody>
</table>
</body>
</html>
</xsl:template>
<!-- Copy all and apply templates -->
<xsl:template match="@*|node()">
<xsl:copy>
<xsl:apply-templates select="@*|node()" />
</xsl:copy>
</xsl:template>
</xsl:stylesheet>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/images/maximize.gif
<<Binary file>>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/images/delete.gif
<<Binary file>>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/images/space.gif
<<Binary file>>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/images/minimize.gif
<<Binary file>>
1.1 cocoon-2.1/src/blocks/portal/samples/skins/basic/images/show.gif
<<Binary file>>
1.1
cocoon-2.1/src/blocks/portal/samples/skins/basic/images/customize.gif
<<Binary file>>
1.1 cocoon-2.1/src/blocks/portal/samples/skins/common/css/page.css
Index: page.css
===================================================================
body { background-color: #FFFFFF; margin: 0px 0px 0px 0px; font-family: Verdana,
Helvetica, sans-serif; font-size : 100%;}
.tab { font-size : 85%; border: 0 }
.tab a:link { text-decoration : none; color: #000066; }
.tab a:visited { text-decoration : none; color: #2A4A6D }
.tab a:hover { color: #0000FF; }
1.11 +5 -5 cocoon-2.1/src/blocks/portal/samples/sitemap.xmap
Index: sitemap.xmap
===================================================================
RCS file: /home/cvs/cocoon-2.1/src/blocks/portal/samples/sitemap.xmap,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- sitemap.xmap 1 Jun 2003 15:50:18 -0000 1.10
+++ sitemap.xmap 25 Jun 2003 08:23:17 -0000 1.11
@@ -77,7 +77,7 @@
</map:match>
<!-- Cascading Stylesheets -->
- <map:match pattern="css-*.css">
+ <map:match pattern="*.css">
<map:read mime-type="text/css" src="{global:skin}css/{1}.css"/>
</map:match>
@@ -98,7 +98,7 @@
<map:generate type="portal" label="content">
<map:parameter name="portal-name" value="portal" />
</map:generate>
- <map:transform src="{global:skin}styles/header.xsl"/>
+ <map:transform src="{global:skin}styles/portal-page.xsl"/>
<map:transform type="cinclude"/>
<map:transform type="encodeURL"/>
<!--
@@ -123,7 +123,7 @@
</map:act>
<map:generate src="resources/login.xml"/>
<map:transform src="{global:skin}styles/login-html.xsl"/>
- <map:transform src="{global:skin}styles/header.xsl"/>
+ <map:transform src="{global:skin}styles/portal-page.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
@@ -140,7 +140,7 @@
<map:redirect-to uri="portal"/>
</map:act>
<map:generate src="resources/login-error.xml"/>
- <map:transform src="{global:skin}styles/header.xsl"/>
+ <map:transform src="{global:skin}styles/portal-page.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:match>
@@ -151,7 +151,7 @@
<map:parameter name="application" value="portal"/>
<map:generate src="resources/logged-in.xml"/>
- <map:transform src="{global:skin}styles/header.xsl"/>
+ <map:transform src="{global:skin}styles/portal-page.xsl"/>
<map:transform type="encodeURL"/>
<map:serialize/>
</map:act>
1.1 cocoon-2.1/src/blocks/portal/samples/skins/basic/css/page.css
Index: page.css
===================================================================
body { background-color: #FFFFFF; margin: 0px 0px 0px 0px; font-family: Verdana,
Helvetica, sans-serif; font-size : 100%;}
.tab { font-size : 85%; border: 0 }
.tab a:link { text-decoration : none; color: #000066; }
.tab a:visited { text-decoration : none; color: #2A4A6D }
.tab a:hover { color: #0000FF; }
