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: 12-Mar-2006 20:16:37
Branch: HEAD Handle: 2006031219163501
Modified files:
openpkg-meta canvas-html.php canvas-js.php canvas-layout.php
canvas-nav-bar.php canvas-nav-path.php
canvas-nav-tab.php canvas-nav-title.php
canvas-nav.php canvas-style.php canvas.php
Log:
code cosmetics
Summary:
Revision Changes Path
1.2 +2 -2 openpkg-meta/canvas-html.php
1.5 +34 -11 openpkg-meta/canvas-js.php
1.15 +4 -4 openpkg-meta/canvas-layout.php
1.12 +25 -45 openpkg-meta/canvas-nav-bar.php
1.6 +3 -3 openpkg-meta/canvas-nav-path.php
1.9 +4 -4 openpkg-meta/canvas-nav-tab.php
1.5 +1 -1 openpkg-meta/canvas-nav-title.php
1.9 +8 -3 openpkg-meta/canvas-nav.php
1.10 +12 -12 openpkg-meta/canvas-style.php
1.20 +4 -4 openpkg-meta/canvas.php
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-html.php
============================================================================
$ cvs diff -u -r1.1 -r1.2 canvas-html.php
--- openpkg-meta/canvas-html.php 12 Mar 2006 18:36:58 -0000 1.1
+++ openpkg-meta/canvas-html.php 12 Mar 2006 19:16:35 -0000 1.2
@@ -21,7 +21,7 @@
## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
## SUCH DAMAGE.
##
-## canvas-layout.php: canvas page layout
+## canvas-html.php: HTML document
##
# generate the outer HTML document
@@ -39,7 +39,7 @@
# Cascading Style Sheet (CSS)
if ($opt["embed"]["css"]) {
- # internally embedded
+ # internally embedded
echo "<style type=\"text/css\">\n";
echo undivert("css");
echo "</style>\n";
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-js.php
============================================================================
$ cvs diff -u -r1.4 -r1.5 canvas-js.php
--- openpkg-meta/canvas-js.php 11 Mar 2006 16:32:59 -0000 1.4
+++ openpkg-meta/canvas-js.php 12 Mar 2006 19:16:35 -0000 1.5
@@ -21,7 +21,7 @@
## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
## SUCH DAMAGE.
##
-## canvas-js.php: javascript reuseable components
+## canvas-js.php: JavaScript reuseable components
##
</script>
@@ -35,12 +35,23 @@
<script src="<?php echo $cfg["url.base"] ?>canvas-js-dhtml/yui/event.js"
type="text/javascript"></script>
<script src="<?php echo $cfg["url.base"] ?>canvas-js-dhtml/yui/dom.js"
type="text/javascript"></script>
-<!-- CSS-style DOM node selection -->
+<!-- CSS-style DOM element selection -->
<!-- see http://dean.edwards.name/my/cssQuery/ for more details. -->
<script src="<?php echo $cfg["url.base"]
?>canvas-js-dhtml/cssquery/cssquery.js" type="text/javascript"></script>
-<!-- create own convenience JavaScript object -->
-<script type="text/javascript">
+<!-- compliance patch for Microsoft Internet Explorer 5.5 and 6.0 -->
+<!-- see http://dean.edwards.name/IE7/ for more details. -->
+<!--[if lt IE 7]>
+<script type="text/javascript">IE7_PNG_SUFFIX = "-T.png";</script>
+<script src="<?php echo $cfg["url.base"]
?>canvas-js-dhtml/ie7/ie7-standard-p.js" type="text/javascript"></script>
+<![endif]-->
+
+<script language="php">
+ divert("js");
+</script>
+
+/* create own convenience DOM JavaScript object */
+
DOM = {
getNode: function (str, obj) {
return cssQuery(str, obj);
@@ -65,12 +76,24 @@
YAHOO.util.Event.addListener(obj, name, cb, ctx, override);
}
};
-</script>
-<!-- compliance patch for Microsoft Internet Explorer 5.5 and 6.0 -->
-<!-- see http://dean.edwards.name/IE7/ for more details. -->
-<!--[if lt IE 7]>
-<script type="text/javascript">IE7_PNG_SUFFIX = "-T.png";</script>
-<script src="<?php echo $cfg["url.base"]
?>canvas-js-dhtml/ie7/ie7-standard-p.js" type="text/javascript"></script>
-<![endif]-->
+/* smart deferred execution */
+
+var defer_scheduled = Array();
+var defer_handle = Array();
+
+function defer_schedule (id, cmd, delay) {
+ if (defer_scheduled[id])
+ clearTimeout(defer_handle[id]);
+ defer_scheduled[id] = 1;
+ defer_handle[id] = setTimeout("defer_scheduled["+id+"] = 0; " + cmd,
delay);
+ return;
+}
+
+function defer_cancel (id) {
+ if (defer_scheduled[id])
+ clearTimeout(defer_handle[id]);
+ defer_scheduled[id] = 0;
+ return;
+}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-layout.php
============================================================================
$ cvs diff -u -r1.14 -r1.15 canvas-layout.php
--- openpkg-meta/canvas-layout.php 11 Mar 2006 16:32:59 -0000 1.14
+++ openpkg-meta/canvas-layout.php 12 Mar 2006 19:16:35 -0000 1.15
@@ -181,12 +181,12 @@
position: absolute;
left: 60px;
bottom: 4px;
-}
+}
DIV#canvas_foot DIV.canvas_foot_right {
position: absolute;
right: 40px;
bottom: 4px;
-}
+}
<script language="php">
divert("html-head");
@@ -195,7 +195,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
<link rel="ICON" href="<?php echo $cfg["url.base"]
?>canvas/canvas-favicon.ico"/>
<link rel="SHORTCUT ICON" href="<?php echo $cfg["url.base"]
?>canvas/canvas-favicon.ico"/>
-<!-- CANVAS: HEAD -->
+<!-- CANVAS: HEAD -->
<script language="php">
divert("html-body");
@@ -216,7 +216,7 @@
</div>
<div id="canvas_body">
<script language="php">echo undivert("canvas-body");</script>
- <!-- CANVAS: BODY -->
+ <!-- CANVAS: BODY -->
</div>
<div id="canvas_nav">
<script language="php">echo undivert("canvas-nav");</script>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-bar.php
============================================================================
$ cvs diff -u -r1.11 -r1.12 canvas-nav-bar.php
--- openpkg-meta/canvas-nav-bar.php 12 Mar 2006 17:40:46 -0000 1.11
+++ openpkg-meta/canvas-nav-bar.php 12 Mar 2006 19:16:35 -0000 1.12
@@ -29,47 +29,47 @@
divert("css");
</script>
-DIV.navbar {
+div.navbar {
width: 180px;
margin-bottom: 20px;
- font-family: sans-serif,helvetica,lucida,verdana,arial;
- font-size: 9pt;
+ font-family: sans-serif,helvetica,lucida,verdana,arial;
+ font-size: 9pt;
}
-DIV.navbar UL {
- padding: 0px 0px 0px 0px;
- margin: 0px 0px 0px 0px;
- white-space: nowrap;
+div.navbar ul {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+ white-space: nowrap;
}
-DIV.navbar UL UL {
- margin-left: 0px;
+div.navbar ul ul {
+ margin-left: 0px;
padding-left: 0px;
}
-DIV.navbar LI.active > A {
+div.navbar li.active > a {
font-weight: bold;
}
-DIV.navbar LI {
- display: block;
- list-style: none;
+div.navbar li {
+ display: block;
+ list-style: none;
padding: 0px 0px 0px 0px;
}
-DIV.navbar A {
+div.navbar a {
text-decoration: none;
font-weight: normal;
color: #000000;
}
-DIV.navbar UL UL LI {
+div.navbar ul ul li {
padding-left: 8px;
}
-DIV.navbar LI:first-child {
+div.navbar li:first-child {
border-top: 1px solid #c5c0b0;
}
-DIV.navbar LI {
+div.navbar li {
border-bottom: 1px solid #c5c0b0;
}
-DIV.navbar LI:last-child {
+div.navbar li:last-child {
border-bottom: none;
}
-DIV.navbar > UL > LI:last-child {
+div.navbar > ul > li:last-child {
border-bottom: 1px solid #c5c0b0;
}
@@ -99,32 +99,12 @@
divert("js");
</script>
-/* smart deferred execution */
-
-var defer_scheduled = Array();
-var defer_handle = Array();
-
-function defer_schedule (id, cmd, delay) {
- if (defer_scheduled[id])
- clearTimeout(defer_handle[id]);
- defer_scheduled[id] = 1;
- defer_handle[id] = setTimeout("defer_scheduled["+id+"] = 0; " + cmd,
delay);
- return;
-}
-
-function defer_cancel (id) {
- if (defer_scheduled[id])
- clearTimeout(defer_handle[id]);
- defer_scheduled[id] = 0;
- return;
-}
-
/* dynamic navigation bar item expading/collapsing */
var navbar_default = "<script language="php">echo
"navbar.".$opt["path"]</script>";
var navbar_active = navbar_default;
-function navbar_over (e) {
+function navbar_over(event) {
var id = this;
var el = document.getElementById(id).getElementsByTagName('a')[0];
window.status = el.href;
@@ -133,20 +113,20 @@
defer_schedule("navbar_over", "navbar_update();", 800);
}
-function navbar_out (e) {
+function navbar_out(event) {
var id = this;
window.status = "";
defer_schedule("navbar_out", "navbar_out_stage2('"+id+"');", 4000);
}
-function navbar_out_stage2 (id) {
+function navbar_out_stage2(id) {
if (navbar_active != id)
return;
navbar_active = navbar_default;
navbar_update();
}
-function navbar_update () {
+function navbar_update() {
var active_a = navbar_active.split(".");
active_a.pop();
var active_prefix = active_a.join(".");
@@ -172,9 +152,9 @@
/* DOM event activation */
function nav_bar_setevents(e) {
- var nodes = DOM.getNode("DIV.navbar LI");
+ var nodes = DOM.getNode("div.navbar li");
for (var i = 0; i < nodes.length; i++) {
- var anchor = DOM.getNode("A", nodes[i])[0];
+ var anchor = DOM.getNode("a", nodes[i])[0];
DOM.setEvent(anchor, "mouseover", navbar_over, nodes[i].id, true);
DOM.setEvent(anchor, "mouseout", navbar_out, nodes[i].id, true);
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-path.php
============================================================================
$ cvs diff -u -r1.5 -r1.6 canvas-nav-path.php
--- openpkg-meta/canvas-nav-path.php 11 Mar 2006 16:32:59 -0000 1.5
+++ openpkg-meta/canvas-nav-path.php 12 Mar 2006 19:16:35 -0000 1.6
@@ -30,9 +30,9 @@
</script>
SPAN.navpath {
- font-family: sans-serif,helvetica,lucida,verdana,arial;
- font-size: 9pt;
- white-space: nowrap;
+ font-family: sans-serif,helvetica,lucida,verdana,arial;
+ font-size: 9pt;
+ white-space: nowrap;
color: #bbbbbb;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-tab.php
============================================================================
$ cvs diff -u -r1.8 -r1.9 canvas-nav-tab.php
--- openpkg-meta/canvas-nav-tab.php 11 Mar 2006 16:32:59 -0000 1.8
+++ openpkg-meta/canvas-nav-tab.php 12 Mar 2006 19:16:36 -0000 1.9
@@ -30,8 +30,8 @@
</script>
ul.navtab {
- padding: 0px;
- margin: 0px;
+ padding: 0px;
+ margin: 0px;
height: 20px;
list-style: none;
}
@@ -71,7 +71,7 @@
ul.navtab li a {
text-decoration: none;
font-weight: normal;
- font-family: tahoma,helvetica,lucida,verdana,arial,sans-serif;
+ font-family: tahoma,helvetica,lucida,verdana,arial,sans-serif;
font-size: 9pt;
color: inherit;
}
@@ -105,7 +105,7 @@
}
/* activate tab background update function */
-DOM.setEvent(window, "resize", nav_tab_update);
+DOM.setEvent(window, "resize", nav_tab_update);
DOM.setEvent(window, "load", nav_tab_update);
<script language="php">
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav-title.php
============================================================================
$ cvs diff -u -r1.4 -r1.5 canvas-nav-title.php
--- openpkg-meta/canvas-nav-title.php 11 Mar 2006 16:32:59 -0000 1.4
+++ openpkg-meta/canvas-nav-title.php 12 Mar 2006 19:16:36 -0000 1.5
@@ -21,7 +21,7 @@
## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
## SUCH DAMAGE.
##
-## canvas-nav-tab.php: canvas navigation tabs
+## canvas-nav-title.php: canvas navigation title
##
</script>
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-nav.php
============================================================================
$ cvs diff -u -r1.8 -r1.9 canvas-nav.php
--- openpkg-meta/canvas-nav.php 20 Feb 2006 08:34:35 -0000 1.8
+++ openpkg-meta/canvas-nav.php 12 Mar 2006 19:16:36 -0000 1.9
@@ -21,11 +21,15 @@
## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
## SUCH DAMAGE.
##
-## canvas-nav-tree.php: canvas navigation tree
+## canvas-nav.php: canvas navigation tree
##
</script>
<script language="php">
+ # Global Navigation Tree Definition
+ # NOTICE: The navigation specification below is post-processed multiple
times.
+ # The "id" and "href" attributes are relatively specified,
+ # but calculated into accumulated/absolute form afterwards!
divert("tmp");
</script>
@@ -118,7 +122,7 @@
</ul>
<script language="php">
- # split above navigation tree into lines
+ # split above navigation tree into lines
divert_end();
$html = undivert("tmp");
$html = explode("\n", $html);
@@ -152,7 +156,8 @@
array_pop($url);
}
}
-
+ unset($id, $url, $count, $prefix);
+
# assemble back into a navigation tree and output to new diversion
$html = implode("\n", $html);
divert("nav");
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas-style.php
============================================================================
$ cvs diff -u -r1.9 -r1.10 canvas-style.php
--- openpkg-meta/canvas-style.php 11 Mar 2006 16:32:59 -0000 1.9
+++ openpkg-meta/canvas-style.php 12 Mar 2006 19:16:36 -0000 1.10
@@ -45,24 +45,24 @@
}
/* hyper-links */
-A {
+A {
text-decoration: none;
- font-weight: bold;
-}
-A:link {
+ font-weight: bold;
+}
+A:link {
text-decoration: none;
- font-weight: bold;
+ font-weight: bold;
color: #909090;
-}
-A:visited {
+}
+A:visited {
text-decoration: none;
font-weight: bold;
color: #909090;
-}
-A:hover {
+}
+A:hover {
text-decoration: underline;
font-weight: bold;
- color: #909090;
+ color: #909090;
}
/* lists */
@@ -87,7 +87,7 @@
width: 12em;
margin: 1em 1em 1em 0em;
text-align: left;
- font-size: 80%;
+ font-size: 80%;
font-weight: bold;
color: #000000;
}
@@ -97,7 +97,7 @@
width: 12em;
margin: 1em 0em 1em 1em;
text-align: left;
- font-size: 80%;
+ font-size: 80%;
font-weight: bold;
color: #000000;
}
@@ .
patch -p0 <<'@@ .'
Index: openpkg-meta/canvas.php
============================================================================
$ cvs diff -u -r1.19 -r1.20 canvas.php
--- openpkg-meta/canvas.php 12 Mar 2006 18:58:39 -0000 1.19
+++ openpkg-meta/canvas.php 12 Mar 2006 19:16:36 -0000 1.20
@@ -25,14 +25,14 @@
##
## url ::= "http://meta.openpkg.org/"; . option*
-## option ::= # content dispatching (internal)
+## option ::= # content dispatching (internal)
## ("type=" . ("html"|"css"|"js"))
## | # content embedding
## ("embed=" . ("css"|"js") . (",".("css"|"js"))?)
## | # content path selection
## ("path=" . site.(".".area.(".".page.(".".part)?)?)?
-## | # content layouting
-## ("pane=" . ("1"|"2"))
+## | # content layouting
+## ("pane=" . ("1"|"2"))
## | # x-axis streching
## ("stretch=" . ("canvas"|"margin"))
## | # root URL type
@@ -80,7 +80,7 @@
}
else if ($opt["root"] == "relative") {
# advantage: IE loads javascript, HTTPS seamless integration
- # disadvantage: slower
+ # disadvantage: slower
$cfg["url.base"] = "/openpkg-meta/";
}
else {
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
