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/01/30 17:51:49 UTC

cvs commit: modperl-docs/tmpl/custom/html logo menu_links menu_main sitemap wrap_box ad index link page menu_top_level

stas        02/01/30 08:51:49

  Modified:    .        TODO
               src      config.cfg style.css
               tmpl/custom/html ad index link page
  Added:       tmpl/custom/html logo menu_links menu_main sitemap wrap_box
  Removed:     tmpl/custom/html menu_top_level
  Log:
  - improving the link template to strip /./ from ././../
  - imporving the template layout and naming
  - start using the new bg image
  - introduce a wrapper wrap_box for the boxes on the left side
  
  Revision  Changes    Path
  1.7       +0 -4      modperl-docs/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/modperl-docs/TODO,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- TODO	28 Jan 2002 02:33:58 -0000	1.6
  +++ TODO	30 Jan 2002 16:51:48 -0000	1.7
  @@ -2,10 +2,6 @@
   
   - Menu: 
   
  -  o the current page's item is hyperlinked (it's not clear if it
  -    shouldn't be as it helps navigation, since the menu opens only the
  -    first level and it allows to go all the way up )
  -
     o Need to try to make the menu smaller
   
   - Navigation
  
  
  
  1.8       +9 -10     modperl-docs/src/config.cfg
  
  Index: config.cfg
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/config.cfg,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- config.cfg	30 Jan 2002 06:35:00 -0000	1.7
  +++ config.cfg	30 Jan 2002 16:51:48 -0000	1.8
  @@ -25,16 +25,15 @@
               maillist
              )
        ],
  -     links => [
  -         {
  -          id       => 'take23',
  -          link     => 'http://take23.org/',
  -          stitle   => 'News@Take23',
  -          title    => 'News and Resources for the mod_perl world',
  -          abstract => 'Take23 is a news, documentation, and general advocacy web site for mod_perl
  -',
  -         },
  -     ],
  +#     links => [
  +#         {
  +#          id       => '',
  +#          link     => '',
  +#          stitle   => '',
  +#          title    => '',
  +#          abstract => ',
  +#         },
  +#     ],
        docsets => [
            qw(
               docs
  
  
  
  1.13      +44 -22    modperl-docs/src/style.css
  
  Index: style.css
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/style.css,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- style.css	28 Jan 2002 04:14:21 -0000	1.12
  +++ style.css	30 Jan 2002 16:51:48 -0000	1.13
  @@ -2,8 +2,9 @@
           font-family: helvetica, verdana, sans-serif; 
           font-size: 0.8em;
           color: #000000; 
  -        background-color: #000066;
  -}        
  +        /* background-color: #000066; */
  +        background-image:url(images/bgline.jpg)
  +}
   
   .headline {
           padding: 5px;
  @@ -27,14 +28,21 @@
   a:active  { color: #0000ff;}
   a:hover   { color: #0000ff;}
   
  -pre { 
  -        padding: 3px;
  -        border: 6px;
  -        border-style: solid;
  -        border-color: #ffffff;
  -        background-color: #ddffff;
  +pre {  
  +        white-space: pre;
  +	font-family: profont, monaco, ocr-a, monospace, fixed;
  +	font-size: 1em;;
  +	line-height: normal;
  +	color: black;
  +	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      */
   }
   
  +
   code { 
           font-family: courier new, courier, monospace;
   }
  @@ -59,21 +67,45 @@
   
   /* boxes in the left box */
   div.logo {
  -        width: 160px;
  +        width: 150px;
           padding: 5px;  /* 0px works in NS4 */
           border: 1px;
           border-style: none;
           background-color: #ffffff;
   }
   
  -div.menu {
  -        width: 160px;
  +div.menumain {
           border: 1px;
           padding: 5px;
           border-style: none;
  -        background-color: #ffffff;
  +       /* background-color: #ffffff; */
  +}
  +
  +div.menulinks {
  +        border: 1px;
  +        padding: 5px;
  +        border-style: none;
  +        /* background-color: #ffffff; */
  +}
  +
  +div.ad {
  +        border: 1px;
  +        padding: 5px;
  +        border-style: none;
  +       /* background-color: #ffffff;*/
  +        font-size: x-small;
  +        text-align:center;
   }
   
  +.table-head	{ }
  +.table-top	{ background-color:#cccccc; }
  +.table-cell	{ background-color:#eeeeee; 
  +		  vertical-align:top; }
  +.table-surround	{ background-color:black; }
  +.table-light	{ background-color:#00cc99; }
  +
  +
  +
   div.selectedmenuitem {
           font-weight: bold;
           font-size:12px;
  @@ -96,16 +128,6 @@
   div.nonselectedmenuitem a:visited {text-decoration: none; color: #525D76;}
   div.nonselectedmenuitem a:active  {text-decoration: none; color: #525D76;}
   div.nonselectedmenuitem a:hover   {text-decoration: none; color: #525D76;}
  -
  -div.ad {
  -        width: 160px;
  -        border: 1px;
  -        padding: 5px;
  -        border-style: none;
  -        background-color: #ffffff;
  -         font-size: x-small;
  -        text-align:center;
  -}
   
   /* boxes in the right box */
   div.content {
  
  
  
  1.5       +23 -11    modperl-docs/tmpl/custom/html/ad
  
  Index: ad
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/ad,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- ad	25 Jan 2002 08:57:00 -0000	1.4
  +++ ad	30 Jan 2002 16:51:48 -0000	1.5
  @@ -1,36 +1,48 @@
  +[% WRAPPER wrap_box 
  +           title = 'Books'
  +-%]
   <div class='ad' align="center">
  -    <br>
       <a href="http://www.modperl.com/">
  -        <b>Writing Apache Modules with Perl and C</b><br><br>
  +        Writing Apache Modules with Perl and C<br><br>
           <img src="[% doc.dir.abs_doc_root %]/images/ads/wrapmod.jpg" 
                border=0 align="middle" width=107 height=140 
                alt="Writing Apache Modules with Perl and C"><br><br>
  -        <b>By Lincoln Stein, Doug MacEachern</b>
  +        By Lincoln Stein, Doug MacEachern
       </a><br>
  +
  +
   </div>
   
  -<br>
  +[% END %]
   
  +[% WRAPPER wrap_box 
  +           title = ''
  +-%]
   <div class='ad' align="center">
  -    <br>
  +   <br>
       <a href="http://www.modperlcookbook.org/">
  -        <b>The mod_perl Developer's Cookbook</b><br><br>
  +        The mod_perl Developer's Cookbook</b><br><br>
           <img src="[% doc.dir.abs_doc_root %]/images/ads/modperlcookbook.jpg" 
                border=0 align="middle" width=113 height=140 
                alt="The mod_perl Developer's Cookbook"><br><br>
  -        <b>By Geoffrey Young, Paul Lindner, Randy Kobes</b>
  +        By Geoffrey Young, Paul Lindner, Randy Kobes</b>
       </a><br>
   </div>
   
  -<br>
  +[% END %]
   
  + [% WRAPPER wrap_box 
  +           title = ''
  +-%]
   <div class='ad' align="center">
       <br>
       <a href="http://www.oreilly.com/catalog/modperlpr/">
  -        <b> mod_perl Pocket Reference</b><br><br>
  +         mod_perl Pocket Reference</b><br><br>
           <img src="[% doc.dir.abs_doc_root %]/images/ads/modperlpr.jpg" 
                border=0 align="middle" width=85 height=140
                alt="mod_perl Pocket Reference"><br><br>
  -        <b>By Andrew Ford</b>
  +        By Andrew Ford</b>
       </a><br>
  -</div>
  \ No newline at end of file
  +</div>
  +
  +[% END %]
  
  
  
  1.9       +6 -2      modperl-docs/tmpl/custom/html/index
  
  Index: index
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- index	30 Jan 2002 05:03:51 -0000	1.8
  +++ index	30 Jan 2002 16:51:48 -0000	1.9
  @@ -13,9 +13,13 @@
   
   <!-- left box (NAV)-->
   <div class='leftbox'>
  -    [% INCLUDE menu_top_level nav=doc.nav; %]
  +    [% INCLUDE logo %]
       <br>
  -    [% INCLUDE ad -%]
  +    [% INCLUDE menu_main nav=doc.nav; %]
  +    <br>
  +    [% INCLUDE menu_links %]
  +    <br>
  +    [% INCLUDE ad %]
       <br><br>
   </div>
   <!-- end left box-->
  
  
  
  1.2       +8 -4      modperl-docs/tmpl/custom/html/link
  
  Index: link
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/link,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- link	5 Jan 2002 19:29:53 -0000	1.1
  +++ link	30 Jan 2002 16:51:48 -0000	1.2
  @@ -1,11 +1,13 @@
  -[% # creates links correctly (if the link starts with foo:// the
  -   # prefix won't be appended)
  -   # expects to be set:
  +[% # creates links correctly:
  +   # - if the link starts with foo:// the prefix won't be appended
  +   # - strips ./ parts (see the comments below)
  +   # 
  +   # this template expects these vars to be set:
      # prefix - dir to prefix
      # link   - link as defined in the docset
      #
      IF link.search('^[^:]+://');
  -      return = link;
  +      return = link; # a complete scheme:// already
      ELSE;
          IF prefix;
              return = "$prefix/$link";
  @@ -13,5 +15,7 @@
             return = link;
          END;
      END;
  +   return = return.replace('/\./','/'); # clean a path like foo/.././bar
  +   return = return.replace('/\.$','');  # clean a path like foo/../.  
   -%]   
   [%- return -%]
  
  
  
  1.9       +8 -4      modperl-docs/tmpl/custom/html/page
  
  Index: page
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- page	30 Jan 2002 05:03:51 -0000	1.8
  +++ page	30 Jan 2002 16:51:48 -0000	1.9
  @@ -14,12 +14,16 @@
   
   <!-- left box (NAV)-->
   <div class='leftbox'>
  -    [% INCLUDE menu_top_level
  +    [% INCLUDE logo %]
  +    <br>
  +    [% INCLUDE menu_main
                 nav=doc.nav
                 rel_doc_root=doc.dir.rel_doc_root;
       %]
       <br>
  -    [% INCLUDE ad -%]
  +    [% INCLUDE menu_links %]
  +    <br>
  +    [% INCLUDE ad %]
       <br><br>
   </div>
   <!-- end left box-->
  @@ -27,10 +31,10 @@
   <!-- right box-->
   <div class='rightbox'>
       [% INCLUDE page_body %]
  -    <br>
  +    <br>....
       [% INCLUDE tail %]
  -<!-- end right box-->
   </div>
  +<!-- end right box-->
   
   </body>
   </html>
  
  
  
  1.1                  modperl-docs/tmpl/custom/html/logo
  
  Index: logo
  ===================================================================
  <div class='logo'>
  <a href="http://perl.apache.org/"><img src="[% doc.dir.abs_doc_root %]/images/mod_perl2.jpg" border=0 alt="mod_perl icon" height=59 width=150></a><br>
  </div>
  
  
  1.1                  modperl-docs/tmpl/custom/html/menu_links
  
  Index: menu_links
  ===================================================================
  [% # links menu
     # expects to be set:
     # nav          - cache navigator object
     # rel_doc_root - relative docs path (only for chapters!)
  -%]
  [% SET buttons = [
      [ 'http://take23.org/', 'mod_perl news @ Take23'],
      ['http://asf.apache.org/', 'The ASF'],
      ['http://www.apacheweek.com/', 'Apache Week'],
      ['http://perl.org/', 'Perl Mongers'],
      ['http://use.perl.org/', 'Use Perl'],
         ]; 
  %]
  <div class='menulinks'>
  [% WRAPPER wrap_box 
             title = 'sister sites'
  -%]
  [%- FOREACH but = buttons %]
  <div class='nonselectedmenuitem'><a href="[% but.0 %]">[% but.1 %]</a></div>
  [% END %]
  [% END %]
  </div>
  
  
  
  
  1.1                  modperl-docs/tmpl/custom/html/menu_main
  
  Index: menu_main
  ===================================================================
  [% # 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;
         l = p;
         p = p.up;
     END;
  
     p = l; # last valid node
     IF p.parent_rel_path.defined;
        prefix = p.parent_rel_path;
     ELSE;
        prefix = ".";
     END;
     IF rel_doc_root.defined;
         prefix = "$prefix/$rel_doc_root";
     END;
  
     # 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;
             style = 'selectedmenuitem';
         ELSE;
             style = 'nonselectedmenuitem';
         END;
         buttons.push({link => link, text => p.meta.stitle, style => style});
         p = p.next; # next node
     END;
  -%]
  
  <div class='menumain'>
  [% WRAPPER wrap_box 
             title = 'perl.apache.org'
  -%]
  [%- FOREACH but = buttons %]
  <div class='[% but.style  %]'><a href="[% but.link %]">[% but.text %]</a></div>
  [% END %]
  [% END %]
  </div>
  
  
  
  
  1.1                  modperl-docs/tmpl/custom/html/sitemap
  
  Index: sitemap
  ===================================================================
  [% # site map
     # expects to be set:
     # nav          - cache navigator object
     # rel_doc_root - relative docs path (only for chapters!)
  -%]
  
  [% 
     # first go up to the absolute root
     l = nav; # remember last valid node 
     p = nav.up;
     WHILE p;
         l = p;
         p = p.up;
     END;
  
     p = l; # last valid node
  
     # now go to the left
     p = p.first;
  
     # now recursively render all levels
  
  
  
     IF p.parent_rel_path.defined;
        prefix = p.parent_rel_path;
     ELSE;
        prefix = ".";
     END;
     IF rel_doc_root.defined;
         prefix = "$prefix/$rel_doc_root";
     END;
  
     # 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;
         buttons.push({link => link, text => p.meta.stitle});
         IF p.id == current.id;
             selected = count;
         END;
         p = p.next; # next node
     END;
  -%]
  <div class='logo'>
  <a href="http://perl.apache.org/"><img src="[% doc.dir.abs_doc_root %]/images/mod_perl2.jpg" border=0 alt="mod_perl icon" height=59 width=150></a><br>
  </div>
  <br>
  <div class='menu'>
  [% INCLUDE splash/domm_pulldown 
       select = selected
       width  = "5%"
       pad    = 0
       border = 0
       align   = 'left'
  %]
  </div>
  
  
  
  1.1                  modperl-docs/tmpl/custom/html/wrap_box
  
  Index: wrap_box
  ===================================================================
  [%  # wrap_box - create these nice wrap boxes with a header cell
      # ARGS: title, content
  
  -%]
  <table class="table-surround" width="150px" cellspacing="1" cellpadding="3">
    <tr><th class="table-top" align="center">[% title %]</th></tr>
      <tr><td class="table-cell">
  
        [%- content %]
      </td>
    </tr>
  </table>
  
  
  

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