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/28 03:24:53 UTC

cvs commit: modperl-docs/tmpl/custom/html index index_body index_toc menu_top_level navbar_global navbar_local page page_body page_toc tail

stas        02/01/27 18:24:52

  Modified:    .        TODO
               src      style.css
               tmpl/custom/html index index_body index_toc menu_top_level
                        navbar_global navbar_local page page_body page_toc
                        tail
  Added:       src/images top.gif
  Log:
  * some finetunig in style.css
  * moved a <br> out of page/index into navbar_global, so that the boxes
  align
  well if there is no breadcrumb
  * removed now not needed toc-anchor
  * changed main menu to plain links seperated by line brakes
  * moved Stas' new download widget into navbar_local, removing the old one
  from toc
  * removed the 4 icons from the tail
  * added a new top-link-image (also attached, although the image is not
  perfect)
  * TODO update
  
  Revision  Changes    Path
  1.5       +10 -10    modperl-docs/TODO
  
  Index: TODO
  ===================================================================
  RCS file: /home/cvs/modperl-docs/TODO,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TODO	24 Jan 2002 19:11:19 -0000	1.4
  +++ TODO	28 Jan 2002 02:24:51 -0000	1.5
  @@ -1,19 +1,19 @@
   # things to do for mod_perl site infrastructure
   
  -- Menu: the current page's item shouldn't be hyperlinked
  +- Menu: 
   
  -- Internal links (e.g. in src/docs/1.0/guide) aren't hyperlinked.
  +  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
   
  -- ErrorDocument (can we use .htaccess?) => /404.html
  +- Navigation
   
  -- URL changes adjustments to go to src/.htaccess:
  +  o The 'TOP' image should be made using the same colors as other
  +    widgets.
   
  -# embperl
  -RedirectPermanent /Embperl/ http://perl.apache.org/embperl/
  -RedirectPermanent /perl/Embperl/ http://perl.apache.org/embperl/
  -RedirectPermanent /embperl.html /embperl/
  +- Internal links (e.g. in src/docs/1.0/guide) aren't hyperlinked.
   
  -# ASP
  -Redirect /asp http://www.apache-asp.org/
   
   - Think about porting the conferences stuff
  
  
  
  1.10      +62 -54    modperl-docs/src/style.css
  
  Index: style.css
  ===================================================================
  RCS file: /home/cvs/modperl-docs/src/style.css,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- style.css	18 Jan 2002 02:23:09 -0000	1.9
  +++ style.css	28 Jan 2002 02:24:51 -0000	1.10
  @@ -1,29 +1,33 @@
   body {
           font-family: helvetica, verdana, sans-serif; 
  -        font-size: small;
  +        font-size: 0.8em;
           color: #000000; 
           background-color: #000066;
   }        
   
   .headline {
  -        padding: 2px;
  -        background-color: #828DA6;
  +        padding: 5px;
  +/* width:100%; /* works in NS4, but not in Moz/Opera */
  +        margin-top:2px;
  +        background-color: #525D76;
           color: #ffffff;
  -}  
  -
  +        border-style:none;
  +        border:1px;
  +        font-size:1.4em;
  +}
  +  
   h1, h2, h3, h4 {
  -        background-color: #dddddd;
           color: #525D76;
  -
  +        font-size:1.2em;
   }  
   
  -a:link    { color: #0000ff; font-family: helvetica, verdana, sans-serif;}
  -a:visited { color: #0000ff; font-family: helvetica, verdana, sans-serif;}
  -a:active  { color: #0000ff; font-family: helvetica, verdana, sans-serif;}
  -a:hover   { color: #0000ff; font-family: helvetica, verdana, sans-serif;}
  +
  +a:link    { color: #0000ff;} 
  +a:visited { color: #0000ff;}
  +a:active  { color: #0000ff;}
  +a:hover   { color: #0000ff;}
   
   pre { 
  -        font-family: courier new, courier, monospace;
           padding: 3px;
           border: 6px;
           border-style: solid;
  @@ -41,94 +45,103 @@
           position: absolute;
           top: 5px;
           left: 5px;
  -        width: 160px;
  +        width: 170px;
           padding: 0px;
   }
   
   div.rightbox {
           position: absolute;
           top: 5px;
  -        left: 175px;
  -        padding: 0px;
  -        margin-right: 10px;
  +        left: 190px;
  +        padding: px;
  +        padding-right:10px; 
   }
   
   /* boxes in the left box */
   div.logo {
  -        padding: 5px;
  +        width: 160px;
  +        padding: 5px;  /* 0px works in NS4 */
           border: 1px;
  -        border-style: solid;
  -        border-color: #000000;
  -        text-align: center;
  +        border-style: none;
           background-color: #ffffff;
   }
   
   div.menu {
  +        width: 160px;
           border: 1px;
           padding: 5px;
  -        border-style: solid;
  -        border-color: #000000;
  +        border-style: none;
           background-color: #ffffff;
   }
   
   div.activenav {
           font-weight: bold;
  -        padding: 5px;
  -        background-color: #525D76;
  +        font-size:12px;
  +        margin-bottom:5px;
  +        margin-top:5px;
   }
  -div.activenav    a {text-decoration: none; color: #ffffff;}
  +
  +div.activenav a:link {text-decoration: none; color: #525D76;}
  +div.activenav a:visited {text-decoration: none; color: #525D76;}
  +div.activenav a:active {text-decoration: none; color: #525D76;}
  +div.activenav a:hover {text-decoration: none; color: #525D76;}
   
   div.notactivenav {
  -        padding: 5px;
  -        font-weight: bold;
  -        border: 1px;
  -        border-style: solid;
  -        border-color: #000000;
  -        margin-top: -1px;
  +        font-size:12px;
  +        margin-bottom:5px;
  +        margin-top:5px;
   
   }
  -div.notactivenav a {text-decoration: none; color: #525D76;}
  +
  +div.notactivenav a:link {text-decoration: none; color: #525D76;}
  +div.notactivenav a:visited {text-decoration: none; color: #525D76;}
  +div.nottctivenav a:active {text-decoration: none; color: #525D76;}
  +div.notactivenav a:hover {text-decoration: none; color: #525D76;}
  +
   
   div.ad {
  +        width: 160px;
           border: 1px;
           padding: 5px;
  -        border-style: solid;
  -        border-color: #000000;
  +        border-style: none;
           background-color: #ffffff;
  -        font-size: x-small;
  +         font-size: x-small;
  +        text-align:center;
   }
   
   /* boxes in the right box */
   div.content {
  -        padding: 5px;
  -        border: 2px;
  -        border-style: solid;
  +        border: 1px;
  +        border-style: none;
           border-color: #000000;
           background-color: #ffffff;
  +        padding: 5px;
  +        padding-left: 8px;
  +        padding-right: 8px;
   }
   
   div.navbarglobal {
  -        padding: 5px;
  -        border: 2px;
  -        border-style: solid;
  +        padding:5px;
  +        padding-left: 8px;
  +        border: 1px;
  +        border-style: none;
           border-color: #000000;
           background-color: #ffffff;
           color: #000000;
   }
  +
   div.navbarglobal a {text-decoration: none; color: #828DA6;}
   
   div.navbarlocal {
           text-align: right;
   }
   
  -
  -
   div.tail {
  -        padding: 1px;
  -        font-size: x-small;
  +        padding:5px;
  +        font-size: 0.6em;
           font-family: helvetica, verdana, sans-serif;
  -        border: 2px;
  -        border-style: solid;
  +        border: 1px;
  +        border-style: none;
           border-color: #000000;
           background-color: #ffffff;
   }
  @@ -136,15 +149,10 @@
   div.toc {
           font-size: small;
   }
  -div.toc          a {text-decoration: none; color: #0000ff;}
  +
  +div.toc a {text-decoration: none; color: #0000ff;}
   
   
   div.download {
           font-size: x-small;
   }
  -
  -
  -
  -
  -
  -
  
  
  
  1.1                  modperl-docs/src/images/top.gif
  
  	<<Binary file>>
  
  
  1.7       +5 -1      modperl-docs/tmpl/custom/html/index
  
  Index: index
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/index,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- index	18 Jan 2002 02:23:09 -0000	1.6
  +++ index	28 Jan 2002 02:24:52 -0000	1.7
  @@ -3,24 +3,28 @@
       splash.fg = 'mauve';
       splash.bg = 'lilac';
   -%]
  -
   [% INCLUDE head
       paget   = doc.meta.title
       title   = "mod_perl: $paget" 
       content = ''
   -%]
   
  +<!-- left box (NAV)-->
   <div class='leftbox'>
       [% INCLUDE menu_top_level nav=doc.nav; %]
       <br>
       [% INCLUDE ad -%]
  +    <br><br>
   </div>
  +<!-- end left box-->
   
  +<!-- right box-->
   <div class='rightbox'>
       [% INCLUDE index_body %]
       <br>
       [% INCLUDE tail %]
   </div>
  +<!-- end right box-->
   
   </body>
   </html>
  
  
  
  1.4       +5 -3      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.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- index_body	24 Jan 2002 16:30:42 -0000	1.3
  +++ index_body	28 Jan 2002 02:24:52 -0000	1.4
  @@ -1,10 +1,9 @@
   [%
       INCLUDE navbar_global nav=doc.nav;
   %]
  -<br>
   
   <!-- content-->
  -<div class='content'>
  +<div class="content">
   [%
       INCLUDE title;
   
  @@ -18,11 +17,14 @@
   
       INCLUDE download;
   
  +#    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;
  -
   %]
   </div>
  
  
  
  1.5       +0 -1      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.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- index_toc	24 Jan 2002 16:30:42 -0000	1.4
  +++ index_toc	28 Jan 2002 02:24:52 -0000	1.5
  @@ -7,7 +7,6 @@
   [% numbers = ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X'] %]
   
   [% IF toc.size %]
  -    <a name="toc"></a>
       <div class="toc">
   
       [% IF toc.0.group_title.defined;
  
  
  
  1.5       +7 -9      modperl-docs/tmpl/custom/html/menu_top_level
  
  Index: menu_top_level
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/menu_top_level,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- menu_top_level	24 Jan 2002 19:11:20 -0000	1.4
  +++ menu_top_level	28 Jan 2002 02:24:52 -0000	1.5
  @@ -32,10 +32,12 @@
      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;
  +           style = 'activenav';
  +       ELSE;
  +           style = 'notactivenav';
          END;
  +       buttons.push({link => link, text => p.meta.stitle, style=> style });
          p = p.next; # next node
      END;
   -%]
  @@ -44,13 +46,9 @@
   </div>
   <br>
   <div class='menu'>
  -[% INCLUDE splash/domm_pulldown 
  -     select = selected
  -     width  = "5%"
  -     pad    = 0
  -     border = 0
  -     align   = 'left'
  -%]
  +[% FOREACH but = buttons %]
  +<div class='[% but.style  %]'><a href="[% but.link %]">[% but.text %]</a></div>
  +[% END %]
   </div>
   
   
  
  
  
  1.3       +1 -0      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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- navbar_global	24 Jan 2002 16:30:42 -0000	1.2
  +++ navbar_global	28 Jan 2002 02:24:52 -0000	1.3
  @@ -45,4 +45,5 @@
   <a href="[% sec.link %]"><b>[% sec.text %]</b></a> / 
   [% END -%][% END -%]
   </div>
  +<br>
   [% END %][% END %]
  
  
  
  1.5       +14 -5     modperl-docs/tmpl/custom/html/navbar_local
  
  Index: navbar_local
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/navbar_local,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- navbar_local	25 Jan 2002 08:57:00 -0000	1.4
  +++ navbar_local	28 Jan 2002 02:24:52 -0000	1.5
  @@ -3,21 +3,30 @@
      # nav          - cache navigator object
      # rel_doc_root - relative docs path
   %]
  -<div class='navbarlocal'>
  +<table width=100% border=0>
  +<tr>
  +<td align="left">
  +<div class="download">
  +[%   INCLUDE download   %]
  +</div>
  +</td>
  +<td align="right">
  +<div class="navbarlocal">
   [% 
      prev = nav.prev;
      IF prev;
           link = INCLUDE link prefix=rel_doc_root link=prev.meta.link;
  -        "<a href='$link'><img src='${doc.dir.abs_doc_root}/images/prev.gif' ALT='prev' border=0 width=48 height=20></a>";
  +        "<a href='$link'><img src='${doc.dir.abs_doc_root}/images/prev.gif' ALT='prev' border=0 width=48 heigth=20></a>";
      END;
  -%]<a href='[% rel_doc_root %]/index.html'><img src='[% doc.dir.abs_doc_root %]/images/up.gif' ALT='up' border=0 height=20 width=25></a>[% 
  +%]<a href='[% rel_doc_root %]/index.html'><img src='[% doc.dir.abs_doc_root %]/images/up.gif' ALT='up' border=0 heigth=20 width=25></a>[% 
      next = nav.next;
      IF next;
           link = INCLUDE link prefix=rel_doc_root link=next.meta.link;
  -        "<a href='$link'><img src='${doc.dir.abs_doc_root}/images/next.gif' ALT='next' border=0 width=49 height=20></a>";
  +        "<a href='$link'><img src='${doc.dir.abs_doc_root}/images/next.gif' ALT='next' border=0 width=49 heigth=20></a>";
      END;
   %]
  -</div>
  +</div></td>
  +</tr></table>
   
   
   
  
  
  
  1.7       +3 -0      modperl-docs/tmpl/custom/html/page
  
  Index: page
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/page,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page	18 Jan 2002 02:23:09 -0000	1.6
  +++ page	28 Jan 2002 02:24:52 -0000	1.7
  @@ -10,6 +10,7 @@
       content = ''
   -%]
   
  +<!-- left box (NAV)-->
   <div class='leftbox'>
       [% INCLUDE menu_top_level
                 nav=doc.nav
  @@ -17,7 +18,9 @@
       %]
       <br>
       [% INCLUDE ad -%]
  +    <br><br>
   </div>
  +<!-- end left box-->
   
   <!-- right box-->
   <div class='rightbox'>
  
  
  
  1.7       +2 -7      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.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- page_body	25 Jan 2002 08:57:00 -0000	1.6
  +++ page_body	28 Jan 2002 02:24:52 -0000	1.7
  @@ -3,10 +3,9 @@
           nav=doc.nav
           rel_doc_root=doc.dir.rel_doc_root;
   %]
  -<br>
   
   <!-- content-->
  -<div class='content'>
  +<div class="content">
   [%
       INCLUDE title;
   
  @@ -16,10 +15,8 @@
   
       INCLUDE page_toc toc=doc.toc;
   
  -    INCLUDE download;
  -
       # render the content
  -    menu="<a href='#top'><img src='${doc.dir.abs_doc_root}/images/top.gif' width=54 height=21 border='0' alt='TOP'></a>";
  +    menu="<a href='#top'><img src='${doc.dir.abs_doc_root}/images/top.gif' width='85' height='20' border='0' alt='TOP'></a>";
       FOREACH sec = doc.body;
           sec;
           menu;
  @@ -28,8 +25,6 @@
       INCLUDE navbar_local
           nav=doc.nav
           rel_doc_root=doc.dir.rel_doc_root;
  -
  -
   %]
   </div>
   <!-- end content-->
  
  
  
  1.3       +4 -13     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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- page_toc	25 Jan 2002 08:57:00 -0000	1.2
  +++ page_toc	28 Jan 2002 02:24:52 -0000	1.3
  @@ -3,18 +3,9 @@
      # toc - an array with keys: link, title, abstract, subs
      #       (subs is optional and includes a similar array)
   %]
  -
   [% IF toc.size %]
  -<a name="toc"></a>
  -<table border=0 width="100%">
  -<tr><th colspan=2><h3>Table of Contents</h3></th></tr>
  -<tr><td valign='top'><div class='toc'>
  -[% INCLUDE page_toc_section subs=toc %]
  -</div></td>
  -<td valign='top'>
  -<div class='download'>Download:<br><br>
  -<img src='[% doc.dir.abs_doc_root %]/images/pdf.gif' ALT='PDF'> (123 kB)<br>
  -<br>
  -<img src='[% doc.dir.abs_doc_root %]/images/page.gif' ALT='SRC'> (12 kB)<br>
  -</div></td></tr></table>
  +<h3>Table of Contents</h3>
  +<div class="toc">
  +    [% INCLUDE page_toc_section subs=toc %]
  +</div>
   [% END %]
  
  
  
  1.5       +5 -18     modperl-docs/tmpl/custom/html/tail
  
  Index: tail
  ===================================================================
  RCS file: /home/cvs/modperl-docs/tmpl/custom/html/tail,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- tail	25 Jan 2002 08:57:00 -0000	1.4
  +++ tail	28 Jan 2002 02:24:52 -0000	1.5
  @@ -1,25 +1,12 @@
   <!-- footer (tail )-->
   <div class='tail'>
  -    <br>
       <center>
  -    <table border="0" cellpadding="0" cellspacing="0" width="80%">
  -        <tr align="center">
  -            <td><a href="http://perl.apache.org/"><img src="[% doc.dir.abs_doc_root %]/images/mod_perl.gif" height="30" width="90" border="0" alt="mod_perl logo"></a></td>
  -            <td><a href="http://validator.w3.org/check/referer"><img border="0" src="http://www.w3.org/Icons/valid-html401" height="31" width="88" alt="valid html 4.01"></a></td>
  -            <td><a href="http://jigsaw.w3.org/css-validator/"><img style="border:0;width:88px;height:31px" src="http://jigsaw.w3.org/css-validator/images/vcss" alt="Valid CSS!"></a></td>
  -            <td>[% PROCESS splash/ttpower %]</td>
  -        </tr>
  -        <tr>
  -            <td colspan="4" align="center" style="font-size:x-small;">Use of the Camel for Perl is a trademark of <a href="http://www.ora.com">O'Reilly &amp; Associates</a>, and is used by permission.</td>
  -        </tr>
  -    </table>
  +    Use of the Camel for Perl is a trademark of <a href="http://www.ora.com">O'Reilly &amp; Associates</a>, and is used by permission.
  +    <br><br>
  +    Last modified [% doc.last_modified %]
       </center>
  -    <br>    
  -    <table border="0" cellpadding="2" cellspacing="0" width="100%">
  -        <tr>
  -            <td bgcolor="#828DA6" align="right" style="font-size:x-small;">Last modified [% doc.last_modified %]</td>
  -        </tr>
  -    </table>
   </div>
   <br><br>
   <!-- end footer (tail)-->
  +
  +
  
  
  

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