You are viewing a plain text version of this content. The canonical link for it is here.
Posted to docs-cvs@perl.apache.org by st...@apache.org on 2002/02/03 12:14:56 UTC

cvs commit: modperl-docs/tmpl/custom/html search index index_body navbar_global navbar_local_top page page_body tail

stas        02/02/03 03:14:55

  Modified:    .        TODO
               src      config.cfg style.css
               src/search search.tt
               tmpl/custom/html index index_body navbar_global
                        navbar_local_top page page_body tail
  Added:       tmpl/custom/html search
  Log:
  - add the navbar_local_top to index pages as well for consistency
  - add a few <hr>s, to make logical separation
  - add the search widget
  
  Revision  Changes    Path
  1.10      +13 -1     modperl-docs/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/modperl-docs/TODO,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- TODO	3 Feb 2002 06:44:27 -0000	1.9
  +++ TODO	3 Feb 2002 11:14:55 -0000	1.10
  @@ -15,4 +15,16 @@
   - Think about porting the conferences stuff
   
   - src/creation.html, should be completed and linked from somewhere
  -  (the tail?)
  \ No newline at end of file
  +  (the tail?)
  +
  +style.css:
  +
  +- consider using: font-family: helvetica, arial, verdana, sans-serif;
  +
  +Templates:
  +
  +- consider passing the class name to the wrap_box template, so the
  +  'content' doesn't have to wrap itself in a <div> tag. If class is
  +  passed then we can use it in <td class="">
  +
  +
  
  
  
  1.9       +9 -9      modperl-docs/src/config.cfg
  
  Index: config.cfg
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/config.cfg,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- config.cfg	30 Jan 2002 16:51:48 -0000	1.8
  +++ config.cfg	3 Feb 2002 11:14:55 -0000	1.9
  @@ -25,15 +25,6 @@
               maillist
              )
        ],
  -#     links => [
  -#         {
  -#          id       => '',
  -#          link     => '',
  -#          stitle   => '',
  -#          title    => '',
  -#          abstract => ',
  -#         },
  -#     ],
        docsets => [
            qw(
               docs
  @@ -43,6 +34,15 @@
               contribute
               stats
              )
  +     ],
  +     links => [
  +         {
  +          id       => 'search',
  +          link     => 'search/swish.cgi',
  +          stitle   => 'Search',
  +          title    => 'Search the Site',
  +          abstract => 'Search the whole site or parts of it',
  +         },
        ],
   
        hidden => [
  
  
  
  1.21      +3 -3      modperl-docs/src/style.css
  
  Index: style.css
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/style.css,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- style.css	3 Feb 2002 09:07:38 -0000	1.20
  +++ style.css	3 Feb 2002 11:14:55 -0000	1.21
  @@ -38,9 +38,9 @@
           background-color: #ddffff;
           padding: 6px; 
           margin: .25em;
  -        border: 1px;              /* this is a must for */
  -        border-color: #ffffff;    /* for <pre>          */
  -        border-style: solid;      /* working in NS      */
  +        border: 1px;              /* this is a must for  */
  +        border-color: #ffffff;    /* the <pre></pre> tag */
  +        border-style: solid;      /* working in NS       */
   }
   
   
  
  
  
  1.2       +0 -17     modperl-docs/src/search/search.tt
  
  Index: search.tt
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/search/search.tt,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- search.tt	30 Jan 2002 06:35:00 -0000	1.1
  +++ search.tt	3 Feb 2002 11:14:55 -0000	1.2
  @@ -19,8 +19,6 @@
           [% PROCESS results_list %]
       [% END %]
   
  -    [% PROCESS swish_footer %]
  -
   [% END %]
   
   
  @@ -60,21 +58,6 @@
       </table>
   
   [% END %]    
  -
  -[% BLOCK swish_footer %]
  -    <hr>
  -    <small>Powered by <em>Swish-e</em> <a href="http://swish-e.org">swish-e.org</a></small>
  -    [% IF search.MOD_PERL %]
  -        <br><small>Response brought to you by <a href="http://perl.apache.org"><em>mod_perl</em></a></small>
  -    [% END %]
  -  <p>
  -    <a href="http://validator.w3.org/check/referer"><img border="0"
  -        src="http://www.w3.org/Icons/valid-html401"
  -        alt="Valid HTML 4.01!" height="31" width="88"></a>
  -  </p>
  -[% END %]    
  -
  -
   
   [% BLOCK show_message %]
       [% IF search.errstr %]
  
  
  
  1.10      +1 -1      modperl-docs/tmpl/custom/html/index
  
  Index: index
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- index	30 Jan 2002 16:51:48 -0000	1.9
  +++ index	3 Feb 2002 11:14:55 -0000	1.10
  @@ -27,7 +27,7 @@
   <!-- right box-->
   <div class='rightbox'>
       [% INCLUDE index_body %]
  -    <br>
  +    <br><hr>
       [% INCLUDE tail %]
   </div>
   <!-- end right box-->
  
  
  
  1.7       +15 -8     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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index_body	31 Jan 2002 02:29:19 -0000	1.6
  +++ index_body	3 Feb 2002 11:14:55 -0000	1.7
  @@ -1,12 +1,20 @@
   [%
       INCLUDE navbar_global nav=doc.nav;
  -%]
  +-%]
   
   <!-- content-->
   <div class="content">
   [%
       INCLUDE title;
   
  +#    INCLUDE download_link;
  +#    INCLUDE search;
  +
  +    INCLUDE navbar_local_top
  +        nav=doc.nav.up
  +        rel_doc_root=doc.dir.rel_doc_root;
  +    "<hr>";
  +
       IF doc.body.top;
           "<p>${doc.body.top}</p>";
       END;
  @@ -15,19 +23,18 @@
           "<p>${doc.meta.abstract}</p>";
       END;
   
  -    INCLUDE download_link;
  -
  -#    INCLUDE navbar_local
  -#        nav=doc.nav
  -#        rel_doc_root=doc.dir.rel_doc_root;
  -
       PROCESS index_toc toc=doc.toc;
   
       IF doc.body.bot;
           "<p>${doc.body.bot}</p>";
       END;
  +
  +    INCLUDE navbar_local_bottom
  +        nav=doc.nav.up
  +        rel_doc_root=doc.dir.rel_doc_root;
  +
   %]
   <!-- start workaround for pages with narrow content -->
   &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp; &nbsp;
   <!-- end workaround for pages with narrow content -->
  -</div>
  \ No newline at end of file
  +</div>
  
  
  
  1.5       +0 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navbar_global	3 Feb 2002 10:55:50 -0000	1.4
  +++ navbar_global	3 Feb 2002 11:14:55 -0000	1.5
  @@ -46,6 +46,5 @@
               [%- FOREACH sec = sects -%]<a href="[% sec.link %]"><b>[% sec.text %]</b></a> / [%- END -%]
           [%- END -%]
           </div>
  -        <br>
       [%- END -%]
   [% END -%]
  
  
  
  1.3       +3 -0      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navbar_local_top	3 Feb 2002 06:27:01 -0000	1.2
  +++ navbar_local_top	3 Feb 2002 11:14:55 -0000	1.3
  @@ -6,6 +6,9 @@
   <table width="100%" border=0>
   <tr>
   <td align="left">
  +[% INCLUDE search %]
  +</td>
  +<td align="center">
   <div class="download">
   [% INCLUDE download_link %]
   </div>
  
  
  
  1.11      +1 -1      modperl-docs/tmpl/custom/html/page
  
  Index: page
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- page	31 Jan 2002 02:19:53 -0000	1.10
  +++ page	3 Feb 2002 11:14:55 -0000	1.11
  @@ -31,7 +31,7 @@
   <!-- right box-->
   <div class='rightbox'>
       [% INCLUDE page_body %]
  -    <br>
  +    <br><hr>
       [% INCLUDE tail %]
   </div>
   <!-- end right box-->
  
  
  
  1.14      +1 -0      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- page_body	31 Jan 2002 02:29:19 -0000	1.13
  +++ page_body	3 Feb 2002 11:14:55 -0000	1.14
  @@ -12,6 +12,7 @@
       INCLUDE navbar_local_top
           nav=doc.nav
           rel_doc_root=doc.dir.rel_doc_root;
  +    "<hr>";
   
       INCLUDE page_toc toc=doc.toc;
   
  
  
  
  1.6       +1 -0      modperl-docs/tmpl/custom/html/tail
  
  Index: tail
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/tail,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- tail	28 Jan 2002 02:24:52 -0000	1.5
  +++ tail	3 Feb 2002 11:14:55 -0000	1.6
  @@ -10,3 +10,4 @@
   <!-- end footer (tail)-->
   
   
  +
  
  
  
  1.1                  modperl-docs/tmpl/custom/html/search
  
  Index: search
  ===================================================================
  <form method="post" action="/modperl-site/search/swish.cgi" 
        enctype="application/x-www-form-urlencoded">
  <input type="text" name="query"  size="15" maxlength="200" />
  <input type="submit" name="submit" value="Search!" /><br>
  <input type="hidden" name="metaname" value="swishdefault">
  <input type="hidden" name="sort" value="swishrank">
  </form>
  
  
  
  
  
  

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