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: 13-Mar-2006 16:02:14
Branch: HEAD Handle: 2006031315021201
Added files:
openpkg-meta canvas-foot.php
Modified files:
openpkg-meta canvas-layout.php canvas-nav-path.php canvas.php
Log:
polish the positioning of title, navigation path and headline; split
footer stuff into own file
Summary:
Revision Changes Path
1.1 +70 -0 openpkg-meta/canvas-foot.php
1.17 +33 -45 openpkg-meta/canvas-layout.php
1.8 +12 -2 openpkg-meta/canvas-nav-path.php
1.22 +3 -4 openpkg-meta/canvas.php
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-foot.php
============================================================================
$ cvs diff -u -r0 -r1.1 canvas-foot.php
--- /dev/null 2006-03-13 16:02:14 +0100
+++ canvas-foot.php 2006-03-13 16:02:14 +0100
@@ -0,0 +1,70 @@
+<script language="php">
+##
+## Copyright (c) 2005-2006 OpenPKG Foundation e.V. <http://openpkg.net/>
+## Copyright (c) 2005-2006 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-layout.php: canvas page layout
+##
+</script>
+
+<script language="php">
+ divert("css");
+</script>
+
+div#canvas_foot {
+ background-color: #706050;
+ color: #d0c0b0;
+ border-top: 1px solid #e0d0c0;
+ z-index: 10;
+}
+div#canvas_foot a {
+ font-weight: normal;
+ color: #d0c0b0;
+}
+div#canvas_foot span.sep {
+ color: #a09080;
+}
+div#canvas_foot div.canvas_foot_left {
+ position: absolute;
+ left: 60px;
+ bottom: 4px;
+}
+div#canvas_foot div.canvas_foot_right {
+ position: absolute;
+ right: 40px;
+ bottom: 4px;
+}
+
+<script language="php">
+ divert("canvas-foot");
+</script>
+
+<div class="canvas_foot_left">
+ Quick Links:
+ <a href="<?php echo $cfg["url.base"] ?>imprint">Imprint</a> <span
class="sep">|</span>
+ <a href="<?php echo $cfg["url.base"] ?>search">Search</a>
+</div>
+<div class="canvas_foot_right">
+ Validate:
+ <a href="http://validator.w3.org/check?verbose=1;uri=referer";>XHTML</a>
<span class="sep">|</span>
+ <a href="http://jigsaw.w3.org/css-validator/check/referer";>CSS</a>
+</div>
+
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-layout.php
============================================================================
$ cvs diff -u -r1.16 -r1.17 canvas-layout.php
--- openpkg-meta/canvas-layout.php 13 Mar 2006 07:47:38 -0000 1.16
+++ openpkg-meta/canvas-layout.php 13 Mar 2006 15:02:13 -0000 1.17
@@ -101,6 +101,8 @@
z-index: 10;
}
+<script language="php">if ($opt["pane"] == "1") {</script>
+
div#canvas_title img {
position: absolute;
left: 60px;
@@ -108,20 +110,21 @@
}
h1 {
- margin: 0px;
position: absolute;
left: 60px;
- height: auto;
+ top: 170px;
}
-<script language="php">if ($opt["pane"] == "1") {</script>
-
-h1 {
+div#canvas_path {
+ position: absolute;
+ left: 60px;
top: 220px;
+ height: 20px;
+ z-index: 10;
}
div#canvas_body {
- margin-top: 260px;
+ margin-top: 250px;
margin-left: 60px;
margin-right: 60px;
margin-bottom: 80px;
@@ -129,17 +132,25 @@
}
div#canvas_nav {
- position: absolute;
- margin-left: 60px;
- margin-right: 60px;
- top: 190px;
- height: 20px;
+ display: none;
}
<script language="php">} else if ($opt["pane"] == "2") {</script>
+div#canvas_title img {
+ position: absolute;
+ left: 60px;
+ top: 130px;
+}
+
h1 {
- top: 190px;
+ position: absolute;
+ left: 60px;
+ top: 170px;
+}
+
+div#canvas_path {
+ display: none;
}
div#canvas_body {
@@ -164,29 +175,8 @@
left: 0px;
bottom: 0px;
width: 100%;
- height: 20px;
- background-color: #908070;
- color: #e0d0c0;
- border-top: 1px solid #d0c0b0;
+ height: 24px;
z-index: 10;
- display: none;
-}
-div#canvas_foot a {
- font-weight: normal;
- color: #e0d0c0;
-}
-div#canvas_foot span.sep {
- color: #b0a090;
-}
-div#canvas_foot div.canvas_foot_left {
- position: absolute;
- left: 60px;
- bottom: 4px;
-}
-div#canvas_foot div.canvas_foot_right {
- position: absolute;
- right: 40px;
- bottom: 4px;
}
<script language="php">
@@ -199,6 +189,12 @@
<!-- CANVAS: HEAD -->
<script language="php">
+ divert("canvas-body");
+</script>
+
+<!-- CANVAS: BODY -->
+
+<script language="php">
divert("html-body");
</script>
@@ -215,25 +211,17 @@
<div id="canvas_title">
<script language="php">echo undivert("canvas-title");</script>
</div>
+ <div id="canvas_path">
+ <script language="php">echo undivert("canvas-path");</script>
+ </div>
<div id="canvas_body">
<script language="php">echo undivert("canvas-body");</script>
- <!-- CANVAS: BODY -->
</div>
<div id="canvas_nav">
<script language="php">echo undivert("canvas-nav");</script>
</div>
<div id="canvas_foot">
<script language="php">echo undivert("canvas-foot");</script>
- <div class="canvas_foot_left">
- Quick Links:
- <a href="<?php echo $cfg["url.base"] ?>imprint">Imprint</a>
<span class="sep">|</span>
- <a href="<?php echo $cfg["url.base"] ?>search">Search</a>
- </div>
- <div class="canvas_foot_right">
- Validate:
- <a
href="http://validator.w3.org/check?verbose=1;uri=referer";>XHTML</a> <span
class="sep">|</span>
- <a
href="http://jigsaw.w3.org/css-validator/check/referer";>CSS</a>
- </div>
</div>
</div>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-path.php
============================================================================
$ cvs diff -u -r1.7 -r1.8 canvas-nav-path.php
--- openpkg-meta/canvas-nav-path.php 13 Mar 2006 07:47:38 -0000 1.7
+++ openpkg-meta/canvas-nav-path.php 13 Mar 2006 15:02:13 -0000 1.8
@@ -33,7 +33,17 @@
font-family: sans-serif,helvetica,lucida,verdana,arial;
font-size: 9pt;
white-space: nowrap;
- color: #bbbbbb;
+ color: #504030;
+}
+span.navpath a {
+ color: #b0a090;
+ font-weight: normal;
+ text-decoration: none;
+}
+span.navpath a:hover {
+ color: #b0a090;
+ font-weight: normal;
+ text-decoration: underline;
}
<script language="php">
@@ -51,7 +61,7 @@
}
$html = implode(" → ", $list);
$html = preg_replace("/(<span id=\"navpath.".$opt["path"]."\")/s", "$1
class=\"active\"", $html);
- divert("canvas-nav");
+ divert("canvas-path");
echo "<span class=\"navpath\" id=\"navpath\">\n";
echo $html;
echo "</span>\n";
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas.php
============================================================================
$ cvs diff -u -r1.21 -r1.22 canvas.php
--- openpkg-meta/canvas.php 13 Mar 2006 12:06:25 -0000 1.21
+++ openpkg-meta/canvas.php 13 Mar 2006 15:02:13 -0000 1.22
@@ -116,10 +116,9 @@
include("canvas-nav.php");
include("canvas-nav-title.php");
include("canvas-nav-tab.php");
-if ($opt["pane"] == "1")
- include("canvas-nav-path.php");
-else if ($opt["pane"] == "2")
- include("canvas-nav-bar.php");
+include("canvas-nav-path.php");
+include("canvas-nav-bar.php");
+include("canvas-foot.php");
include("canvas-layout.php");
include("canvas-html.php");
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
