stas 02/04/02 21:18:28
Modified: tmpl/custom/html ad download_link headers index index_body
index_toc index_toc_section logo menu_links
menu_main navbar_global navbar_local_bottom
navbar_local_top page page_body page_toc
page_toc_section prev_next_link search tail title
top_link wrap_box
Log:
- adjust templates for the new design
Submitted by: allan
Revision Changes Path
1.12 +54 -62 modperl-docs/tmpl/custom/html/ad
Index: ad
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/ad,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- ad 21 Mar 2002 12:02:46 -0000 1.11
+++ ad 3 Apr 2002 05:18:27 -0000 1.12
@@ -1,69 +1,61 @@
-<div class="ad">
-[% WRAPPER wrap_box
- title = 'Books'
+[%- WRAPPER wrap_box
+ title = 'Books'
-%]
- <!--books top-line separator-->
- <tr>
- <td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
- </tr>
- <tr>
- <td class="menu-border" width="1"><br></td>
- <td class="ad-bg">
- <div class="adtext">
- The mod_perl Developer's Cookbook<br><br>
- <a href="http://www.modperlcookbook.org/";>
- <img src="[% doc.dir.abs_doc_root
%]/images/ads/modperlcookbook.jpg" border="1" align="middle" width="113"
height="140" class="img-border" alt="The mod_perl Developer's Cookbook">
- </a>
- <br><br>
- <em>By Geoffrey Young, Paul Lindner, Randy Kobes</em>
- </div>
- </td>
- <td class="menu-border" width="1"><br></td>
- </tr>
-[% END %]
-[% WRAPPER wrap_box
- title = ''
--%]
- <tr>
- <td class="menu-border" width="1"><br></td>
- <td class="ad-bg">
- <div class="adtext">
- mod_perl Pocket Reference<br><br>
- <a href="http://www.oreilly.com/catalog/modperlpr/";>
- <img src="[% doc.dir.abs_doc_root
%]/images/ads/modperlpr.jpg" border="1" align="middle" width="85" height="140"
class="img-border" alt="mod_perl Pocket Reference">
- </a>
+ <tr>
+ <td class="menu-border" width="1"><br></td>
+ <td class="ad-bg">
+ <div class="adtext">
+ The mod_perl Developer's Cookbook<br><br>
+ <a href="http://www.modperlcookbook.org/";>
+ <img src="[% doc.dir.abs_doc_root
%]/images/ads/modperlcookbook.jpg" border="1" align="middle" width="113"
height="140" class="img-border" alt="The mod_perl Developer's Cookbook">
+ </a>
<br><br>
- <em>By Andrew Ford</em>
- </div>
- </td>
- <td class="menu-border" width="1"><br></td>
- </tr>
+ <em>By Geoffrey Young, Paul Lindner, Randy Kobes</em>
+ </div>
+ </td>
+ <td class="menu-border" width="1"><br></td>
+ </tr>
-[% END %]
+ <tr>
+ <td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
+ </tr>
-[% WRAPPER wrap_box
- title = ''
--%]
- <tr>
- <td class="menu-border" width="1"><br></td>
- <td class="ad-bg">
- <div class="adtext">
- <br>Writing Apache Modules with Perl and C<br><br>
- <a href="http://www.modperl.com/";>
- <img src="[% doc.dir.abs_doc_root
%]/images/ads/wrapmod.jpg" border="1" align="middle" width="107" height="140"
class="img-border" alt="Writing Apache Modules with Perl and C">
- </a>
- <br><br>
- <em>By Lincoln Stein, Doug MacEachern</em>
- </div>
- </td>
- <td class="menu-border" width="1"><br></td>
- </tr>
- <tr>
- <td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
- </tr>
- <!--books bottom-line separator-->
+ <tr>
+ <td class="menu-border" width="1"><br></td>
+ <td class="ad-bg">
+ <div class="adtext">
+ mod_perl Pocket Reference<br><br>
+ <a href="http://www.oreilly.com/catalog/modperlpr/";>
+ <img src="[% doc.dir.abs_doc_root
%]/images/ads/modperlpr.jpg" border="1" align="middle" width="85" height="140"
class="img-border" alt="mod_perl Pocket Reference">
+ </a>
+ <br><br>
+ <em>By Andrew Ford</em>
+ </div>
+ </td>
+ <td class="menu-border" width="1"><br></td>
+ </tr>
-[% END %]
+ <tr>
+ <td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
+ </tr>
+
+ <tr>
+ <td class="menu-border" width="1"><br></td>
+ <td class="ad-bg">
+ <div class="adtext">
+ <br>Writing Apache Modules with Perl and C<br><br>
+ <a href="http://www.modperl.com/";>
+ <img src="[% doc.dir.abs_doc_root
%]/images/ads/wrapmod.jpg" border="1" align="middle" width="107" height="140"
class="img-border" alt="Writing Apache Modules with Perl and C">
+ </a>
+ <br><br>
+ <em>By Lincoln Stein, Doug MacEachern</em>
+ </div>
+ </td>
+ <td class="menu-border" width="1"><br></td>
+ </tr>
-</div>
\ No newline at end of file
+ <tr>
+ <td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
+ </tr>
+[% END %]
\ No newline at end of file
1.6 +11 -8 modperl-docs/tmpl/custom/html/download_link
Index: download_link
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/download_link,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- download_link 22 Mar 2002 02:02:16 -0000 1.5
+++ download_link 3 Apr 2002 05:18:27 -0000 1.6
@@ -1,17 +1,20 @@
-[% # link to the pdf, source and other variants of the doc
+[%- # link to the pdf, source and other variants of the doc
# src block
+ flag = 0;
IF doc.src_doc.link;
INCLUDE src_doc;
+ ELSE;
+ flag = flag + 1;
END;
- " ";
# pdf block
IF doc.pdf_doc.link;
INCLUDE pdf_doc;
+ ELSE;
+ flag = flag + 1;
END;
+
+ IF flag == 2;
+ "<br>";
+ END;
-%]
-[% BLOCK src_doc %]
-<a href="[% doc.src_doc.link -%]"><img src="[% doc.dir.abs_doc_root
%]/images/nav/page_src.gif" width="48" height="20" border="0" align="middle"
alt="Source version of the document ([%- doc.src_doc.size -%])"></a>
-[% END %]
-[% BLOCK pdf_doc %]
-<a href="[% doc.pdf_doc.link -%]"><img src="[% doc.dir.abs_doc_root
%]/images/nav/page_pdf.gif" width="48" height="20" border="0" align="middle"
alt="PDF version of the document ([%- doc.pdf_doc.size -%])"></a>
-[% END %]
+[%- BLOCK src_doc -%]<a href="[%- doc.src_doc.link -%]"><img src="[%-
doc.dir.abs_doc_root -%]/images/nav/page_src.gif" width="48" height="20"
border="0" alt="Source version of the document ([%- doc.src_doc.size
-%])"></a>[%- END -%][%- BLOCK pdf_doc -%]<a href="[%- doc.pdf_doc.link
-%]"><img src="[%- doc.dir.abs_doc_root -%]/images/nav/page_pdf.gif" width="48"
height="20" border="0" alt="PDF version of the document ([%- doc.pdf_doc.size
-%])"></a>[%- END -%]
\ No newline at end of file
1.4 +6 -6 modperl-docs/tmpl/custom/html/headers
Index: headers
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/headers,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- headers 22 Feb 2002 10:21:34 -0000 1.3
+++ headers 3 Apr 2002 05:18:27 -0000 1.4
@@ -1,6 +1,6 @@
- <meta name="Author" content="docs-dev (at) perl.apache.org">
- <meta name="Description" content="mod_perl documentation: Manuals, Hints,
Guidelines, Scenarios, Troubleshooting and Help">
- <meta name="keywords" content="mod_perl modperl perl cgi apache webserver
speed fast guide mod_perl asf parent apache guide help info faq mod_perl
installation cgi troubleshooting help no sex speedup child rules free open
source OSS mod_perl speed suck apache guide manual troubleshoot cgi fast apache
sexy ">
- <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
- <meta name="Classification" content="information">
- <link href="[% doc.dir.abs_doc_root %]/style.css" rel="stylesheet"
type="text/css" title="refstyle">
\ No newline at end of file
+ <meta name="Author" content="docs-dev (at) perl.apache.org">
+ <meta name="Description" content="mod_perl documentation: Manuals,
Hints, Guidelines, Scenarios, Troubleshooting and Help">
+ <meta name="keywords" content="mod_perl modperl perl cgi apache
webserver speed fast guide mod_perl asf parent apache guide help info faq
mod_perl installation cgi troubleshooting help no sex speedup child rules free
open source OSS mod_perl speed suck apache guide manual troubleshoot cgi fast
apache sexy ">
+ <meta http-equiv="Content-Type" content="text/html;
charset=iso-8859-1">
+ <meta name="Classification" content="information">
+ <link href="[% doc.dir.abs_doc_root %]/style.css" rel="stylesheet"
type="text/css" title="refstyle">
\ No newline at end of file
1.18 +54 -10 modperl-docs/tmpl/custom/html/index
Index: index
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- index 22 Mar 2002 02:02:16 -0000 1.17
+++ index 3 Apr 2002 05:18:27 -0000 1.18
@@ -1,32 +1,76 @@
[%- INCLUDE head
paget = doc.meta.title
- title = "mod_perl: $paget"
+ title = "mod_perl: $paget"
content = ''
-%]
-
<!-- Swishcommand noindex -->
-<!-- left box (NAV)-->
+<!-- logobox begin -->
+<div class="logobox">
+ <table border="0" cellspacing="0" cellpadding="0" width="100%"
align="center">
+ <tr valign="top">
+
+ [%- INCLUDE logo -%]
+ [%- INCLUDE navbar_global
+ nav=doc.nav
+ rel_doc_root=doc.dir.rel_doc_root;
+ -%]
+
+ <!-- camel begin -->
+ <td align="right"><img src="[%- doc.dir.abs_doc_root
-%]/images/logo/logo_blend_camel.gif" border="0" alt="mod_perl icon" width="40"
height="49"></td>
+ <!-- camel end -->
+ </tr>
+ </table>
+</div>
+<!-- logobox end -->
+
+<!-- left box begin -->
<div class="leftbox">
- [%- INCLUDE logo -%]
+ <!-- menu main begin -->
+
+[%-INCLUDE menu_main nav=doc.nav; -%]
+
+ <!-- menu main end -->
+
<br>
- [%- INCLUDE menu_main nav=doc.nav; -%]
+
+ <!-- search begin -->
+
+[%- INCLUDE search -%]
+
+ <!-- search end -->
+
<br>
- [%- INCLUDE menu_links -%]
+
+ <!-- menu links begin -->
+
+[%- INCLUDE menu_links -%]
+
+ <!-- menu links end -->
+
<br>
- [%- INCLUDE ad -%]
+
+ <!-- ad begin -->
+
+[%- INCLUDE ad -%]
+
+ <!-- ad end -->
+
<br><br>
</div>
-<!-- end left box-->
+<!-- left box end -->
-<!-- right box-->
+<!-- right box begin-->
<div class="rightbox">
[%- INCLUDE index_body -%]
+
<br>
<hr noshade size="1">
+
[%- INCLUDE tail -%]
+
</div>
-<!-- end right box-->
+<!-- right box end -->
</body>
</html>
1.13 +12 -10 modperl-docs/tmpl/custom/html/index_body
Index: index_body
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index_body,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- index_body 22 Mar 2002 02:02:16 -0000 1.12
+++ index_body 3 Apr 2002 05:18:27 -0000 1.13
@@ -1,16 +1,15 @@
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-[%- INCLUDE navbar_global
- nav=doc.nav;
+[%-
INCLUDE title;
--%]
-</table>
-[%-
INCLUDE navbar_local_top
nav=doc.nav.up
rel_doc_root=doc.dir.rel_doc_root;
+-%]
+
+
+ <!-- content begin -->
- "<!-- content-->";
+[%-
IF doc.body.top;
"${doc.body.top}";
END;
@@ -25,10 +24,13 @@
"${doc.body.bot}";
END;
- "<br>";
+-%]
+ <br>
+[%-
INCLUDE navbar_local_bottom
nav=doc.nav.up
rel_doc_root=doc.dir.rel_doc_root;
-%]
-<!-- end content-->
\ No newline at end of file
+-%]
+
+ <!-- content end -->
1.7 +17 -17 modperl-docs/tmpl/custom/html/index_toc
Index: index_toc
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index_toc,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- index_toc 21 Feb 2002 08:55:18 -0000 1.6
+++ index_toc 3 Apr 2002 05:18:27 -0000 1.7
@@ -1,25 +1,25 @@
-[% #
+[%-#
# expected args:
# toc - an array with keys: link, stitle, title, abstract, subs
- # (subs is optional and includes a similar array)
-%]
+ # (subs is optional and includes a similar array)
+-%]
-[% numbers = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X'] %]
+[%- numbers = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X']
-%]
-[% IF toc.size %]
+[%- IF toc.size -%]
<div class="toc">
-
- [% IF toc.0.group_title.defined;
- SET counter = 0;
- FOREACH group = toc;
- "<h3>Part ${numbers.$counter}: ${group.group_title}</h3>";
- INCLUDE index_toc_section subs=group.subs;
- counter = counter + 1;
- END;
- ELSE;
- INCLUDE index_toc_section subs=toc;
+[%- IF toc.0.group_title.defined;
+ SET counter = 0;
+ FOREACH group = toc;
+ "<h3>Part ${numbers.$counter}: ${group.group_title}</h3>";
+ INCLUDE index_toc_section subs=group.subs;
+ counter = counter + 1;
END;
- %]
+ ELSE;
+ INCLUDE index_toc_section subs=toc;
+ END;
+-%]
</div>
-[% END %]
\ No newline at end of file
+
+[%- END -%]
\ No newline at end of file
1.5 +12 -8 modperl-docs/tmpl/custom/html/index_toc_section
Index: index_toc_section
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index_toc_section,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- index_toc_section 21 Feb 2002 08:55:18 -0000 1.4
+++ index_toc_section 3 Apr 2002 05:18:27 -0000 1.5
@@ -1,13 +1,17 @@
-[% # render one level of toc and call recursively itself if there are
+[%-# render one level of toc and call recursively itself if there are
# nested levels.
# expected args:
# subs - an array with keys indentical to 'toc' from above.
-%]
- [% FOREACH sec = subs %]
+-%]
+
+[%- FOREACH sec = subs -%]
+
<dl>
- <dt><a href="[% sec.link %]"><img src="[% doc.dir.abs_doc_root
%]/images/arrow_right.gif" alt="-" align="middle" border="0" height="18"
width="18">[% sec.title %]</a></dt>
- [% IF sec.abstract %]
- <dd>[% sec.abstract %]</dd>
- [% END %]
+ <dt><a href="[%- sec.link -%]"><img src="[%-
doc.dir.abs_doc_root -%]/images/arrow_right.gif" alt="-" align="middle"
border="0" height="18" width="18">[%- sec.title -%]</a></dt>
+
+[%- IF sec.abstract -%]
+ <dd>[%- sec.abstract -%]</dd>
+
+[%- END -%]
</dl>
- [% END %]
\ No newline at end of file
+[%- END -%]
1.6 +3 -10 modperl-docs/tmpl/custom/html/logo
Index: logo
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/logo,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- logo 28 Feb 2002 16:11:11 -0000 1.5
+++ logo 3 Apr 2002 05:18:27 -0000 1.6
@@ -1,10 +1,3 @@
-<table border="0" cellspacing="0" cellpadding="0" width="150" align="center">
- <tr>
- <td>
- <div class="logo" align="center">
- <a href="http://perl.apache.org/";><img src="[%
doc.dir.abs_doc_root %]/images/logo/mod_perl2.jpg" border="0" alt="mod_perl
icon" height="59" width="150"></a>
- </div>
- </td>
- </tr>
-</table>
-
+ <td>
+ <a href="http://perl.apache.org/";><img src="[%
doc.dir.abs_doc_root %]/images/logo/logo_blend.gif" border="0" alt="mod_perl
icon" width="195" height="52"></a>
+ </td>
\ No newline at end of file
1.6 +12 -12 modperl-docs/tmpl/custom/html/menu_links
Index: menu_links
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/menu_links,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- menu_links 21 Feb 2002 12:15:25 -0000 1.5
+++ menu_links 3 Apr 2002 05:18:27 -0000 1.6
@@ -1,33 +1,33 @@
-[% # links menu
+[%-# links menu
# expects to be set:
# nav - cache navigator object
# rel_doc_root - relative docs path (only for chapters!)
-%]
-[% SET buttons = [
+[%- SET buttons = [
[ 'http://take23.org/', 'mod_perl news @ Take23'],
['http://www.apache.org/', 'The ASF'],
['http://www.apacheweek.com/', 'Apache Week'],
['http://www.perl.org/', 'Perl Mongers'],
['http://use.perl.org/', 'Use Perl'],
- ];
-%]
-<div class="menulinks">
-[% WRAPPER wrap_box
- title = 'sister sites'
+ ];
-%]
-[%- FOREACH but = buttons %]
+[%- WRAPPER wrap_box
+ title = 'sister sites'
+-%]
+
+[%- FOREACH but = buttons -%]
+
<tr>
<td class="menu-border"><br></td>
<td class="non-sel-bg">
<div class="nonselectedmenuitem">
- <a href="[% but.0 %]">[% but.1 %]</a>
+ <a href="[%- but.0 -%]">[%- but.1 -%]</a>
</div>
</td>
<td class="menu-border"><br></td>
</tr>
-[% END %]
+[%- END -%]
<tr>
<td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
</tr>
-[% END %]
-</div>
\ No newline at end of file
+[%- END -%]
\ No newline at end of file
1.4 +35 -37 modperl-docs/tmpl/custom/html/menu_main
Index: menu_main
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/menu_main,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- menu_main 21 Feb 2002 12:15:25 -0000 1.3
+++ menu_main 3 Apr 2002 05:18:27 -0000 1.4
@@ -1,35 +1,34 @@
-[% # main menu
- # expects to be set:
- # nav - cache navigator object
- # rel_doc_root - relative docs path (only for chapters!)
--%]
+[%- # main menu
+ # expects to be set:
+ # nav - cache navigator object
+ # rel_doc_root - relative docs path (only for chapters!)
-[% # collect the top level data
- # first go up to the absolute root
- l = nav; # remember last valid node
- p = nav.up;
- WHILE p;
+ # collect the top level data
+ # first go up to the absolute root
+ l = nav; # remember last valid node
+ p = nav.up;
+ WHILE p;
l = p;
p = p.up;
- END;
+ END;
- p = l; # last valid node
- IF p.parent_rel_path.defined;
+ p = l; # last valid node
+ IF p.parent_rel_path.defined;
prefix = p.parent_rel_path;
- ELSE;
+ ELSE;
prefix = ".";
- END;
- IF rel_doc_root.defined;
+ END;
+ IF rel_doc_root.defined;
prefix = "$prefix/$rel_doc_root";
- END;
+ END;
- # walk through the top level nodes
- count = 0;
- selected = 0;
- current = p;
- buttons = [];
- p = p.first;
- WHILE p;
+ # walk through the top level nodes
+ count = 0;
+ selected = 0;
+ current = p;
+ buttons = [];
+ p = p.first;
+ WHILE p;
count = count + 1;
link = INCLUDE link prefix=prefix link=p.meta.link;
IF p.id == current.id;
@@ -41,27 +40,26 @@
END;
buttons.push({link => link, text => p.meta.stitle, style => style,
td_style => td_style});
p = p.next; # next node
- END;
--%]
+ END;
+ -%]
-<div class="menumain">
-[% WRAPPER wrap_box
- title = 'perl.apache.org'
+[%- WRAPPER wrap_box
+ title = 'perl.apache.org'
-%]
-[%- FOREACH but = buttons %]
+
+[%- FOREACH but = buttons -%]
+
<tr>
<td class="menu-border"><br></td>
- <td class="[% but.td_style %]">
- <div class="[% but.style %]">
- <a href="[% but.link %]">[% but.text %]</a>
+ <td class="[%- but.td_style -%]">
+ <div class="[%- but.style -%]">
+ <a href="[%- but.link -%]">[%- but.text -%]</a>
</div>
</td>
<td class="menu-border"><br></td>
</tr>
-
-[% END %]
+[%- END -%]
<tr>
<td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
</tr>
-[% END %]
-</div>
\ No newline at end of file
+[%- END -%]
\ No newline at end of file
1.10 +66 -40 modperl-docs/tmpl/custom/html/navbar_global
Index: navbar_global
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/navbar_global,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- navbar_global 22 Mar 2002 02:02:16 -0000 1.9
+++ navbar_global 3 Apr 2002 05:18:27 -0000 1.10
@@ -1,55 +1,81 @@
-[% # parent-docsets navigation bar
- # expects to be set:
- # nav - cache navigator object
- # rel_doc_root - relative docs path (only for chapters!)
+[%- # parent-docsets navigation bar
+ # expects to be set:
+ # nav - cache navigator object
+ # rel_doc_root - relative docs path (only for chapters!)
-%]
-[% IF nav -%]
- [% # prepare the sects to show where are we relative
- # to the absolute root
- parents = [];
- p = nav.up;
- nav_not_empty = 0;
- WHILE p;
- parents.unshift(p);
- p = p.up;
- nav_not_empty = 1;
- END;
-
- sects = [];
- FOREACH p = parents;
- SET path = [];
- IF p.parent_rel_path.defined; # top level has no rel_path
- path.push(p.parent_rel_path);
- END;
- IF rel_doc_root.defined;
- path.push(rel_doc_root);
- END;
- nav_not_empty = 1;
- link = path.join("/");
- sects.push({link => "$link/index.html", text =>
p.index_node.stitle});
+[%- IF nav -%]
+
+[%- # prepare the sects to show where are we relative
+ # to the absolute root
+ parents = [];
+ p = nav.up;
+ nav_not_empty = 0;
+ WHILE p;
+ parents.unshift(p);
+ p = p.up;
+ nav_not_empty = 1;
+ END;
+
+ sects = [];
+ FOREACH p = parents;
+ SET path = [];
+ IF p.parent_rel_path.defined; # top level has no rel_path
+ path.push(p.parent_rel_path);
END;
- # a page has index as its parent, so we push it here
IF rel_doc_root.defined;
- nav_not_empty = 1;
- sects.push({link => "$rel_doc_root/index.html",
- text => nav.index_node.stitle});
+ path.push(rel_doc_root);
END;
- -%]
+ nav_not_empty = 1;
+ link = path.join("/");
+ sects.push({link => "$link/index.html", text =>
p.index_node.stitle});
+ END;
+ # a page has index as its parent, so we push it here
+ IF rel_doc_root.defined;
+ nav_not_empty = 1;
+ sects.push({link => "$rel_doc_root/index.html",
+ text => nav.index_node.stitle});
+ END;
+-%]
- <!--start breadcrumb-->
- <tr>
- <td class="navbarglobal" valign="top" height="20">
+
+ <!-- breadcrumb and topline begin -->
+ <td width="100%" align="left">
+ <table border="0" cellspacing="0" cellpadding="0"
width="100%">
+ <tr valign="bottom">
+ <td class="navbarglobal" height="31" width="100%">
+ <!-- breadcrumb start -->
[%- IF nav_not_empty == 1 -%]
[%- WRAPPER button
width = "100%"
align = 'left'
-%]
- [%- FOREACH sec = sects -%]<a href="[% INCLUDE link
link=sec.link %]"><b>[% sec.text %]</b></a> / [%- END -%]
+ [%- FOREACH sec = sects -%]
+
+ <a href="[%- sec.link -%]"><b>[%- sec.text
-%]</b></a> /
+ [%- END -%]
[%- END -%]
[%- ELSE -%]
<br>
[%- END -%]
+
+ <!-- breadcrumb end -->
+ </td>
+ </tr>
+ <tr valign="top">
+ <td height="6"><br class="smallbr"></td>
+ </tr>
+ <!-- topline begin -->
+ <tr valign="top">
+ <td height="1" bgcolor="#BFCFE7"><br
class="smallbr"></td>
+ </tr>
+ <tr valign="top">
+ <td height="1" bgcolor="#525d76"><br
class="smallbr"></td>
+ </tr>
+ <!-- topline end -->
+ <tr valign="top">
+ <td height="6"><br class="smallbr"></td>
+ </tr>
+ </table>
</td>
- </tr>
- <!--end breadcrumb-->
-[% END -%]
+ <!-- breadcrumb and topline end -->
+[%- END -%]
1.5 +12 -13 modperl-docs/tmpl/custom/html/navbar_local_bottom
Index: navbar_local_bottom
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/navbar_local_bottom,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- navbar_local_bottom 22 Feb 2002 09:36:51 -0000 1.4
+++ navbar_local_bottom 3 Apr 2002 05:18:27 -0000 1.5
@@ -1,16 +1,15 @@
-[% # '<=prev | up | next=>' chapters navigation bar
+[%- # '<=prev | up | next=>' chapters navigation bar
# expects to be set
# nav - cache navigator object
# rel_doc_root - relative docs path
-%]
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td align="left" width="50%" nowrap>
- [% INCLUDE top_link %]
- </td>
- <td align="right" width="50%" nowrap>
- [% INCLUDE prev_next_link %]
- </td>
- </tr>
-</table>
-<!--this line break must be here for ns4-->
+-%]
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td align="left" width="50%" nowrap>
+ [%- INCLUDE top_link -%]
+ </td>
+ <td align="right" width="50%" nowrap>
+ [%- INCLUDE prev_next_link -%]
+ </td>
+ </tr>
+ </table>
\ No newline at end of file
1.12 +18 -19 modperl-docs/tmpl/custom/html/navbar_local_top
Index: navbar_local_top
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/navbar_local_top,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- navbar_local_top 24 Mar 2002 17:06:39 -0000 1.11
+++ navbar_local_top 3 Apr 2002 05:18:27 -0000 1.12
@@ -1,22 +1,21 @@
-[% # '<=prev | up | next=>' chapters navigation bar
+[%-# '<=prev | up | next=>' chapters navigation bar
# expects to be set
# nav - cache navigator object
# rel_doc_root - relative docs path
-%]
-<table width="100%" border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td colspan="3" height="6"><br class="smallbr"></td>
- </tr>
- <tr valign="middle">
- <td align="left" valign="top" width="33%" nowrap>
- [% INCLUDE search %]
- </td>
- <td align="center" valign="top" class="download" width="33%" nowrap>
- [% INCLUDE download_link %]
- </td>
- <td align="right" valign="top" width="33%" nowrap>
- [% INCLUDE prev_next_link %]
- </td>
- </tr>
-</table>
-<!--this line break must be here for ns4-->
+-%]
+
+ <!-- download and local navigation begin -->
+ <table width="100%" border="0" cellspacing="0" cellpadding="0">
+ <tr>
+ <td colspan="2" height="6"><br class="smallbr"></td>
+ </tr>
+ <tr valign="middle">
+ <td align="left" valign="top" width="50%" nowrap>
+ [%- INCLUDE download_link -%]
+ </td>
+ <td align="right" valign="top" width="50%" nowrap>
+ [%- INCLUDE prev_next_link -%]
+ </td>
+ </tr>
+ </table>
+ <!-- download and local navigation end -->
\ No newline at end of file
1.20 +60 -14 modperl-docs/tmpl/custom/html/page
Index: page
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- page 22 Mar 2002 02:02:16 -0000 1.19
+++ page 3 Apr 2002 05:18:27 -0000 1.20
@@ -1,33 +1,79 @@
-[% INCLUDE head
+[%- INCLUDE head
paget = doc.meta.title
- title = "mod_perl: $paget"
+ title = "mod_perl: $paget"
content = ''
-%]
<!-- Swishcommand noindex -->
-<!-- left box (NAV)-->
+<!-- logobox begin -->
+<div class="logobox">
+ <table border="0" cellspacing="0" cellpadding="0" width="100%"
align="center">
+ <tr valign="top">
+
+ [%- INCLUDE logo -%]
+ [%- INCLUDE navbar_global
+ nav=doc.nav
+ rel_doc_root=doc.dir.rel_doc_root;
+ -%]
+
+ <!-- camel begin -->
+ <td align="right"><img src="[%- doc.dir.abs_doc_root
-%]/images/logo/logo_blend_camel.gif" border="0" alt="mod_perl icon" width="40"
height="49"></td>
+ <!-- camel end -->
+ </tr>
+ </table>
+</div>
+<!-- logobox end -->
+
+<!-- left box begin -->
<div class="leftbox">
- [%- INCLUDE logo -%]
+ <!-- menu main begin -->
+
+[%- INCLUDE menu_main
+ nav=doc.nav
+ rel_doc_root=doc.dir.rel_doc_root;
+-%]
+
+ <!-- menu main end -->
+
<br>
- [%- INCLUDE menu_main
- nav=doc.nav
- rel_doc_root=doc.dir.rel_doc_root;
- -%]
+
+ <!-- search begin -->
+
+[%- INCLUDE search -%]
+
+ <!-- search end -->
+
<br>
- [%- INCLUDE menu_links -%]
+
+ <!-- menu links begin -->
+
+[%- INCLUDE menu_links -%]
+
+ <!-- menu links end -->
+
<br>
- [%- INCLUDE ad -%]
+
+ <!-- ad begin -->
+
+[%- INCLUDE ad -%]
+
+ <!-- ad end -->
+
<br><br>
</div>
-<!-- end left box-->
+<!-- left box end -->
-<!-- right box-->
+<!-- right box begin-->
<div class="rightbox">
- [% INCLUDE page_body %]
+ [%- INCLUDE page_body -%]
+
<br>
<hr noshade size="1">
+
[%- INCLUDE tail -%]
+
</div>
-<!-- end right box-->
+<!-- right box end -->
+
</body>
</html>
1.21 +31 -28 modperl-docs/tmpl/custom/html/page_body
Index: page_body
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page_body,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- page_body 23 Mar 2002 09:11:33 -0000 1.20
+++ page_body 3 Apr 2002 05:18:27 -0000 1.21
@@ -1,37 +1,40 @@
-<table border="0" width="100%" cellspacing="0" cellpadding="0">
-[%- INCLUDE navbar_global
- nav=doc.nav
- rel_doc_root=doc.dir.rel_doc_root;
+[%-
INCLUDE title;
--%]
-</table>
-[%
INCLUDE navbar_local_top
nav=doc.nav
rel_doc_root=doc.dir.rel_doc_root;
+-%]
- "<!-- content-->";
- INCLUDE page_toc toc=doc.toc;
- # render the content
- # index_section is used to break up the doc into sections for indexing
+ <!-- content begin -->
+ [%-
+ INCLUDE page_toc toc=doc.toc;
+
+ # render the content
+ # index-section is used to break up the doc into sections for
indexing
+
+FOREACH sec = doc.body;
+ -%]
- FOREACH sec = doc.body;
- '<div class="index_section">';
- '<!-- SwishCommand index -->';
- sec;
- "<br><br>\n";
- IF loop.count == loop.size;
- INCLUDE navbar_local_bottom
- nav=doc.nav
- rel_doc_root=doc.dir.rel_doc_root;
- ELSE;
- INCLUDE top_link;
- END;
- "<br><br>\n";
- '<!-- SwishCommand noindex -->';
- "</div>\n\n";
+ <div class="index-section">
+ <!-- SwishCommand index -->
+
+ [%-
+ sec;
+ "<br><br>\n";
+ IF loop.count == loop.size;
+ INCLUDE navbar_local_bottom
+ nav=doc.nav
+ rel_doc_root=doc.dir.rel_doc_root;
+ ELSE;
+ INCLUDE top_link;
END;
-%]
-<!-- end content-->
+ -%]
+
+ <br><br>
+ <!-- SwishCommand noindex -->
+ </div>
+[%- END -%]
+
+ <!-- content end -->
1.8 +13 -10 modperl-docs/tmpl/custom/html/page_toc
Index: page_toc
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page_toc,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- page_toc 22 Mar 2002 02:02:16 -0000 1.7
+++ page_toc 3 Apr 2002 05:18:27 -0000 1.8
@@ -1,15 +1,18 @@
-[% # Create a 'Table of Contents' section, if there are more than one
+[%-# Create a 'Table of Contents' section, if there are more than one
# sections
#
# Expected args:
# toc - an array ref with keys: link, title, abstract, subs
# (subs is optional and includes a similar array)
-%]
-[% IF toc.size && toc.size > 1 %]
-<h3>Table of Contents</h3>
-<div class="toc">
- [% INCLUDE page_toc_section subs=toc %]
-</div>
-[% ELSE %]
-<br>
-[% END %]
+-%]
+[%- IF toc.size && toc.size > 1 -%]
+
+ <h3>Table of Contents</h3>
+ <div class="toc">
+ [%- INCLUDE page_toc_section subs=toc -%]
+ </div>
+
+[%- ELSE -%]
+
+ <br>
+[%- END -%]
1.4 +9 -14 modperl-docs/tmpl/custom/html/page_toc_section
Index: page_toc_section
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page_toc_section,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- page_toc_section 21 Feb 2002 12:15:25 -0000 1.3
+++ page_toc_section 3 Apr 2002 05:18:27 -0000 1.4
@@ -1,17 +1,12 @@
-[% # render one level of toc and call recursively itself if there are
+[%- # render one level of toc and call recursively itself if there are
# nested levels.
# expected args:
# subs - an array with keys indentical to 'toc' from above.
-%]
- <ul>
- [% FOREACH sec = subs %]
- <li><a href="[% sec.link %]">[% sec.title %]</a>
- [% IF sec.abstract %]
- <br>[% sec.abstract %]<br><br>
- [% END %]
- [% IF sec.subs %]
- [% PROCESS page_toc_section subs=sec.subs %]
- [% END %]
- </li>
- [% END %]
- </ul>
\ No newline at end of file
+-%]
+ <ul>
+[%- FOREACH sec = subs -%]
+ <li>
+ <a href="[%- sec.link -%]">[%- sec.title -%]</a>[%- IF
sec.abstract -%]<br>[%- sec.abstract -%]<br><br>[%- END -%][%- IF sec.subs
-%][%- PROCESS page_toc_section subs=sec.subs -%][%- END -%]
+ </li>
+[%- END -%]
+ </ul>
1.10 +1 -1 modperl-docs/tmpl/custom/html/prev_next_link
Index: prev_next_link
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/prev_next_link,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- prev_next_link 25 Mar 2002 08:09:12 -0000 1.9
+++ prev_next_link 3 Apr 2002 05:18:27 -0000 1.10
@@ -1,4 +1,4 @@
-[% # '<=prev | up | next=>' chapters navigation bar
+[%-# '<=prev | up | next=>' chapters navigation bar
# if there is no up, prev or next we render only a transparent placeholder
# expects to be set
# nav - cache navigator object
1.13 +65 -23 modperl-docs/tmpl/custom/html/search
Index: search
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/search,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- search 24 Mar 2002 17:06:39 -0000 1.12
+++ search 3 Apr 2002 05:18:27 -0000 1.13
@@ -1,29 +1,71 @@
[%- # search widget
- #
# this template expects these vars to be set:
# doc.dir.abs_doc_root - doc root
# doc.dir.path_from_base
-%]
+ <table border="0" cellspacing="0" cellpadding="0" width="150"
align="center">
+ <tr>
+ <td class="menu-border" width="1"><br class="smallbr"></td>
+ <td class="menu-border" width="148"><br class="smallbr"></td>
+ <td class="menu-border" width="1"><br class="smallbr"></td>
+ </tr>
-<form method="post" action="[% doc.dir.abs_doc_root %]/search/swish.cgi"
enctype="application/x-www-form-urlencoded" name="site_search_form">
-<table border="0" cellspacing="0" cellpadding="0">
- <tr>
- <td class="menu-border" colspan="5" height="1"><br
class="smallbr"></td>
- </tr>
- <tr>
- <td class="menu-border" width="1"><br class="smallbr"></td>
- <td class="search">
- <input type="text" name="query" size="15" maxlength="200"
class="input-fld" value="">
- </td>
- <td class="menu-border" width="1"><br class="smallbr"></td>
- <td class="search" width="2" align="center">
- <input type="submit" name="submit" value="Search"
class="submit-but">
- <input type="hidden" name="sbm" value="[% doc.dir.path_from_base
%]">
- </td>
- <td class="menu-border" width="1"><br class="smallbr"></td>
- </tr>
- <tr>
- <td class="menu-border" colspan="5" height="1"><br
class="smallbr"></td>
- </tr>
-</table>
-</form>
+ <tr>
+ <td class="menu-border"><br></td>
+ <td align="center" class="menu-title-bg">
+ <div class="menu-title">Search</div>
+ </td>
+ <td class="menu-border"><br></td>
+ </tr>
+
+ <tr>
+ <td class="menu-border" colspan="3"><br class="smallbr"></td>
+ </tr>
+
+ <tr>
+ <td class="menu-border"><br></td>
+ <td class="non-sel-bg" align="center">
+ <div class="nonselectedmenuitem">
+ <form method="post" action="[% doc.dir.abs_doc_root
%]/search/swish.cgi" enctype="application/x-www-form-urlencoded"
name="site_search_form">
+ <table border="0" cellspacing="0" cellpadding="2">
+ <tr>
+ <td colspan="2" height="5"><br
class="smallbr"></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="text" name="query"
size="12" maxlength="200" value="">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" height="5"><br
class="smallbr"></td>
+ </tr>
+ <tr valign="top">
+ <td><input type="radio" name="smb" value="[%
doc.dir.path_from_base %]" checked></td>
+ <td class="radio-font">This section</td>
+ </tr>
+ <tr valign="top">
+ <td><input type="radio" name="smb"
value=""></td>
+ <td class="radio-font">Whole site</td>
+ </tr>
+ <tr>
+ <td colspan="2" height="5"><br
class="smallbr"></td>
+ </tr>
+ <tr>
+ <td colspan="2" align="center">
+ <input type="submit" name="submit"
value="Search">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2" height="5"><br
class="smallbr"></td>
+ </tr>
+ </table>
+ </form>
+ </div>
+ </td>
+ <td class="menu-border"><br></td>
+ </tr>
+
+ <tr>
+ <td class="menu-border" colspan="3" height="1"><br
class="smallbr"></td>
+ </tr>
+ </table>
\ No newline at end of file
1.10 +11 -10 modperl-docs/tmpl/custom/html/tail
Index: tail
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/tail,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- tail 3 Mar 2002 03:43:56 -0000 1.9
+++ tail 3 Apr 2002 05:18:27 -0000 1.10
@@ -1,11 +1,12 @@
-<!-- footer (tail )-->
-<div class="tail">
- <center>
- Use of the Camel for Perl is a trademark of <a
href="http://www.ora.com";>O'Reilly & Associates</a>, and is used by
permission.
- <br><br>
- Last modified [% doc.last_modified %]
- </center>
-</div>
-<br><br>
-<!-- end footer (tail)-->
+ <!-- footer (tail )-->
+ <div class="tail">
+ <center>
+ Use of the Camel for Perl is a trademark of <a
href="http://www.ora.com";>O'Reilly & Associates</a>, and is used by
permission.
+ <br><br>
+ Last modified [% doc.last_modified %]
+ </center>
+ </div>
+ <!-- end footer (tail)-->
+
+ <br><br>
\ No newline at end of file
1.8 +12 -12 modperl-docs/tmpl/custom/html/title
Index: title
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/title,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- title 22 Mar 2002 02:02:16 -0000 1.7
+++ title 3 Apr 2002 05:18:27 -0000 1.8
@@ -1,12 +1,12 @@
-[% IF doc.meta.title.defined %]
- <tr>
- <td>
- <!--title-->
- <table border="0" width="100%" cellspacing="0" cellpadding="3">
- <tr>
- <td class="headline">[% doc.meta.title %]</td>
- </tr>
- </table>
- </td>
- </tr>
-[% END %]
+[%- IF doc.meta.title.defined -%]
+
+ <!-- title begin -->
+ <table border="0" width="100%" cellspacing="0" cellpadding="0">
+ <tr>
+ <td class="blue-bg">
+ <div class="headline">[%- doc.meta.title -%]</div>
+ </td>
+ </tr>
+ </table>
+ <!-- title end -->
+[%- END -%]
\ No newline at end of file
1.4 +1 -1 modperl-docs/tmpl/custom/html/top_link
Index: top_link
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/top_link,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- top_link 21 Feb 2002 08:55:18 -0000 1.3
+++ top_link 3 Apr 2002 05:18:27 -0000 1.4
@@ -1 +1 @@
-<a href="#top"><img src="[% doc.dir.abs_doc_root %]/images/nav/page_top.gif"
width="51" height="20" border="0" alt="TOP"></a>
\ No newline at end of file
+<a href="#top"><img src="[%- doc.dir.abs_doc_root
-%]/images/nav/page_top.gif" width="48" height="20" border="0" alt="TOP"></a>
\ No newline at end of file
1.6 +9 -7 modperl-docs/tmpl/custom/html/wrap_box
Index: wrap_box
===================================================================
RCS file: /home/cvs/modperl-docs/tmpl/custom/html/wrap_box,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- wrap_box 27 Feb 2002 03:20:58 -0000 1.5
+++ wrap_box 3 Apr 2002 05:18:27 -0000 1.6
@@ -1,6 +1,6 @@
-[% # wrap_box - create these nice wrap boxes with a header cell
+[%-
+ # wrap_box - create these nice wrap boxes with a header cell
# ARGS: title, content
-
-%]
<table border="0" cellspacing="0" cellpadding="0" width="150"
align="center">
<tr>
@@ -8,11 +8,12 @@
<td class="menu-border" width="148"><br class="smallbr"></td>
<td class="menu-border" width="1"><br class="smallbr"></td>
</tr>
- [% IF title %]
+ [%- IF title -%]
+
<tr>
<td class="menu-border"><br></td>
<td align="center" class="menu-title-bg">
- <div class="menu-title">[% title %]</div>
+ <div class="menu-title">[%- title -%]</div>
</td>
<td class="menu-border"><br></td>
</tr>
@@ -20,6 +21,7 @@
<tr>
<td class="menu-border" colspan="3"><br class="smallbr"></td>
</tr>
- [% END %]
- [% content %]
-</table>
+ [%- END -%]
+ [%- content -%]
+
+ </table>
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
