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/core/context/skins/common/scripts breadcrumbs-optimized.js breadcrumbs.js
Date Tue, 25 Nov 2003 16:12:51 GMT
nicolaken    2003/11/25 08:12:51

  Modified:    src/core/context faq.xmap resources.xmap sitemap.xmap
               src/core/context/skins/common/scripts
                        breadcrumbs-optimized.js breadcrumbs.js
  Log:
        <action dev="NKB" type="update" context="skins" fixes-bug="FOR-85"
          due-to="Ross Gardler" due-to-email="ross@saafe.org" >
          Skins are now editable directly in FORREST_HOME.
        </action>
  
  Revision  Changes    Path
  1.2       +41 -17    xml-forrest/src/core/context/faq.xmap
  
  Index: faq.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/faq.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- faq.xmap	20 Oct 2003 15:37:49 -0000	1.1
  +++ faq.xmap	25 Nov 2003 16:12:51 -0000	1.2
  @@ -70,16 +70,30 @@
       </map:resource>
   
       <map:resource name="skinit">
  -      <map:transform src="skins/{forrest:skin}/xslt/html/{type}.xsl">
  -        <map:parameter name="notoc" value="{notoc}"/>
  -        <!-- For backwards-compat with 0.2 - 0.4 skins -->
  -        <map:parameter name="isfaq" value="{notoc}"/>
  -        <map:parameter name="path" value="{path}"/>
  -        <!-- Can set an alternative project skinconfig here 
  -        <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  -        -->
  -      </map:transform>
  -
  +        <map:select type="exists">
  +          <map:when test="{project:skins-dir}{forrest:skin}/xslt/html/(type.xsl}">
  +            <map:transform src="{project:skins-dir}{forrest:skin}/xslt/html/{type}.xsl">
  +              <map:parameter name="notoc" value="{notoc}"/>
  +              <!-- For backwards-compat with 0.2 - 0.4 skins -->
  +              <map:parameter name="isfaq" value="{notoc}"/>
  +              <map:parameter name="path" value="{path}"/>
  +              <!-- Can set an alternative project skinconfig here 
  +              <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  +              -->
  +            </map:transform>
  +          </map:when>
  +          <map:otherwise>
  +            <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/html/{type}.xsl">
  +              <map:parameter name="notoc" value="{notoc}"/>
  +              <!-- For backwards-compat with 0.2 - 0.4 skins -->
  +              <map:parameter name="isfaq" value="{notoc}"/>
  +              <map:parameter name="path" value="{path}"/>
  +              <!-- Can set an alternative project skinconfig here 
  +              <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  +              -->
  +            </map:transform>
  +          </map:otherwise>
  +        </map:select>
         <map:serialize/>
       </map:resource>
   
  @@ -97,14 +111,24 @@
         'numbersections' param into document2fo.xsl -->
         <map:match pattern="**.pdf">
           <map:generate src="cocoon:/{1}.xml"/>
  -        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  -          <map:parameter name="numbersections" value="false"/>
  -          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  -          <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
  -        </map:transform>
  +        <map:select type="exists">
  +          <map:when  test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
  +            <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
  +              <map:parameter name="numbersections" value="false"/>
  +              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
  +            </map:transform>
  +          </map:when>
  +          <map:otherwise>
  +            <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  +              <map:parameter name="numbersections" value="false"/>
  +              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
  +            </map:transform>
  +          </map:otherwise>
  +        </map:select>
           <map:serialize type="fo2pdf"/>
         </map:match>
  -
   
         <!-- ============================================================ -->
         <!-- INTERMEDIATE FORMATS                                         -->
  
  
  
  1.2       +11 -4     xml-forrest/src/core/context/resources.xmap
  
  Index: resources.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/resources.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- resources.xmap	20 Oct 2003 15:37:49 -0000	1.1
  +++ resources.xmap	25 Nov 2003 16:12:51 -0000	1.2
  @@ -28,11 +28,18 @@
      <map:resources>
         <map:resource name="skin-read">
               <map:select type="exists">
  -               <map:when test="skins/{forrest:skin}/{path}">
  -                  <map:read src="skins/{forrest:skin}/{path}" mime-type="{mime-type}"
/>
  +               <map:when test="{project:skins-dir}{forrest:skin}/{path}">
  +                  <map:read src="{project:skins-dir}{forrest:skin}/{path}" mime-type="{mime-type}"
/>
                  </map:when>
                  <map:otherwise>
  -                  <map:read src="skins/common/{path}" mime-type="{mime-type}" />
  +                <map:select type="exists">
  +                  <map:when test="{forrest:home}context/skins/{forrest:skin}/{path}">
  +                    <map:read src="{forrest:home}context/skins/{forrest:skin}/{path}"
mime-type="{mime-type}" />
  +                  </map:when>
  +                  <map:otherwise>
  +                    <map:read src="{forrest:home}context/skins/common/{path}" mime-type="{mime-type}"
/>
  +                  </map:otherwise>
  +                </map:select>
                  </map:otherwise>
               </map:select>
         </map:resource>
  
  
  
  1.2       +37 -16    xml-forrest/src/core/context/sitemap.xmap
  
  Index: sitemap.xmap
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/sitemap.xmap,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- sitemap.xmap	20 Oct 2003 15:37:49 -0000	1.1
  +++ sitemap.xmap	25 Nov 2003 16:12:51 -0000	1.2
  @@ -125,17 +125,28 @@
   
     <map:resources>
       <map:resource name="skinit">
  -      <map:transform src="skins/{forrest:skin}/xslt/html/{type}.xsl">
  -        <map:parameter name="notoc" value="{notoc}"/>
  -        <!-- For backwards-compat with 0.2 - 0.4 skins -->
  -        <map:parameter name="isfaq" value="{notoc}"/>
  -        <map:parameter name="nopdf" value="{nopdf}"/>
  -        <map:parameter name="path" value="{path}"/>
  -        <!-- Can set an alternative project skinconfig here 
  -        <map:parameter name="config-file" value="../../../../skinconf.xml"/>
  -        -->
  -      </map:transform>
  -
  +        <map:select type="exists">
  +          <map:when test="{project:skins-dir}{forrest:skin}/xslt/html/{type}.xsl">
  +            <map:transform src="{project:skins-dir}{forrest:skin}/xslt/html/{type}.xsl">
  +              <map:parameter name="notoc" value="{notoc}"/>
  +              <!-- For backwards-compat with 0.2 - 0.4 skins -->
  +              <map:parameter name="isfaq" value="{notoc}"/>
  +              <map:parameter name="nopdf" value="{nopdf}"/>
  +              <map:parameter name="path" value="{path}"/>
  +              <map:parameter name="config-file" value="{project:skinconf}"/>
  +            </map:transform>
  +          </map:when>
  +          <map:otherwise>
  +            <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/html/{type}.xsl">
  +              <map:parameter name="notoc" value="{notoc}"/>
  +              <!-- For backwards-compat with 0.2 - 0.4 skins -->
  +              <map:parameter name="isfaq" value="{notoc}"/>
  +              <map:parameter name="nopdf" value="{nopdf}"/>
  +              <map:parameter name="path" value="{path}"/>
  +              <map:parameter name="config-file" value="{project:skinconf}"/>
  +            </map:transform>
  +          </map:otherwise>
  +        </map:select>
         <map:serialize/>
       </map:resource>
   
  @@ -330,10 +341,20 @@
           <!-- <map:transform type="idgen"/> -->
           <map:transform type="xinclude"/>
           <map:transform type="linkrewriter" src="cocoon://{1}linkmap-{2}.pdf"/>
  -        <map:transform src="skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  -          <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  -          <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
  -        </map:transform>
  +        <map:select type="exists">
  +          <map:when test="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
  +            <map:transform src="{project:skins-dir}{forrest:skin}/xslt/fo/document2fo.xsl">
  +              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
  +            </map:transform>
  +          </map:when>
  +          <map:otherwise>
  +            <map:transform src="{forrest:home}context/skins/{forrest:skin}/xslt/fo/document2fo.xsl">
  +              <map:parameter name="ctxbasedir" value="{realpath:.}/"/>
  +              <map:parameter name="xmlbasedir" value="{project:content.xdocs}{1}"/>
  +            </map:transform>
  +          </map:otherwise>
  +        </map:select>
           <map:serialize type="fo2pdf"/>
         </map:match>
   
  
  
  
  1.3       +1 -1      xml-forrest/src/core/context/skins/common/scripts/breadcrumbs-optimized.js
  
  Index: breadcrumbs-optimized.js
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/scripts/breadcrumbs-optimized.js,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- breadcrumbs-optimized.js	24 Nov 2003 12:54:59 -0000	1.2
  +++ breadcrumbs-optimized.js	25 Nov 2003 16:12:51 -0000	1.3
  @@ -9,7 +9,7 @@
   if(!(link3=="")&&!link3.indexOf( "@" ) == 0){
     PREPREND_CRUMBS.push( new Array( link3, @skinconfig.trail.link3.href@ ) ); }
   var DISPLAY_SEPARATOR=" &gt; ";
  -var DISPLAY_PREPREND="";
  +var DISPLAY_PREPREND=" &gt; ";
   var DISPLAY_POSTPREND=":";
   var CSS_CLASS_CRUMB="breadcrumb";
   var CSS_CLASS_TRAIL="breadcrumbTrail";
  
  
  
  1.3       +1 -1      xml-forrest/src/core/context/skins/common/scripts/breadcrumbs.js
  
  Index: breadcrumbs.js
  ===================================================================
  RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/scripts/breadcrumbs.js,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- breadcrumbs.js	24 Nov 2003 12:54:59 -0000	1.2
  +++ breadcrumbs.js	25 Nov 2003 16:12:51 -0000	1.3
  @@ -109,7 +109,7 @@
   /**
    * String to include at the beginning of the trail
    */
  -var DISPLAY_PREPREND = "";
  +var DISPLAY_PREPREND = " &gt; ";
   /**
    * String to include at the end of the trail
    */
  
  
  

Mime
View raw message