You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@cocoon.apache.org by cz...@apache.org on 2005/01/24 17:23:59 UTC
svn commit: r126300 - in cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common: css styles
Author: cziegeler
Date: Mon Jan 24 08:23:58 2005
New Revision: 126300
URL: http://svn.apache.org/viewcvs?view=rev&rev=126300
Log:
Improve layout
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css?view=diff&rev=126300&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css&r1=126299&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css&r2=126300
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/css/page.css Mon Jan 24 08:23:58 2005
@@ -1,5 +1,5 @@
/*
-* Copyright 1999-2004 The Apache Software Foundation
+* Copyright 1999-2005 The Apache Software Foundation
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -19,3 +19,10 @@
.tab a:link { text-decoration : none; color: #000066; }
.tab a:visited { text-decoration : none; color: #2A4A6D }
.tab a:hover { color: #0000FF; }
+
+p,li { font-size:10pt;
+ line-height:12pt;
+ font-family:Verdana, Helvetica, sans-serif;
+ letter-spacing:0.2mm;
+ word-spacing:0.8mm;
+ color:black; }
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl?view=diff&rev=126300&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl&r1=126299&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl&r2=126300
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl Mon Jan 24 08:23:58 2005
@@ -39,9 +39,10 @@
<img height="1" src="images/space.gif" width="15"/>
</td>
</tr>
- <tr>
- <td bgColor="#ffffff" align="center">
- <br/>
+ <tr>
+ <td bgColor="#ffffff" align="center">
+ <br/>
+ <p>
If you are not already registered, use this guest login:
<br/><br/>
User: <b>guest</b>
@@ -53,9 +54,10 @@
Password:
<b>cocoon</b>
<br/><br/>
+ </p>
</td>
- </tr>
-</tbody></table>
+ </tr>
+ </tbody></table>
</xsl:template>
<xsl:template match="form">
@@ -78,7 +80,7 @@
<xsl:template match="field">
<tr>
<td align="left">
- <xsl:value-of select="@description"/>:
+ <p><xsl:value-of select="@description"/>:</p>
</td>
<td align="left">
<input>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl?view=diff&rev=126300&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl&r1=126299&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl&r2=126300
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/tab.xsl Mon Jan 24 08:23:58 2005
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
<!--
- Copyright 1999-2004 The Apache Software Foundation
+ Copyright 1999-2005 The Apache Software Foundation
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
@@ -21,125 +21,130 @@
<!-- Process a tab -->
<xsl:template match="tab-layout">
-<!-- ~~~~~ Begin body table ~~~~~ -->
-<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>
- <xsl:when test="@selected">
- <!-- ~~~~~ begin selected tab ~~~~~ -->
- <!-- ~~~~~ begin spacer between tabs ~~~~~ -->
- <td width="5" Valign="bottom" bgcolor="#294563">
- <table summary="spacer" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td height="99%"><img height="5" src="images/space.gif" width="5"/></td>
- </tr>
- <tr>
- <td height="10" bgcolor="#4C6C8F"><img height="10" src="images/space.gif" width="5"/></td>
- </tr>
- </table>
- </td>
- <!-- ~~~~~ end spacer between tabs ~~~~~ -->
- <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="images/tabSel-left.gif"/>
- </td>
- <td valign="middle" bgcolor="#FFFFFF">
- <font color="#ffffff" size="2" face="Arial, Helvetica, Sans-serif"><b>
- <a href="{@parameter}"><font color="#000000"><xsl:value-of select="@name"/></font></a></b>
- </font>
- </td>
- <td valign="top" width="5" bgcolor="#FFFFFF">
- <img height="5" width="5" alt="" src="images/tabSel-right.gif"/>
- </td>
- </tr>
- <tr>
- <td colspan="3" height="5" bgcolor="#FFFFFF"></td>
- </tr>
-
- </table>
- </td>
- <!-- ~~~~~ end selected tab ~~~~~ -->
- </xsl:when>
- <xsl:otherwise>
- <!-- ~~~~~ begin non 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">
- <tr>
- <td height="99%"><img height="5" src="images/space.gif" width="5"/></td>
- </tr>
- <tr>
- <td height="10" bgcolor="#4C6C8F"><img height="10" src="images/space.gif" width="5"/></td>
- </tr>
- </table>
- </td>
- <!-- ~~~~~ end spacer between tabs ~~~~~ -->
- <td width="1" Valign="bottom" bgcolor="#294563">
- <table summary="non selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td valign="top" width="5" bgcolor="#B2C4E0">
- <img height="5" width="5" alt="" src="images/tab-left.gif"/>
- </td>
- <td valign="middle" bgcolor="#B2C4E0" >
- <div class="tab">
- <a href="{@parameter}" style=" font-size : 85%; border: 0; color: #000066;">
- <xsl:value-of select="@name"/>
- </a>
- </div>
- </td>
- <td valign="top" width="5" bgcolor="#B2C4E0">
- <img height="5" width="5" alt="" src="images/tab-right.gif"/>
- </td>
- </tr>
- <tr>
- <td colspan="3" height="10" bgcolor="#4C6C8F"></td>
- </tr>
- </table>
- </td>
- <!-- ~~~~~ end non selected tab ~~~~~ -->
- </xsl:otherwise>
- </xsl:choose>
- </xsl:for-each>
- <td width="99%" bgcolor="#294563">
- <!-- ~~~~~ 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">
- <img height="10" src="images/space.gif" width="1"/>
- </td>
- </tr>
- <tr>
- <td height="1" bgcolor="#4C6C8F" width="99%">
- <img height="10" src="images/space.gif" width="1"/>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- </table>
- </td>
- </tr>
- <!-- ~~~~~ End tab row ~~~~~ -->
- <tr>
- <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>
+ <!-- ~~~~~ Begin body table ~~~~~ -->
+ <table border="0" cellpadding="0" cellspacing="0" width="100%"><tbody>
+ <!-- ~~~~~ Begin tab row ~~~~~ -->
+ <tr>
+ <td>
+ <table summary="tab bar" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody>
+ <tr vAlign="top">
+ <xsl:for-each select="named-item">
+ <xsl:choose>
+ <xsl:when test="@selected">
+ <!-- ~~~~~ begin selected tab ~~~~~ -->
+ <!-- ~~~~~ begin spacer between tabs ~~~~~ -->
+ <td width="5" Valign="bottom" bgcolor="#294563">
+ <table summary="spacer" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0"><tbody>
+ <tr>
+ <td height="99%"><img height="5" src="images/space.gif" width="5"/></td>
+ </tr>
+ <tr>
+ <td height="10" bgcolor="#294563"><img height="10" src="images/space.gif" width="5"/></td>
+ </tr>
+ </tbody></table>
+ </td>
+ <!-- ~~~~~ end spacer between tabs ~~~~~ -->
+ <td width="1" Valign="bottom" bgcolor="#294563">
+ <table summary="selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0"><tbody>
+ <tr>
+ <td valign="top" width="5" bgcolor="#FFFFFF">
+ <img height="5" width="5" alt="" src="images/tabSel-left.gif"/>
+ </td>
+ <td valign="middle" bgcolor="#FFFFFF">
+ <b>
+ <a href="{@parameter}" style=" font-size : 2; border: 0; color: #000000;"><xsl:value-of select="@name"/></a>
+ </b>
+ </td>
+ <td valign="top" width="5" bgcolor="#FFFFFF">
+ <img height="5" width="5" alt="" src="images/tabSel-right.gif"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" height="5" bgcolor="#FFFFFF"></td>
+ </tr>
+ </tbody></table>
+ </td>
+ <!-- ~~~~~ end selected tab ~~~~~ -->
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- ~~~~~ begin non 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"><tbody>
+ <tr>
+ <td height="99%">
+ <img height="5" src="images/space.gif" width="5"/>
+ </td>
+ </tr>
+ <tr>
+ <td height="10" bgcolor="#294563">
+ <img height="10" src="images/space.gif" width="5"/>
+ </td>
+ </tr>
+ </tbody></table>
+ </td>
+ <!-- ~~~~~ end spacer between tabs ~~~~~ -->
+ <td width="1" Valign="bottom" bgcolor="#294563">
+ <table summary="non selected tab" style="height: 1.8em" border="0" cellpadding="0" cellspacing="0"><tbody>
+ <tr>
+ <td valign="top" width="5" bgcolor="#B2C4E0">
+ <img height="5" width="5" alt="" src="images/tab-left.gif"/>
+ </td>
+ <td valign="middle" bgcolor="#B2C4E0" >
+ <div class="tab">
+ <a href="{@parameter}" style=" font-size : 85%; border: 0; color: #000066;">
+ <xsl:value-of select="@name"/>
+ </a>
+ </div>
+ </td>
+ <td valign="top" width="5" bgcolor="#B2C4E0">
+ <img height="5" width="5" alt="" src="images/tab-right.gif"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="3" height="10" bgcolor="#294563"></td>
+ </tr>
+ </tbody></table>
+ </td>
+ <!-- ~~~~~ end non selected tab ~~~~~ -->
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:for-each>
+ <td width="99%" bgcolor="#294563">
+ <!-- ~~~~~ last "blank" tab~~~~~ -->
+ <table style="height: 2.0em" border="0" cellpadding="0" cellspacing="0" width="100%"><tbody>
+ <tr>
+ <td height="99%" bgcolor="#294563" width="99%" align="right" valign="center">
+ <img height="10" src="images/space.gif" width="1"/>
+ </td>
+ </tr>
+ <tr>
+ <td height="1" bgcolor="#294563" width="99%">
+ <img height="10" src="images/space.gif" width="1"/>
+ </td>
+ </tr>
+ </tbody></table>
+ </td>
+ </tr>
+ </tbody></table>
+ </td>
+ </tr>
+ <!-- ~~~~~ End tab row ~~~~~ -->
+ <tr>
+ <td bgcolor="#FFFFFF">
+ <table cellpadding="0" cellspacing="0" width="100%"
+ style="border-width:3px;border-style:solid;border-color:#294563;border-top-width:0px"><tbody>
+ <tr>
+ <td width="5"/>
+ <td>
+ <xsl:apply-templates select="named-item"/>
+ </td>
+ <td width="5"/>
+ </tr>
+ </tbody></table>
+ </td>
+ </tr>
+ </tbody></table>
</xsl:template>
<xsl:template match="named-item">