forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r159971 - forrest/trunk/plugins/org.apache.forrest.plugin.leather forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs forrest/trunk/plugins/org.apache.forrest.plugin.view forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs
Date Mon, 04 Apr 2005 00:01:25 GMT
Author: thorsten
Date: Sun Apr  3 17:01:22 2005
New Revision: 159971

URL: http://svn.apache.org/viewcvs?view=rev&rev=159971
Log:
extracted the css to a file that is requested by the view. Fixed as well the path issues with linking to subdirs. More or less is working fine. :)

Added:
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/basic.css   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/Thumbs.db   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter_open.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/current.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/doc.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background-grad.png   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.png   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header_white_line.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/label.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/page.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/pdfdoc.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/printer.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-left.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-right.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/sidebar_bg.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/singlepage.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/spacer.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-left.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-right.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-off.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-on.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-off.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-on.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/xmldoc.gif   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets/contract.css.xsl   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap   (with props)
    forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.css.xsl   (with props)
Removed:
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/commands.xml
Modified:
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/output.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/content.ft
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/nav-main.ft
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/commands.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/site.xml
    forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties
    forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap
    forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.xhtml.xsl
    forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.leather/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/forrest.properties?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/forrest.properties Sun Apr  3 17:01:22 2005
@@ -26,7 +26,7 @@
 
 # Specifies name of Forrest skin to use
 #project.skin=tigris
-#project.skin=pelt
+project.skin=pelt
 
 # comma separated list, file:// is supported
 #forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
@@ -106,4 +106,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugin.leather,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugins.view,org.apache.forrest.plugins.leather,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.leather/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/output.xmap?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/output.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/output.xmap Sun Apr  3 17:01:22 2005
@@ -109,6 +109,14 @@
      <map:transform src="resources/stylesheets/contract.property.xsl"/>
      <map:serialize type="xml"/>
    </map:match>
+  <!--
+  Get the css of the requested contract. 
+  -->
+   <map:match pattern="get.contract-css.*">
+     <map:generate src="cocoon:/resolve.contract.{1}"/>
+     <map:transform src="resources/stylesheets/contract.css.xsl"/>
+     <map:serialize type="txt"/>
+   </map:match>
 <!-- ls.fbits 
   list the default fbits-->
   <map:pipeline>
@@ -140,7 +148,7 @@
     <map:match pattern="ls.contracts.l">
 		  <map:generate src="cocoon:/ls.contracts"/>
       <map:transform src="resources/stylesheets/ls.contracts.xsl">
-        <map:parameter name="contentDir" value="{forrest:plugins}/org.apache.forrest.plugin.views"/>
+        <map:parameter name="contentDir" value="{forrest:plugins}/org.apache.forrest.plugin.view"/>
       </map:transform>
       <map:transform src="resources/stylesheets/ls.contracts.html.xsl"/>
       <map:serialize type="xhtml"/>
@@ -153,7 +161,7 @@
     <map:match pattern="ls.contracts.project.l">
 		  <map:generate src="cocoon:/ls.contracts.project"/>
       <map:transform src="resources/stylesheets/ls.contracts.xsl">
-        <map:parameter name="contentDir" value="{forrest:plugins}/org.apache.forrest.plugin.views"/>
+        <map:parameter name="contentDir" value="{forrest:plugins}/org.apache.forrest.plugin.view"/>
       </map:transform>
       <map:transform src="resources/stylesheets/ls.contracts.html.xsl"/>
       <map:serialize type="xhtml"/>
@@ -195,8 +203,8 @@
      	<map:serialize type="xhtml"/>
     </map:match>
     <map:match pattern="**/*.html">
-      <map:generate src="cocoon://{1}{2}/{3}.page"/>
-      <map:transform src="cocoon://prepare.xhtml.{1}">
+      <map:generate src="cocoon://{1}/{2}.page"/>
+      <map:transform src="cocoon://prepare.xhtml.{1}/{2}">
         <map:parameter name="path" value="{0}"/>
       </map:transform>
      	<map:serialize type="xhtml"/>

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/basic.css
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/basic.css?view=auto&rev=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/basic.css (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/basic.css Sun Apr  3 17:01:22 2005
@@ -0,0 +1,148 @@
+/*============HTML tags==========================*/
+body {
+	text-align:center;
+	font-family: verdana, helvetica, sans;
+	font-size: 8pt;
+}
+img {border:0;}
+hr {border:0px; height: 1px; background-color:#ddd;}
+
+/*============Container and branding=============*/
+#container {
+	width: 750px;
+	text-align:left;
+	margin: 0 auto 12px auto;
+}
+#branding {
+	padding: 0;
+	height: 75px;
+	max-height: 75px;
+	background: url(images/header-background.gif) transparent;
+	background-repeat: no-repeat;
+	position: relative;
+}/*
+#projectlogo {
+	height: 75px;
+	width: 0;
+	padding: 5px;
+	float: left;
+}
+#search {
+	padding: 8px;
+	float: right;
+	font-family: verdana, helvetica, sans;
+	font-size: 8pt;
+	font-weight: bold;
+	color: #ddddff;
+}
+#search input {
+	font-size: 8pt;
+	font-family: verdana, helvetica, sans;
+}*/
+#spacer {
+    clear:both;
+}
+
+/*============Sub-tabs===========================*/
+#nav-main-sub {
+	text-align: right;
+	margin-right: 20px;
+}
+
+/*============Main content=======================*/
+#content {
+	clear: none;
+	margin-left: 25%;
+	padding: 10px;
+	font-family: verdana, helvetica, sans;
+	font-size: 10pt;
+	max-width: 75%;
+}
+#content-pdf {
+	float: right;
+	text-decoration: none;
+}
+#content-pdf a {
+	text-decoration: none;
+}
+#content h1 {
+	font-weight: bold;
+	font-size: 16pt;
+	letter-spacing: 2px;
+	padding: 0;
+	margin: 0;
+	display: block;
+	border-bottom: 2px solid #ddd;
+	color: #9AB;
+}
+#content h2 {
+	font-weight: bold;
+	font-size: 11pt;
+	letter-spacing: 1.5px;
+	padding: 0;
+	margin: 0;
+	display: block;
+	border-bottom: 2px solid #ddd;
+	color: #567;
+	font-family: "Trebuchet MS", helvetica, sans
+}
+#content h3 {
+	font-weight: bold;
+	font-size: 10pt;
+	letter-spacing: 1px;
+	padding: 0;
+	margin: 0;
+	display: block;
+	border-bottom: 2px solid #ddd;
+	color: #567;
+	font-family: verdana, helvetica, sans
+}
+
+#content a {
+	text-decoration:underline;
+	color: #567;
+}
+#content a:hover {
+	text-decoration:none;
+	color: #678;
+}
+
+/*============Labels, fixme etc.=================*/
+.frame {
+	border: solid black 1px;
+	margin: 1em 3em;
+}
+.frame .label {
+	background: #369;
+	color: white;
+	font-weight: bold;
+	padding: 5px 10px;
+}
+.frame .content {
+	padding: 5px 10px;
+	background: #F0F0FF;
+	color: black;
+	line-height: 170%;
+	font-size: 90%;
+}
+.warning .label {
+	background: #C00;
+	color: white;
+}
+.warning .content {
+	background: #FFF0F0;
+	color: black;
+}
+.fixme .label {
+	background: #C6C600;
+}
+
+/*============Footer=============================*/
+#siteinfo {
+	text-align: center;
+	clear: both;
+	padding: 5px;
+}
+#siteinfo p {
+	margin: 5px;
+}

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/css/basic.css
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/Thumbs.db
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/Thumbs.db?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/Thumbs.db
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter_open.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter_open.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/chapter_open.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/current.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/current.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/current.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/doc.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/doc.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/doc.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background-grad.png
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background-grad.png?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background-grad.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.png
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.png?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header-background.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header_white_line.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header_white_line.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/header_white_line.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/label.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/label.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/label.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/page.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/page.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/page.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/pdfdoc.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/pdfdoc.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/pdfdoc.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/printer.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/printer.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/printer.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-left.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-left.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-left.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-right.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-right.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/search-right.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/sidebar_bg.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/sidebar_bg.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/sidebar_bg.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/singlepage.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/singlepage.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/singlepage.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/spacer.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/spacer.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/spacer.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-left.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-left.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-left.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-right.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-right.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tab-right.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-off.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-off.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-off.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-on.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-on.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tl-on.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-off.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-off.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-off.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-on.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-on.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/tr-on.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/xmldoc.gif
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/xmldoc.gif?view=auto&rev=159971
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/skin/images/xmldoc.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets/contract.css.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets/contract.css.xsl?view=auto&rev=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets/contract.css.xsl (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets/contract.css.xsl Sun Apr  3 17:01:22 2005
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<xsl:stylesheet version="1.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:forrest="http://apache.org/forrest/templates/1.0">
+  
+  <xsl:template match="/">
+    <xsl:apply-templates select="//forrest:template/xsl:stylesheet/xsl:template[contains(@name,'-css')]"/>
+  </xsl:template>
+
+	<xsl:template match="xsl:template[contains(@name,'-css')]">
+    <xsl:value-of select="."/>
+	</xsl:template>
+</xsl:stylesheet>

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/stylesheets/contract.css.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/content.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/content.ft?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/content.ft (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/content.ft Sun Apr  3 17:01:22 2005
@@ -83,6 +83,10 @@
 #content a:hover {
 	text-decoration:none;
 	color: #678;
+}
+.section {
+	text-decoration:none;
+	color: #000;
 }</xsl:template>   
 		  <xsl:template name="content-body">
 <xsl:comment>+

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/nav-main.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/nav-main.ft?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/nav-main.ft (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/resources/templates/nav-main.ft Sun Apr  3 17:01:22 2005
@@ -39,7 +39,7 @@
 }
 #branding li {
 	float: right;
-	background: transparent url("images/tr-on.gif") 100% 0% no-repeat;
+	background: transparent url("/skin/images/tr-on.gif") 100% 0% no-repeat;
 	padding: 0 6px 0 0;
 	margin: 0 1px 0 0;
 	border-bottom: 1px solid #515358;
@@ -48,16 +48,16 @@
 	float: left;
 	display: block;
 	padding: 4px 4px 4px 10px;
-	background: transparent url("images/tl-on.gif") no-repeat;
+	background: transparent url("/skin/images/tl-on.gif") no-repeat;
 	font-weight: bold;
 	color: #fff;
 	text-decoration: none;
 }
-#branding ul li:hover a {background: url("images/tl-off.gif") no-repeat;}
-#branding ul li:hover {background: url("images/tr-off.gif") 100% 0% no-repeat;}
+#branding ul li:hover a {background: url("/skin/images/tl-off.gif") no-repeat;}
+#branding ul li:hover {background: url("/skin/images/tr-off.gif") 100% 0% no-repeat;}
 
-#branding ul li.current a {background: url("images/tl-off.gif") no-repeat;}
-#branding ul li.current {background: url("images/tr-off.gif") 100% 0% no-repeat;}
+#branding ul li.current a {background: url("/skin/images/tl-off.gif") no-repeat;}
+#branding ul li.current {background: url("/skin/images/tr-off.gif") 100% 0% no-repeat;}
 
 </xsl:template>
 		  

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/commands.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/commands.xml?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/commands.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/commands.xml Sun Apr  3 17:01:22 2005
@@ -24,13 +24,13 @@
     <section>
       <title>ls - list directory contents</title>
       <dl>
-        <dt><a href="/ls.contracts">ls.contracts</a></dt>
+        <dt><a href="site:ls.contracts">ls.contracts</a></dt>
         <dd>list the default contracts as xml</dd>
-        <dt><a href="/ls.contracts.l">ls.contracts.l</a></dt>
+        <dt><a href="site:ls.contracts.l">ls.contracts.l</a></dt>
         <dd>transform the dir-list (ls.contrcats) and add more information about usage</dd>
-        <dt><a href="/ls.contracts.project">ls.contracts.project</a> <strong>NOT working in views plugin</strong> </dt>
+        <dt><a href="site:ls.contracts.project">ls.contracts.project</a> <strong>NOT working in views plugin</strong> </dt>
         <dd>list the project specific contracts as xml</dd>
-        <dt><a href="/ls.contracts.project.l">ls.contracts.project.l</a> <strong>NOT working in views plugin</strong></dt>
+        <dt><a href="site:ls.contracts.project.l">ls.contracts.project.l</a> <strong>NOT working in views plugin</strong></dt>
         <dd>transform the dir-list (ls.contrcats.project) and add more information about usage</dd>
       </dl>
     </section>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/site.xml?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.leather/src/documentation/content/xdocs/site.xml Sun Apr  3 17:01:22 2005
@@ -35,6 +35,12 @@
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.views"/>
     <commands label="commands" href="commands.html" description="All commands of this plugin"/>
+    	
+    <ls.contracts label="ls.contracts" href="ls.contracts" description="ls.contracts"/>
+	<ls.contracts label="ls.contracts.l" href="ls.contracts.l" description="ls.contracts"/>
+	<ls.contracts label="ls.contracts.project" href="ls.contracts.project" description="ls.contracts"/>
+	<ls.contracts label="ls.contracts.project.l" href="ls.contracts.project.l" description="ls.contracts"/>
+	
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/forrest.properties Sun Apr  3 17:01:22 2005
@@ -27,6 +27,7 @@
 # Specifies name of Forrest skin to use
 #project.skin=tigris
 #project.skin=pelt
+#project.skin=leather-dev
 
 # comma separated list, file:// is supported
 #forrest.skins.descriptors=http://forrest.apache.org/skins/skins.xml,file:///c:/myskins/skins.xml
@@ -106,4 +107,4 @@
 # The names of plugins that are required to build the project
 # comma separated list (no spaces)
 # Run "forrest available-plugins" for a list of plug-ins currently available
-project.required.plugins=org.apache.forrest.plugins.view,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output
+project.required.plugins=org.apache.forrest.plugins.view,org.apache.forrest.plugins.leather,org.apache.forrest.plugin.projectInfo,org.apache.forrest.plugin.pdf-output

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/internal.xmap Sun Apr  3 17:01:22 2005
@@ -52,7 +52,7 @@
 	      <doctype-system>http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd</doctype-system>
 	      <encoding>UTF-8</encoding>
 	    </map:serializer>
-      <map:serializer name="txt" 
+      <map:serializer name="text" 
 			   src="org.apache.cocoon.serialization.TextSerializer"
 			   mime-type="text/plain" 
 			   logger="sitemap.serializer.text" 
@@ -70,45 +70,7 @@
   -->
 
 
-<!--
-  2. nuggets
-  This is the content producing factory.
-  -->
-<!--NOTE: 
-  The current factory uses the skin producing templates (e.g. document2xhtml.xsl).
-  It is only exchanging the last step of a skin producing pipe (site2xhtml.xsl) till now.
-  This will have to be changed in the future.
-  -->  
-  <map:pipeline>
-    <map:match pattern="*.page">
-				<map:aggregate element="site">
-          <map:part src="cocoon://skinconf.xml"/>
-          <map:part src="cocoon://build-info"/>
-          <map:part src="cocoon://tab-{1}.html"/>
-          <map:part src="cocoon://menu-{1}.html"/>
-          <map:part src="cocoon://body-{1}.html"/>
-          <map:part src="cocoon:/prepare.view-nugget.{1}"/>
-        </map:aggregate>
-        <map:serialize type="xml"/>
-    </map:match>
-    <map:match pattern="**/*.page">
-        <map:aggregate element="site">
-          <map:part src="cocoon://skinconf.xml"/>
-          <map:part src="cocoon://build-info"/>
-          <map:part src="cocoon://{1}/tab-{2}.html"/>
-          <map:part src="cocoon://{1}/menu-{2}.html"/>
-          <map:part src="cocoon://{1}/body-{2}.html"/>
-          <map:part src="cocoon:/prepare.view-nugget.{2}"/>
-        </map:aggregate>
-        <map:serialize type="xml"/>
-      </map:match>
- 
-  </map:pipeline>  
 
-  
-<!-- END
-	2. nuggets
-	-->
 <!--
   3. views
   prepares and transforms the requested contracts (fbits) and populate them with the content (nuggets).
@@ -119,7 +81,7 @@
     File specific views have priority before default ones.
     If no views can be found in the project we use the default one of the view plugin.
     -->
-    <map:match pattern="prepare.view.*">
+    <map:match pattern="prepare.view.**">
       <map:select type="exists">
         <!--
           Here we will have to test, whether the requested page needs a specific view.
@@ -146,7 +108,7 @@
     </map:match>
     
     <!--Add nuggets to the view that the content can be used later on.-->
-    <map:match pattern="prepare.view-nugget.*">
+    <map:match pattern="prepare.view-nugget.**">
       <map:generate src="cocoon:/prepare.view.{1}"/>
       <map:transform src="resources/stylesheets/prepare.view.xsl">
         <map:parameter name="view" value="{1}"/>
@@ -158,7 +120,7 @@
   Aggregate the contract-templates requested by the view with xinclude.
   The result is a stylesheet with all needed xsl:templates.
   -->
-    <map:match pattern="prepare.include.*">
+    <map:match pattern="prepare.include.**">
       <map:generate src="cocoon:/prepare.view.{1}"/>
       <map:transform src="resources/stylesheets/prepare.include.xsl">
 	      <map:parameter name="config-file" value="{project:skinconf}"/>
@@ -171,7 +133,7 @@
       Aggregate the forrest:properties requested by the *.fv.
       The result is an aggregation of properties which defines the templates to be call.
       -->
-    <map:match pattern="prepare.properties.*">
+    <map:match pattern="prepare.properties.**">
       <map:generate src="cocoon:/prepare.view.{1}"/>
       <map:transform src="resources/stylesheets/prepare.properties.xsl"/>
       <map:transform type="xinclude"/> 
@@ -181,7 +143,7 @@
       Aggregate all contracts-templates requested by the view.
       Create a xsl that can be used for the last step of the transformation of the view.
   		--> 
-    <map:match pattern="prepare.xhtml.*">
+    <map:match pattern="prepare.xhtml.**">
       <map:aggregate element="forrest:filter">
         <map:part src="cocoon://prepare.view.{1}" />
         <map:part src="cocoon://prepare.properties.{1}" /> 
@@ -192,7 +154,74 @@
       <map:transform type="xinclude"/> 
      	<map:serialize type="xml"/>
     </map:match>
-
+    <!--
+      Aggregate all contracts-css requested by the view.
+  		--> 
+    <map:match pattern="skin/contracts-**.css">
+      <map:aggregate element="forrest:css">
+        <map:part src="cocoon://skinconf.xml" />
+        <map:part src="cocoon://prepare.properties.{1}" /> 
+      </map:aggregate>
+      <map:transform src="resources/stylesheets/prepare.css.xsl" />
+      <map:transform type="xinclude"/> 
+     	<map:serialize type="text" mime-type="text/css"/>
+    </map:match>
   </map:pipeline>
+  
+  <!--
+  2. nuggets
+  This is the content producing factory.
+  -->
+<!--NOTE: 
+  The current factory uses the skin producing templates (e.g. document2xhtml.xsl).
+  It is only exchanging the last step of a skin producing pipe (site2xhtml.xsl) till now.
+  This will have to be changed in the future.
+  -->  
+  <map:pipeline>
+    <map:match pattern="*.page">
+				<map:aggregate element="site">
+          <map:part src="cocoon://skinconf.xml"/>
+          <map:part src="cocoon://build-info"/>
+          <map:part src="cocoon://tab-{1}.html"/>
+          <map:part src="cocoon://menu-{1}.html"/>
+          <map:part src="cocoon://body-{1}.html"/>
+          <map:part src="cocoon:/prepare.view-nugget.{1}"/>
+        </map:aggregate>
+        <map:serialize type="xml"/>
+    </map:match>
+    <map:match pattern="**/*.page">
+        <map:aggregate element="site">
+          <map:part src="cocoon://skinconf.xml"/>
+          <map:part src="cocoon://build-info"/>
+          <map:part src="cocoon://{1}/tab-{2}.html"/>
+          <map:part src="cocoon://{1}/menu-{2}.html"/>
+          <map:part src="cocoon://{1}/body-{2}.html"/>
+          <map:part src="cocoon:/prepare.view-nugget.{2}"/>
+        </map:aggregate>
+        <map:serialize type="xml"/>
+      </map:match>
+      
+       <map:match pattern="**.js">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+      <map:match pattern="**.css">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+      <map:match pattern="**images**">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+      <map:match pattern="**.png">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match>
+     <map:match pattern="**.ico">
+        <map:mount uri-prefix="" src="resources.xmap" check-reload="yes" />
+      </map:match> 
+  </map:pipeline>  
+
+  
+<!-- END
+	2. nuggets
+	-->
+  
  </map:pipelines>
 </map:sitemap>

Added: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap?view=auto&rev=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap Sun Apr  3 17:01:22 2005
@@ -0,0 +1,403 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!-- ===============================================
+Pipelines for resources (css, images, javascript etc).
+
+
+Generates  :  CSS, images (possibly from SVG), javascript.
+Example URL:  http://localhost:8888/images/project-logo.gif
+Used by    :  sitemap.xmap
+Uses       :  resources/*, skins/*/{css,images}
+
+$Revision: 1.13 $
+==================================================== -->
+<map:sitemap xmlns:map="http://apache.org/cocoon/sitemap/1.0">
+   <map:components>
+      <map:generators default="file" >
+        <map:generator name="asciiart-svg"
+                       src="org.apache.cocoon.generation.asciiart.AsciiArtSVGGenerator"/>
+        <map:generator name="text" 
+                       src="org.apache.cocoon.generation.TextGenerator">
+    <parameter name="localizable" value="true"/>
+   </map:generator>
+      </map:generators>               
+      <map:serializers default="html">
+         <map:serializer name="svg2jpeg" mime-type="image/jpeg" src="org.apache.cocoon.serialization.SVGSerializer">
+            <parameter name="quality" type="float" value="1.0" />
+         </map:serializer>
+         <map:serializer mime-type="image/png" 
+                         name="svg2png" 
+                         src="org.apache.cocoon.serialization.SVGSerializer" >
+            <!--<parameter name="background_color" type="color" value="#ff00ff"/>-->
+            <!-- <parameter name="gamma" type="float" value="0.48"/> -->
+            <parameter name="gamma" type="float" value="0"/>
+         </map:serializer>                
+         <map:serializer name="text"   mime-type="text/plain"  src="org.apache.cocoon.serialization.TextSerializer"/>
+      </map:serializers>
+      <map:transformers default="xslt">
+       <map:transformer name="pattern" 
+                        src="org.apache.cocoon.transformation.PatternTransformer">
+        <parameter name="groups" value="true"/>
+       </map:transformer>
+      </map:transformers>
+      
+      <map:readers default="resource" />
+      <map:matchers default="wildcard" />
+   </map:components>
+
+   <map:resources>
+      <map:resource name="skin-read">
+            <map:select type="exists">
+              <!-- First location: project skin dir -->
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.css">
+		         <map:call resource="read-linked-text">
+		           <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.css" />
+		         </map:call>
+               </map:when>
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.{ext}">
+                  <map:read src="{project:skins-dir}{forrest:skin}/{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:when>
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.css.xslt">
+                  <map:call resource="pipe-text-resource">
+                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.css.xslt" />
+                    <map:parameter name="mime-type" value="text/css" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-resource">
+                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" />
+                  </map:call>
+               </map:when>
+               
+              <!-- Second location: leather skin dir -->
+
+               <map:when test="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.css">
+		         <map:call resource="read-linked-text">
+		           <map:parameter name="path" value="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.css" />
+		         </map:call>
+               </map:when>
+               <map:when test="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.{ext}">
+                  <map:read src="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:when>
+               <map:when test="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.css.xslt">
+                  <map:call resource="pipe-text-resource">
+                    <map:parameter name="path" value="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.css.xslt" />
+                    <map:parameter name="mime-type" value="text/css" />
+                  </map:call>
+               </map:when>
+               <map:when test="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-resource">
+                    <map:parameter name="path" value="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.svg.xslt" />
+                  </map:call>
+               </map:when>
+               
+              <!-- Third location: forrest common skin dir -->
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.css">
+		         <map:call resource="read-linked-text">
+		           <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.css" />
+		         </map:call>
+               </map:when>
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.{ext}">
+                  <map:read src="{forrest:context}/skins/common/{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:when>
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.css.xslt">
+                  <map:call resource="pipe-text-resource">
+                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.css.xslt" />
+                    <map:parameter name="mime-type" value="text/css" />
+                  </map:call>
+               </map:when>
+               <map:when test="{forrest:context}/skins/common/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-resource">
+                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
+                  </map:call>
+               </map:when>
+               <map:otherwise>
+                   <!-- this should always fail; it is used so the error has the correct filename and extension -->
+                  <map:read src=".../{path}/{name}.{ext}" mime-type="{mime-type}" />
+               </map:otherwise>
+            </map:select>
+      </map:resource>
+
+       <map:resource name="read-svg2png-corner-resource">
+            <map:select type="exists">
+               <map:when test="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-corner-resource">
+                    <map:parameter name="path" value="{project:skins-dir}{forrest:skin}/{path}/{name}.svg.xslt" />
+                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+                    <map:parameter name="size" value="{size}"/>   
+                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+                  </map:call>
+               </map:when>
+               <map:when test="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.svg.xslt">
+                  <map:call resource="pipe-transformed-svg2png-corner-resource">
+                    <map:parameter name="path" value="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/skin/{path}/{name}.svg.xslt" />
+                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+                    <map:parameter name="size" value="{size}"/>   
+                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+                  </map:call>
+               </map:when>
+               <map:otherwise>
+                  <map:call resource="pipe-svg2png-corner-resource">
+                    <map:parameter name="path" value="{forrest:context}/skins/common/{path}/{name}.svg.xslt" />
+                    <map:parameter name="orientation-tb" value="{orientation-tb}"/>
+                    <map:parameter name="orientation-lr" value="{orientation-lr}"/>
+                    <map:parameter name="size" value="{size}"/>   
+                    <map:parameter name="bg-color-name" value="{bg-color-name}"/>
+                    <map:parameter name="stroke-color-name" value="{stroke-color-name}"/>
+                    <map:parameter name="fg-color-name" value="{fg-color-name}"/>   
+                  </map:call>
+               </map:otherwise>
+            </map:select>
+      </map:resource>
+      
+      <map:resource name="pipe-text-resource">
+        <map:call resource="generate-transformed-resource">
+           <map:parameter name="path" value="{path}" />
+         </map:call>
+         <map:serialize type="text" mime-type="{mime-type}"/>
+      </map:resource>
+
+      <map:resource name="pipe-aggregate-svg2png-resource">
+         <map:call resource="generate-aggregate-resource">
+           <map:parameter name="path" value="{path}" />
+         </map:call>
+         <map:call resource="transform-project2text"/>
+         <map:transform src="{forrest:stylesheets}/extract-svg.xsl"/>
+         <map:serialize type="svg2png" />
+      </map:resource>
+
+      <map:resource name="pipe-transformed-svg2png-resource">
+         <map:call resource="generate-transformed-resource">
+           <map:parameter name="path" value="{path}" />
+         </map:call>
+         <map:call resource="transform-project2text"/>
+         <map:serialize type="svg2png" />
+      </map:resource>
+
+      <map:resource name="pipe-svg2png-corner-resource">
+        <map:generate src="cocoon://skinconf.xml" />
+        <map:transform src="{path}">
+            <map:parameter name="orientation-tb" 
+                         value="{orientation-tb}"/>
+            <map:parameter name="orientation-lr" 
+                         value="{orientation-lr}"/>
+            <map:parameter name="size" 
+                         value="{size}"/>
+            <map:parameter name="bg-color-name" 
+                         value="{bg-color-name}"/>
+            <map:parameter name="stroke-color-name" 
+                         value="{stroke-color-name}"/>
+            <map:parameter name="fg-color-name" 
+                         value="{fg-color-name}"/>            
+        </map:transform>
+        <map:call resource="transform-project2text"/>
+        <map:serialize type="svg2png" />
+      </map:resource>
+      
+      <map:resource name="generate-aggregate-resource">
+        <map:aggregate element="resource">
+          <map:part src="cocoon://skinconf.xml" />
+          <map:part src="{path}"/>
+        </map:aggregate>
+      </map:resource>
+      
+      <map:resource name="generate-transformed-resource">
+        <map:generate src="cocoon://skinconf.xml" />
+        <map:transform src="{path}"/>
+      </map:resource>
+      
+      <map:resource name="transform-project2text">
+         <map:transform src="{forrest:stylesheets}/project2text.xsl"/>
+      </map:resource>
+      
+      <map:resource name="read-linked-text">
+        <map:generate type="text" src="{path}" />
+        <map:transform type="pattern" src="{forrest:context}/resources/chaperon/grammars/link.xlex"/>
+        <map:transform src="{forrest:context}/resources/chaperon/stylesheets/pattern2link.xsl"/>                  
+        <map:serialize type="text" mime-type="text/css"/>
+      </map:resource>
+
+   </map:resources>
+   
+   <map:pipelines>
+       <map:pipeline>
+         <map:match pattern="**skin/**.js">
+            <map:call resource="skin-read">
+               <map:parameter name="path" value="scripts" />
+               <map:parameter name="name" value="{2}" />
+               <map:parameter name="ext" value="js" />
+               <map:parameter name="mime-type" value="application/x-javascript" />
+            </map:call>
+         </map:match>
+
+         <map:match pattern="**skin/**.css">
+            <map:call resource="skin-read">
+               <map:parameter name="path" value="css" />
+               <map:parameter name="name" value="{2}" />
+               <map:parameter name="ext" value="css" />
+               <map:parameter name="mime-type" value="text/css" />
+            </map:call>
+         </map:match>
+
+         <!-- special case corner generator pipeline -->
+         <map:match pattern="skin/images**/*c-*-*-*-1*-2*-3*.png">
+            <map:call resource="read-svg2png-corner-resource">
+               <map:parameter name="path" value="images/{1}" />
+               <map:parameter name="name" value="{2}c" />
+               <map:parameter name="orientation-tb" value="{3}"/>
+               <map:parameter name="orientation-lr" value="{4}"/>
+               <map:parameter name="size" value="{5}"/>    
+               <map:parameter name="bg-color-name" value="{6}"/>
+               <map:parameter name="stroke-color-name" value="{7}"/>
+               <map:parameter name="fg-color-name" value="{8}"/>    
+            </map:call>
+         </map:match>
+         
+         <map:match pattern="skin/images**/*.*">
+            <map:call resource="skin-read">
+               <map:parameter name="path" value="images/{1}" />
+               <map:parameter name="name" value="{2}" />
+               <map:parameter name="ext" value="{3}" />
+               <map:parameter name="mime-type" value="image/{3}" />
+            </map:call>
+         </map:match>
+
+         <!-- handles images local to a contributor directory -->
+         <map:match pattern="**my-images/**.*">
+            <map:read src="{project:content.xdocs}{1}my-images/{2}.{3}" mime-type="image/{3}" />
+         </map:match>
+
+         <map:match pattern="images/**.png">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/images/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="{project:content.xdocs}/images/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:resources.images}/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="{project:resources.images}/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="resources/images/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="resources/images/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:content.xdocs}/images/{1}.png">
+                  <map:read src="{project:content.xdocs}/images/{1}.png" mime-type="image/png" />
+               </map:when>
+               <map:when test="resources/images/{1}.png">
+                  <map:read src="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/images/{1}.png" mime-type="image/png" />
+               </map:when>
+               <map:when test="{project:resources.images}/{1}.png">
+                  <map:read src="{project:resources.images}/{1}.png" mime-type="image/png" />
+               </map:when>
+               <map:otherwise>
+                 <!-- needed for compatibility for the standard resources/images that are now
+                      in the common skin -->
+                 <map:call resource="skin-read">
+                   <map:parameter name="path" value="images" />
+                   <map:parameter name="name" value="{1}" />
+                   <map:parameter name="ext" value="png" />
+                   <map:parameter name="mime-type" value="image/png" />
+                 </map:call>
+               </map:otherwise>
+            </map:select>
+         </map:match>
+         
+         <map:match pattern="images/**.*">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/images/{1}.{2}">
+                  <map:read src="{project:content.xdocs}/images/{1}.{2}" mime-type="image/{2}" />
+               </map:when>
+               <map:when test="resources/images/{1}.{2}">
+                  <map:read src="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/images/{1}.{2}" mime-type="image/{2}" />
+               </map:when>
+               <map:when test="{project:resources.images}/{1}.{2}">
+                  <map:read src="{project:resources.images}/{1}.{2}" mime-type="image/{2}" />
+               </map:when>
+               <map:otherwise>
+                 <!-- needed for compatibility for the standard resources/images that are now
+                      in the common skin -->
+                 <map:call resource="skin-read">
+                   <map:parameter name="path" value="images" />
+                   <map:parameter name="name" value="{1}" />
+                   <map:parameter name="ext" value="{2}" />
+                   <map:parameter name="mime-type" value="image/{2}" />
+                 </map:call>
+               </map:otherwise>
+            </map:select>
+         </map:match>
+
+         <map:match pattern="**/images/**.*">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/{1}/images/{2}.{3}">
+                  <map:read src="{project:content.xdocs}/{1}/images/{2}.{3}" mime-type="image/{3}" />
+               </map:when>
+               <map:when test="resources/images/{2}.{3}">
+                  <map:read src="{forrest:plugins}/org.apache.forrest.plugin.leather/resources/images/{2}.{3}" mime-type="image/{3}" />
+               </map:when>
+               <map:otherwise>
+                  <map:read src="{project:resources.images}/{2}.{3}" mime-type="image/{3}" />
+               </map:otherwise>
+            </map:select>
+         </map:match>
+
+         <map:match pattern="**.png">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/{1}.svg">
+                  <map:call resource="pipe-aggregate-svg2png-resource">
+                    <map:parameter name="path" value="{project:content.xdocs}/{1}.svg" />
+                  </map:call>
+               </map:when>
+               <map:when test="{project:content.xdocs}/{1}.aart">
+                  <map:generate type="asciiart-svg" src="{project:content.xdocs}/{1}.aart" />
+                  <map:call resource="transform-project2text"/>
+                  <map:serialize type="svg2png" />
+               </map:when>
+               <map:otherwise>
+                  <map:read src="{project:content.xdocs}/{1}.png" mime-type="image/png" />
+               </map:otherwise>
+            </map:select>
+         </map:match>
+
+         <map:match pattern="**.ico">
+            <map:select type="exists">
+               <map:when test="{project:content.xdocs}/{1}.ico">
+                  <map:read src="{project:content.xdocs}/{1}.ico" mime-type="image/x-icon" />
+               </map:when>
+               <map:otherwise>
+                 <map:call resource="skin-read">
+                   <map:parameter name="path" value="images" />
+                   <map:parameter name="name" value="{1}" />
+                   <map:parameter name="ext" value="ico" />
+                   <map:parameter name="mime-type" value="image/x-icon" />
+                 </map:call>
+               </map:otherwise>
+            </map:select>
+         </map:match>
+      </map:pipeline>
+   </map:pipelines>
+</map:sitemap>

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources.xmap
------------------------------------------------------------------------------
    svn:eol-style = native

Added: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.css.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.css.xsl?view=auto&rev=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.css.xsl (added)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.css.xsl Sun Apr  3 17:01:22 2005
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+<!--
+  Copyright 2002-2004 The Apache Software Foundation or its licensors,
+  as applicable.
+
+  Licensed under the Apache License, Version 2.0 (the "License");
+  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
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<xsl:stylesheet version="1.0" 
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+  xmlns:xi="http://www.w3.org/2001/XInclude"
+  xmlns:forrest="http://apache.org/forrest/templates/1.0" 
+  >
+  
+  <xsl:template match="/">
+		  <xsl:for-each select="//forrest:properties/*[@css='true']">
+	      <xi:include href="cocoon://get.contract-css.{@name}" />
+		  </xsl:for-each>
+      <test><xsl:apply-templates select="//extra-css"/></test>
+  </xsl:template>
+  <xsl:template match="extra-css">
+    <xsl:value-of select="."/>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.css.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.xhtml.xsl
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.xhtml.xsl?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.xhtml.xsl (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/resources/stylesheets/prepare.xhtml.xsl Sun Apr  3 17:01:22 2005
@@ -38,12 +38,12 @@
 		      <alias:call-template name="{@name}-head" />
 			  </xsl:for-each>
 		   </alias:template>
-	    <xsl:comment>All xhtml css elements requested by the forrest:template</xsl:comment>
+	    <!--<xsl:comment>All xhtml css elements requested by the forrest:template</xsl:comment>
 			<alias:template name="getCss">
 			  <xsl:for-each select="/*/forrest:properties/*[@css='true']">
 		      <alias:call-template name="{@name}-css" />
 			  </xsl:for-each>
-		   </alias:template>
+		   </alias:template>-->
 		   	   
        <xsl:comment>All xhtml body elements requested by the forrest:template</xsl:comment>
 			 <alias:template name="getBody">
@@ -54,7 +54,7 @@
         <xhtml>
       		<head>
     				<alias:call-template name="getHead"/>
-            <style type="text/css">
+            <!--<style type="text/css">
 body {
 	text-align:center;
 	font-family: verdana, helvetica, sans;
@@ -84,9 +84,13 @@
     clear:both;
 }
 <alias:call-template name="getCss"/>
-</style>
-            <!--<link rel="stylesheet" href="{$root}skin/basic.css" type="text/css" 
-                />-->
+</style>-->
+            <link rel="stylesheet" type="text/css" >
+              <xsl:attribute name="href">{$root}skin/basic.css</xsl:attribute>
+            </link>
+             <link rel="stylesheet" type="text/css" >
+              <xsl:attribute name="href">{$root}skin/contracts-<xsl:value-of select="$request"/>.css</xsl:attribute>
+            </link>
 						<title>
                 <alias:value-of select="div[@id='content']/h1"/>
             </title>

Modified: forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewcvs/forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml?view=diff&r1=159970&r2=159971
==============================================================================
--- forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml (original)
+++ forrest/trunk/plugins/org.apache.forrest.plugin.view/src/documentation/content/xdocs/site.xml Sun Apr  3 17:01:22 2005
@@ -34,7 +34,6 @@
 
   <about label="About">
     <index label="Index" href="index.html" description="Welcome to org.apache.forrest.plugin.views"/>
-    <commands label="commands" href="commands.html" description="All commands of this plugin"/>
     <changes label="Changes" href="changes.html" description="History of Changes" />
     <todo label="Todo" href="todo.html" description="Todo List" />
   </about>



Mime
View raw message