cocoon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vgritse...@apache.org
Subject svn commit: r595367 - in /cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF: ./ resource/external/ resource/external/images/ resource/external/styles/ resource/internal/ stylesheets/
Date Thu, 15 Nov 2007 17:16:46 GMT
Author: vgritsenko
Date: Thu Nov 15 09:16:37 2007
New Revision: 595367

URL: http://svn.apache.org/viewvc?rev=595367&view=rev
Log:
new style for samples page header

Added:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/apache-logo.jpg
  (with props)
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/cocoon-logo.jpg
  (with props)
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/group-title-line.gif
  (with props)
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/logo-background.jpg
  (with props)
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/top-background.jpg
  (with props)
Removed:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/README.txt
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/internal/README.txt
Modified:
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/main.css
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap
    cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/stylesheets/simple-samples2html.xsl

Added: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/apache-logo.jpg
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/apache-logo.jpg?rev=595367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/apache-logo.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/cocoon-logo.jpg
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/cocoon-logo.jpg?rev=595367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/cocoon-logo.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/group-title-line.gif
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/group-title-line.gif?rev=595367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/group-title-line.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/logo-background.jpg
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/logo-background.jpg?rev=595367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/logo-background.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Added: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/top-background.jpg
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/top-background.jpg?rev=595367&view=auto
==============================================================================
Binary file - no diff available.

Propchange: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/images/top-background.jpg
------------------------------------------------------------------------------
    svn:mime-type = image/jpeg

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/main.css
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/main.css?rev=595367&r1=595366&r2=595367&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/main.css
(original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/resource/external/styles/main.css
Thu Nov 15 09:16:37 2007
@@ -42,6 +42,24 @@
 
 /* Samples */
 
+#top { background: url(/images/top-background.jpg) repeat-x; }
+#header { height: 129px; background: url(/images/logo-background.jpg) no-repeat; }
+.projectlogo { float: left; }
+.logoImage { margin: 30px 0 0 34px; }
+.grouplogo { margin: 10px 10px 0 0; float: right; }
+.grouptitle { margin: 0; padding-bottom: 5px; background: url(/images/group-title-line.gif)
repeat-x bottom; }
+.grouptitle a:link, .grouptitle a:visited { color: #545454; text-decoration: none; }
+#samplesBar { margin-bottom: 10px; height: 25px; border-top: 1px solid #f2f2f2; border-bottom:
1px solid #f2f2f2; }
+#samplesBar #links { margin: 5px 15px 0 0; padding: 0; list-style: none; float: right; }
+#samplesBar #links li.sep { padding: 0 16px; background: none; float: left; border: 0px;
}
+#samplesBar #links li { padding: 0 8px; background: none; float: left; border-right: 1px
solid #f2f2f2; }
+#samplesBar #links a { color: #acacac; text-decoration: none; }
+#samplesBar #links a:hover { text-decoration: underline; }
+.samplesBarClear { height: 1%; clear: both; }
+
+.samplesTitle a { text-decoration: none; }
+.samplesTitle a:hover { text-decoration: underline; }
+
 .samplesGroup {
     margin: 15px 0 10px 0;
     padding: 0 0 5px 17px;

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap?rev=595367&r1=595366&r2=595367&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap (original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/sitemap.xmap Thu Nov 15
09:16:37 2007
@@ -181,6 +181,10 @@
         <map:read src="resource/external/images/{1}.gif" mime-type="image/gif"/>
       </map:match>
 
+      <map:match pattern="images/*.jpg">
+        <map:read src="resource/external/images/{1}.jpg" mime-type="image/jpeg"/>
+      </map:match>
+
       <!-- CSS stylesheets -->
       <map:match pattern="styles/*.css">
         <map:read src="resource/external/styles/{1}.css" mime-type="text/css"/>

Modified: cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/stylesheets/simple-samples2html.xsl
URL: http://svn.apache.org/viewvc/cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/stylesheets/simple-samples2html.xsl?rev=595367&r1=595366&r2=595367&view=diff
==============================================================================
--- cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/stylesheets/simple-samples2html.xsl
(original)
+++ cocoon/trunk/blocks/cocoon-welcome/src/main/resources/COB-INF/stylesheets/simple-samples2html.xsl
Thu Nov 15 09:16:37 2007
@@ -29,50 +29,58 @@
   <xsl:variable name="stdLinks" select="samples/links/link[not(@role)]"/>
   <xsl:variable name="seeAlsoLinks" select="samples/links/link[@role='see-also']"/>
 
-  
+
   <xsl:template match="/">
     <html>
       <head>
-        <title>Apache Cocoon @version@</title>
+        <title>
+          <xsl:text>Apache Cocoon @version@</xsl:text>
+          <xsl:if test="samples/@name">
+            <xsl:text> | </xsl:text>
+            <xsl:value-of select="samples/@name"/>
+          </xsl:if>
+        </title>
         <link rel="SHORTCUT ICON" href="favicon.ico"/>
         <link href="{$contextPath}/styles/main.css" type="text/css" rel="stylesheet"/>
       </head>
       <body>
-       <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
-         <tr>
-           <td width="*">The Apache Software Foundation is proud to present...</td>
-           <td width="40%" align="center"><img border="0" src="{$contextPath}/images/cocoon.gif"/></td>
-           <td width="30%" align="center">Version: <b>@version@</b></td>
-         </tr>
-       </table>
-
-       <table border="0" cellspacing="2" cellpadding="2" align="center" width="100%">
-         <tr>
-           <td width="75%">
-             <h2><xsl:value-of select="samples/@name"/></h2>
-             <xsl:if test="$seeAlsoLinks">
-               <div class="seeAlsoLinks">
-                 <b>See also:</b>&#160;<xsl:apply-templates select="$seeAlsoLinks"/>
-               </div>
-             </xsl:if>
-           </td>
-           <td nowrap="nowrap" align="right">
-	           <xsl:apply-templates select="$stdLinks"/>
-	           <xsl:if test="not(samples/@add-view-links='false')">
-               Orthogonal views:
-               <a href="?cocoon-view=content">Content</a>
-               &#160;
-               <a href="?cocoon-view=pretty-content">Pretty content</a>
-               &#160;
-               <a href="?cocoon-view=links">Links</a>
-	           </xsl:if>
-           </td>
-         </tr>
-       </table>
+        <div id="top">
+          <div id="header">
+            <div class="projectlogo">
+              <a href="http://cocoon.apache.org/"><img class="logoImage" src="{$contextPath}/images/cocoon-logo.jpg"
alt="Apache Cocoon" border="0"/></a>
+            </div>
+            <div class="grouplogo">
+              <p class="grouptitle">
+                <a href="http://cocoon.apache.org/">The Apache Cocoon Project</a>
+                <img src="{$contextPath}/images/apache-logo.jpg" alt="Cocoon Project Logo"/>
+              </p>
+            </div>
+          </div>
+          <div id="samplesBar">
+            <h1 class="samplesTitle"><xsl:value-of select="samples/@name"/></h1>
+            <ul id="links">
+              <xsl:if test="$seeAlsoLinks">
+                <li class="sep">See also:</li>
+                <xsl:apply-templates select="$seeAlsoLinks"/>
+              </xsl:if>
+              <xsl:if test="$stdLinks">
+                <li class="sep"/>
+                <xsl:apply-templates select="$stdLinks"/>
+              </xsl:if>
+              <xsl:if test="not(samples/@add-view-links='false')">
+                <li class="sep">Orthogonal views:</li>
+                <li><a href="?cocoon-view=content">Content</a></li>
+                <li><a href="?cocoon-view=pretty-content">Pretty content</a></li>
+                <li><a href="?cocoon-view=links">Links</a></li>
+              </xsl:if>
+            </ul>
+          </div>
+          <div class="samplesBarClear"/>
+        </div>
 
        <xsl:apply-templates select="samples"/>
        <xsl:apply-templates select="samples/additional-info"/>
-       
+
        <p class="copyright">
          Copyright &#169; @year@ <a href="http://www.apache.org/">The Apache Software
Foundation</a>.
          All rights reserved.
@@ -199,6 +207,16 @@
   </xsl:template>
 
 
+  <xsl:template match="links/link">
+    <li><a href="{@href}"><xsl:value-of select="."/></a></li>
+  </xsl:template>
+
+  <xsl:template match="additional-info">
+    <h4><xsl:value-of select="@title"/></h4>
+    <xsl:copy-of select="node()"/>
+  </xsl:template>
+
+
   <xsl:template match="@*|node()" priority="-2">
     <xsl:copy>
       <xsl:apply-templates select="@*|node()"/>
@@ -208,16 +226,5 @@
   <xsl:template match="text()" priority="-1">
     <xsl:value-of select="."/>
   </xsl:template>
-  
-  <xsl:template match="links/link">
-    <a href="{@href}">
-      <xsl:value-of select="."/>
-    </a>
-  </xsl:template>
-  
-  <xsl:template match="additional-info">
-    <h4><xsl:value-of select="@title"/></h4>
-    <xsl:copy-of select="node()"/>
-  </xsl:template>
-  
+
 </xsl:stylesheet>



Mime
View raw message