stas        02/03/21 18:02:16

  Modified:    .        TODO
               admin    doc_template.pod
               src      config.cfg
               src/search README SwishSpiderConfig.pl
               tmpl/custom/html button download_link index index_body link
                        navbar_global navbar_local_top page page_body
                        page_toc search title
  Log:
  fixes, fixes, and fixes again
  
  Revision  Changes    Path
  1.28      +12 -0     modperl-docs/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/modperl-docs/TODO,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- TODO	6 Mar 2002 09:30:28 -0000	1.27
  +++ TODO	22 Mar 2002 02:02:15 -0000	1.28
  @@ -30,6 +30,8 @@
   Content:
   --------
   
  +- move the jobs out of support to the main menu
  +
   - need to make the content review and adjust config.cfg files to
     provide good abstracts. The same goes for src html files -- should
     use the <meta name="description" value=""> to add abstracts here.
  @@ -44,6 +46,16 @@
     a few pages, making About a DocSet.
   
   - implement Changes/Contributors pages for each docset
  +
  +- add to the success stories: http://perl.com/pub/a/2001/10/17/etoys.html
  +
  +- the CVS checkout info wasn't ported. consider adding to
  +  download/distributions.html or a separate page, which potentially
  +  could integrate the cvs hints pod.
  +
  +- ask perl.com to link to perl.apache.org from 'perl sites' section.
  +  + also they need to add theperlreview.com
  +
   
   Search:
   -------
  
  
  
  1.3       +8 -0      modperl-docs/admin/doc_template.pod
  
  Index: doc_template.pod
  ===================================================================
  RCS file: /home/cvs/modperl-docs/admin/doc_template.pod,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- doc_template.pod	25 Dec 2001 05:23:22 -0000	1.2
  +++ doc_template.pod	22 Mar 2002 02:02:15 -0000	1.3
  @@ -2,6 +2,11 @@
   
   TITLE goes here
   
  +=head1 Description
  +
  +the first paragraph of the description will be displayed on the index
  +page, so make sure to put the general overview in this first paragraph.
  +
   =head1 ...
   
   =head2 ...
  @@ -22,6 +27,9 @@
   =item * Foo Tar E<lt>foo (at) tar.example.comE<gt>
   
   =back
  +
  +Only the major authors are listed above. For contributors see the
  +Changes file.
   
   =cut
   
  
  
  
  1.14      +1 -1      modperl-docs/src/config.cfg
  
  Index: config.cfg
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/config.cfg,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- config.cfg	7 Mar 2002 05:56:52 -0000	1.13
  +++ config.cfg	22 Mar 2002 02:02:15 -0000	1.14
  @@ -92,7 +92,7 @@
                tmpl       => [qw(tmpl/custom tmpl/std tmpl)],
   
                # search path for pods, etc. must put more specific paths first!
  -             search_path => [qw(
  +             search_paths => [qw(
                    docs/2.0/api/mod_perl-2.0 
                    docs/2.0/api/ModPerl-Registry 
                    docs/2.0 
  
  
  
  1.3       +6 -2      modperl-docs/src/search/README
  
  Index: README
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/search/README,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- README	3 Mar 2002 11:27:22 -0000	1.2
  +++ README	22 Mar 2002 02:02:15 -0000	1.3
  @@ -14,12 +14,16 @@
   
   1. Set an environment variable to the path of the site:
   
  -    export MODPERL_SITE='http://perl.org'
  +    export MODPERL_SITE='http://perl.apache.org'
   
   or
   
       export MODPERL_SITE='http://localhost:4000/dst_html'
   
  +tcsh:
  +
  +   setenv MODPERL_SITE http://perl.apache.org
  +
   This is used as the base for spidering, plus is used to determine
   the sections of the site (for limiting the site to those sections.
       
  @@ -33,7 +37,7 @@
   3. Index the site
   
     % cd dst_html/search
  -  % ./swish-e -S prog -c swish.conf
  +  % swish-e -S prog -c swish.conf
   
   You should see something like:
   
  
  
  
  1.4       +0 -2      modperl-docs/src/search/SwishSpiderConfig.pl
  
  Index: SwishSpiderConfig.pl
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/search/SwishSpiderConfig.pl,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- SwishSpiderConfig.pl	3 Mar 2002 11:27:22 -0000	1.3
  +++ SwishSpiderConfig.pl	22 Mar 2002 02:02:15 -0000	1.4
  @@ -2,8 +2,6 @@
   #
   # a few custom callbacks are located after the @servers definition section.
   
  -
  -
   my $base_path = $ENV{MODPERL_SITE} || die "must set \$ENV{MODPERL_SITE}";
   
   die "Don't use trailing slash in MODPERL_SITE" if $base_path =~ m!/$!;
  
  
  
  1.3       +5 -28     modperl-docs/tmpl/custom/html/button
  
  Index: button
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/button,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- button	27 Feb 2002 03:20:58 -0000	1.2
  +++ button	22 Mar 2002 02:02:16 -0000	1.3
  @@ -1,32 +1,9 @@
   [%  # button: a bar 
       #
  -    #  ARGS: content, style
  -    # STYLE: col, bgcol, align, width
  -    #
  -    SET
  -        default = splash.style.default
  -    ;
  -    DEFAULT 
  -        style   = default
  -        col     = style.col.fore     or default.col.fore
  -        bgcol   = style.col.back     or default.col.back
  -        align   = style.button.align or default.button.align
  -    ;
  -    SET
  -        rgbcol  = splash.rgb.$col
  -        imgbase = "$splash.images/$bgcol"
  -        imgsize = splash.imgsize
  -        imgtype = splash.imgtype
  -    ;
  +    #  ARGS: content
  +    #  OPT ARGS: navstyle, linebrake
   -%]
  -[% IF navstyle %]<div class='[%- navstyle  -%]'>[% END %]
  +[% IF navstyle %]<div class='[%- navstyle  -%]'>[% END -%]
   [%- content.length ? content : '&nbsp;' -%]
  -[% IF navstyle %]</div>[% END %]
  -[% IF linebrake %]<br>[% END %]
  -
  -
  -
  -
  -
  -
  -
  +[%- IF navstyle %]</div>[% END -%]
  +[%- IF linebrake %]<br>[% END -%]
  \ No newline at end of file
  
  
  
  1.5       +9 -16     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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- download_link	22 Feb 2002 09:00:29 -0000	1.4
  +++ download_link	22 Mar 2002 02:02:16 -0000	1.5
  @@ -1,24 +1,17 @@
  -[% 
  -# link to the pdf, source and other variants of the doc 
  -    # pdf block
  -    IF doc.pdf_doc.link;
  -        INCLUDE pdf_doc;
  +[%  # link to the pdf, source and other variants of the doc 
  +    # src block
  +    IF doc.src_doc.link;
  +        INCLUDE src_doc;
       END;
       "&nbsp;&nbsp;";
       # pdf block
  -    IF doc.src_doc.link;
  -        INCLUDE src_doc;
  +    IF doc.pdf_doc.link;
  +        INCLUDE pdf_doc;
       END;
   -%]
  -[% BLOCK pdf_doc %]
  -<a href="[% doc.pdf_doc.link -%]"><img src="[% doc.dir.abs_doc_root %]/images/new_pdf.gif" width="34" height="20" border="0" align="middle" alt="PDF version of the document">&nbsp;[% doc.pdf_doc.size %]</a> 
  -[% END %]
   [% BLOCK src_doc %]
  -<a href="[% doc.src_doc.link -%]"><img src="[% doc.dir.abs_doc_root %]/images/new_src.gif" width="34" height="20" border="0" align="middle" alt="Source version of the document">&nbsp;[%doc.src_doc.size %]</a>
  -[% END %]
  -[% BLOCK pdf_doc1 %]
  -<a href="[% doc.pdf_doc.link -%]"><img src="[% doc.dir.abs_doc_root %]/images/ver_pdf.gif" width="31" height="32" border="0" alt="PDF version of the document">&nbsp;[% doc.pdf_doc.size %]</a> 
  +<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 src_doc1 %]
  -<a href="[% doc.src_doc.link -%]"><img src="[% doc.dir.abs_doc_root %]/images/ver_src.gif" width="31" height="32" border="0" alt="Source version of the document">&nbsp;[%doc.src_doc.size %]</a>
  +[% 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 %]
  
  
  
  1.17      +7 -7      modperl-docs/tmpl/custom/html/index
  
  Index: index
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- index	5 Mar 2002 15:18:41 -0000	1.16
  +++ index	22 Mar 2002 02:02:16 -0000	1.17
  @@ -1,4 +1,4 @@
  -[% INCLUDE head
  +[%- INCLUDE head
       paget   = doc.meta.title
       title   = "mod_perl: $paget" 
       content = ''
  @@ -8,23 +8,23 @@
   
   <!-- left box (NAV)-->
   <div class="leftbox">
  -    [% INCLUDE logo %]
  +    [%- INCLUDE logo -%]
       <br>
  -    [% INCLUDE menu_main nav=doc.nav; %]
  +    [%- INCLUDE menu_main nav=doc.nav; -%]
       <br>
  -    [% INCLUDE menu_links %]
  +    [%- INCLUDE menu_links -%]
       <br>
  -    [% INCLUDE ad %]
  +    [%- INCLUDE ad -%]
       <br><br>
   </div>
   <!-- end left box-->
   
   <!-- right box-->
   <div class="rightbox">
  -    [% INCLUDE index_body %]
  +    [%- INCLUDE index_body -%]
       <br>
       <hr noshade size="1">
  -    [% INCLUDE tail %]
  +    [%- INCLUDE tail -%]
   </div>
   <!-- end right box-->
   
  
  
  
  1.12      +7 -9      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.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- index_body	21 Feb 2002 08:55:18 -0000	1.11
  +++ index_body	22 Mar 2002 02:02:16 -0000	1.12
  @@ -1,18 +1,16 @@
  -[%
  -    INCLUDE navbar_global nav=doc.nav;
  --%]
  -
  -<!-- content-->
  -[%
  +<table border="0" width="100%" cellspacing="0" cellpadding="0">
  +[%- INCLUDE navbar_global 
  +        nav=doc.nav;
       INCLUDE title;
  +-%]
  +</table>
   
  -#    INCLUDE download_link;
  -#    INCLUDE search;
  -
  +[%-
       INCLUDE navbar_local_top
           nav=doc.nav.up
           rel_doc_root=doc.dir.rel_doc_root;
   
  +    "<!-- content-->";
       IF doc.body.top;
           "${doc.body.top}";
       END;
  
  
  
  1.3       +1 -0      modperl-docs/tmpl/custom/html/link
  
  Index: link
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/link,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- link	30 Jan 2002 16:51:48 -0000	1.2
  +++ link	22 Mar 2002 02:02:16 -0000	1.3
  @@ -17,5 +17,6 @@
      END;
      return = return.replace('/\./','/'); # clean a path like foo/.././bar
      return = return.replace('/\.$','');  # clean a path like foo/../.  
  +   return = return.replace('^\./','');  # clean a path like ./foo 
   -%]   
   [%- return -%]
  
  
  
  1.9       +2 -5      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.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- navbar_global	22 Feb 2002 11:06:01 -0000	1.8
  +++ navbar_global	22 Mar 2002 02:02:16 -0000	1.9
  @@ -36,18 +36,15 @@
           END;
       -%]
   
  -
  -<table border="0" width="100%" cellspacing="0" cellpadding="0">
  -    <!--breadcrumb-->
  +    <!--start breadcrumb-->
           <tr>
               <td class="navbarglobal" valign="top" height="20">
                   [%- IF nav_not_empty == 1 -%]
                       [%- WRAPPER button 
                               width = "100%"
                               align = 'left'
  -                            col   = splash.style.select.col.fore
                       -%]
  -                        [%- FOREACH sec = sects -%]<a href="[% sec.link %]"><b>[% sec.text %]</b></a>&nbsp;/&nbsp;[%- END -%]
  +                        [%- FOREACH sec = sects -%]<a href="[% INCLUDE link link=sec.link %]"><b>[% sec.text %]</b></a>&nbsp;/&nbsp;[%- END -%]
                       [%- END -%]
                   [%- ELSE -%]
                       <br>
  
  
  
  1.10      +0 -3      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.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- navbar_local_top	5 Mar 2002 06:43:54 -0000	1.9
  +++ navbar_local_top	22 Mar 2002 02:02:16 -0000	1.10
  @@ -19,8 +19,5 @@
           </td>
       </tr>
   </table>
  -    <input type="hidden" name="metaname" value="swishdefault">
  -    <input type="hidden" name="sort" value="swishrank">
  -    <input type="hidden" name="what" value="[% %]">
   </form>
   <!--this line break must be here for ns4-->
  
  
  
  1.19      +6 -6      modperl-docs/tmpl/custom/html/page
  
  Index: page
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- page	5 Mar 2002 15:18:41 -0000	1.18
  +++ page	22 Mar 2002 02:02:16 -0000	1.19
  @@ -7,16 +7,16 @@
   
   <!-- left box (NAV)-->
   <div class="leftbox">
  -    [% INCLUDE logo %]
  +    [%- INCLUDE logo -%]
       <br>
  -    [% INCLUDE menu_main
  +    [%- INCLUDE menu_main
                 nav=doc.nav
                 rel_doc_root=doc.dir.rel_doc_root;
  -    %]
  +    -%]
       <br>
  -    [% INCLUDE menu_links %]
  +    [%- INCLUDE menu_links -%]
       <br>
  -    [% INCLUDE ad %]
  +    [%- INCLUDE ad -%]
       <br><br>
   </div>
   <!-- end left box-->
  @@ -26,7 +26,7 @@
       [% INCLUDE page_body %]
       <br>
       <hr noshade size="1">
  -    [% INCLUDE tail %]
  +    [%- INCLUDE tail -%]
   </div>
   <!-- end right box-->
   </body>
  
  
  
  1.19      +6 -6      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.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- page_body	28 Feb 2002 16:40:56 -0000	1.18
  +++ page_body	22 Mar 2002 02:02:16 -0000	1.19
  @@ -1,17 +1,17 @@
  -[% 
  -    INCLUDE navbar_global 
  +<table border="0" width="100%" cellspacing="0" cellpadding="0">
  +[%- INCLUDE navbar_global 
           nav=doc.nav
           rel_doc_root=doc.dir.rel_doc_root;
  -%]
  -
  -<!-- content-->
  -[%
       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
  
  
  
  1.7       +3 -1      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page_toc	21 Feb 2002 08:55:18 -0000	1.6
  +++ page_toc	22 Mar 2002 02:02:16 -0000	1.7
  @@ -10,4 +10,6 @@
   <div class="toc">
       [% INCLUDE page_toc_section subs=toc %]
   </div>
  -[% END %]
  \ No newline at end of file
  +[% ELSE %]
  +<br>
  +[% END %]
  
  
  
  1.9       +9 -1      modperl-docs/tmpl/custom/html/search
  
  Index: search
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/search,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- search	5 Mar 2002 15:18:41 -0000	1.8
  +++ search	22 Mar 2002 02:02:16 -0000	1.9
  @@ -1,4 +1,11 @@
  -<form method="post" action="/modperl-site/search/swish.cgi" enctype="application/x-www-form-urlencoded" name="site_search_form">
  +[%- # search widget
  +    #
  +    # this template expects these vars to be set:
  +    # doc.dir.abs_doc_root - doc root
  +    # doc.dir.path_from_base
  +-%]
  +
  +<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>
  @@ -11,6 +18,7 @@
           <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>
  
  
  
  1.7       +0 -1      modperl-docs/tmpl/custom/html/title
  
  Index: title
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/title,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- title	5 Mar 2002 05:05:26 -0000	1.6
  +++ title	22 Mar 2002 02:02:16 -0000	1.7
  @@ -10,4 +10,3 @@
           </td>
       </tr>
   [% END %]
  -</table>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: docs-cvs-unsubscribe@perl.apache.org
For additional commands, e-mail: docs-cvs-help@perl.apache.org