OpenPKG CVS Repository
  http://cvs.openpkg.org/
  ____________________________________________________________________________

  Server: cvs.openpkg.org                  Name:   Ralf S. Engelschall
  Root:   /v/openpkg/cvs                   Email:  [EMAIL PROTECTED]
  Module: openpkg-meta                     Date:   27-Nov-2005 18:46:22
  Branch: HEAD                             Handle: 2005112717462101

  Added files:
    openpkg-meta            canvas-nav-title.php
  Modified files:
    openpkg-meta            canvas-layout.php canvas.php

  Log:
    generate the title automatically, too

  Summary:
    Revision    Changes     Path
    1.8         +2  -3      openpkg-meta/canvas-layout.php
    1.1         +45 -0      openpkg-meta/canvas-nav-title.php
    1.10        +1  -0      openpkg-meta/canvas.php
  ____________________________________________________________________________

  patch -p0 <<'@@ .'
  Index: openpkg-meta/canvas-layout.php
  ============================================================================
  $ cvs diff -u -r1.7 -r1.8 canvas-layout.php
  --- openpkg-meta/canvas-layout.php    27 Nov 2005 13:12:35 -0000      1.7
  +++ openpkg-meta/canvas-layout.php    27 Nov 2005 17:46:21 -0000      1.8
  @@ -166,7 +166,8 @@
       height:                20px;
       background-color:      #908070;
       color:                 #e0d0c0;
  -    border-top:            1px solid #000000;
  +    border-top:            1px solid #d0c0b0;
  +    z-index:               10;
   }
   DIV#canvas_foot A {
       font-weight:           normal;
  @@ -193,7 +194,6 @@
   <meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
   <link rel="ICON" href="<?php echo $rooturl ?>canvas/canvas-favicon.ico"/>
   <link rel="SHORTCUT ICON" href="<?php echo $rooturl 
?>canvas/canvas-favicon.ico"/>
  -<title>OpenPKG: <script language="php">echo undivert("title");</script><!-- 
CANVAS: TITLE --></title>
   <!-- CANVAS: HEAD --> 
   
   <script language="php">
  @@ -227,7 +227,6 @@
           <div class="canvas_foot_left">
               Quick Links:
               <a href="<?php echo $rooturl ?>imprint">Imprint</a> <span 
class="sep">|</span>
  -            <a href="<?php echo $rooturl ?>sponsors">Sponsors</a> <span 
class="sep">|</span>
               <a href="<?php echo $rooturl ?>search">Search</a>
           </div>
           <div class="canvas_foot_right">
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-meta/canvas-nav-title.php
  ============================================================================
  $ cvs diff -u -r0 -r1.1 canvas-nav-title.php
  --- /dev/null 2005-11-27 18:46:12 +0100
  +++ canvas-nav-title.php      2005-11-27 18:46:22 +0100
  @@ -0,0 +1,45 @@
  +<script language="php">
  +##
  +##  Copyright (c) 2005 OpenPKG Foundation e.V. <http://openpkg.net/>
  +##  Copyright (c) 2005 Ralf S. Engelschall <http://engelschall.com/>
  +##
  +##  Permission to use, copy, modify, and distribute this software for
  +##  any purpose with or without fee is hereby granted, provided that
  +##  the above copyright notice and this permission notice appear in all
  +##  copies.
  +##
  +##  THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
  +##  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
  +##  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
  +##  IN NO EVENT SHALL THE AUTHORS AND COPYRIGHT HOLDERS AND THEIR
  +##  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  +##  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  +##  LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
  +##  USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  +##  ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
  +##  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
  +##  OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  +##  SUCH DAMAGE.
  +##
  +##  canvas-nav-tab.php: canvas navigation tabs
  +##
  +</script>
  +
  +<script language="php">
  +  $html = undivert("nav");
  +  $html = explode("\n", $html);
  +  $count = count($html);
  +  $list = Array();
  +  for ($i = 0; $i < $count; $i++) {
  +      if (preg_match("/<li id=\"(.+?)\"><a[^>]+>(.+?)<\/a>/", $html[$i], 
$match)) {
  +          $prefix = $match[1];
  +          if (preg_match("/^$prefix/", $path)) {
  +              array_push($list, $match[2]);
  +          }
  +      }
  +  }
  +  $title = implode(": ", $list);
  +  divert("html-head");
  +  echo "<title>$title</title>\n";
  +</script>
  +
  @@ .
  patch -p0 <<'@@ .'
  Index: openpkg-meta/canvas.php
  ============================================================================
  $ cvs diff -u -r1.9 -r1.10 canvas.php
  --- openpkg-meta/canvas.php   27 Nov 2005 13:30:59 -0000      1.9
  +++ openpkg-meta/canvas.php   27 Nov 2005 17:46:22 -0000      1.10
  @@ -114,6 +114,7 @@
   #   load content generation parts
   divert("/dev/null");
   include("canvas-nav.php");
  +include("canvas-nav-title.php");
   include("canvas-nav-tab.php");
   if ($pane == "1")
       include("canvas-nav-path.php");
  @@ .
______________________________________________________________________
The OpenPKG Project                                    www.openpkg.org
CVS Repository Commit List                     [email protected]

Reply via email to