Mailing-List: contact commits-help@manifoldcf.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@manifoldcf.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1459193 - in /manifoldcf/site/trunk/src/documentation:
 skinconf.xml skins/common/xslt/fo/footerinfo.xsl
 skins/lucene/xslt/html/site-to-xhtml.xsl
Date: Thu, 21 Mar 2013 08:54:35 -0000
To: commits@manifoldcf.apache.org
From: kwright@apache.org
Message-Id: <20130321085435.3A7A823888E4@eris.apache.org>

Author: kwright
Date: Thu Mar 21 08:54:34 2013
New Revision: 1459193

URL: http://svn.apache.org/r1459193
Log:
Modify skins etc. to print out proper trademark attribution.

Modified:
    manifoldcf/site/trunk/src/documentation/skinconf.xml
    manifoldcf/site/trunk/src/documentation/skins/common/xslt/fo/footerinfo.xsl
    manifoldcf/site/trunk/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl

Modified: manifoldcf/site/trunk/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/skinconf.xml?rev=1459193&r1=1459192&r2=1459193&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/skinconf.xml (original)
+++ manifoldcf/site/trunk/src/documentation/skinconf.xml Thu Mar 21 08:54:34 2013
@@ -102,7 +102,8 @@ which will be used to configure the chos
     FileNet P8 and IBM are trademarks of IBM, Inc.
     LiveLink and OpenText are trademarks of OpenText, Inc.
     QBase, MetaCarta, and GTS are trademarks of QBase, Inc.
-    Meridio and Autonomy are trademarks of HP, Inc.
+    Meridio and Autonomy are trademarks of Hewlett Packard, Inc.
+    Alfresco is a trademark of Alfresco Software, Inc.
   </trademark-statement>
   <!-- Some skins use this to form a 'breadcrumb trail' of links.
     Use location="alt" to move the trail to an alternate location

Modified: manifoldcf/site/trunk/src/documentation/skins/common/xslt/fo/footerinfo.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/skins/common/xslt/fo/footerinfo.xsl?rev=1459193&r1=1459192&r2=1459193&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/skins/common/xslt/fo/footerinfo.xsl (original)
+++ manifoldcf/site/trunk/src/documentation/skins/common/xslt/fo/footerinfo.xsl Thu Mar 21 08:54:34 2013
@@ -41,6 +41,9 @@ with @role='pdf' is present, that is use
           select="//skinconfig/vendor"/>
 <xsl:text> All rights reserved.</xsl:text>
       </xsl:if>
+      <xsl:if test="not($pdfcredit) and not($config/disable-trademark-footer = 'true')">
+        <xsl:value-of select="//skinconfig/trademark-statement"/>
+      </xsl:if>
     </xsl:variable>
     <xsl:variable name="url" select="$pdfcredit/url"/>
     <fo:block-container font-style="italic" absolute-position="absolute"

Modified: manifoldcf/site/trunk/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/site/trunk/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl?rev=1459193&r1=1459192&r2=1459193&view=diff
==============================================================================
--- manifoldcf/site/trunk/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl (original)
+++ manifoldcf/site/trunk/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl Thu Mar 21 08:54:34 2013
@@ -324,6 +324,11 @@ footer, searchbar, css etc.  As input, i
               </xsl:choose>
             </div>
           </xsl:if>
+          <xsl:if test="not($config/disable-trademark-footer = 'true')">
+            <div class="copyright">
+              <xsl:value-of select="$config/trademark-statement"/>
+            </div>
+          </xsl:if>
           <xsl:if test="$filename = 'index.html'">
             <div id="logos" >
               <xsl:if test="$config/disable-compliance-links/@align">