forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject svn commit: r76281 - in forrest/trunk/main/webapp/skins: common common/xslt/html tigris tigris/css tigris/xslt/html
Date Thu, 18 Nov 2004 20:57:46 GMT
Author: rick
Date: Thu Nov 18 12:57:44 2004
New Revision: 76281

Modified:
   forrest/trunk/main/webapp/skins/common/skinconf.xsl
   forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl
   forrest/trunk/main/webapp/skins/tigris/README.txt
   forrest/trunk/main/webapp/skins/tigris/css/tigris.css
   forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl
Log:
Applying patch for issue http://issues.cocoondev.org/browse/FOR-377:

Displays link for TXT output.  Modified slightly from the patch attached
to issue FOR-377 (txtpod.png image is used rather than pdfdoc.png).

Also modified the CSS so that the image is displayed with a size of 16x16
size and placed properly as well.

This is only for the tigris skin at the moment.  Other skins will be
updated.  Need to look at the common XSLTs that are included.  I suspect
that the common includes are no longer common. :)



Modified: forrest/trunk/main/webapp/skins/common/skinconf.xsl
==============================================================================
--- forrest/trunk/main/webapp/skins/common/skinconf.xsl	(original)
+++ forrest/trunk/main/webapp/skins/common/skinconf.xsl	Thu Nov 18 12:57:44 2004
@@ -24,6 +24,9 @@
      <xsl:if test="not(disable-pdf-link)">     
        <disable-pdf-link>true</disable-pdf-link>
      </xsl:if>
+     <xsl:if test="not(disable-txt-link)">     
+       <disable-txt-link>true</disable-txt-link>
+     </xsl:if>
      <xsl:if test="not(disable-pod-link)">     
        <disable-pod-link>true</disable-pod-link>
      </xsl:if>

Modified: forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl	(original)
+++ forrest/trunk/main/webapp/skins/common/xslt/html/site2xhtml.xsl	Thu Nov 18 12:57:44 2004
@@ -36,6 +36,8 @@
 <xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 
   <xsl:variable name="config" select="//skinconfig"/>
+  <!-- If true, a txt link for this page will not be generated -->
+  <xsl:variable name="disable-txt-link" select="//skinconfig/disable-txt-link"/>
   <!-- If true, a PDF link for this page will not be generated -->
   <xsl:variable name="disable-pdf-link" select="//skinconfig/disable-pdf-link"/>
   <!-- If true, a "print" link for this page will not be generated -->

Modified: forrest/trunk/main/webapp/skins/tigris/README.txt
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/README.txt	(original)
+++ forrest/trunk/main/webapp/skins/tigris/README.txt	Thu Nov 18 12:57:44 2004
@@ -14,3 +14,4 @@
  changed: for each image url(), removed the "../"
  changed: "inline-block" to "inline" at line 709 (fixes CSS validation error)
  added: .pdflink .xmllink .podlink .printlink
+ added: .txtlink

Modified: forrest/trunk/main/webapp/skins/tigris/css/tigris.css
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/css/tigris.css	(original)
+++ forrest/trunk/main/webapp/skins/tigris/css/tigris.css	Thu Nov 18 12:57:44 2004
@@ -864,6 +864,30 @@
     width: 16px;
 }
 
+.txtlink {
+    position: relative; /* IE bugfix cont'd */
+    float: right;
+    margin: 0px 5px;
+    padding: 0;
+}
+.txtlink br {
+    margin-top: -10px;
+    padding-left: 1px;
+}
+.txtlink a {
+    display: block;
+    font-size: 70%;
+    text-align: center;
+    margin: 0;
+    padding: 0;
+}
+
+.txtlink img {
+    display: block;
+    height: 16px;
+    width: 16px;
+}
+
 .printlink {
     float: right;
 }

Modified: forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl	(original)
+++ forrest/trunk/main/webapp/skins/tigris/xslt/html/site2xhtml.xsl	Thu Nov 18 12:57:44 2004
@@ -188,7 +188,16 @@
   <xsl:template match="td[@class='tasknav']/div[@align='left']" >
     <xsl:call-template name="breadcrumbs"/>
   </xsl:template>
-  
+
+  <!-- Generates the TXT link -->
+  <xsl:template match="div[@id='skinconf-txtlink']">
+    <xsl:if test="not($config/disable-txt-link) or $disable-txt-link = 'false'"> 
+      <div class="txtlink" title="Text Format"><a href="{$filename-noext}.txt" class="dida">
+        <img class="skin" src="{$skin-img-dir}/txtdoc.gif" alt="TXT -icon" /><br/>
+        txt</a>
+      </div>
+    </xsl:if>
+  </xsl:template>
   <!-- Generates the PDF link -->
   <xsl:template match="div[@id='skinconf-pdflink']">
     <xsl:if test="not($config/disable-pdf-link) or $disable-pdf-link = 'false'"> 

Mime
View raw message