forrest-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nicola...@apache.org
Subject cvs commit: xml-forrest/src/resources/conf resources.xmap
Date Fri, 17 Oct 2003 15:42:36 GMT
nicolaken    2003/10/17 08:42:36

  Modified:    .        build.xml
               src/resources/skins/common/images README.txt
               src/resources/conf resources.xmap
  Added:       src/resources/skins/common/images add.jpg fix.jpg
                        forrest-credit-logo.png hack.jpg remove.jpg rss.png
                        update.jpg vcss.png
  Log:
        <action dev="NKB" type="update" context="core">
           Images in skins/common/images are used if the corresponding image
           is not found in the skin being used.
           Moved under this dir the images
           that were placed by default under resources/images, and added a
           temporary sitemap rule to route the request of these to the new location.
           Moved also the common images in this dir to reduce unneeded duplication.
        </action>
  
  Revision  Changes    Path
  1.79      +0 -7      xml-forrest/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/xml-forrest/build.xml,v
  retrieving revision 1.78
  retrieving revision 1.79
  diff -u -r1.78 -r1.79
  --- build.xml	4 Oct 2003 08:41:15 -0000	1.78
  +++ build.xml	17 Oct 2003 15:42:35 -0000	1.79
  @@ -270,17 +270,10 @@
         <fileset dir="${resource.dir}/schema"/>
       </copy>
   
  -    <!-- Copy default image files. These may be overridden by identically named
  -    files in ${project.home}/src/documentation/resources/images. -->
  -    <copy todir="${bare-context.dir}/resources/images" >
  -      <fileset dir="${resource.dir}/images"/>
  -    </copy>
  -
       <!-- Copy Chaperon grammars -->
       <copy todir="${bare-context.dir}/resources/grammars" >
         <fileset dir="${resource.dir}/grammars"/>
       </copy>
  -
   
       <!-- Copy Cocoon configuration and sitemap -->
       <copy todir="${bare-context.dir}">
  
  
  
  1.2       +1 -3      xml-forrest/src/resources/skins/common/images/README.txt
  
  Index: README.txt
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/skins/common/images/README.txt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- README.txt	27 Jan 2003 14:02:45 -0000	1.1
  +++ README.txt	17 Oct 2003 15:42:35 -0000	1.2
  @@ -1,3 +1 @@
  -This directory is currently useless, as the sitemap only looks in
  -skins/{forrest:skin}, so files must be kept in synch manually until this is
  -fixed.
  +The images in this directlry are used  if the current skin lacks them.
  
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/add.jpg
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/fix.jpg
  
  	<<Binary file>>
  
  
  1.3       +0 -0      xml-forrest/src/resources/skins/common/images/forrest-credit-logo.png
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/hack.jpg
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/remove.jpg
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/rss.png
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/update.jpg
  
  	<<Binary file>>
  
  
  1.1                  xml-forrest/src/resources/skins/common/images/vcss.png
  
  	<<Binary file>>
  
  
  1.9       +28 -5     xml-forrest/src/resources/conf/resources.xmap
  
  Index: resources.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/resources/conf/resources.xmap,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- resources.xmap	17 Oct 2003 12:32:32 -0000	1.8
  +++ resources.xmap	17 Oct 2003 15:42:36 -0000	1.9
  @@ -27,10 +27,17 @@
   
      <map:resources>
         <map:resource name="skin-read">
  -         <map:read src="skins/{forrest:skin}/{path}" mime-type="{mime-type}" />
  +            <map:select type="exists">
  +               <map:when test="skins/{forrest:skin}/{path}">
  +                  <map:read src="skins/{forrest:skin}/{path}" mime-type="{mime-type}"
/>
  +               </map:when>
  +               <map:otherwise>
  +                  <map:read src="skins/common/{path}" mime-type="{mime-type}" />
  +               </map:otherwise>
  +            </map:select>
         </map:resource>
      </map:resources>
  -
  +   
      <map:pipelines>
         <map:pipeline>
            <map:match pattern="skin/**.js">
  @@ -104,8 +111,16 @@
                  <map:when test="resources/images/{1}.png">
                     <map:read src="resources/images/{1}.png" mime-type="image/png" />
                  </map:when>
  -               <map:otherwise>
  +               <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/{1}.png" />
  +                   <map:parameter name="mime-type" value="image/png" />
  +                 </map:call>
                  </map:otherwise>
               </map:select>
            </map:match>
  @@ -118,8 +133,16 @@
                  <map:when test="resources/images/{1}.{2}">
                     <map:read src="resources/images/{1}.{2}" mime-type="image/{2}" />
                  </map:when>
  -               <map:otherwise>
  +               <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/{1}.{2}" />
  +                   <map:parameter name="mime-type" value="image/{2}" />
  +                 </map:call>
                  </map:otherwise>
               </map:select>
            </map:match>
  
  
  

Mime
View raw message