You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by pi...@apache.org on 2018/04/12 15:21:47 UTC

svn commit: r1828986 - in /manifoldcf/trunk: ./ site/src/documentation/ site/src/documentation/resources/images/ site/src/documentation/skins/common/xslt/html/ site/src/documentation/skins/lucene/xslt/html/

Author: piergiorgio
Date: Thu Apr 12 15:21:46 2018
New Revision: 1828986

URL: http://svn.apache.org/viewvc?rev=1828986&view=rev
Log:
- updated the website with a dynamic banner for Apache events (CONNECTORS-1501)
- Updated the favicon and the Apache Support image that now is resized

Added:
    manifoldcf/trunk/site/src/documentation/resources/images/SupportApache-small-128.png   (with props)
    manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl   (with props)
Modified:
    manifoldcf/trunk/CHANGES.txt
    manifoldcf/trunk/site/src/documentation/resources/images/favicon.ico
    manifoldcf/trunk/site/src/documentation/skinconf.xml
    manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl
    manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl

Modified: manifoldcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/CHANGES.txt?rev=1828986&r1=1828985&r2=1828986&view=diff
==============================================================================
--- manifoldcf/trunk/CHANGES.txt (original)
+++ manifoldcf/trunk/CHANGES.txt Thu Apr 12 15:21:46 2018
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 2.10-dev =====================
 
+CONNECTORS-1501: Add dynamic snippet for the next Apache event
+(Piergiorgio Lucidi)
+
 CONNECTORS-1437: Documentation for the CMIS Output Connector
 (Piergiorgio Lucidi)
 

Added: manifoldcf/trunk/site/src/documentation/resources/images/SupportApache-small-128.png
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/SupportApache-small-128.png?rev=1828986&view=auto
==============================================================================
Binary file - no diff available.

Propchange: manifoldcf/trunk/site/src/documentation/resources/images/SupportApache-small-128.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: manifoldcf/trunk/site/src/documentation/resources/images/favicon.ico
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/resources/images/favicon.ico?rev=1828986&r1=1828985&r2=1828986&view=diff
==============================================================================
Binary files - no diff available.

Modified: manifoldcf/trunk/site/src/documentation/skinconf.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skinconf.xml?rev=1828986&r1=1828985&r2=1828986&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skinconf.xml (original)
+++ manifoldcf/trunk/site/src/documentation/skinconf.xml Thu Apr 12 15:21:46 2018
@@ -20,7 +20,7 @@ Skin configuration file. This file conta
 which will be used to configure the chosen Forrest skin.
 -->
 
-<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.8-2//EN" "http://forrest.apache.org/dtd/skinconfig-v08-2.dtd">
+<!DOCTYPE skinconfig PUBLIC "-//APACHE//DTD Skin Configuration V0.8-2//EN" "skinconfig.dtd">
 <skinconfig>
   <!-- To enable lucene search add provider="lucene" (default is google).
     Add box-location="alt" to move the search box to an alternate location
@@ -69,6 +69,7 @@ which will be used to configure the chos
   <project-description>ManifoldCF</project-description>
   <project-url>http://manifoldcf.apache.org</project-url>
   <project-logo>images/ManifoldCF-logo.PNG</project-logo>
+  
   <!-- Alternative static image:
   <project-logo>images/project-logo.gif</project-logo> -->
 
@@ -76,21 +77,21 @@ which will be used to configure the chos
        default skin: renders it at the top-left corner -->
   <group-name>Apache</group-name>
   <group-description>Apache Software Foundation</group-description>
-  <group-url>http://www.apache.org</group-url>
-  <group-logo>images/asf_logo.png</group-logo>
+  <group-url>https://www.apache.org</group-url>
+  <group-logo>images/SupportApache-small-128.png</group-logo>
   <!-- Alternative static image:
   <group-logo>images/group-logo.gif</group-logo> -->
 
   <!-- optional host logo (e.g. sourceforge logo)
        default skin: renders it at the bottom-left corner -->
-  <host-url></host-url>
-  <host-logo></host-logo>
+  <host-url>https://www.apache.org/events/current-event.html</host-url>
+  <host-logo>https://www.apache.org/events/current-event-234x60.png</host-logo>
 
   <!-- relative url of a favicon file, normally favicon.ico -->
   <favicon-url>images/favicon.ico</favicon-url>
 
   <!-- The following are used to construct a copyright statement -->
-  <year>2009-2017</year>
+  <year>2009-2018</year>
   <vendor>The Apache Software Foundation.</vendor>
   <copyright-link>http://www.apache.org/licenses/</copyright-link>
   <!-- Optional text trademark statement below the copyright statement -->

Added: manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl?rev=1828986&view=auto
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl (added)
+++ manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl Thu Apr 12 15:21:46 2018
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+<!--
+A simple callable template that renders a logo for an entity. The logo will 
+be a hyperlink and may include an image (with width and height if specified)
+or else it will just include the specified text.
+
+Note that text and image are mandatory parts of the template.
+-->
+<xsl:stylesheet
+  version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+  <xsl:template name="render-event-logo">
+    <xsl:param name="url"/>
+    <xsl:param name="logo"/>
+    <a href="{$url}">
+    <xsl:choose>
+      <xsl:when test="$logo and not($logo = '')">
+        <img class="logoImage">
+          <xsl:attribute name="src">
+            <xsl:value-of select="$logo"/>
+          </xsl:attribute>
+        </img>
+      </xsl:when>
+    </xsl:choose></a>
+  </xsl:template>
+</xsl:stylesheet>

Propchange: manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl
------------------------------------------------------------------------------
    svn:keywords = Date Revision Author HeadURL Id

Propchange: manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/render-event-logo.xsl
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl?rev=1828986&r1=1828985&r2=1828986&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl (original)
+++ manifoldcf/trunk/site/src/documentation/skins/common/xslt/html/site-to-xhtml.xsl Thu Apr 12 15:21:46 2018
@@ -52,6 +52,7 @@ footer, searchbar, css etc.  As input, i
   <xsl:include href="dotdots.xsl"/>
   <xsl:include href="pathutils.xsl"/>
   <xsl:include href="renderlogo.xsl"/>
+  <xsl:include href="render-event-logo.xsl"/>
 <!-- Path (..'s) to the root directory -->
   <xsl:variable name="root">
     <xsl:call-template name="dotdots">
@@ -118,6 +119,13 @@ footer, searchbar, css etc.  As input, i
           <xsl:with-param name="root" select="$root"/>
           <xsl:with-param name="description" select="//skinconfig/project-description"/>
         </xsl:call-template>
+        <xsl:call-template name="renderlogo">
+          <xsl:with-param name="name" select="//skinconfig/group-name"/>
+          <xsl:with-param name="url" select="//skinconfig/host-url"/>
+          <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
+          <xsl:with-param name="description" select="//skinconfig/project-description"/>
+          <xsl:with-param name="root" select="$root"/>
+        </xsl:call-template>
         <xsl:comment>================= start Tabs ==================</xsl:comment>
         <xsl:apply-templates select="div[@class='tab']"/>
         <xsl:comment>================= end Tabs ==================</xsl:comment>
@@ -151,14 +159,6 @@ footer, searchbar, css etc.  As input, i
         <script language="JavaScript" type="text/javascript"><![CDATA[<!--
           document.write(" - "+"Last Published: " + document.lastModified);
           //  -->]]></script>
-        <xsl:if test="//skinconfig/host-logo and not(//skinconfig/host-logo = '')"><a href="{//skinconfig/host-url}">
-          <xsl:call-template name="renderlogo">
-            <xsl:with-param name="name" select="//skinconfig/host-name"/>
-            <xsl:with-param name="url" select="//skinconfig/host-url"/>
-            <xsl:with-param name="logo" select="//skinconfig/host-logo"/>
-            <xsl:with-param name="root" select="$root"/>
-          </xsl:call-template></a>
-        </xsl:if>
         <xsl:if test="$filename = 'index.html' and //skinconfig/credits">
           <xsl:for-each select="//skinconfig/credits/credit[not(@role='pdf')]">
             <xsl:call-template name="renderlogo">

Modified: manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl?rev=1828986&r1=1828985&r2=1828986&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl (original)
+++ manifoldcf/trunk/site/src/documentation/skins/lucene/xslt/html/site-to-xhtml.xsl Thu Apr 12 15:21:46 2018
@@ -191,6 +191,12 @@ footer, searchbar, css etc.  As input, i
             <xsl:comment>+
     |end Project Logo
     +</xsl:comment>
+            <div class="projectlogo">           
+              <xsl:call-template name="render-event-logo">
+                <xsl:with-param name="url" select="$config/host-url"/>
+                <xsl:with-param name="logo" select="$config/host-logo"/>
+              </xsl:call-template>
+            </div>
             <xsl:if 
             test="$config/search and not($config/search/@box-location = 'alt')">
               <xsl:comment>+
@@ -362,16 +368,6 @@ footer, searchbar, css etc.  As input, i
               </xsl:if>
             </div>
           </xsl:if>
-          <xsl:if test="$config/host-logo and not($config/host-logo = '')">
-            <div class="host">
-              <xsl:call-template name="renderlogo">
-                <xsl:with-param name="name" select="$config/host-name"/>
-                <xsl:with-param name="url" select="$config/host-url"/>
-                <xsl:with-param name="logo" select="$config/host-logo"/>
-                <xsl:with-param name="root" select="$root"/>
-              </xsl:call-template>
-            </div>
-          </xsl:if>
           <xsl:if test="$config/feedback">
             <xsl:call-template name="feedback"/>
           </xsl:if>