cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cziege...@apache.org
Subject svn commit: r332516 - in /cocoon/blocks/portal-sample/trunk/samples/skins/modern: css/page.css styles/borderless-window.xsl styles/portal-page.xsl styles/tab.xsl styles/window.xsl
Date Fri, 11 Nov 2005 10:59:58 GMT
Author: cziegeler
Date: Fri Nov 11 02:59:53 2005
New Revision: 332516

URL: http://svn.apache.org/viewcvs?rev=332516&view=rev
Log:
Update layout - patch provided by Klaus Bertram (k.bertram@kbsm.de)

Modified:
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/css/page.css
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/borderless-window.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/tab.xsl
    cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/window.xsl

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=332516&r1=332515&r2=332516&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 Fri Nov 11 02:59:53
2005
@@ -17,7 +17,8 @@
 	background-color: #FFFFFF; 
 	margin: 0px 0px 0px 0px; 
 	font-family: Verdana, Helvetica, sans-serif;
-    font-size : 100%;
+    font-size : 10pt;
+    line-height:12pt;
 }
 p,li  { font-size:10pt;
         line-height:12pt;
@@ -26,41 +27,45 @@
         word-spacing:0.8mm;
         color:black;
 }
+#cocoon-portal-header-logout a{color:#fff;text-decoration: none;}
 .coplet {
     border-width:2px;
     border-color:#294563;
     border-style:solid;
 }
-.borderless {
+.coplet-borderless {
     border-width:2px 0px 0px 0px;
     border-color:#294563;
     border-style:solid;
 }
 .coplet-header {
+	background-color:#294563;
     border-width:1px;
     border-color:#294563;
     border-style:solid;
-    background-color:#294563;
     width:100%;
 }
 .coplet-title {
     background-color: #294563;
     color: #ffffff;
-    font-size:100%;
-    float:left;
+    font-size:12pt;
+    line-height:12pt;
+    margin:0px;
+    padding:0px;
     padding-left: 0.2em;
     padding-top: 0.2em;
     padding-bottom: 0.2em;
 }
 .coplet-icons {
     background-color:#294563;
-    float:right;
-    padding-top: 0.2em;
+    padding:0px;
     padding-right: 0.2em;
+    float:right;
 }
 .coplet-icon {
     background-color:#294563;
     float:left;
+    padding:0px;
     padding-left:1px;
 }
 .cocoon-portal-columns {
@@ -80,21 +85,27 @@
 	padding-bottom:3px;
     clear: both;
 }
+.coplet-content{
+  vertical-align:top;
+}
 .tab-layout {
-  width:100%;
   background-color: #294563;
+  width:100%;
 }
 .tab-layout ul {
+  background-color: #294563;
   display: block;
   list-style: none outside;
   padding: 0;
   margin: 0 0 0 10px;
   font-family: Verdana, sans-serif;
-  font-size : 100%;
+  height:22px;
+  font-size : 12pt;
+  
 }
 .tab-layout li {
   padding: 0.2em;
-  margin: 0 4px 0 0;
+  margin: 0px 4px 0px 0px;
   border-top: 1px solid #B2C4E0;
   border-right: 1px solid #B2C4E0;
   border-left: 1px solid #B2C4E0;
@@ -135,14 +146,17 @@
   float: left;
   position: relative;
 }
-.tab-layout-clear {
+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: 80px;
+    height: 90px;
 }
 .cocoon-portal-footer {
     background-color: #294563;
@@ -150,6 +164,9 @@
     width: 100%;
     height: 10px;
 }
+#cocoon-portal-header-logo {
+	height:90px;
+}
 #cocoon-portal-header-logout {
     float:right;
-}
\ No newline at end of file
+}

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=332516&r1=332515&r2=332516&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 Fri
Nov 11 02:59:53 2005
@@ -20,18 +20,9 @@
 
   <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="coplet-borderless" id="coplet-{$copletId}">
       <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-title" id="coplet-title-{$copletId}">        
         <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">
@@ -122,6 +113,15 @@
               </a>
             </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/portal-page.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/portal-page.xsl?rev=332516&r1=332515&r2=332516&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 Fri Nov
11 02:59:53 2005
@@ -33,9 +33,7 @@
       </head>
       <body>
         <div class="cocoon-portal-header">
-          <div id="cocoon-portal-header-logo">
-            <img src="skin/{$skin}/images/portal-logo.gif" width="250" height="90"/>
-          </div>
+          
           <xsl:if test="$user!='anonymous'">
             <div id="cocoon-portal-header-logout">
               <a href="logout"><img src="skin/{$skin}/images/logout-door.gif" width="18"
height="22" border="0"/></a>
@@ -44,7 +42,11 @@
               <a href="tools/">Tools</a>
             </div>
           </xsl:if>
+          <div id="cocoon-portal-header-logo" >
+            <img src="skin/{$skin}/images/portal-logo.gif" width="250" height="90"/>
+	    </div>
 	    </div>
+	    
         <div class="cocoon-portal-content">
           <xsl:copy-of select="*"/>
 	    </div>

Modified: cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/tab.xsl
URL: http://svn.apache.org/viewcvs/cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/tab.xsl?rev=332516&r1=332515&r2=332516&view=diff
==============================================================================
--- cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/tab.xsl (original)
+++ cocoon/blocks/portal-sample/trunk/samples/skins/modern/styles/tab.xsl Fri Nov 11 02:59:53
2005
@@ -34,7 +34,7 @@
         </xsl:for-each>
       </ul>
     </div>
-    <div class="tab-layout-clear"/>
+    <div class="tab-layout-clear">&#160;</div>
     <xsl:apply-templates select="named-item"/>
   </xsl:template>
 

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=332516&r1=332515&r2=332516&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 Fri Nov 11 02:59:53
2005
@@ -23,15 +23,7 @@
     <div class="coplet" id="coplet-{$copletId}">
       <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">
@@ -122,6 +114,15 @@
               </a>
             </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}">



Mime
View raw message