You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/12/04 05:14:09 UTC

svn commit: r600786 - in /openejb/trunk/website: html/all.css html/ie.css src/vm/openejb_autoexport.vm

Author: dblevins
Date: Mon Dec  3 20:14:07 2007
New Revision: 600786

URL: http://svn.apache.org/viewvc?rev=600786&view=rev
Log:
New site template and stylesheets that work in Safari *and* Internet Explorer

Added:
    openejb/trunk/website/html/all.css
    openejb/trunk/website/html/ie.css
Modified:
    openejb/trunk/website/src/vm/openejb_autoexport.vm

Added: openejb/trunk/website/html/all.css
URL: http://svn.apache.org/viewvc/openejb/trunk/website/html/all.css?rev=600786&view=auto
==============================================================================
--- openejb/trunk/website/html/all.css (added)
+++ openejb/trunk/website/html/all.css Mon Dec  3 20:14:07 2007
@@ -0,0 +1,834 @@
+body {
+	background: #fff;
+  font-family: arial, helvetica, sans-serif;
+  font-size: 12px;
+	margin: 0px;
+	padding: 0px;
+  line-height: 16px;
+  color: #222222;
+}
+
+a {
+  color: #7270c2;
+  text-decoration: none;
+}
+
+a:active, a:hover {
+  text-decoration: underline;
+}
+
+img {
+  border : 0px;
+}
+
+.frameTable {
+  border: 0px;
+  padding: 0px;
+
+}
+
+.Row1 {
+  height: 6px;
+}
+
+.Row1 .Col3, .Row1 .Col4 {
+  background: #5A5CB8;
+}
+
+.Row1 .Col5 {
+  background: #E24717;
+}
+
+.Row2 {
+  padding-top: 2px;
+  padding-bottom: 2px;
+}
+
+.Row2 .Col3, .Row2 .Col4 {
+  /*border-top: 1px solid #cbcbeb;*/
+  padding-left: 12px;
+  padding-right: 12px;
+  font-size: x-small;
+  color: #cccccc;
+}
+
+.Col1 {
+  background: #7270c2;
+  width: 110px;
+  padding-left: 20px;
+  border-right: 7px solid;
+}
+
+.Col2 {
+  width: 40px;
+}
+
+.Col4 {
+  width: 20px;
+}
+
+.Col5 {
+  /*min-width: 20px;*/
+  max-width: 280px;
+  /*width: 280px;*/
+}
+
+.Row4 .Col5 {
+  padding: 20px;
+}
+
+.Row1 .Col1, .Row2 .Col1 {
+  border-right-color: #fff;
+}
+
+.Row3 .Col1 {
+  border-right-color: #6260b2;
+}
+
+.Row3Img {
+  height: 0px;
+}
+
+#thinLine {
+  height: 3px;
+  width: 107px;
+}
+
+.Row2 .Col3 {
+  border-bottom: 1px solid #4b4b7e;
+}
+
+.Row3 .Col3 {
+  border-top: 1px solid #cbcbeb;
+}
+
+.Row3 .Col2 {
+  border-top: 1px solid #dbdbfb;
+}
+
+.Row4 .Col1, .Row5 .Col1, .Row6 .Col1 {
+  border-right-color: #a9a5de;
+}
+
+.Row4 {
+  vertical-align: top;
+}
+
+.Row4 .Col5 {
+  padding: 10px;
+}
+
+.Row5 .Col1 {
+  background: url(http://openejb.apache.org/images/stripe105.gif) repeat-x left top;
+}
+
+.bodyGrey {
+	font-size: 11px;
+	font-family: "Tahoma", "Helvetica", "Arial", "sans-serif";
+	line-height: 14px; color: #666666;
+}
+
+
+/* Navigation ------------------------------*/
+
+#Navigation h3, #Navigation a {
+  color: #cbcbeb;
+}
+
+#Navigation h3 {
+  font-size: 14px;
+  border-bottom: 1px solid #8280d2;
+  border-right: 1px solid #8280d2;
+  margin-bottom: .5em;
+}
+
+#Navigation ul {
+  margin: 0px;
+  margin-top: 10px;
+  margin-bottom: 10px;
+  padding-left: 15px;
+}
+
+#Navigation li {
+  margin: 0px;
+  margin-right: 15%;
+  line-height: 17px;
+  font-size: 11px;
+  list-style: none;
+}
+
+#Navigation .feeds {
+  padding-left: 0px;
+}
+
+#Navigation .feedsText  {
+  vertical-align: top;
+}
+
+/* Page Header ---------------------------*/
+
+#PageHeader {
+  margin-top: 20px;
+  border-bottom: 1px solid black;
+}
+
+#page_title {
+  font-weight: bold;
+  font-size: x-large;
+  vertical-align: bottom;
+  padding-bottom: 15px;
+}
+
+/* Right Content --------------------------*/
+
+#RightContent {
+  /*padding: 12px;*/
+  width: 280px;
+}
+
+#RightContent .panel {
+  border: 2px solid #a9a5de;
+  font-size: 14px;
+  padding: 0px;
+  margin-bottom: .5em;
+}
+
+#RightContent .panelHeader{
+  /*color: #efefff;*/
+  /*background: #7270c2;*/
+  background: #eef url(http://openejb.apache.org/images/openejb_buttonl.gif) no-repeat right;
+  font-size: 14px;
+  padding: 3px;
+  padding-left: 5px;
+  margin-bottom: .5em;
+}
+#RightContent .panelHeader b{
+  /*padding-left: 9px;*/
+}
+
+#RightContent .panelContent {
+  border: 0px;
+  font-size: 12px;
+  padding-right: 5px;
+  padding-left: 5px;
+  margin-bottom: .5em;
+}
+
+#RightContent .panelContent .tableview {
+  font-size: 9px;
+}
+
+#RightContent .panelContent .tabletitle {
+  font-size: 10px;
+}
+
+/* Confluence related-css */
+
+.noteMacro { border-style: solid; border-width: 1px; border-color: #F0C000; background-color: #FFFFCE; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.warningMacro { border-style: solid; border-width: 1px; border-color: #c00; background-color: #fcc; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.infoMacro { border-style: solid; border-width: 1px; border-color: #3c78b5; background-color: #D8E4F1; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.tipMacro { border-style: solid; border-width: 1px; border-color: #090; background-color: #dfd; text-align:left; margin-top: 5px; margin-bottom: 5px}
+.informationMacroPadding { padding: 5px 0 0 5px; }
+
+/* section headers */
+
+h1, h2, h3, h4, h5 {
+  margin-bottom: .5em;
+  font-weight: bold;
+}
+
+h1 {
+  padding: 4px;
+  padding-top: 6px;
+  padding-bottom: 6px;
+  border-top: 1px solid #cccccc;
+  border-left: 1px solid #cccccc;
+  color: #000000;
+  font-size: 18px;
+  background-color: #eeeeee;
+}
+
+h2 {
+  font-size: 16px;
+}
+
+h3 {
+  font-size: 14px;
+}
+
+h4 {
+  font-size: 13px;
+  font-style: italic;
+}
+
+
+/* News / Blog */
+
+.blogSurtitle {
+  border-top: 1px dotted #cccccc;
+  padding-top: 10px;
+}
+
+.blogHeading {
+  font-size: 13px;
+  font-weight: bold;
+  margin: 10px 0px 0px 0px;
+}
+
+
+/* Random Confluence stuff */
+table.confluenceTable
+{
+    margin: 5px;
+    border-collapse: collapse;
+}
+
+td.confluenceTd
+{
+    border: 1px solid #ccc;
+    padding: 3px 4px 3px 4px;
+}
+
+th.confluenceTh
+{
+    border: 1px solid #ccc;
+    padding: 3px 4px 3px 4px;
+    background: #f0f0f0;
+    text-align: center;
+}
+
+table.bodyTable, table.wikitable {
+  margin: 10px;
+  border-collapse: collapse;
+  border-spacing: 0pt;
+  background-color: #eeeeee;
+}
+
+#Content table.grid {
+  border: 1px solid #000000;
+}
+
+table.grid {
+  padding: 0px;
+  border-collapse: collapse;
+  border-spacing: 0pt;
+  margin-left: 1em;
+  margin-right: 1em;
+}
+
+table.grid th {
+  background-color: #eeeeee;
+  font-size: smaller;
+  padding: 4px;
+  border: 1px solid #bbbbbb;
+}
+
+table.grid td {
+  font-size: x-small;
+  border: 1px solid #bbbbbb;
+  padding: 3px;
+}
+
+table.bodyTable th, table.bodyTable td, table.wikitable th, table.wikitable td {
+  border: 1px solid #999999;
+  font-size: smaller;
+  padding: 4px;
+}
+
+
+table.bodyTable th, table.wikitable th {
+  text-align: left;
+  background-color: #dddddd;
+  border: 2px solid #999999;
+  padding: 4px;
+}
+
+.nobr
+  white-space: nowrap;
+}
+
+table.bodyTable td {
+  padding: 4px;
+}
+
+.code {
+ 	border: 1px dashed #3c78b5;
+    font-size: 11px;
+	font-family: Courier;
+    margin: 10px;
+	line-height: 13px;
+}
+
+.codeHeader {
+    background-color: #f0f0f0;
+ 	border-bottom: 1px dashed #3c78b5;
+    padding: 3px;
+	text-align: center;
+}
+
+.codeContent {
+    text-align: left;
+    background-color: #f0f0f0;
+    padding: 3px;
+}
+
+.code-keyword {
+  color: #000091;
+  background-color: inherit;
+}
+
+.code-object {
+  color: #910091;
+  background-color: inherit;
+}
+
+.code-quote {
+  color: #009100;
+  background-color: inherit;
+}
+
+.code-comment {
+  color: #808080;
+  background-color: inherit;
+}
+
+
+.code-xml .code-keyword {
+  color: inherit;
+  font-weight: bold;
+}
+
+.code-tag {
+  color: #000091;
+  background-color: inherit;
+}
+
+.preformatted {
+        border: 1px dashed #3c78b5;
+    font-size: 11px;
+        font-family: Courier;
+    margin: 10px;
+        line-height: 13px;
+}
+
+.preformattedHeader {
+    background-color: #f0f0f0;
+        border-bottom: 1px dashed #3c78b5;
+    padding: 3px;
+        text-align: center;
+}
+
+.preformattedContent {
+    background-color: #f0f0f0;
+    padding: 3px;
+}
+
+pre {
+    padding: 0px;
+    margin-top: 5px;
+    margin-left: 15px;
+    margin-bottom: 5px;
+    margin-right: 5px;
+    text-align: left;
+}
+
+.source {
+  padding: 12px;
+  margin: 1em;
+  border: 1px solid #7270c2;
+  border-left: 2px solid #7270c2;
+  border-right: 2px solid #7270c2;
+  color: #555555;
+}
+
+
+.java-keyword {
+  color: #7270c2;
+}
+
+.java-object {
+  color: #000099;
+}
+
+.java-quote {
+  color: #990000;
+}
+
+#footer {
+  padding-left: 4px;
+  border-top: 3px solid #eeeeee;
+  color: #888888;
+  font-size: x-small;
+}
+
+
+blockquote {
+  padding-left: 10px;
+  padding-right: 10px;
+  margin-left: 5px;
+  margin-right: 0px;
+  color: #555;
+  border-left: 1px solid #3c78b5;
+}
+
+input[type="text"] {
+  margin: 0px;
+  border: 1px solid #999999;
+  background-color: #dddddd;
+}
+
+input.required {
+  margin: 0px;
+  border: 1px solid #990000;
+}
+
+input {
+  border: 1px solid #999999;
+}
+
+textarea {
+  border: 1px solid #999999;
+}
+
+textarea.required {
+  border: 1px solid #990000;
+}
+
+label {
+  font-size: smaller;
+}
+
+label.required {
+  color: #990000;
+}
+
+.searchResults {
+  color: black;
+}
+
+.searchResults b {
+  color: #7270c2;
+}
+
+
+.linecomment { color: #bbbbbb; }
+.blockcomment { color: #bbbbbb; }
+.prepro { color: #0000BB; }
+.select {}
+.quote { color: #770000; }
+.category1 { color: #7270c2; }
+.category2 { color: #0000BB; }
+.category3 { color: #0000BB; }
+
+.monospaced {
+  margin: 1em;
+  line-height: 1.7em;
+  font-size: 1em;
+  color: #777;
+}
+
+.greenbar {
+  background-color: green;
+}
+
+.redbar {
+  background-color: red;
+}
+
+tr.testpassed td {
+  padding: 0px;
+  padding-left: 1px;
+  padding-right: 1px;
+  margin: 0px;
+}
+
+tr td.noformatting {
+  border: none;
+  padding: 0px;
+  padding-left: 4px;
+  padding-right: 4px;
+  margin: 0px;
+}
+
+.greybox {
+  background: #f0f0f0;
+  font-weight: bold;
+  text-decoration: none;
+  color: black;
+  border: 1px solid #ddd;
+  padding: 3px;
+  margin: 1px 1px 1px 1px;
+}
+
+
+.header_name {
+	font-size: smaller;
+	padding: 2px;
+	padding-right: 1ex;
+	border-right: 1px solid #555;
+	background-color: #ccc;
+}
+
+.header_value {
+	font-size: smaller;
+	background-color: #ddd;
+	padding: 2px;
+}
+
+.header_fields {
+	width: 100%;
+	border: 1px solid #999;
+	background-color: #fff;
+}
+
+.email_body {
+	margin: 2ex;
+	padding: 1ex;
+	padding-left: 2ex;
+	padding-right: 2ex;
+	border: 1px solid #999;
+	font-size: smaller;
+}
+
+.email_body pre {
+	padding: 0px;
+	margin: 0px;
+}
+
+.email_body blockquote {
+	padding: 0px;
+	margin: 0px;
+	border: 1px solid #ccc;
+}
+
+.msg_navblock {
+	margin-bottom: 2ex;
+	border: 1px solid #999;
+	background-color: #fff;
+}
+
+.msg_navblock th {
+	border: 1px solid #ccc;
+	font-size: smaller;
+}
+
+.msg_navblock td {
+	border: 1px solid #ccc;
+	font-size: smaller;
+}
+
+.single_entry {
+	border: 1px solid #aaa;
+	padding: .5ex;
+	padding-left: 1ex;
+	border-left: 1px solid #090;
+	margin: 2px;
+	background-color: #eee;
+}
+
+.root_entry {
+	border: 1px solid #aaa;
+	padding: .5ex;
+	padding-left: 1ex;
+	border-left: 1px solid #090;
+	margin-top: 8px;
+	margin-bottom: 8px;
+	background-color: #eee;
+}
+
+.root_entry .sub_entry {
+	padding: .5ex;
+	padding-left: 1ex;
+	margin: 2px;
+	margin-left: 1ex;
+	border-left: 1px solid #999;
+}
+
+.list_entry {
+	border: 1px solid #aaa;
+	padding: 1ex;
+	margin-top: 1ex;
+	margin-bottom: 1ex;
+}
+
+.list_entry td {
+	border: 1px solid #999;
+}
+
+.project_entry {
+	border: 1px solid #aaa;
+	padding: 1ex;
+	margin-top: 1ex;
+	margin-bottom: 1ex;
+}
+
+.update-tabletitle {
+  padding-left: 4px;
+  color: #E24717;
+  font-size: 13px;
+  font-weight: bold;
+}
+
+.update-title a {
+  font-size: 11px;
+  text-decoration: underline;
+  font-weight: normal;
+}
+
+.update-description {
+  font-size: smaller;
+  line-height: 12px;
+}
+
+.update-details {
+  font-size: smaller;
+  color: #777777;
+}
+
+.update-details a {
+  font-size: 10px;
+  color: #777777;
+}
+
+
+div.Updated {
+  margin-left: 13px;
+  margin-right: 5px;
+}
+
+div.Updated td {
+	border-bottom: 1px solid #bbb;
+	padding: 4px;
+	background-color: #fff;
+}
+
+div.Updated div.title {
+  border: 1px solid #999;
+  padding: 2px;
+  background-color: #eee;
+  font-weight: bold;
+  color: #000;
+}
+
+div.Updated div.page a, div.Updated div.smalltext a {
+  font-weight: normal;
+  color: #8280d2;
+}
+
+div.Updated div.smalltext {
+  font-size: 11px;
+  text-align: left;
+  font-weight: normal;
+  color: #555;
+}
+
+/****** Deck Settings *******/
+
+/* Global settings */
+.deck {
+	padding: 0px; margin: 0px;
+}
+
+.deck .tabBar {
+	padding: 0px;
+	padding-right: 8px;
+	margin: 0px;
+	position: relative;
+	z-index: 2;
+	font: bold 11px Verdana, sans-serif;
+}
+
+.deck .tabBar table tbody tr td {
+	margin: 0px; padding: 0px; border: 0px;
+}
+
+.deck .tabBar .tab {
+	margin: 0px; padding: 0px;
+	padding-left: 8px;
+}
+
+.deck .tabBar .tab a {
+	display: block;
+	padding: 1px 0.5em;
+	vertical-align: text-bottom;
+	background: #3c78b5;
+	border: 1px solid #3c78b5;
+	color: #ffffff;
+	text-decoration: none;
+	white-space: nowrap;
+}
+
+.deck .tabBar .tab a:hover {
+	color: #ffffff;
+	background: #003366;
+	border-color: #003366;
+}
+
+.deck .tabBar .tab#current a {
+	background: white;
+	border: 1px solid #3c78b5;
+	color: black;
+}
+
+.deck .tabBar .tab#current a:hover {
+	cursor: default;
+}
+
+.deck .cards.tabbed {
+	border: 1px solid #3c78b5;
+}
+
+/* Hack to get around clipping problem with no tabs... */
+.deck .cards.untabbed .card {
+	overflow: hidden;
+}
+
+.deck .cards.tabbed .card {
+	margin: 0px;
+	padding: 8px;
+	position: relative;
+	z-index: 1;
+}
+
+/* Tabs at the top */
+
+.deck .tabBar.top {
+	bottom: -1px;
+	margin-top: 3px;
+}
+
+.deck .tabBar.top table tbody tr td {
+	vertical-align: bottom;
+}
+
+.deck .tabBar.top .tab a {
+	margin-bottom: 1px;
+}
+
+.deck .tabBar.top .tab#current a {
+	border-bottom: 1px solid white;
+	padding-bottom: 2px;
+	margin-bottom: 0px;
+}
+
+/* Tabs at the bottom */
+
+.deck .tabBar.bottom {
+	top: -1px;
+	margin-bottom: 3px;
+}
+
+.deck .tabBar.bottom table tbody tr td {
+	vertical-align: top;
+}
+
+.deck .tabBar.bottom .tab a {
+	margin-top: 1px;
+}
+
+.deck .tabBar.bottom .tab#current a {
+	border-top: 1px solid white;
+	padding-top: 2px;
+	margin-top: 0px;
+}
+

Added: openejb/trunk/website/html/ie.css
URL: http://svn.apache.org/viewvc/openejb/trunk/website/html/ie.css?rev=600786&view=auto
==============================================================================
--- openejb/trunk/website/html/ie.css (added)
+++ openejb/trunk/website/html/ie.css Mon Dec  3 20:14:07 2007
@@ -0,0 +1,3 @@
+.Row4 .Col1 {
+  padding-top: 12px;
+}
\ No newline at end of file

Modified: openejb/trunk/website/src/vm/openejb_autoexport.vm
URL: http://svn.apache.org/viewvc/openejb/trunk/website/src/vm/openejb_autoexport.vm?rev=600786&r1=600785&r2=600786&view=diff
==============================================================================
--- openejb/trunk/website/src/vm/openejb_autoexport.vm (original)
+++ openejb/trunk/website/src/vm/openejb_autoexport.vm Mon Dec  3 20:14:07 2007
@@ -1,8 +1,7 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
 ##
 #set ($images = "http://openejb.apache.org/images")
 #set ($siteroot = "http://cwiki.apache.org/OPENEJB")
-#set ($pageContentHeaderEnabled = false)
 ##
 #if ( $page.title.equals("Index") )
     #set ($title = "Home")
@@ -55,266 +54,194 @@
             ##set ($content = $content.substring(3, $content.length()))
             ##set ($end = $content.length() - 4)
             ##set ($content = $content.substring(0, $end))
-    <td width="120" height="5" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="350" height="11" border="0">
 <div id="RightContent">
 $content
 </div>
-</td>
 
         #end
     #end
 #end
 ##
-#macro (pageContent)
-    <div id="PageContent">
-        #if ($pageContentHeaderEnabled)
-            <div class="pageheader" style="padding: 6px 0px 0px 0px;">
-                <div style="margin: 0px 10px 0px 10px" class="smalltext">$page.space.name</div>
-                <div style="margin: 0px 10px 8px 10px" class="pagetitle">$page.title</div>
-            </div>
-        #end
+<HTML>
+  <HEAD>
+    <!-- $PAGETITLE -->
+    <TITLE>OpenEJB - $title</TITLE>
+    <LINK href="http://openejb.apache.org/all.css" rel="stylesheet" type="text/css">
+    <!--[if IE]><link rel="stylesheet" type="text/css" media="screen, projection" href="openejb.apache.org/ie.css"><![endif]-->
+
+    <LINK rel="SHORTCUT ICON" href="http://openejb.apache.org/images/favicon.ico">
+    <SCRIPT language="JavaScript" src="http://cwiki.apache.org/confluence/pages/viewpage.action?spaceKey=OPENEJB&title=functions.js" type="text/javascript"></SCRIPT>
+    <META http-equiv="Content-Type" content="text/html;charset=UTF-8">
+  </HEAD>
+  <BODY>
+
+    <!-- Delay the loading of the external javascript file needed for labels (as it takes too long to load and visibly holds loading of the page body) -->
+    <!-- To do this without javascript errors over undefined functions, we need to declare stubs here (that are overrided later by the proper implementations) -->
+    <SCRIPT language="JavaScript" type="text/javascript">
+      function doAddLabel(hideTextfieldAfterAddParam)
+      {
+      // stub
+      }
+
+      function onAddLabel()
+      {
+      // stub
+      }
+
+      function showLabelsInput()
+      {
+      // stub
+      }
+    </SCRIPT>
+
+    <A name="top"></A>
+    <TABLE class="frameTable" cellpadding="0" cellspacing="0" border="0">
+      <TR class="Row1">
+        <TD class="Col1"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col2"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col3"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col4"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col5"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+      </TR>
+      <TR class="Row2">
+        <TD class="Col1"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col2">&nbsp;</TD>
+        <TD class="Col3" id="breadcrumbs">
+          <!-- $TOP_NAV_BAR -->
+          #renderPage('QuickLinks')
+        </TD>
+        <TD class="Col4"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col5">&nbsp;</TD>
+      </TR>
+      <TR class="Row3">
+        <TD class="Col1"><IMG alt="" class="Row3Img" id="thinLine" src="http://openejb.apache.org/images/line_sm.gif"></TD>
+        <TD class="Col2"><IMG alt="" class="Row3Img" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col3"><IMG alt="" class="Row3Img" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col4"><IMG alt="" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col5"><IMG alt="" class="Row3Img" src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+      </TR>
+      <TR class="Row4">
+        <TD class="Col1">
+          <SPAN id="Navigation">
+
+            #renderPage("Navigation")
+
+            <H3>
+              <A name="Navigation-Feeds"></A>
+              Feeds
+            </H3>
+
+            <UL class="feeds">
+            <li>
+              <A href="http://cwiki.apache.org/confluence/spaces/rss.action?key=OPENEJB&newPages=false">
+              <IMG src="http://openejb.apache.org/images/rss.gif"></a>
+              <A class="feedsText" href="http://cwiki.apache.org/confluence/spaces/rss.action?key=OPENEJB&newPages=false">Site</a>
+            </li>
+
+            <li><A href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=OPENEJB">
+              <IMG src="http://openejb.apache.org/images/rss.gif"></a>
+              <A class="feedsText" href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=OPENEJB">News</a>
+            </li>
+            </ul>
+          </SPAN>
+        </TD>
+        <TD class="Col2">&nbsp;</TD>
+        <TD class="Col3">
+          <TABLE id="PageHeader" border="0" width="100%">
+            <TR>
+              <TD>
+                <A href="http://openejb.org/">
+                  <IMG hspace="0" src="http://openejb.apache.org/images/logo_openejb.gif" vspace="0">
+                </A>
+              </TD>
+              <TD align="right">
+                <A href="http://www.apache.org/">
+                  <IMG src="http://www.apache.org/images/asf-logo.gif" width="258" height="66">
+                </A>
+              </TD>
+            </TR>
+            <TR>
+              <TD  id="page_title">
+                <!-- $TITLE -->
+                $title
+              </TD>
 
-        <div class="pagecontent">
-            <div class="wiki-content">
-                $body
-            </div>
-        </div>
-    </div>
-#end
- <html>
- <head>
-  <!-- $PAGETITLE -->
-  <title>OpenEJB - $title</title>
-  <link href="http://openejb.apache.org/default.css" rel="stylesheet" type="text/css" />
-  <link href="http://openejb.apache.org/style.css" rel="stylesheet" type="text/css" />
-  <link rel="SHORTCUT ICON" href="http://openejb.apache.org/images/favicon.ico">
-  <script language="JavaScript" src="functions.js" type="text/javascript"></script>
- </head>
-  <body bgcolor="#ffffff" link="#6763a9" vlink="#6763a9" topmargin="0" bottommargin="0" leftmargin="0" marginheight="0" marginwidth="0">
-
-<!-- Delay the loading of the external javascript file needed for labels (as it takes too long to load and visibly holds loading of the page body) -->
-<!-- To do this without javascript errors over undefined functions, we need to declare stubs here (that are overrided later by the proper implementations) -->
-<script language="JavaScript" type="text/javascript">
-    function doAddLabel(hideTextfieldAfterAddParam)
-    {
-        // stub
-    }
-
-    function onAddLabel()
-    {
-        // stub
-    }
-
-    function showLabelsInput()
-    {
-        // stub
-    }
-</script>
-
-  <a name="top"></a>
-  <table border="0" cellpadding="0" cellspacing="0" width="100%" height="400">
-   <tr>
-    <td width="20" valign="top" align="left" bgcolor="#7270c2"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="1" border="0"></td>
-    <td width="95" valign="top" align="left" bgcolor="#7270c2"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="1" border="0"></td>
-    <td width="7" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" border="0" width="1" height="1"></td>
-    <td width="40" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="40" height="6" border="0"></td>
-    <td width="100%" valign="top" align="left" bgcolor="#5A5CB8"><img src="http://openejb.apache.org/images/top_2.gif" width="430" height="6" border="0"></td>
-    <td width="120" valign="top" align="left" bgcolor="#E24717"><img src="http://openejb.apache.org/images/top_3.gif" width="120" height="6" border="0"></td>
-   </tr>
-   <tr>
-    <td width="20" bgcolor="#7270c2" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" border="0" width="1" height="1"></td>
-    <td width="95" bgcolor="#7270c2" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" border="0" width="1" height="1"></td>
-    <td width="7" bgcolor="#ffffff" valign="top" align="left"></td>
-    <td width="40" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="1" border="0"></td>
-    <td id="breadcrumbs" width="100%" valign="middle" align="left">
-      <!-- $TOP_NAV_BAR -->
-      <span id="Content">
-        #renderPage("QuickLinks")
-      </span>
-     <img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="2" border="0"></td>
-    <td width="120" height="20" valign="top" align="left">&nbsp;</td>
-   </tr>
-   <tr>
-    <td width="20" bgcolor="#7270c2" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="20" height="3" border="0"></td>
-    <td width="95" bgcolor="#7270c2" valign="top" align="left"><img src="http://openejb.apache.org/images/line_sm.gif" width="105" height="3" border="0"></td>
-    <td width="7" bgcolor="#a9a5de" valign="top" align="left"><img src="http://openejb.apache.org/images/line_sm.gif" width="7" height="3" border="0"></td>
-    <td width="40" valign="top" align="left"><img src="http://openejb.apache.org/images/line_light.gif" width="40" height="3" border="0"></td>
-    <td width="100%" valign="top" align="left"><img src="http://openejb.apache.org/images/line_light.gif" width="430" height="3" border="0"></td>
-    <td width="120" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" border="0" width="1" height="1"></td>
-   </tr>
-   <tr>
-    <td bgcolor="#7270c2" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="20" height="10" border="0"></td>
-    <td id="leftColumn" valign="top" style="padding-top: 0px;">
-    <span id="Content">
-      #renderPage("Navigation")
-    </span>
+              <TD align="right">
+                <br><br>
+                <!-- Google CSE Search Box Begins  -->
+                <FORM id="searchbox_010475492895890475512:_t4iqjrgx90" action="http://www.google.com/cse">
+                  <INPUT type="hidden" name="cx" value="010475492895890475512:_t4iqjrgx90">
+                  <INPUT type="hidden" name="cof" value="FORID:0">
+                  <INPUT name="q" type="text" size="25">
+                  <INPUT type="submit" name="sa" value="Search">
+                </FORM>
+                <SCRIPT type="text/javascript"
+                        src="http://www.google.com/coop/cse/brand?form=searchbox_010475492895890475512:_t4iqjrgx90"></SCRIPT>
+                <!-- Google CSE Search Box Ends -->
 
-            <h3 class="heading3">Feeds</h3>
-            <table border="0" cellspacing="4px">
+              </TD>
+            </TR>
+          </TABLE>
+          <P>
+            <!-- $BODY -->
+            <DIV id="PageContent">
+              $body
+            </DIV>
+          </P>
+        </TD>
+        <TD class="Col4"><IMG src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col5">
+          #renderRightSidePage("${title}Links")
+        </TD>
+      </TR>
+      <TR  class="Row5">
+        <TD class="Col1">&nbsp;</TD>
+        <TD class="Col2">&nbsp;</TD>
+        <TD class="Col3">
+          <br>
+          <br>
+          <IMG width="100%" height="1" src="http://openejb.apache.org/images/line_light.gif">
+          <table width="100%">
             <tr>
-              <td align="right">
-                <a href="http://cwiki.apache.org/confluence/spaces/rss.action?key=OPENEJB&newPages=false"><img src="http://openejb.apache.org/images/rss.gif" border="0"></a><br/>
+              <td>
+                <SPAN class="bodyGrey">
+                  <SMALL>
+                    <NOTICE><!-- $FOOTER -->
+                      Apache OpenEJB is an project of The Apache Software Foundation (ASF)
+                    </NOTICE>
+                    <BR>
+                    Site Powered by
+                    <A href="http://atlassian.com/">Atlassian</A>
+                    <A href="http://atlassian.com/confluence/">Confluence</A>
+                    .
+                  </SMALL>
+                </SPAN>
               </td>
-              <td align="left">
-                <a href="http://cwiki.apache.org/confluence/spaces/rss.action?key=OPENEJB&newPages=false">Site</a>
-              </td>
-            </tr>
-            <tr>
               <td align="right">
-                <a href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=OPENEJB"><img src="http://openejb.apache.org/images/rss.gif" border="0"></a>
-              </td>
-              <td align="left">
-                <a href="http://cwiki.apache.org/confluence/spaces/blogrss.action?key=OPENEJB">News</a>
+                <A style="color:#999;font-size:small;font-weight:normal;" href="$confluenceUri/pages/editpage.action?spaceKey=OPENEJB&title=$page.title">[ edit ]</A>
               </td>
             </tr>
-            </table>
-        </td>
-    <td width="7" bgcolor="#a9a5de" valign="top" align="left">&nbsp;</td>
-    <td width="40" valign="top" align="left">&nbsp;</td>
-    <td rowspan="4" width="100%" valign="top">
-     <table cols="1" rows="2" border="0" cellpadding="0" cellspacing="0" width="100%">
-      <tr>
-       <td valign="top" align="left"><br>
-          <table cols="3" rows="1" border="0" cellpadding="0" cellspacing="0" width="100%">
-          <tr>
-           <td valign="top" width="200" align="left">
-           <A HREF="http://openejb.org">
-           <img border="0" hspace="0" src="http://openejb.apache.org/images/logo_openejb.gif" vspace="0" >
-           </A>
-           </td>
-           <td align="right" valign="middle" style="padding:0px;margin:0px;">
-	      <table style="padding:0px;margin:0px;">
-            <tr>
-                <td>
-	            <A href="http://www.apache.org/">
-	              <IMG src="http://www.apache.org/images/asf-logo.gif" border="0" width="258" height="66">
-	            </A>
-                </td>
-            <tr>
-<!--
-	        <tr>
-	            <td align="right" valign="top" style="font-size:12px;color:#777777">
-	            [OpenEJB is a Podling in the Apache Incubator]
-	            </td>
-	        </tr>
--->
           </table>
-           </td>
-          </tr>
-          </table>
-	<br>
-      </td>
-      </tr>
-      <tr>
-       <td valign="top" align="left">
-         <img border="0" height="7" hspace="0" src="http://openejb.apache.org/images/dotTrans.gif"><br>
-          <div id="page_title">
-            <table width="100%">
-              <tr>
-                <td>
-	<!-- $TITLE -->
-	$title
-                </td>
-
-                <!-- Google CSE Search Box Begins  -->
-                <td align='right'>
-                  <form id="searchbox_010475492895890475512:_t4iqjrgx90" action="http://www.google.com/cse">
-                    <input type="hidden" name="cx" value="010475492895890475512:_t4iqjrgx90" />
-                    <input type="hidden" name="cof" value="FORID:0" />
-                    <input name="q" type="text" size="25" />
-                    <input type="submit" name="sa" value="Search" />
-                  </form>
-                  <script type="text/javascript" src="http://www.google.com/coop/cse/brand?form=searchbox_010475492895890475512%3A_t4iqjrgx90"></script>
-                </td>
-                <!-- Google CSE Search Box Ends -->
-
-                 <td align="right" style="padding-left:0px;"><a style="color:#999;font-size:small;font-weight:normal;" href="http://cwiki.apache.org/confluence/pages/editpage.action?spaceKey=OPENEJB&title=$page.title">[ edit ]</a></td>
-                <td align="right" width="25">
-
-            <script type="text/javascript" language="javascript">
-                document.write('<a href="$confluenceUri/pages/viewpage');
-                document.write('.action?pageId=$page.id&decorator=printable">');
-            </script>
-            <img src="http://cwiki.apache.org/confluence/images/icons/print_16.gif" height="16" width="16" border="0" align="absmiddle" title="Print"></a>
-
-                </td>
-              </tr>
-            </table>
-          </div>
-        <img border="0" height="1" hspace="0" src="http://openejb.apache.org/images/dotTrans.gif"></td>
-      </tr>
-     </table>
-     <p>
-     <!-- $BODY -->
-        #pageContent()
-     </p>
-    </td>
-
-        #renderRightSidePage("${title}Links")
-
-   </tr>
-   <tr height="5">
-    <td width="20" height="5" bgcolor="#7270c2" valign="top" align="left">&nbsp;</td>
-    <td width="95" height="5" bgcolor="#7270c2" valign="top">&nbsp;</td>
-    <td width="7" height="5" bgcolor="#a9a5de" valign="top" align="left">&nbsp;</td>
-    <td width="40" height="5" valign="top" align="left">&nbsp;</td>
-    <td width="120" height="5" valign="top" align="left">&nbsp;</td>
-   </tr>
-   <tr>
-    <td width="20" height="5" bgcolor="#7270c2" valign="top" align="left">&nbsp;</td>
-    <td width="95" bgcolor="#7270c2" valign="BOTTOM" align="left">&nbsp;</td>
-    <td width="7" bgcolor="#a9a5de" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="25" border="0"></td>
-    <td width="40" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="25" border="0"></td>
-    <td width="120" valign="top" align="left">&nbsp;</td>
-   </tr>
-   <tr>
-    <td width="20" height="5" bgcolor="#7270c2" valign="top" align="left">&nbsp;</td>
-    <td width="95" bgcolor="#7270c2" valign="BOTTOM" align="left">&nbsp;</td>
-    <td width="7" bgcolor="#a9a5de" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="25" border="0"></td>
-    <td width="40" valign="top" align="left"><img src="http://openejb.apache.org/images/dotTrans.gif" width="1" height="25" border="0"></td>
-    <td width="120" valign="top" align="left">&nbsp;</td>
-   </tr>
-   <tr height="5">
-    <td width="20" rowspan="2" height="100%" bgcolor="#7270c2" valign="bottom" align="left"><img src="http://openejb.apache.org/images/stripes1.gif" width="20" height="125" border="0"></td>
-    <td width="95" rowspan="2" height="100%" bgcolor="#7270c2" valign="bottom" align="left"><img src="http://openejb.apache.org/images/stripe105.gif" width="105" height="125" border="0"></td>
-    <td width="7" rowspan="2" height="100%" bgcolor="#a9a5de" valign="top" align="left">&nbsp;</td>
-    <td width="40" height="100%" valign="top" align="left">&nbsp;</td>
-    <td width="120" height="100%" valign="top" align="left">&nbsp;</td>
-   </tr>
-   <tr height="5">
-    <td width="40" height="25" valign="top" align="left">&nbsp;</td>
-    <td width="100%" height="25" valign="bottom" align="left"><br>
-     <br>
-     <img src="http://openejb.apache.org/images/line_light.gif" border="0" width="430" height="3"><br>
-     <p>
-     </p>
-     <span class="bodyGrey">
-     <small><notice><!-- $FOOTER -->
-Apache OpenEJB is an project of The Apache Software Foundation (ASF)
-     </notice> <br>
-     &nbsp;<br>
-          Powered by <a href="http://atlassian.com/">Atlassian</a> <a href="http://atlassian.com/confluence/">Confluence</a>.
-     </small>
-     </span>
-     <p>
-     </p>
-     </td>
-    <td width="120" height="25" valign="top" align="left">&nbsp;</td>
-   </tr>
-  </table>
-
-<!-- Needed for composition plugin -->
-<!-- delay the loading of large javascript files to the end so that they don't interfere with the loading of page content -->
-<span style="display: none">
-    <script type="text/javascript" language="JavaScript" src="http://cwiki.apache.org/confluence/labels-javascript"></script>
-
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript">
-</script>
-<script type="text/javascript">
-_uacct = "UA-2717626-1";
-urchinTracker();
-</script>
-</span>
+          <br>
+        </TD>
+        <TD class="Col4"><IMG src="http://openejb.apache.org/images/dotTrans.gif"></TD>
+        <TD class="Col5">&nbsp;</TD>
+      </TR>
+    </TABLE>
+
+    <!-- Needed for composition plugin -->
+    <!-- delay the loading of large javascript files to the end so that they don't interfere with the loading of page content -->
+    <SPAN style="display: none">
+      <SCRIPT type="text/javascript" language="JavaScript"
+              src="http://cwiki.apache.org/confluence/labels-javascript"></SCRIPT>
+
+      <SCRIPT src="http://www.google-analytics.com/urchin.js" type="text/javascript">
+      </SCRIPT>
+      <SCRIPT type="text/javascript">
+        _uacct = "UA-2717626-1";
+        urchinTracker();
+      </SCRIPT>
+    </SPAN>
 
-  </body>
- </html>
+  </BODY>
+</HTML>
\ No newline at end of file