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/11/16 14:27:28 UTC

svn commit: r345009 - in /cocoon/blocks/portal-sample/trunk: ./ samples/ samples/conf/ samples/skins/modern/css/ samples/skins/modern/images/ samples/skins/modern/styles/

Author: cziegeler
Date: Wed Nov 16 05:27:10 2005
New Revision: 345009

URL: http://svn.apache.org/viewcvs?rev=345009&view=rev
Log:
Add new layout provided by Helma Van Der Linden.

Added:
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css   (with props)
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/balk.gif   (with props)
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/nav_tab_bg_on.jpg   (with props)
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/shadowAlpha.png   (with props)
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/tabmenu.gif   (with props)
Modified:
    cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
    cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/customize.gif
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/delete.gif
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/edit.gif
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/help.gif
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/minimize.gif
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/show.gif
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/borderless-window.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/login-html.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/window.xsl
    cocoon/blocks/portal-sample/trunk/status.xml

Modified: cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf (original)
+++ cocoon/blocks/portal-sample/trunk/samples/conf/cocoon-portal-sample.xconf Wed Nov 16 05:27:10 2005
@@ -168,7 +168,7 @@
     <!-- Scan the provided directories every minute: -->
     <scanning-delay>60000</scanning-delay>
     <!-- Scan the following locations (comma-separated): -->
-    <deployment-sources>conf/deply</deployment-sources>
+    <deployment-sources>conf/deploy</deployment-sources>
     <!-- Turn on/off hot deployment: -->
     <hot-deployment>true</hot-deployment>
   </portal-deployment-manager>

Modified: cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap (original)
+++ cocoon/blocks/portal-sample/trunk/samples/sitemap.xmap Wed Nov 16 05:27:10 2005
@@ -145,6 +145,9 @@
       <map:match pattern="skin/*/**.js">
         <map:read src="{portal-skin:{1}:skin.basepath}/{2}.js"/>
       </map:match>
+      <map:match pattern="skin/*/**.png">
+        <map:read src="{portal-skin:{1}:skin.basepath}/{2}.png"/>
+      </map:match>
 
       <map:match pattern="resources/ajax/js/cocoon-ajax.js">
         <map:read src="resource://org/apache/cocoon/ajax/resources/js/cocoon-ajax.js"/>

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css Wed Nov 16 05:27:10 2005
@@ -5,7 +5,7 @@
 * 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
+*     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,
@@ -13,160 +13,237 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
+
+/* general settings */
+
 body { 
-	background-color: #FFFFFF; 
-	margin: 0px 0px 0px 0px; 
+	background-color: white; 
+	margin: 0; 
 	font-family: Verdana, Helvetica, sans-serif;
-    font-size : 10pt;
-    line-height:12pt;
+	font-size: 10pt;
+   line-height: 12pt;
+	color: black;
+	border-left: 5px solid white;
+	border-right: 5px solid white;
+}
+
+p, li  {
+/*   letter-spacing: 0.2mm; */
+/*   word-spacing: 0.8mm; */
+}
+
+h1 {
+	font-size: 13pt;
+}
+
+/* portal styling */
+
+.cocoon-portal-header {
+   width: 100%;
+	height: 42px;
+	background-color: #0076a3;
+}
+
+#cocoon-portal-header-logo {
+	display: none;
+}
+
+#cocoon-portal-header-logout {
+   position: relative;
+	float: right;
+	right: 0px;
+	bottom: -20px;
+	padding-right: 0.5em;
+	vertical-align: middle;
+}
+#cocoon-portal-header-logout img {
+	display: none;
+}
+
+#cocoon-portal-header-logout a {
+	padding: 0.5em;
+	vertical-align: middle;
+	color: white;
+	font-weight: bold;
+	text-decoration: none;
+}
+
+.cocoon-portal-content {
+	overflow: auto;
+}
+
+.cocoon-portal-footer {
+	clear: both;
+   width: 100%;
+   height: 10px;
+	margin-top: 5px;
+	background-color: #0076a3;
+}
+
+.cocoon-portal-columns {
+   clear: both;
+	width: 100%;
+	overflow: auto;
+	border: 0;
+}
+
+.cocoon-portal-column {
+   float: left;
+	margin: 0 5px 0 5px;
+}
+
+.cocoon-portal-rows {
+	clear: both;
+   width: 100%;
+	overflow: auto;
+	border: 0;
 }
-p,li  { font-size:10pt;
-        line-height:12pt;
-        font-family:Verdana, Helvetica, sans-serif;
-        letter-spacing:0.2mm;
-        word-spacing:0.8mm;
-        color:black;
+
+.cocoon-portal-row {
+	clear: both;
+	margin: 5px 0 5px 0;
 }
-#cocoon-portal-header-logout a{color:#fff;text-decoration: none;}
+
+/* coplet styling */
+
 .coplet {
-    border-width:2px;
-    border-color:#294563;
-    border-style:solid;
+	background-color: white;
+	border-right: 1px solid white;
+	border-bottom: 1px solid white;
+	border-top: 0;
+	background: url("../images/shadowAlpha.png") repeat bottom right;
+	padding: 0 0px 0px 0;
+	margin: 5px 0 0 5px;
+}
+
+.coplet .innerbox {
+	position: relative;
+	bottom: 5px;
+	right: 5px;
+	border: 1px solid #787878;
 }
 .coplet-borderless {
-    border-width:2px 0px 0px 0px;
-    border-color:#294563;
-    border-style:solid;
+/*	border: 1px dotted #eee; */
+	border-top: 1px solid white;
+	background: url("../images/shadowAlpha.png") bottom right repeat;
+	padding: 0 5px 5px 0;
 }
+
 .coplet-header {
-	background-color:#294563;
-    border-width:1px;
-    border-color:#294563;
-    border-style:solid;
-    width:100%;
+   width: 100%;
+	background: url("../images/balk.gif") top left repeat-x;
+	height: 24px;
+	border: 1px 0 1px 0 solid #ffff00;
+}
+
+.coplet-borderless .coplet-header {
+	border: 0;
 }
+
 .coplet-title {
-    background-color: #294563;
-    color: #ffffff;
-    font-size:12pt;
-    line-height:12pt;
-    margin:0px;
-    padding:0px;
-    padding-left: 0.2em;
-    padding-top: 0.2em;
-    padding-bottom: 0.2em;
+	float: left;
+   color: white;
+   margin: 0px;
+   padding: 0.2em;
+   font-size: 10pt;
+	font-weight: bold;
+   line-height: 12pt;
 }
+
 .coplet-icons {
-    background-color:#294563;
-    padding:0px;
-    padding-right: 0.2em;
-    float:right;
+	
+	float:right;
+	width: auto;
+   padding: 0.2em;
 }
+
 .coplet-icon {
-    background-color:#294563;
-    float:left;
-    padding:0px;
-    padding-left:1px;
-}
-.cocoon-portal-columns {
-    clear: both;
-	width:100%;
-}
-.cocoon-portal-column {
-    float:left;
-    padding-left:3px;
-}
-.cocoon-portal-rows {
-    width:100%;
-    clear: both;
-}
-.cocoon-portal-row {
-    padding-top:3px;
-	padding-bottom:3px;
-    clear: both;
-}
-.coplet-content{
-  vertical-align:top;
+   float: left;
+   padding: 0px;
+   padding-left: 1px;
+}
+
+.coplet-content {
+	padding: 0 0.5em 0.5em 0.5em;
+	background-color: white;
+	border: 0;
+	border-top: 1px solid white;
+/*
+	border-left: 1px solid #787878;
+	border-top: 1px solid white;
+*/
 }
+
+.coplet-borderless .coplet-content {
+	border: 0;
+	border-top: 1px solid white;
+}
+
+/* tabbed menu styling */
+
 .tab-layout {
-  background-color: #294563;
-  width:100%;
+	width: 100%;
+	height: 24px;
+	padding: 0;
+	border: 0;
+	background: url("../images/balk.gif") repeat-x top left;
 }
+
 .tab-layout ul {
-  background-color: #294563;
-  display: block;
-  list-style: none outside;
-  padding: 0;
-  margin: 0 0 0 10px;
-  font-family: Verdana, sans-serif;
-  height:22px;
-  font-size : 12pt;
-  
+  	display: block;
+  	list-style: none outside;
+  	margin: 0 0 0 10px;
+  	padding: 0;
+	height: 24px;
+  	font-size: 10pt;
 }
+
 .tab-layout li {
-  padding: 0.2em;
-  margin: 0px 4px 0px 0px;
-  border-top: 1px solid #B2C4E0;
-  border-right: 1px solid #B2C4E0;
-  border-left: 1px solid #B2C4E0;
-  background-color: #B2C4E0;
-  color: #294563;
-  font-weight: bold;
-  /* the next 4 lines are magic */
-  display: block;
-  float: left;
-  position: relative;
-}
-.tab-layout a:link {
-  text-decoration: none;
-  padding-left: 1em;
-  padding-right: 1em;
-  color: #000000;
-}
-.tab-layout a:visited {
-  text-decoration: none;
-  padding-left: 1em;
-  padding-right: 1em;
-  color: #000000;
+  	display: block;
+	float: left;
+	position: relative;
+	height: 24px;
+  	border-left: 1px solid #E1E3EB;
+	border-right: 1px solid #7B81A9;
+  	color: white;
+	font-weight: bold;
+	vertical-align: middle;
+	 
+}
+
+.tab-layout a {
+	height: 24px;
+  	text-decoration: none;
+	padding: 0 1.5em 0 1.5em;
+  	color: white;
+	vertical-align: middle;
+}
+
+.tab-layout li:hover {
+	color: black;
+	background: url("../images/nav_tab_bg_on.jpg") top left repeat-x;
+}
+.tab-layout a:hover {
+	height: 24px;
+  	color: black;
+	background: url("../images/nav_tab_bg_on.jpg") top left repeat-x;
 }
+
 .tab-layout li.tab-selected {
-  padding: 0.2em;
-  margin: 0 4px 0 0;
-  border-top: 1px solid #ffffff;
-  border-right: 1px solid #ffffff;
-  border-left: 1px solid #ffffff;
-  background-color: #ffffff;
-  color: #000000;
-  font-weight: bold;
-  text-decoration: none;
-  padding-left: 1em;
-  padding-right: 1em;
-  /* the next 4 lines are magic */
-  display: block;
-  float: left;
-  position: relative;
+	height: 24px;
+	padding: 0 1.5em 0 1.5em;
+	vertical-align: middle;
+	background: url("../images/nav_tab_bg_on.jpg") top left repeat-x;
+  	color: black;
+}
+
+.tab-layout li.tab-selected  a {
+  	color: black;
 }
+
 div.tab-layout-clear {
-  clear: both;
-  font-size:0px;
-  line-height:2px;
-  height:2px;
-}
-.cocoon-portal-header {
-    background-color: #294563;
-    color: #ffffff;
-    width: 100%;
-    height: 90px;
-}
-.cocoon-portal-footer {
-    background-color: #294563;
-    color: #ffffff;
-    width: 100%;
-    height: 10px;
-}
-#cocoon-portal-header-logo {
-	height:90px;
-}
-#cocoon-portal-header-logout {
-    float:right;
+  	clear: both;
+  	font-size: 0px;
+  	line-height: 5px;
+  	height: 5px;
 }

Added: cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css?rev=345009&view=auto
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css (added)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css Wed Nov 16 05:27:10 2005
@@ -0,0 +1,31 @@
+/* specific styling for the portal page */
+
+/*
+This is just fun with restyling tables to
+something that is different to what you
+would expect.
+Verified to be working as intended in FireFox 
+and Safari on OSX.
+Verified to be working as intended in FireFox
+on Win XP.
+Doesn't work in IE6 on Win XP (why should it eh? ;-) ).
+
+*/
+#personal_area {
+	border: 1px dashed #ddd;
+	width: 100%;
+	overflow: auto;
+}
+
+#personal_area h3 { 
+	font-size: 12pt;
+	font-style: normal;
+}
+
+#personal_area td:last-child { 
+	font-style: italic;  
+}
+
+#personal_area table td {
+	font-style: normal;
+}
\ No newline at end of file

Propchange: cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/portal-page.css
------------------------------------------------------------------------------
    svn:keywords = Id

Added: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/balk.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/balk.gif?rev=345009&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/balk.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/customize.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/customize.gif?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/delete.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/delete.gif?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/edit.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/edit.gif?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/help.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/help.gif?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
Binary files - no diff available.

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/minimize.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/minimize.gif?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
Binary files - no diff available.

Added: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/nav_tab_bg_on.jpg
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/nav_tab_bg_on.jpg?rev=345009&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/nav_tab_bg_on.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/shadowAlpha.png
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/shadowAlpha.png?rev=345009&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/shadowAlpha.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/show.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/show.gif?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
Binary files - no diff available.

Added: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/tabmenu.gif
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/tabmenu.gif?rev=345009&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/blocks/portal-sample/trunk/samples/skins/modern/images/tabmenu.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/borderless-window.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/borderless-window.xsl?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/borderless-window.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/borderless-window.xsl Wed Nov 16 05:27:10 2005
@@ -21,8 +21,18 @@
   <xsl:template match="window">
     <xsl:variable name="copletId"><xsl:value-of select="instance-id"/></xsl:variable>
     <div class="coplet-borderless" id="coplet-{$copletId}">
+      <div class="innerbox">
       <div class="coplet-header" id="coplet-header-{$copletId}">
         <div class="coplet-title" id="coplet-title-{$copletId}">        
+        <xsl:choose>
+            <xsl:when test="@title">
+              <xsl:value-of select="@title"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="title"/>
+            </xsl:otherwise>
+          </xsl:choose> 
+        </div>
         <div class="coplet-icons" id="coplet-icons-{$copletId}">
           <xsl:variable name="copletSize"><xsl:value-of select="coplet-size"/></xsl:variable>
           <xsl:if test="basket-add-link">
@@ -114,14 +124,6 @@
             </div>
           </xsl:if>
         </div>
-        <xsl:choose>
-            <xsl:when test="@title">
-              <xsl:value-of select="@title"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="title"/>
-            </xsl:otherwise>
-          </xsl:choose> 
         </div>
       </div>
       <div class="coplet-content" id="coplet-content-{$copletId}">

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/login-html.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/login-html.xsl?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/login-html.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/login-html.xsl Wed Nov 16 05:27:10 2005
@@ -26,21 +26,16 @@
 <xsl:param name="resource"/>
 
 <xsl:template match="content">
-<table bgColor="#ffffff" border="0" cellPadding="0" cellSpacing="0" width="100%"><tbody>
+<table id="personal_area"><tbody>
   <tr>
-	<td bgColor="#ffffff" align="center">
+	<td>
 	  <br/>
         <xsl:apply-templates/>
       <br/>
     </td>
   </tr>
   <tr>
-    <td bgColor="#ffffff" width="15">
-	  <img height="1" src="images/space.gif" width="15"/>
-    </td>
-  </tr>
-    <tr>
-      <td bgColor="#ffffff" align="center">
+      <td>
       <br/>
       <p>
          If you are not already registered, use this guest login:

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl Wed Nov 16 05:27:10 2005
@@ -28,6 +28,7 @@
         <title><xsl:value-of select="$title"/></title>
         <link type="text/css" rel="stylesheet" href="skin/{$skin}/css/page.css"/>
         <link type="text/css" rel="stylesheet" href="skin/{$skin}/css/wsrp.css"/>
+        <link type="text/css" rel="stylesheet" href="skin/{$skin}/css/portal-page.css"/>
         <script src="resources/ajax/js/cocoon-ajax.js" type="text/javascript"/>
         <script src="resources/portal/js/cocoon-portal.js" type="text/javascript"/>
       </head>

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/window.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/window.xsl?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/window.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/window.xsl Wed Nov 16 05:27:10 2005
@@ -21,8 +21,18 @@
   <xsl:template match="window">
     <xsl:variable name="copletId"><xsl:value-of select="instance-id"/></xsl:variable>
     <div class="coplet" id="coplet-{$copletId}">
+      <div class="innerbox">
       <div class="coplet-header" id="coplet-header-{$copletId}">
         <div class="coplet-title" id="coplet-title-{$copletId}">
+        <xsl:choose>
+            <xsl:when test="@title">
+              <xsl:value-of select="@title"/>
+            </xsl:when>
+            <xsl:otherwise>
+              <xsl:value-of select="title"/>
+            </xsl:otherwise>
+          </xsl:choose> 
+        </div>
           
         <div class="coplet-icons" id="coplet-icons-{$copletId}">
           <xsl:variable name="copletSize"><xsl:value-of select="coplet-size"/></xsl:variable>
@@ -115,14 +125,6 @@
             </div>
           </xsl:if>
         </div>
-        <xsl:choose>
-            <xsl:when test="@title">
-              <xsl:value-of select="@title"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="title"/>
-            </xsl:otherwise>
-          </xsl:choose> 
         </div>
       </div>
       <div class="coplet-content" id="coplet-content-{$copletId}">

Modified: cocoon/blocks/portal-sample/trunk/status.xml
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/status.xml?rev=345009&r1=345008&r2=345009&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/status.xml (original)
+++ cocoon/blocks/portal-sample/trunk/status.xml Wed Nov 16 05:27:10 2005
@@ -65,6 +65,9 @@
  <!-- The following list contains the changes since the latest 2.1.x version. -->
  <changes>
   <release version="@version@" date="@date@">
+    <action dev="CZ" type="add">
+      Add new layout provided by Helma Van Der Linden.
+    </action>
   </release>
  </changes>