[Yanel-commits] rev 22500 - in
public/yanel/trunk/src/realms/test/yanel/data: css img xslt
simon at wyona.com
simon at wyona.com
Wed Feb 7 11:39:18 CET 2007
Author: simon
Date: 2007-02-07 11:39:17 +0100 (Wed, 07 Feb 2007)
New Revision: 22500
Added:
public/yanel/trunk/src/realms/test/yanel/data/img/everything_is_content.png
public/yanel/trunk/src/realms/test/yanel/data/img/yanel.png
Removed:
public/yanel/trunk/src/realms/test/yanel/data/img/yanel.gif
Modified:
public/yanel/trunk/src/realms/test/yanel/data/css/global.css
public/yanel/trunk/src/realms/test/yanel/data/xslt/global.xsl
Log:
applies new layout to the test realm. fixes bug #5175
Modified: public/yanel/trunk/src/realms/test/yanel/data/css/global.css
===================================================================
--- public/yanel/trunk/src/realms/test/yanel/data/css/global.css 2007-02-07 10:05:00 UTC (rev 22499)
+++ public/yanel/trunk/src/realms/test/yanel/data/css/global.css 2007-02-07 10:39:17 UTC (rev 22500)
@@ -1,99 +1,120 @@
-body {
- background-color:#ffffff;
- font-size:11px;
- font-family:Verdana, Arial, SunSans-Regular, Sans-Serif;
- color:#564b47;
- padding:0px;
- margin:0px;
- text-align:center
+*{
+ font-family:"lucida grande", tahoma, verdana, arial, sans-serif;
+ font-size:13px
}
+body {
+ margin-top:10px;
+ background-color:#ffffff;
+ text-align:center;
+}
+#bodytable {
+ text-align:left;
+ background-color:#f7f7f7;
+ border:0px;
+ width:90%;
+ margin-left: auto; margin-right: auto;
+}
-#container {
- width:800px;
- padding:0px;
- margin:0px;
- margin-left:auto;
- margin-right:auto;
- text-align:left
-}
+#header {
+ background-color:#4682B4;
+ height:35px;
+ margin:0px;
+ padding:0px
+}
-#header {
- text-align:left;
- background-color:#ffffff;
- padding-top:0px;
- margin:10px 0px 0px 0px;
- border-style:solid;
- border-color:#d8dfea;
- border-width:1px
-}
+#logo {
+ margin-left:10px;
+ border:0px
+}
-#header img {
- padding:0px;
- border:0px;
- margin-top:0px;
- margin-left:0px
-}
+#lead {
+ margin-bottom:4px;
+ margin-left:10px;
+ border:0px
+}
-#navigation {
- width:171px;
- float:left;
- position:relative;
- margin-left:-171px;
- margin-right:1px;
- padding:5px
-}
+#content {
+ border-style:solid;
+ border-color:#d8dfea;
+ border-width:1px;
+ margin:5px;
+ padding:5px;
+ padding-left:10px;
+ background-color:#ffffff;
+ height:100%;
+ font-size:12px
+}
-#content {
- position:relative;
- margin:0px;
- padding:5px;
- background-color:#ffffff;
- border-style:solid;
- border-color:#d8dfea;
- border-width:1px
-}
+#footer {
+ border-top:solid 1px #d8dfea;
+ border-bottom:solid 1px #d8dfea;
+ font-size:11px;
+ padding-top:2px;
+ padding-bottom:4px;
+ padding-left:10px;
+}
-#outer {
- /*navigation background-color*/
- border-left:solid 171px #f7f7f7;
- /*content background-color*/
- background-color:#f7f7f7; padding:5px
-}
+#navigation {
+ margin:5px;
+ padding:10px;
+ font-size:12px
+}
-#inner {
- margin:0px;
- width:100%
-}
+.searchbox {
+ vertical-align:middle;
+ border:solid 1px #999999;
+ margin-right:10px
+}
-#footer {
- clear:left;
- padding:10px;
- margin:0px;
- background-color:#f7f7f7;
- text-align:left
+hr {
+ border: 0;
+ color:#4682B4;
+ background-color:#4682B4;
+ height: 1px;
}
-h1 {
- font-size:14px
-}
+a {
+ color:#0066cc;
+ text-decoration:none
+}
-a {
- color:#0066cc;
- text-decoration:none
-}
+a:hover {
+ text-decoration:underline;
+ color:#3366cc
+}
-a:hover {
- text-decoration:underline;
- color:#3366cc
+a:visited {
+ text-decoration:none;
+ color:#777777
+}
+
+a:visited:hover {
+ text-decoration:underline;
+ color:#777777
+}
+
+#content table {
+ border-collapse:collapse;
+ border-color:#999999
+}
+
+#content td {
+ border:1px solid;
+ border-color:#999999;
+ padding:2px;
}
-a:visited {
- text-decoration:none;
- color:#777777
+#content th {
+ border:1px solid;
+ border-color:#999999;
+ background-color:#f7f7f7;
+ padding:2px;
}
-a:visited:hover {
- text-decoration:underline;
- color:#777777
+div.language_choice{
+ text-align:right;
+ font-size:smaller;
+ width:auto;
+ float:right;
}
Added: public/yanel/trunk/src/realms/test/yanel/data/img/everything_is_content.png
===================================================================
(Binary files differ)
Property changes on: public/yanel/trunk/src/realms/test/yanel/data/img/everything_is_content.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: public/yanel/trunk/src/realms/test/yanel/data/img/yanel.gif
===================================================================
(Binary files differ)
Added: public/yanel/trunk/src/realms/test/yanel/data/img/yanel.png
===================================================================
(Binary files differ)
Property changes on: public/yanel/trunk/src/realms/test/yanel/data/img/yanel.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: public/yanel/trunk/src/realms/test/yanel/data/xslt/global.xsl
===================================================================
--- public/yanel/trunk/src/realms/test/yanel/data/xslt/global.xsl 2007-02-07 10:05:00 UTC (rev 22499)
+++ public/yanel/trunk/src/realms/test/yanel/data/xslt/global.xsl 2007-02-07 10:39:17 UTC (rev 22500)
@@ -1,90 +1,110 @@
<?xml version="1.0" encoding="UTF-8"?>
-<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+
+<xsl:stylesheet version="1.0"
+ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:xhtml="http://www.w3.org/1999/xhtml"
xmlns:i18n="http://apache.org/cocoon/i18n/2.1"
- xmlns="http://www.w3.org/1999/xhtml">
+ xmlns="http://www.w3.org/1999/xhtml"
+>
- <!-- IMPORTANT: Needs to correspond to the mime-type which is sent by the server! -->
- <xsl:output method="xhtml" encoding="UTF-8"/>
+<!-- IMPORTANT: Needs to correspond to the mime-type which is sent by the server! -->
+<xsl:output method="xhtml" encoding="UTF-8"/>
+<!--
+<xsl:output method="html"/>
+-->
- <xsl:param name="yanel.path.name" select="'NAME_IS_NULL'"/>
- <xsl:param name="yanel.path" select="'PATH_IS_NULL'"/>
- <xsl:param name="yanel.back2context" select="'BACK2CONTEXT_IS_NULL'"/>
- <xsl:param name="yarep.back2realm" select="'BACK2REALM_IS_NULL'"/>
- <xsl:param name="yanel.meta.language" select="'en'"/>
+<xsl:param name="yanel.path.name" select="'NAME_IS_NULL'"/>
+<xsl:param name="yanel.path" select="'PATH_IS_NULL'"/>
+<xsl:param name="yanel.back2context" select="'BACK2CONTEXT_IS_NULL'"/>
+<xsl:param name="yarep.back2realm" select="'BACK2REALM_IS_NULL'"/>
- <xsl:variable name="name-without-suffix" select="substring-before($yanel.path.name, '.')"/>
+<xsl:param name="yanel.meta.language" select="'en'"/>
- <xsl:template match="/">
- <html xmlns="http://www.w3.org/1999/xhtml">
- <xsl:comment> WARNING: This content has been generated dynamically. All
- changes will be lost.</xsl:comment>
- <head>
- <xsl:comment>Name: <xsl:value-of select="$yanel.path.name"/> (without
- suffix: <xsl:value-of select="$name-without-suffix"/>), Path:
- <xsl:value-of select="$yanel.path"/>, Back 2 Realm: <xsl:value-of
- select="$yarep.back2realm"/>, Back 2 Context: <xsl:value-of select="$yanel.back2context"/>
- </xsl:comment>
- <title>
- <xsl:value-of select="/xhtml:html/xhtml:head/xhtml:title"/> - Yanel</title>
- <!-- This is needed such that Microsoft Internet Explorer displays characters such as correctly (also see xsl:output, whereas I (Michi) am not sure if the encoding is really needed there) -->
- <meta content="application/xhtml+xml; charset=UTF-8" http-equiv="Content-Type"/>
- <meta name="generator" content="Wyona Yanel"/>
- <!-- http://dublincore.org/documents/2001/04/12/usageguide/simple-html.shtml -->
- <meta name="DC.Creator" content="TODO"/>
- <meta name="DC.Language" content="TODO"/>
- <link rel="stylesheet" href="{$yarep.back2realm}css/global.css" type="text/css"/>
- <xsl:copy-of select="/xhtml:html/xhtml:head/*[name(.) != 'title']"/>
- <xsl:choose>
- <xsl:when test="/xhtml:html/xhtml:head/xhtml:link/@rel='neutron-introspection'">
- <!-- NOTE: Use the one from the copy above in case one exists! -->
- </xsl:when>
- <xsl:otherwise>
- <!-- TODO: Maybe one should better not cut-off the suffix! -->
- <link rel="neutron-introspection" type="application/neutron+xml" href="introspection-{$name-without-suffix}.xml"/>
- </xsl:otherwise>
- </xsl:choose>
- </head>
- <body>
- <div id="container">
- <div id="header">
- <a href="{$yarep.back2realm}index.html">
- <img src="{$yarep.back2realm}img/yanel.gif"/>
- </a>
- </div>
- <div id="outer">
- <div id="inner">
- <div id="navigation">
- <xsl:call-template name="navigation"/>
- </div>
- <div id="content">
- <div id="test">
- <xsl:copy-of select="/xhtml:html/xhtml:body/*"/>
- </div>
- </div>
- </div>
- </div>
- <div id="footer">
- <font size="-1">
- <i18n:message key="poweredBy"/>
- <a href="http://yanel.wyona.org">Wyona Yanel</a>, <a
- href="https://svn.wyona.org/repos/public/tomcat-cluster/">Wyona
- Balancer</a>, <a href="http://tomcat.apache.org">Apache
- Tomcat</a>, <a href="http://httpd.apache.org">Apache HTTP Server</a>
- </font>
- <br/> Copyright © 2006 <a
- href="http://www.wyona.com">Wyona</a>. <i18n:message
- key="allRightsReserved"/>. - <a href="?yanel.resource.meta">
- <i18n:message key="pageInfo"/>
- </a>
- </div>
- </div>
- </body>
- </html>
- </xsl:template>
+<xsl:variable name="name-without-suffix" select="substring-before($yanel.path.name, '.')"/>
+<xsl:template match="/">
+<html xmlns="http://www.w3.org/1999/xhtml">
+
+<xsl:comment>
+WARNING: This content has been generated dynamically. All changes will be lost.
+</xsl:comment>
+
+<head>
+<xsl:comment>Name: <xsl:value-of select="$yanel.path.name"/> (without suffix: <xsl:value-of select="$name-without-suffix"/>), Path: <xsl:value-of select="$yanel.path"/>, Back 2 Realm: <xsl:value-of select="$yarep.back2realm"/>, Back 2 Context: <xsl:value-of select="$yanel.back2context"/></xsl:comment>
+
+ <title><xsl:value-of select="/xhtml:html/xhtml:head/xhtml:title"/> - Yanel</title>
+
+ <!-- This is needed such that Microsoft Internet Explorer displays characters such as correctly (also see xsl:output, whereas I (Michi) am not sure if the encoding is really needed there) -->
+ <meta content="application/xhtml+xml; charset=UTF-8" http-equiv="Content-Type"/>
+ <meta name="generator" content="Wyona Yanel"/>
+
+ <!-- http://dublincore.org/documents/2001/04/12/usageguide/simple-html.shtml -->
+ <meta name="DC.Creator" content="TODO"/>
+ <meta name="DC.Language" content="TODO"/>
+
+ <link rel="stylesheet" href="{$yarep.back2realm}css/global.css" type="text/css"/>
+ <xsl:copy-of select="/xhtml:html/xhtml:head/*[name(.) != 'title']"/>
+
+ <xsl:choose>
+ <xsl:when test="/xhtml:html/xhtml:head/xhtml:link/@rel='neutron-introspection'">
+ <!-- NOTE: Use the one from the copy above in case one exists! -->
+ </xsl:when>
+ <xsl:otherwise>
+ <!-- TODO: Maybe one should better not cut-off the suffix! -->
+ <link rel="neutron-introspection" type="application/neutron+xml" href="introspection-{$name-without-suffix}.xml"/>
+ </xsl:otherwise>
+ </xsl:choose>
+</head>
+
+<body>
+
+
+<table id="bodytable" cellpadding="0" cellspacing="0">
+<tr>
+ <td colspan="3">
+ <h1 id="header">
+ <a href="{$yarep.back2realm}index.html">
+ <img id="logo" src="{$yarep.back2realm}img/yanel.png"/>
+ </a>
+ <img id="lead" src="{$yarep.back2realm}img/everything_is_content.png"/>
+ </h1>
+ </td>
+</tr>
+
+<tr>
+<!-- NAVIGATION -->
+<td valign="top">
+<div id="navigation">
+<xsl:call-template name="navigation"/>
+</div>
+</td>
+
+
+
+<!-- CONTENT -->
+<td valign="top" width="100%">
+ <div id="content">
+ <xsl:copy-of select="/xhtml:html/xhtml:body/*"/>
+ </div>
+</td>
+</tr>
+<tr>
+ <td colspan="3" id="footer">
+
+ <i18n:message key="poweredBy"/><xsl:text> </xsl:text><a href="http://yanel.wyona.org">Wyona Yanel</a> | <a href="https://svn.wyona.org/repos/public/tomcat-cluster/">Wyona Balancer</a> | <a href="http://tomcat.apache.org">Apache Tomcat</a> | <a href="http://httpd.apache.org">Apache HTTP Server</a><br/>
+ Copyright © 2006 <a href="http://www.wyona.com">Wyona</a>. <i18n:message key="allRightsReserved"/>. - <a href="?yanel.resource.meta"><i18n:message key="pageInfo"/></a>
+
+ </td>
+</tr>
+</table>
+
+
+</body>
+</html>
+</xsl:template>
+
<xsl:template name="navigation">
- <b><a href="{$yarep.back2realm}">Testing</a></b>
+ <b><a href="{$yarep.back2realm}index.html">Testing</a></b>
<br/>  <a href="{$yarep.back2realm}testing-control.html">Testing Control</a>
<br/>  <a href="{$yarep.back2realm}test-results-archive/">Test Results Archive</a>
<br/>  <a href="{$yarep.back2realm}testing-times.html">Time Analyze</a>
More information about the Yanel-commits
mailing list