You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2003/12/28 23:54:16 UTC
cvs commit: xml-forrest/src/core/fresh-site/src/documentation/content/xdocs tabs.xml
nicolaken 2003/12/28 14:54:16
Modified: src/core/context/skins/common/xslt/html document2html.xsl
tab2menu.xsl tabutils.xsl
src/core/context/skins/krysalis-site/css page.css
src/core/context/skins/krysalis-site/xslt/html
site2xhtml.xsl tab2menu.xsl
src/core/context/skins/tigris-style/xslt/html site2xhtml.xsl
tab2menu.xsl
src/core/context/resources/schema/relaxng skinconf.rnc
src/core/fresh-site/src/documentation skinconf.xml
src/core/fresh-site/src/documentation/content/xdocs tabs.xml
Log:
Double new features (as they have changes some of the same files)
- add subtab handling and enable it for krysalis-site and tigris-style
- show external links with an icon at the end
Note: not added for other skins as forrest-site will use krysalis-site soon
and tigris-style deprecates avalon-tigris. As for teh forrest-css one, never
looked at it, sorry
Revision Changes Path
1.2 +9 -1 xml-forrest/src/core/context/skins/common/xslt/html/document2html.xsl
Index: document2html.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/document2html.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- document2html.xsl 20 Oct 2003 16:29:05 -0000 1.1
+++ document2html.xsl 28 Dec 2003 22:54:16 -0000 1.2
@@ -34,6 +34,9 @@
<xsl:variable name="minitoc-location" select="$config/toc/@location"/>
<!-- Whether to obfuscate email links -->
<xsl:variable name="obfuscate-mail-links" select="$config/obfuscate-mail-links"/>
+ <!-- If true, an the images on all external links will not be added -->
+ <xsl:variable name="disable-external-link-image" select="$config/disable-external-link-image"/>
+
<xsl:variable name="max-depth">
<xsl:choose>
@@ -240,6 +243,11 @@
<xsl:apply-templates/>
</a>
</xsl:when>
+ <xsl:when test="not($disable-external-link-image='true') and contains(@href, ':') and not(contains(@href, $config/group-url)) and not(contains(@href, $config/project-url))">
+ <a href="{@href}">
+ <xsl:apply-templates/> <img src="{$skin-img-dir}/external-link.gif" border="0" alt="links outside of this site"/> 
+ </a>
+ </xsl:when>
<xsl:otherwise>
<a href="{@href}">
<xsl:apply-templates/>
1.2 +67 -12 xml-forrest/src/core/context/skins/common/xslt/html/tab2menu.xsl
Index: tab2menu.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/tab2menu.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tab2menu.xsl 20 Oct 2003 16:29:05 -0000 1.1
+++ tab2menu.xsl 28 Dec 2003 22:54:16 -0000 1.2
@@ -29,34 +29,56 @@
<!-- These templates SHOULD be overridden -->
<!-- ================================================================ -->
- <!-- Called before first tag -->
+ <!-- Called before first level 1 tag -->
<xsl:template name="pre-separator">
</xsl:template>
- <!-- Called after last tag -->
+ <!-- Called after last level 1 tag -->
<xsl:template name="post-separator">
</xsl:template>
- <!-- Called between tags -->
+ <!-- Called between level 1 tags -->
<xsl:template name="separator">
<xsl:text> | </xsl:text>
</xsl:template>
+
+ <!-- Called before first level 2 tag -->
+ <xsl:template name="level2-pre-separator">
+ </xsl:template>
+
+ <!-- Called after last level 2 tag -->
+ <xsl:template name="level2-post-separator">
+ </xsl:template>
+
+ <!-- Called between level 2 tags -->
+ <xsl:template name="level2-separator">
+ <xsl:text> | </xsl:text>
+ </xsl:template>
<!--
Note: sub-stylesheets can't do apply-imports here, because it would choose
the 'tags' template and infinitely recurse. Hence call-template used instead.
-->
- <!-- Display a selected tab node -->
+ <!-- Display a selected level 1 tab node -->
<xsl:template name="selected">
<xsl:call-template name="base-selected"/>
</xsl:template>
- <!-- Display an unselected tab node -->
+ <!-- Display an unselected level 1 tab node -->
<xsl:template name="not-selected">
<xsl:call-template name="base-not-selected"/>
</xsl:template>
+ <!-- Display a selected second level tab node -->
+ <xsl:template name="level2-selected">
+ <xsl:call-template name="base-selected"/>
+ </xsl:template>
+
+ <!-- Display an unselected second level tab node -->
+ <xsl:template name="level2-not-selected">
+ <xsl:call-template name="base-not-selected"/>
+ </xsl:template>
<!-- ================================================================ -->
<!-- These templates CAN be overridden -->
@@ -88,8 +110,8 @@
<xsl:variable name="skin-img-dir" select="concat(string($root), 'skin/images')"/>
<!--
- The longest path of any tab, whose path is a subset of the current URL. Ie,
- the path of the 'current' tab.
+ The longest path of any level 1 tab, whose path is a subset of the current URL. Ie,
+ the path of the 'current' level 1 tab.
-->
<xsl:variable name="longest-dir">
<xsl:call-template name="longest-dir">
@@ -97,26 +119,45 @@
</xsl:call-template>
</xsl:variable>
+ <!--
+ The longest path of any level 2 tab, whose path is a subset of the current URL. Ie,
+ the path of the 'current' level 2 tab.
+ -->
+ <xsl:variable name="level2-longest-dir">
+ <xsl:call-template name="level2-longest-dir">
+ <xsl:with-param name="tabfile" select="/"/>
+ </xsl:call-template>
+ </xsl:variable>
+
<xsl:variable name="matching-id">
<xsl:call-template name="matching-id">
<xsl:with-param name="tabfile" select="/"/>
</xsl:call-template>
</xsl:variable>
-
<!-- Called from tabs, after it has written the outer 'div class=tabs' and
any other HTML -->
<xsl:template name="base-tabs">
<xsl:call-template name="pre-separator"/>
- <xsl:for-each select="//tab">
+ <xsl:for-each select="tab">
<xsl:if test="position()!=1"><xsl:call-template name="separator"/></xsl:if>
- <xsl:apply-templates select="."/>
+ <xsl:apply-templates select="." mode="level1"/>
</xsl:for-each>
<xsl:call-template name="post-separator"/>
</xsl:template>
+ <!-- Called from tabs, after it has written the outer 'div class=tabs' and
+ any other HTML -->
+ <xsl:template name="level2tabs">
+ <xsl:call-template name="level2-pre-separator"/>
+ <xsl:for-each select="tab[@dir=$longest-dir]/tab|tab[@href=$longest-dir]/tab">
+ <xsl:if test="position()!=1"><xsl:call-template name="level2-separator"/></xsl:if>
+ <xsl:apply-templates select="." mode="level2"/>
+ </xsl:for-each>
+ <xsl:call-template name="level2-post-separator"/>
+ </xsl:template>
- <xsl:template match="tab">
+ <xsl:template match="tab" mode="level1">
<xsl:choose>
<xsl:when test="@id and @id = $matching-id">
<xsl:call-template name="selected"/>
@@ -126,6 +167,20 @@
</xsl:when>
<xsl:otherwise>
<xsl:call-template name="not-selected"/>
+ </xsl:otherwise>
+ </xsl:choose>
+ </xsl:template>
+
+ <xsl:template match="tab" mode="level2">
+ <xsl:choose>
+ <xsl:when test="@id and @id = $matching-id">
+ <xsl:call-template name="level2-selected"/>
+ </xsl:when>
+ <xsl:when test="@dir = $level2-longest-dir">
+ <xsl:call-template name="level2-selected"/>
+ </xsl:when>
+ <xsl:otherwise>
+ <xsl:call-template name="level2-not-selected"/>
</xsl:otherwise>
</xsl:choose>
</xsl:template>
1.2 +16 -1 xml-forrest/src/core/context/skins/common/xslt/html/tabutils.xsl
Index: tabutils.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/common/xslt/html/tabutils.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tabutils.xsl 20 Oct 2003 16:29:05 -0000 1.1
+++ tabutils.xsl 28 Dec 2003 22:54:16 -0000 1.2
@@ -59,7 +59,7 @@
</xsl:template>
<!--
- The longest path of any tab, whose path is a subset of the current URL. Ie,
+ The longest path of any level 1 tab, whose path is a subset of the current URL. Ie,
the path of the 'current' tab.
-->
<xsl:template name="longest-dir">
@@ -73,6 +73,21 @@
</xsl:for-each>
</xsl:template>
+ <!--
+ The longest path of any level 2 tab, whose path is a subset of the current URL. Ie,
+ the path of the 'current' tab.
+ -->
+ <xsl:template name="level2-longest-dir">
+ <xsl:param name="tabfile"/>
+ <xsl:for-each select="$tabfile/tabs/tab/tab[starts-with($path, @dir|@href)]">
+ <xsl:sort select="string-length(@dir|@href)"
+ data-type="number" order="descending"/>
+ <xsl:if test="position()=1">
+ <xsl:value-of select="@dir|@href"/>
+ </xsl:if>
+ </xsl:for-each>
+ </xsl:template>
+
</xsl:stylesheet>
1.3 +34 -0 xml-forrest/src/core/context/skins/krysalis-site/css/page.css
Index: page.css
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/css/page.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- page.css 23 Oct 2003 10:19:57 -0000 1.2
+++ page.css 28 Dec 2003 22:54:16 -0000 1.3
@@ -113,20 +113,51 @@
height:20px;
}
+.level2tab {
+ font-size : 85%;
+ border: 0 ;
+ margin: 0 0 0 0;
+ padding: 0 0 0 0;
+ border-spacing: 0 0;
+ vertical-align: middle;
+ height:25px;
+}
+
.tabstrip {
vertical-align: bottom;
}
+.tabstripSeparator {
+ vertical-align: bottom;
+ height:4px;
+ background-color: #a5b6c6;
+}
+
/* ==================== tabs ============================ */
.tab.separator { width:6px; }
+.level2tab.separator { padding-left: 4px; padding-right: 4px;}
.tab.pre-separator { width:9px;}
+.tab.selected { font-weight: bold;}
+.tab.unselected { background-color: #F7F7F7;}
+
+.level2tab.selected {}
+.level2tab.unselected {}
+.level2tab.separator {}
+
+.level2tab { font-size : 80%; font-weight: normal; height: 10px;}
+
.tab a:link { font-weight: normal;}
.tab a:visited { font-weight: normal; }
.tab a:active { font-weight: normal; }
.tab a:hover { font-weight: normal; }
+.tab.selected a:link { font-weight: bold;}
+.tab.selected a:visited { font-weight: bold; }
+.tab.selected a:active { font-weight: bold; }
+.tab.selected a:hover { font-weight: bold; }
+
/* ==================== snail trail ============================ */
.trail { font-size: 70%; }
@@ -231,6 +262,9 @@
.footer { background-color: #a5b6c6;}
.tab.selected { background-color: #a5b6c6;}
.tab.unselected { background-color: #F7F7F7;}
+.level2tab.selected {}
+.level2tab.unselected {}
+.level2tab.separator {}
/* ==================== main text colors ============================ */
1.5 +11 -6 xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/site2xhtml.xsl,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- site2xhtml.xsl 26 Nov 2003 09:15:32 -0000 1.4
+++ site2xhtml.xsl 28 Dec 2003 22:54:16 -0000 1.5
@@ -64,8 +64,10 @@
|| group logo | | project logo | +============+ |
|+============+ +==============+ |
+======================================================+
- ||tab|tab|tab| publish date |
+ ||tab|tab|tab| |
+======================================================+
+ ||subtab|subtab|subtab| publish date |
+ +======================================================+
-->
<table class="header" cellspacing="0" cellpadding="0" border="0" width="100%">
<tr>
@@ -144,12 +146,15 @@
</tr>
<!-- ( ================= Tabs ================== ) -->
<tr>
- <td colspan="3" class="tabstrip">
+ <td colspan="4" class="tabstrip">
<xsl:apply-templates select="table[@class='tab']"/>
</td>
</tr>
<tr>
- <td colspan="4" class="datenote border">
+ <td colspan="2" class="level2tabstrip border">
+ <xsl:apply-templates select="table[@class='level2tab']"/>
+ </td>
+ <td colspan="2" class="datenote border">
<script language="JavaScript" type="text/javascript"><![CDATA[<!--
document.write("Published: " + document.lastModified);
// -->]]></script>
@@ -362,14 +367,14 @@
 <input type="button" onclick="ndeSetTextSize('incr'); return false;" title="Enlarge text" class="biggerfont" value="+a"/>
 <input type="button" onclick="ndeSetTextSize('reset'); return false;" title="Reset text" class="resetfont" value="Reset"/>
</td>
- <td class="subborder"> </td>
+ <td colspan="2" class="subborder"> </td>
</tr>
<tr><td class="border" height="1" colspan="4"></td></tr>
<!-- ( ================= Content================== ) -->
<tr >
<td width="10" align="left"></td>
- <td width="100%" align="left" colspan="2">
+ <td width="100%" align="left" colspan="3">
<xsl:apply-templates select="div[@class='content']"/>
</td>
<td width="10"></td>
1.2 +44 -8 xml-forrest/src/core/context/skins/krysalis-site/xslt/html/tab2menu.xsl
Index: tab2menu.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/krysalis-site/xslt/html/tab2menu.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tab2menu.xsl 20 Oct 2003 16:29:05 -0000 1.1
+++ tab2menu.xsl 28 Dec 2003 22:54:16 -0000 1.2
@@ -14,9 +14,12 @@
path is enabled.
The output of this stylesheet is HTML of the form:
- <div class="tab">
+ <table class="tab">
...
- </div>
+ </table>
+ <table class="level2tab">
+ ...
+ </table>
which is then merged by site2xhtml.xsl
@@ -32,6 +35,15 @@
<xsl:call-template name="base-tabs"/>
</tr>
</table>
+ <xsl:if test="tab[@dir=$longest-dir]/tab">
+ <table class="level2tab" cellspacing="0" cellpadding="0" border="0">
+ <tr>
+ <td>
+ <xsl:call-template name="level2tabs"/>
+ </td>
+ </tr>
+ </table>
+ </xsl:if>
</xsl:template>
<xsl:template name="pre-separator">
@@ -46,12 +58,24 @@
<td class="tab separator"></td>
</xsl:template>
+ <xsl:template name="level2-pre-separator">
+ <td class="tab pre-separator"></td>
+ </xsl:template>
+
+ <xsl:template name="level2-post-separator">
+
+ </xsl:template>
+
+ <xsl:template name="level2-separator">
+ <td class="level2tab separator">|</td>
+ </xsl:template>
+
<xsl:template name="selected">
- <td class="tab selected top-left"></td>
- <td class="tab selected">
- <xsl:call-template name="base-selected"/>
- </td>
- <td class="tab selected top-right"></td>
+ <td class="tab selected top-left"></td>
+ <td class="tab selected">
+ <xsl:call-template name="base-selected"/>
+ </td>
+ <td class="tab selected top-right"></td>
</xsl:template>
<xsl:template name="not-selected">
@@ -68,6 +92,18 @@
<td colspan="3" class="spacer"/>
</tr>
</table>
+ </td>
+ </xsl:template>
+
+ <xsl:template name="level2-selected">
+ <td class="level2tab selected">
+ <xsl:call-template name="base-selected"/>
+ </td>
+ </xsl:template>
+
+ <xsl:template name="level2-not-selected">
+ <td class="level2tab unselected">
+ <xsl:call-template name="base-not-selected"/>
</td>
</xsl:template>
1.3 +28 -21 xml-forrest/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl
Index: site2xhtml.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/tigris-style/xslt/html/site2xhtml.xsl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- site2xhtml.xsl 26 Dec 2003 21:03:54 -0000 1.2
+++ site2xhtml.xsl 28 Dec 2003 22:54:16 -0000 1.3
@@ -26,6 +26,7 @@
<xsl:template match="site">
<html>
<head>
+ <xsl:comment>*** This file is generated using Apache Forrest. Do not edit. ***</xsl:comment>
<style type="text/css">
/* <![CDATA[ */
@import "]]><xsl:value-of select="$root"/><![CDATA[skin/tigris.css";
@@ -72,10 +73,11 @@
|| group logo | | project logo | +============+ |
|+============+ +==============+ |
+======================================================+
- ||tab|tab|tab| publish date |
+ ||tab|tab|tab| |
+======================================================+
- -->
-
+ ||subtab|subtab|subtab| publish date |
+ +======================================================+
+ -->
<div id="banner">
<table border="0" cellspacing="0" cellpadding="8" width="100%">
<tr>
@@ -139,10 +141,21 @@
<!-- ( ================= Tabs ================== ) -->
<xsl:apply-templates select="div[@class='tabs']"/>
- <div id="breadcrumbs">
- subtabs | go | here
- </div>
-
+ <table id="breadcrumbs" cellspacing="0" cellpadding="0" border="0" width="100%">
+ <tr>
+ <td>
+ <xsl:apply-templates select="div[@class='level2tab']"/>
+ </td>
+ <td>
+ <div align="right">
+ <script language="JavaScript" type="text/javascript"><![CDATA[<!--
+ document.write("Published: " + document.lastModified);
+ // -->]]></script>
+ </div>
+ </td>
+ </tr>
+ </table>
+
</xsl:template>
<xsl:template match="td[@class='tasknav']/div[@align='left']" >
@@ -230,23 +243,17 @@
<div id="searchbox" class="toolgroup">
<div class="label"><strong>Search</strong></div>
<div class="body">
- <div>the <xsl:value-of select="$config/searchsite-name"/> site
-<!--
- <select name="scope">
- <option value="projectAndSubs" selected="selected">This project</option>
- <option value="myprojects">My projects</option>
- <option value="domain" >All projects</option>
+ <div>
+ <select name="sitesearch">
+ <option value="{$config/searchsite-domain}" selected="selected"><xsl:value-of select="$config/searchsite-name"/></option>
+ <option value="" >the web</option>
</select>
--->
</div>
<div>
- <input type="hidden" name="sitesearch" value="{$config/searchsite-domain}"/>
- <input type="text" id="query" name="q" size="10" />
- <input type="submit" value="Search" name="Search" />
-
+ <input type="text" id="query" name="q" size="12" />
+ <input type="submit" value="Go" name="Go" />
</div>
- <!--<div><a href="#">Advanced search</a> </div>-->
- </div>
+ </div>
</div>
</form>
</xsl:if>
1.2 +22 -1 xml-forrest/src/core/context/skins/tigris-style/xslt/html/tab2menu.xsl
Index: tab2menu.xsl
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/skins/tigris-style/xslt/html/tab2menu.xsl,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tab2menu.xsl 22 Dec 2003 09:56:11 -0000 1.1
+++ tab2menu.xsl 28 Dec 2003 22:54:16 -0000 1.2
@@ -34,6 +34,11 @@
</tr>
</table>
</div>
+ <xsl:if test="tab[@dir=$longest-dir]/tab">
+ <div class="level2tab">
+ <xsl:call-template name="level2tabs"/>
+ </div>
+ </xsl:if>
</xsl:template>
<xsl:template name="pre-separator">
@@ -45,6 +50,14 @@
<xsl:template name="separator">
</xsl:template>
+ <xsl:template name="level2-pre-separator">
+ </xsl:template>
+
+ <xsl:template name="level2-post-separator">
+ </xsl:template>
+
+ <xsl:template name="level2-separator"> | </xsl:template>
+
<xsl:template name="selected">
<th>
<xsl:call-template name="base-selected"/>
@@ -57,4 +70,12 @@
</td>
</xsl:template>
+ <xsl:template name="level2-selected">
+ <xsl:call-template name="base-selected"/>
+ </xsl:template>
+
+ <xsl:template name="level2-not-selected">
+ <xsl:call-template name="base-not-selected"/>
+ </xsl:template>
+
</xsl:stylesheet>
1.2 +1 -0 xml-forrest/src/core/context/resources/schema/relaxng/skinconf.rnc
Index: skinconf.rnc
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/context/resources/schema/relaxng/skinconf.rnc,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- skinconf.rnc 20 Oct 2003 15:38:12 -0000 1.1
+++ skinconf.rnc 28 Dec 2003 22:54:16 -0000 1.2
@@ -11,6 +11,7 @@
element disable-print-link{xsd:boolean}?, # Disable print link feature. 'true' or 'false'
element disable-pdf-link{xsd:boolean}?, # Disable print link feature. 'true' or 'false'
element disable-xml-link{xsd:boolean}?, # Disable print link feature. 'true' or 'false'
+ element disable-external-link-image{xsd:boolean}?, # Disable images on external links feature. 'true' or 'false'
element disable-compliance-links {xsd:boolean}?, # Disable standards-compliance logos
element obfuscate-mail-links {xsd:boolean}?, # Render mailto: links unrecognisable by spam harvesters
element searchsite-domain {text}?, # DNS domain to search. Eg 'xml.apache.org'
1.5 +6 -2 xml-forrest/src/core/fresh-site/src/documentation/skinconf.xml
Index: skinconf.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/fresh-site/src/documentation/skinconf.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- skinconf.xml 9 Nov 2003 05:20:04 -0000 1.4
+++ skinconf.xml 28 Dec 2003 22:54:16 -0000 1.5
@@ -10,7 +10,7 @@
<!ENTITY % links.att 'name CDATA #REQUIRED'>
<!ENTITY % link.att 'name CDATA #REQUIRED href CDATA #REQUIRED'>
<!ELEMENT skinconfig (disable-lucene?, disable-search?, disable-print-link?, disable-pdf-link?,
- disable-xml-link?, disable-compliance-links?, obfuscate-mail-links?, searchsite-domain?, searchsite-name?,
+ disable-xml-link?, disable-external-link-image?, disable-compliance-links?, obfuscate-mail-links?, searchsite-domain?, searchsite-name?,
project-name, project-description?, project-url, project-logo, group-name?, group-description?, group-url?, group-logo?,
host-url?, host-logo?, year?, vendor?, trail?, toc?, credits?)*>
<!ELEMENT credits (credit*)>
@@ -22,7 +22,8 @@
<!ELEMENT disable-search (#PCDATA)>
<!ELEMENT disable-print-link (#PCDATA)>
<!ELEMENT disable-pdf-link (#PCDATA)>
- <!ELEMENT disable-xml-link (#PCDATA)>
+ <!ELEMENT disable-xml-link (#PCDATA)>
+ <!ELEMENT disable-external-link-image (#PCDATA)>
<!ELEMENT disable-compliance-links (#PCDATA)>
<!ELEMENT obfuscate-mail-links (#PCDATA)>
<!ELEMENT searchsite-domain (#PCDATA)>
@@ -74,6 +75,9 @@
xml format for their uses. Keep this disabled if you don't want other
sites to easily reuse your pages.-->
<disable-xml-link>true</disable-xml-link>
+
+ <!-- If true, an the images on all external links will not be added -->
+ <disable-external-link-image>false</disable-external-link-image>
<!-- Do we want to disable w3c compliance links? -->
<disable-compliance-links>false</disable-compliance-links>
1.2 +9 -3 xml-forrest/src/core/fresh-site/src/documentation/content/xdocs/tabs.xml
Index: tabs.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/core/fresh-site/src/documentation/content/xdocs/tabs.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tabs.xml 20 Oct 2003 15:38:35 -0000 1.1
+++ tabs.xml 28 Dec 2003 22:54:16 -0000 1.2
@@ -1,21 +1,27 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.0//EN" "http://apache.org/forrest/dtd/tab-cocoon-v10.dtd">
+<!DOCTYPE tabs PUBLIC "-//APACHE//DTD Cocoon Documentation Tab V1.1//EN" "http://apache.org/forrest/dtd/tab-cocoon-v11.dtd">
<tabs software="MyProj"
title="MyProj"
copyright="Foo"
xmlns:xlink="http://www.w3.org/1999/xlink">
- <!-- The rules are:
+ <!-- The rules for tabs are:
@dir will always have '/@indexfile' added.
@indexfile gets appended to @dir if the tab is selected. Defaults to 'index.html'
@href is not modified unless it is root-relative and obviously specifies a
directory (ends in '/'), in which case /index.html will be added
If @id's are present, site.xml entries with a matching @tab will be in that tab.
+
+ Tabs can be embedded to a depth of two. The second level of tabs will only
+ be displayed when their parent tab is selected.
-->
<tab id="" label="Home" dir="" indexfile="index.html"/>
- <tab id="samples" label="Samples" dir="samples" indexfile="sample.html"/>
+ <tab id="samples" label="Samples" dir="samples" indexfile="sample.html">
+ <tab id="" label="Index" dir="samples" indexfile="index.html"/>
+ <tab id="" label="Sample2" dir="samples" indexfile="sample2html"/>
+ </tab>
<!-- Add new tabs here, eg:
<tab label="How-Tos" dir="community/howto/"/>
<tab label="XML Site" dir="xml-site/"/>
Re: forrest-css
Posted by Nicola Ken Barozzi <ni...@apache.org>.
David Crossley wrote:
> Nicola Ken Barozzi wrote:
>
>>David Crossley wrote:
>>
>>>>nicolaken 2003/12/28
>
> <snip/>
>
>>>> Note: not added for other skins as forrest-site will use krysalis-site
>>>> soon and tigris-style deprecates avalon-tigris. As for teh forrest-css one,
>>>> never looked at it, sorry
>>>
>>>I have only had time for a glance at the forrest-css. Pity.
>>>This skin was supposed to inspire our general development:
>>
>>I have changed krysalis-site with the same ideas in mind:
>
> Great - i should have known that you would. It was your comment
> about not looking at forrest-css that got me going.
Well, you said it right, I should have said it myself :-)
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
Re: forrest-css
Posted by David Crossley <cr...@indexgeo.com.au>.
Nicola Ken Barozzi wrote:
> David Crossley wrote:
> >>nicolaken 2003/12/28
<snip/>
> >> Note: not added for other skins as forrest-site will use krysalis-site
> >> soon and tigris-style deprecates avalon-tigris. As for teh forrest-css one,
> >> never looked at it, sorry
> >
> > I have only had time for a glance at the forrest-css. Pity.
> > This skin was supposed to inspire our general development:
>
> I have changed krysalis-site with the same ideas in mind:
Great - i should have known that you would. It was your comment
about not looking at forrest-css that got me going.
<snip comforting reply to some concerns/>
> > We should not let those ideas wither. So if someone has
> > the energy, then please keep forrest-css going.
>
> I suggest instead that these changes are ported, where still applicable,
> to krysalis-site, so that we can finally put it to rest and have only
> two skins: forrest-site (from krysalis-site and forrest-css) and
> tigris-style (that deprecates avalon-tigris).
Thanks, i suppose that that is what i was trying to say.
--David
Re: forrest-css
Posted by Johan Kok <jk...@messianic.dyndns.org>.
Great guns... You did not paly around, great work
Nicola Ken Barozzi wrote:
> David Crossley wrote:
>
>>> nicolaken 2003/12/28 14:54:16
>>>
>>> Modified: src/core/context/skins/common/xslt/html document2html.xsl
>>> <snip other modified files/>
>>> Log:
>>> Double new features (as they have changes some of the same files)
>>> - add subtab handling and enable it for krysalis-site and tigris-style
>>> - show external links with an icon at the end
>>>
>>> Note: not added for other skins as forrest-site will use krysalis-site
>>> soon and tigris-style deprecates avalon-tigris. As for teh
>>> forrest-css one,
>>> never looked at it, sorry
>>
>>
>> I have only had time for a glance at the forrest-css. Pity.
>> This skin was supposed to inspire our general development:
>
>
> I have changed krysalis-site with the same ideas in mind:
>
>> * HTML style stuff in the css, not in the output html.
>
>
> Moved all style in css and all style images are in CSS too; the colors
> are neatly separated and the CSS and html is documented.
>
>> * Minimise use of tables.
>
>
> Less tables, but this can still be improved.
>
>> * Standards compliance.
>
>
> Should be html and CSS compliant.
>
>> * Demonstrate best practice.
>
>
> Not sure here ;-)
>
>> * Better rendering in text-mode browsers.
>
>
> Definately better, as our text-browser advocate has chacked it and
> it's better.
>
>> The main discussion thread started at cocoon-docs (thanks Tony):
>> [RT] Getting rid of the table-based layout
>> http://marc.theaimsgroup.com/?l=xml-cocoon-docs&m=103471154901016
>> then branched to cocoon-dev and forrest-dev. Many topics
>> were covered. Then Miles Elam made the skin/forrest-css
>> http://marc.theaimsgroup.com/?l=forrest-dev&m=103583691609120
>> and thankfully someone heeded NKB's email sig and added to Forrest.
>>
>> We should not let those ideas wither. So if someone has
>> the energy, then please keep forrest-css going.
>
>
> I suggest instead that these changes are ported, where still
> applicable, to krysalis-site, so that we can finally put it to rest
> and have only two skins: forrest-site (from krysalis-site and
> forrest-css) and tigris-style (that deprecates avalon-tigris).
>
Re: forrest-css
Posted by Nicola Ken Barozzi <ni...@apache.org>.
David Crossley wrote:
>>nicolaken 2003/12/28 14:54:16
>>
>> Modified: src/core/context/skins/common/xslt/html document2html.xsl
>><snip other modified files/>
>> Log:
>> Double new features (as they have changes some of the same files)
>> - add subtab handling and enable it for krysalis-site and tigris-style
>> - show external links with an icon at the end
>>
>> Note: not added for other skins as forrest-site will use krysalis-site
>> soon and tigris-style deprecates avalon-tigris. As for teh forrest-css one,
>> never looked at it, sorry
>
> I have only had time for a glance at the forrest-css. Pity.
> This skin was supposed to inspire our general development:
I have changed krysalis-site with the same ideas in mind:
> * HTML style stuff in the css, not in the output html.
Moved all style in css and all style images are in CSS too; the colors
are neatly separated and the CSS and html is documented.
> * Minimise use of tables.
Less tables, but this can still be improved.
> * Standards compliance.
Should be html and CSS compliant.
> * Demonstrate best practice.
Not sure here ;-)
> * Better rendering in text-mode browsers.
Definately better, as our text-browser advocate has chacked it and it's
better.
> The main discussion thread started at cocoon-docs (thanks Tony):
> [RT] Getting rid of the table-based layout
> http://marc.theaimsgroup.com/?l=xml-cocoon-docs&m=103471154901016
> then branched to cocoon-dev and forrest-dev. Many topics
> were covered. Then Miles Elam made the skin/forrest-css
> http://marc.theaimsgroup.com/?l=forrest-dev&m=103583691609120
> and thankfully someone heeded NKB's email sig and added to Forrest.
>
> We should not let those ideas wither. So if someone has
> the energy, then please keep forrest-css going.
I suggest instead that these changes are ported, where still applicable,
to krysalis-site, so that we can finally put it to rest and have only
two skins: forrest-site (from krysalis-site and forrest-css) and
tigris-style (that deprecates avalon-tigris).
--
Nicola Ken Barozzi nicolaken@apache.org
- verba volant, scripta manent -
(discussions get forgotten, just code remains)
---------------------------------------------------------------------
forrest-css (was: cvs commit:
xml-forrest/src/core/fresh-site/src/documentation/content/xdocs tabs.xml)
Posted by David Crossley <cr...@indexgeo.com.au>.
> nicolaken 2003/12/28 14:54:16
>
> Modified: src/core/context/skins/common/xslt/html document2html.xsl
> <snip other modified files/>
> Log:
> Double new features (as they have changes some of the same files)
> - add subtab handling and enable it for krysalis-site and tigris-style
> - show external links with an icon at the end
>
> Note: not added for other skins as forrest-site will use krysalis-site
> soon and tigris-style deprecates avalon-tigris. As for teh forrest-css one,
> never looked at it, sorry
I have only had time for a glance at the forrest-css. Pity.
This skin was supposed to inspire our general development:
* HTML style stuff in the css, not in the output html.
* Minimise use of tables.
* Standards compliance.
* Demonstrate best practice.
* Better rendering in text-mode browsers.
The main discussion thread started at cocoon-docs (thanks Tony):
[RT] Getting rid of the table-based layout
http://marc.theaimsgroup.com/?l=xml-cocoon-docs&m=103471154901016
then branched to cocoon-dev and forrest-dev. Many topics
were covered. Then Miles Elam made the skin/forrest-css
http://marc.theaimsgroup.com/?l=forrest-dev&m=103583691609120
and thankfully someone heeded NKB's email sig and added to Forrest.
We should not let those ideas wither. So if someone has
the energy, then please keep forrest-css going.
--David