forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: r328841 - in /forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer: ./ resources/themes/default/html/ resources/themes/default/js/ resources/themes/pelt/html/ resources/themes/pelt/js/
Date Thu, 27 Oct 2005 09:39:22 GMT
Author: thorsten
Date: Thu Oct 27 02:39:02 2005
New Revision: 328841

URL: http://svn.apache.org/viewcvs?rev=328841&view=rev
Log:
moved the jscript matching and source into the themes dir to their corresponding theme. Next
are the images. Fixed the calling of skin/ to themes/ which is the new trigger.

Added:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/LICENSE-prototype.txt
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/LICENSE-prototype.txt
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/breadcrumbs-optimized.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/breadcrumbs-optimized.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/breadcrumbs.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/breadcrumbs.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/fontsize.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/fontsize.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/getBlank.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/getBlank.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/getMenu.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/getMenu.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/menu.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/menu.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/js/prototype.js
      - copied unchanged from r328626, forrest/trunk/main/webapp/skins/common/scripts/prototype.js
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/js/
Modified:
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-breadcrumbs.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-fontsize.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/helper-prototype-ajax.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section.ft
    forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap?rev=328841&r1=328840&r2=328841&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap (original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/output.xmap Thu
Oct 27 02:39:02 2005
@@ -35,6 +35,8 @@
       
       <map:generator name="directory"
         src="org.apache.cocoon.generation.DirectoryGenerator" />
+        <!-- <map:generator name="structurerXsl"
+        src="org.apache.forrest.structurer.generation.StructurerXSLGenerator" /> -->
     </map:generators>
     <map:transformers default="xslt">
       <map:transformer name="cinclude"
@@ -75,10 +77,12 @@
     <map:pipeline>
       <map:match pattern="test.**">
         <map:generate src="status.xml" />
+        <!-- <map:generate src="{lm:structurer.html.{1}}" type="structurerXsl"/>
-->
         <map:transform src="resources/stylesheets/temp.xsl">
           <map:parameter name="test"
-            value="{lm:themes/{1}.css}" />
+            value="{lm:themes/{1}.js}" />
         </map:transform>
+        
         <map:serialize />
       </map:match>
     </map:pipeline>
@@ -94,6 +98,10 @@
       
       <map:match pattern="themes/**.css">
          <map:read mime-type="text/css" src="{lm:themes/{1}.css}" />
+      </map:match>
+      
+      <map:match pattern="themes/**.js">
+         <map:read mime-type="application/x-javascript" src="{lm:themes/{1}.js}" />
       </map:match>
       
       <map:match pattern="**.js">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-breadcrumbs.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-breadcrumbs.ft?rev=328841&r1=328840&r2=328841&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-breadcrumbs.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-breadcrumbs.ft
Thu Oct 27 02:39:02 2005
@@ -63,7 +63,7 @@
            &gt; <a href="{$branding-breadcrumbs/trail/link3/@href}"> 
           <xsl:value-of select="$branding-breadcrumbs/trail/link3/@name"/></a>

           </xsl:if>
-        <script type="text/javascript" language="JavaScript" src="{$root}skin/breadcrumbs.js">&#160;</script>
+        <script type="text/javascript" language="JavaScript" src="{$root}themes/breadcrumbs.js">&#160;</script>
       </div>
         </xsl:template>
     </xsl:stylesheet>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-fontsize.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-fontsize.ft?rev=328841&r1=328840&r2=328841&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-fontsize.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/branding-fontsize.ft
Thu Oct 27 02:39:02 2005
@@ -29,7 +29,7 @@
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 			  <xsl:template name="branding-fontsize-head">
 		      <script type="text/javascript" language="javascript" 
-			        src="{$root}skin/fontsize.js">&#160;</script>
+			        src="{$root}themes/fontsize.js">&#160;</script>
 			  </xsl:template>
         
 			  <xsl:template name="branding-fontsize-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/helper-prototype-ajax.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/helper-prototype-ajax.ft?rev=328841&r1=328840&r2=328841&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/helper-prototype-ajax.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/default/html/helper-prototype-ajax.ft
Thu Oct 27 02:39:02 2005
@@ -34,7 +34,7 @@
     <xsl:stylesheet version="1.1" 
         xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
         <xsl:template name="helper-prototype-ajax-head">
-          <script type="text/javascript" src="{$root}skin/prototype.js">&#160;</script>
+          <script type="text/javascript" src="{$root}themes/prototype.js">&#160;</script>
         </xsl:template>
     </xsl:stylesheet>
   </forrest:template>

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section.ft?rev=328841&r1=328840&r2=328841&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/nav-section.ft
Thu Oct 27 02:39:02 2005
@@ -48,7 +48,7 @@
     <xsl:stylesheet version="1.1" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
       <xsl:template name="nav-section-head">
           <script type="text/javascript" language="javascript"
-              src="{$root}skin/menu.js">&#160;</script>
+              src="{$root}themes/menu.js">&#160;</script>
       </xsl:template>
 
       <xsl:template name="nav-section-body">

Modified: forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft
URL: http://svn.apache.org/viewcvs/forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft?rev=328841&r1=328840&r2=328841&view=diff
==============================================================================
--- forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft
(original)
+++ forrest/trunk/whiteboard/plugins/org.apache.forrest.plugin.output.themer/resources/themes/pelt/html/search-input.ft
Thu Oct 27 02:39:02 2005
@@ -38,7 +38,7 @@
 		  <!--FIXME: IMO each search provider should provide a form. This form should be refactored
into
         a meta-search from-->
       <xsl:template name="search-input-head">
-        <script type="text/javascript" language="javascript" src="{$root}skin/getBlank.js">&#160;</script>
+        <script type="text/javascript" language="javascript" src="{$root}themes/getBlank.js">&#160;</script>
       </xsl:template>
 
       <xsl:template name="search-input-body">



Mime
View raw message