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 15:01:20 UTC
svn commit: r126282 - in cocoon/branches/BRANCH_2_1_X/src/blocks/portal: conf samples/coplets/login samples/profiles/copletinstancedata samples/profiles/layout samples/resources samples/skins/basic/styles samples/skins/common/images samples/skins/common/styles
Author: cziegeler
Date: Mon Jan 24 06:01:17 2005
New Revision: 126282
URL: http://svn.apache.org/viewcvs?view=rev&rev=126282
Log:
Improved layout
Added:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/borderless-window.xsl (contents, props changed)
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/borderless-window.xsl (contents, props changed)
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/customize.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/maximize.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/minimize.gif
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/show.gif
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/portal-page.xsl
cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/conf/portal.samplesxconf Mon Jan 24 06:01:17 2005
@@ -14,7 +14,7 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<!-- SVN $Id:$ -->
+<!-- SVN $Id$ -->
<samplesxconf xpath="/cocoon" unless="component[@role='org.apache.cocoon.portal.profile.ProfileManager/Auth']">
<!-- THIS IS A SAMPLE PORTAL
@@ -100,6 +100,25 @@
<aspects>
<aspect type="xslt">
<parameter name="style" value="{portal-skin:skin.basepath}/styles/window.xsl"/>
+ </aspect>
+ <aspect type="parameter">
+ <parameter name="tag-name" value="window"/>
+ </aspect>
+ <aspect type="window">
+ <parameter name="root-tag" value="false"/>
+ </aspect>
+ <aspect type="coplet-removing"/>
+ <aspect type="coplet-full-screen"/>
+ <aspect type="coplet-sizing"/>
+ <aspect type="history"/>
+ <aspect type="basket"/>
+ <aspect type="coplet-cinclude"/>
+ </aspects>
+ </renderer>
+ <renderer name="borderless-window" class="org.apache.cocoon.portal.layout.renderer.impl.AspectRenderer" logger="portal" >
+ <aspects>
+ <aspect type="xslt">
+ <parameter name="style" value="{portal-skin:skin.basepath}/styles/borderless-window.xsl"/>
</aspect>
<aspect type="parameter">
<parameter name="tag-name" value="window"/>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/coplets/login/login.xml Mon Jan 24 06:01:17 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.
@@ -15,15 +15,16 @@
limitations under the License.
-->
-<!-- $Id: login.xml,v 1.2 2004/03/06 02:25:58 antonio Exp $
+<!-- $Id$
Description: The login form for the portal
-->
<content>
+ <h3>Personalized Area</h3>
<form>
<url>auth</url>
<field name="name" type="text" length="24" description="User"/>
- <field name="password" type="password" length="10" description="Password"/>
+ <field name="password" type="password" length="24" description="Password"/>
</form>
</content>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/copletinstancedata/portal-user-anonymous.xml Mon Jan 24 06:01:17 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
@@ -28,10 +28,6 @@
<coplet-instance-data id="Portal-Bottom-1" name="standard">
<coplet-data>Portal-Bottom</coplet-data>
</coplet-instance-data>
- <coplet-instance-data id="Portal-Demo-1" name="standard">
- <coplet-data>Portal-Demo</coplet-data>
- </coplet-instance-data>
-
<coplet-instance-data id="Login-1" name="standard">
<coplet-data>Login</coplet-data>
</coplet-instance-data>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/profiles/layout/portal-user-anonymous.xml Mon Jan 24 06:01:17 2005
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
@@ -20,7 +20,7 @@
<composite-layout name="column">
<item>
<parameter name="width" value="60%"/>
- <coplet-layout name="coplet">
+ <coplet-layout name="coplet" layout-renderer-name="borderless-window">
<coplet-instance-data>Portal-Intro-1</coplet-instance-data>
</coplet-layout>
</item>
@@ -37,13 +37,13 @@
<composite-layout name="column">
<item>
<parameter name="width" value="25%"/>
- <coplet-layout name="coplet">
+ <coplet-layout name="coplet" layout-renderer-name="borderless-window">
<coplet-instance-data>Portal-Left-1</coplet-instance-data>
</coplet-layout>
</item>
<item>
<parameter name="width" value="75%"/>
- <coplet-layout name="coplet">
+ <coplet-layout name="coplet" layout-renderer-name="borderless-window">
<coplet-instance-data>Portal-Right-1</coplet-instance-data>
</coplet-layout>
</item>
@@ -51,7 +51,7 @@
</item>
<item>
<parameter name="height" value="500"/>
- <coplet-layout name="coplet">
+ <coplet-layout name="coplet" layout-renderer-name="borderless-window">
<coplet-instance-data>Portal-Bottom-1</coplet-instance-data>
</coplet-layout>
</item>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/resources/login.xml Mon Jan 24 06:01:17 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.
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!-- $Id: login.xml,v 1.3 2004/03/06 02:26:05 antonio Exp $
+<!-- $Id$
Description: The login form for the portal
-->
@@ -24,6 +24,6 @@
<form>
<url>auth</url>
<field name="name" type="text" length="24" description="User"/>
- <field name="password" type="password" length="10" description="Password"/>
+ <field name="password" type="password" length="24" description="Password"/>
</form>
</content>
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/borderless-window.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/borderless-window.xsl?view=auto&rev=126282
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/basic/styles/borderless-window.xsl Mon Jan 24 06:01:17 2005
@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- SVN $Id: window.xsl 126209 2005-01-23 11:32:10Z cziegeler $ -->
+<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="0" 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="basket-add-link">
+ <a href="{basket-add-link}">
+ <img src="images/basket.gif" border="0" alt="Add Link"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="basket-add-content">
+ <a href="{basket-add-content}">
+ <img src="images/basket.gif" border="0" alt="Add Content"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="edit-uri">
+ <a href="{edit-uri}">
+ <img src="images/edit.gif" border="0" alt="Edit"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="help-uri">
+ <a href="{help-uri}">
+ <img src="images/help.gif" border="0" alt="Help"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="view-uri">
+ <a href="{view-uri}">
+ <img src="images/view.gif" border="0" alt="View"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="fullscreen-uri and not(maximize-uri)">
+ <a href="{fullscreen-uri}">
+ <img src="images/customize.gif" border="0" alt="Full Screen"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="maxpage-uri">
+ <a href="{maxpage-uri}">
+ <img src="images/show.gif" border="0" alt="Max Page"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="minpage-uri">
+ <a href="{minpage-uri}">
+ <img src="images/show.gif" border="0" alt="Min Page"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="maximize-uri">
+ <a href="{maximize-uri}">
+ <img src="images/maximize.gif" border="0" alt="Maximize"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="minimize-uri">
+ <a href="{minimize-uri}">
+ <img src="images/minimize.gif" border="0" alt="Minimize"/>
+ </a>
+ </xsl:if>
+ <xsl:if test="remove-uri">
+ <a href="{remove-uri}">
+ <img src="images/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>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/customize.gif
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/customize.gif?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/customize.gif&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/customize.gif&r2=126282
==============================================================================
Binary files. No diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/delete.gif&r2=126282
==============================================================================
Binary files. No diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/maximize.gif
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/maximize.gif?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/maximize.gif&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/maximize.gif&r2=126282
==============================================================================
Binary files. No diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/minimize.gif
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/minimize.gif?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/minimize.gif&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/minimize.gif&r2=126282
==============================================================================
Binary files. No diff available.
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/show.gif
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/show.gif?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/show.gif&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/images/show.gif&r2=126282
==============================================================================
Binary files. No diff available.
Added: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/borderless-window.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/borderless-window.xsl?view=auto&rev=126282
==============================================================================
--- (empty file)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/borderless-window.xsl Mon Jan 24 06:01:17 2005
@@ -0,0 +1,158 @@
+<?xml version="1.0"?>
+<!--
+ 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.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+<!-- SVN $Id: window.xsl 126209 2005-01-23 11:32:10Z cziegeler $ -->
+<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>#294563</xsl:text>
+ </xsl:otherwise>
+ </xsl:choose>
+</xsl:variable>
+
+ <table cellSpacing="0" cellpadding="0" width="100%" border="0"><tbody>
+ <tr vAlign="top" height="20">
+ <td width="5" style="background-color:#294563;" valign="top">
+ <img src="images/window-top-left.gif" border="0" width="5" height="5" alt="top-left"/>
+ </td>
+ <td bgColor="{$bgColor}" align="left" valign="middle">
+ <font color="#ffffff" face="Arial" size="2"><b>
+ <xsl:choose>
+ <xsl:when test="@title">
+ <xsl:value-of select="@title"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="title"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </b></font>
+ </td>
+ <td align="right" valign="middle" bgColor="{$bgColor}">
+ <table cellSpacing="0" cellpadding="0" border="0"><tbody><tr>
+ <xsl:if test="basket-add-link">
+ <td width="15">
+ <a href="{basket-add-link}">
+ <img src="images/basket.gif" border="0" alt="Add Link"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="basket-add-content">
+ <td width="15">
+ <a href="{basket-add-content}">
+ <img src="images/basket.gif" border="0" alt="Add Content"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="edit-uri">
+ <td width="15">
+ <a href="{edit-uri}">
+ <img src="images/edit.gif" border="0" alt="Edit"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="help-uri">
+ <td width="15">
+ <a href="{help-uri}">
+ <img src="images/help.gif" border="0" alt="Help"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="view-uri">
+ <td width="15">
+ <a href="{view-uri}">
+ <img src="images/view.gif" border="0" alt="View"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="fullscreen-uri and not(maximize-uri)">
+ <td width="15">
+ <a href="{fullscreen-uri}">
+ <img src="images/customize.gif" border="0" alt="Full Screen"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="maxpage-uri">
+ <td width="15">
+ <a href="{maxpage-uri}">
+ <img src="images/show.gif" border="0" alt="Max Page"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="minpage-uri">
+ <td width="15">
+ <a href="{minpage-uri}">
+ <img src="images/show.gif" border="0" alt="Min Page"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="maximize-uri">
+ <td width="15">
+ <a href="{maximize-uri}">
+ <img src="images/maximize.gif" border="0" alt="Maximize"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="minimize-uri">
+ <td width="15">
+ <a href="{minimize-uri}">
+ <img src="images/minimize.gif" border="0" alt="Minimize"/>
+ </a>
+ </td>
+ </xsl:if>
+ <xsl:if test="remove-uri">
+ <td width="15">
+ <a href="{remove-uri}">
+ <img src="images/delete.gif" border="0" alt="Delete"/>
+ </a>
+ </td>
+ </xsl:if>
+ </tr></tbody></table>
+ </td>
+ <td width="5" style="background-color:#294563;" valign="top">
+ <img src="images/window-top-right.gif" border="0" width="5" height="5" alt="top-right"/>
+ </td>
+ <td width="1"/>
+ </tr>
+ <tr>
+ <td width="5"></td>
+ <td colSpan="2">
+ <xsl:apply-templates select="content"/>
+ </td>
+ <td width="6" colSpan="2"></td>
+ </tr>
+ </tbody></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>
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=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/login-html.xsl&r2=126282
==============================================================================
--- 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 06:01:17 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.
@@ -15,7 +15,7 @@
limitations under the License.
-->
-<!--+ $Id: login-html.xsl,v 1.5 2004/03/06 02:25:56 antonio Exp $
+<!--+ $Id$
|
| Description: Login page to HTML
|
@@ -77,10 +77,10 @@
<xsl:template match="field">
<tr>
- <td>
+ <td align="left">
<xsl:value-of select="@description"/>:
</td>
- <td>
+ <td align="left">
<input>
<xsl:attribute name="name"><xsl:value-of select="@name"/></xsl:attribute>
<xsl:attribute name="type"><xsl:value-of select="@type"/></xsl:attribute>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/portal-page.xsl Mon Jan 24 06:01:17 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.
@@ -19,78 +19,69 @@
xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:param name="user"/>
+
<xsl:template match="/">
-<html>
- <head>
- <link type="text/css" rel="stylesheet" href="css/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="images/space.gif" width="100%"/>
- </td>
- </tr>
- <tr>
- <td colspan="2" bgcolor="#294563" height="98%" align="center" valign="middle" width="100%">
- <img src="images/portal-logo.gif" width="250" height="90" />
- </td>
- </tr>
- <tr valign="bottom">
- <td height="99%" bgcolor="#294563" width="99%" align="right">
- <xsl:if test="$user!='anonymous'">
- <a href="logout"><img src="images/logout-door.gif" width="18" height="22" border="0"/></a>
- </xsl:if>
- <img height="5" src="images/space.gif" width="5"/>
- </td>
- <td height="99%" bgcolor="#294563" width="1%" align="right">
- <xsl:if test="$user!='anonymous'">
- <a href="logout" style="color:#CFDCED;font-size:75%;">Logout</a> 
- </xsl:if>
- <img height="5" src="images/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="images/space.gif" width="1"/>
- </td>
- </tr>
- <tr>
- <td colspan="2" noWrap="" height="30" bgcolor="#294563">
- <img height="1" src="images/space.gif" width="1"/>
- </td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- <!-- end of footer row -->
- </tbody>
- </table>
- </body>
-</html>
+ <html>
+ <head>
+ <link type="text/css" rel="stylesheet" href="css/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="images/space.gif" width="100%"/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" bgcolor="#294563" height="98%" align="center" valign="middle" width="100%">
+ <img src="images/portal-logo.gif" width="250" height="90" />
+ </td>
+ </tr>
+ <tr valign="bottom">
+ <td height="99%" bgcolor="#294563" width="99%" align="right">
+ <xsl:if test="$user!='anonymous'">
+ <a href="logout"><img src="images/logout-door.gif" width="18" height="22" border="0"/></a>
+ </xsl:if>
+ <img height="5" src="images/space.gif" width="5"/>
+ </td>
+ <td height="99%" bgcolor="#294563" width="1%" align="right">
+ <xsl:if test="$user!='anonymous'">
+ <a href="logout" style="color:#CFDCED;font-size:75%;">Logout</a> 
+ </xsl:if>
+ <img height="5" src="images/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="30" bgcolor="#294563">
+ <img height="1" src="images/space.gif" width="1"/>
+ </td>
+ </tr>
+ </tbody></table>
+ </td>
+ </tr>
+ <!-- end of footer row -->
+ </tbody></table>
+ </body>
+ </html>
</xsl:template>
Modified: cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl
Url: http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl?view=diff&rev=126282&p1=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl&r1=126281&p2=cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl&r2=126282
==============================================================================
--- cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl (original)
+++ cocoon/branches/BRANCH_2_1_X/src/blocks/portal/samples/skins/common/styles/window.xsl Mon Jan 24 06:01:17 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.
@@ -31,96 +31,122 @@
</xsl:choose>
</xsl:variable>
-<table cellSpacing="0" cellpadding="0" width="100%">
- <tr vAlign="top">
- <td width="5" style="background-color:#294563;" valign="top"><img src="images/window-top-left.gif" border="0" width="5" height="5" alt="top-left"/></td>
- <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}">
+ <table cellSpacing="0" cellpadding="0" width="100%" border="0"><tbody>
+ <tr vAlign="top" height="20">
+ <td width="5" style="background-color:#294563;" valign="top">
+ <img src="images/window-top-left.gif" border="0" width="5" height="5" alt="top-left"/>
+ </td>
+ <td bgColor="{$bgColor}" align="left" valign="middle">
+ <font color="#ffffff" face="Arial" size="2"><b>
+ <xsl:choose>
+ <xsl:when test="@title">
+ <xsl:value-of select="@title"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:value-of select="title"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </b></font>
+ </td>
+ <td align="right" valign="middle" bgColor="{$bgColor}">
+ <table cellSpacing="0" cellpadding="0" border="0"><tbody><tr>
<xsl:if test="basket-add-link">
+ <td width="15">
<a href="{basket-add-link}">
<img src="images/basket.gif" border="0" alt="Add Link"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="basket-add-content">
+ <td width="15">
<a href="{basket-add-content}">
<img src="images/basket.gif" border="0" alt="Add Content"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="edit-uri">
+ <td width="15">
<a href="{edit-uri}">
<img src="images/edit.gif" border="0" alt="Edit"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="help-uri">
+ <td width="15">
<a href="{help-uri}">
<img src="images/help.gif" border="0" alt="Help"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="view-uri">
+ <td width="15">
<a href="{view-uri}">
<img src="images/view.gif" border="0" alt="View"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="fullscreen-uri and not(maximize-uri)">
+ <td width="15">
<a href="{fullscreen-uri}">
<img src="images/customize.gif" border="0" alt="Full Screen"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="maxpage-uri">
+ <td width="15">
<a href="{maxpage-uri}">
<img src="images/show.gif" border="0" alt="Max Page"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="minpage-uri">
+ <td width="15">
<a href="{minpage-uri}">
<img src="images/show.gif" border="0" alt="Min Page"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="maximize-uri">
+ <td width="15">
<a href="{maximize-uri}">
<img src="images/maximize.gif" border="0" alt="Maximize"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="minimize-uri">
+ <td width="15">
<a href="{minimize-uri}">
<img src="images/minimize.gif" border="0" alt="Minimize"/>
</a>
+ </td>
</xsl:if>
<xsl:if test="remove-uri">
+ <td width="15">
<a href="{remove-uri}">
<img src="images/delete.gif" border="0" alt="Delete"/>
</a>
+ </td>
</xsl:if>
- </td>
- <td width="5" style="background-color:#294563;" valign="top"><img src="images/window-top-right.gif" border="0" width="5" height="5" alt="top-right"/></td>
- </tr>
- <tr>
+ </tr></tbody></table>
+ </td>
+ <td width="5" style="background-color:#294563;" valign="top">
+ <img src="images/window-top-right.gif" border="0" width="5" height="5" alt="top-right"/>
+ </td>
+ <td width="1"/>
+ </tr>
+ <tr>
<td width="5" style="background-image:url(images/window-border-left.gif);"><img src="images/space.gif" border="0" width="5" height="5" alt="space"/></td>
<td colSpan="2">
<xsl:apply-templates select="content"/>
</td>
- <td width="5" style="background-image:url(images/window-border-right.gif);"><img src="images/space.gif" border="0" width="5" height="5" alt="space"/></td>
+ <td width="6" colSpan="2" style="background-image:url(images/window-border-right.gif);"><img src="images/space.gif" border="0" width="5" height="5" alt="space"/></td>
</tr>
<tr>
<td width="5"><img src="images/window-bottom-left.gif" border="0" width="5" height="5" alt="top-left"/></td>
<td colspan="2" style="background-image:url(images/window-border-bottom.gif);"></td>
<td width="5"><img src="images/window-bottom-right.gif" border="0" width="5" height="5" alt="top-left"/></td>
</tr>
-</table>
+ </tbody></table>
</xsl:template>
<xsl:template match="content">