Menu
▾
▴
tavi-cvs-commit — CVS commit changelogs should be forwarded to this list
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(23) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(107) |
Feb
(48) |
Mar
|
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2003 |
Jan
|
Feb
|
Mar
|
Apr
(8) |
May
|
Jun
(29) |
Jul
(14) |
Aug
(9) |
Sep
(34) |
Oct
(14) |
Nov
(6) |
Dec
(18) |
| 2004 |
Jan
|
Feb
(4) |
Mar
(12) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
|
Mar
(43) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(10) |
| 2007 |
Jan
(1) |
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Scott M. <sm...@us...> - 2002-01-01 16:42:03
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv10133/parse
Modified Files:
transforms.php
Log Message:
Tweak presentation of lists in Netscape.
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- transforms.php 2001/12/31 18:31:50 1.11
+++ transforms.php 2002/01/01 16:41:59 1.12
@@ -311,16 +311,7 @@
global $MaxNesting;
static $last_prefix = ''; // Last line's prefix.
static $steal = ''; // Stealing the next line?
- static $skip_blank = 0;
-
-// Lists automatically cause a newline to appear after their end.
-// If we ended a list, and there's a blank line here, ignore it,
-// since it'll appear anyway.
- if($steal == '' && $skip_blank && $text == "\n")
- { $text = ''; }
- $skip_blank = 0;
-
// Locate the indent prefix characters.
preg_match('/^([:\\*#]*)(;([^:]*):)?(.*\\n?$)/', $text, $result);
@@ -424,7 +415,6 @@
{
$text = str_replace("\n", '', $text);
$steal = '';
- $skip_blank = 1;
}
}
|
|
From: Scott M. <sm...@us...> - 2002-01-01 16:42:03
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv10133/template
Modified Files:
wiki.css
Log Message:
Tweak presentation of lists in Netscape.
Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- wiki.css 2001/12/31 16:05:43 1.3
+++ wiki.css 2002/01/01 16:41:59 1.4
@@ -1,8 +1,10 @@
+/* WikkiTikkiTavi default style sheet. */
+/* $Id$ */
body
{ background-color: #f5f5f5;
color: #000000;
- margin-right: 2%;
- margin-left: 2%; }
+ margin-right: 3%;
+ margin-left: 3%; }
a:link
{ color: #97694f;
background: transparent; }
@@ -30,3 +32,8 @@
{ margin-bottom: 0; }
textarea
{ width: 100%; }
+dl, ul, ol
+ { margin-top: 0px;
+ margin-bottom: 0px; }
+form
+ { margin-top: 0px; }
|
|
From: Scott M. <sm...@us...> - 2001-12-31 18:31:53
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv2205/parse
Modified Files:
transforms.php
Log Message:
Fix regular expression for teletype markup.
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- transforms.php 2001/12/19 15:55:17 1.10
+++ transforms.php 2001/12/31 18:31:50 1.11
@@ -201,7 +201,7 @@
function parse_teletype($text)
{
- return preg_replace("/{{(()|[^{].*)}}/Ue",
+ return preg_replace("/{{({*?.*}*?)}}/Ue",
"pair_tokens('tt', q1('\\1'))", $text, -1);
}
|
|
From: Scott M. <sm...@us...> - 2001-12-31 18:31:53
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv2205
Modified Files:
ChangeLog
Log Message:
Fix regular expression for teletype markup.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog 2001/12/28 18:35:27 1.14
+++ ChangeLog 2001/12/31 18:31:50 1.15
@@ -3,6 +3,11 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2001-12-31 Scott Moonen <sm...@an...>
+
+ * Fix rendering of {{ .. }} so that it slurps up braces within
+ the outer braces. I.e., {{{abc}}} now renders as <tt>{abc}</tt>.
+
2001-12-28 Scott Moonen <sm...@an...>
* Removed formatting markup to bring 'Tavi from XHTML-Transitional
|
|
From: Scott M. <sm...@us...> - 2001-12-31 16:05:46
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv10873/template
Modified Files:
wiki.css
Log Message:
Prettify CSS.
Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- wiki.css 2001/12/31 15:58:13 1.2
+++ wiki.css 2001/12/31 16:05:43 1.3
@@ -1,6 +1,8 @@
body
{ background-color: #f5f5f5;
- color: #000000; }
+ color: #000000;
+ margin-right: 2%;
+ margin-left: 2%; }
a:link
{ color: #97694f;
background: transparent; }
|
|
From: Scott M. <sm...@us...> - 2001-12-31 15:58:16
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv9205/parse
Modified Files:
html.php
Log Message:
Tweak CSS for better appearance in Netscape.
Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- html.php 2001/12/28 18:32:42 1.12
+++ html.php 2001/12/31 15:58:13 1.13
@@ -57,11 +57,11 @@
function html_raw($text)
{ return $text; }
function html_diff_old_start()
- { return "<div class=\"diff-removed\">\n"; }
+ { return "<table class=\"diff\"><tr><td class=\"diff-removed\">\n"; }
function html_diff_new_start()
- { return "<div class=\"diff-added\">\n"; }
+ { return "<table class=\"diff\"><tr><td class=\"diff-added\">\n"; }
function html_diff_end()
- { return '</div>'; }
+ { return '</td></tr></table>'; }
function html_diff_add()
{ return html_bold_start() . 'Added:' . html_bold_end(); }
function html_diff_change()
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv9205/template
Modified Files:
admin.php conflict.php diff.php edit.php find.php history.php
prefs.php preview.php view.php wiki.css
Log Message:
Tweak CSS for better appearance in Netscape.
Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/admin.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- admin.php 2001/12/28 18:32:42 1.4
+++ admin.php 2001/12/31 15:58:13 1.5
@@ -19,12 +19,11 @@
</head>
<body>
<div id="body">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- Administering <?php print $WikiName; ?>
-</h1>
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>Administering <?php print $WikiName; ?></h1>
<hr />
<div id="page">
<?php print $html; ?>
Index: conflict.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/conflict.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- conflict.php 2001/12/28 18:32:42 1.4
+++ conflict.php 2001/12/31 15:58:13 1.5
@@ -19,13 +19,14 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- Editing <a class="title" href="<?php print findURL($page); ?>">
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>
+ Editing <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
-</h1>
+ </h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/diff.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- diff.php 2001/12/28 18:32:42 1.4
+++ diff.php 2001/12/31 15:58:13 1.5
@@ -19,13 +19,14 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- <a class="title" href="<?php print findURL($page); ?>">
- <?php print $page; ?></a>
-</h1>
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>
+ <a class="title" href="<?php print findURL($page); ?>">
+ <?php print $page; ?></a>
+ </h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: edit.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/edit.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- edit.php 2001/12/28 18:32:42 1.4
+++ edit.php 2001/12/31 15:58:13 1.5
@@ -19,13 +19,14 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- Editing <a class="title" href="<?php print findURL($page); ?>">
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>
+ Editing <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
-</h1>
+ </h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: find.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/find.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- find.php 2001/12/28 18:32:42 1.4
+++ find.php 2001/12/31 15:58:13 1.5
@@ -19,12 +19,11 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- Find <?php print $find; ?>
-</h1>
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>Find <?php print $find; ?></h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: history.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/history.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- history.php 2001/12/28 18:32:42 1.5
+++ history.php 2001/12/31 15:58:13 1.6
@@ -19,13 +19,14 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- History of <a class="title" href="<?php print findURL($page); ?>">
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>
+ History of <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
-</h1>
+ </h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/prefs.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- prefs.php 2001/12/28 18:32:42 1.5
+++ prefs.php 2001/12/31 15:58:13 1.6
@@ -20,12 +20,11 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- Preferences
-</h1>
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>Preferences</h1>
<hr />
</div>
<div id="body">
Index: preview.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/preview.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- preview.php 2001/12/28 18:32:42 1.4
+++ preview.php 2001/12/31 15:58:13 1.5
@@ -20,13 +20,14 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- Previewing <a class="title" href="<?php print findURL($page); ?>">
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>
+ Previewing <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
-</h1>
+ </h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: view.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/view.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- view.php 2001/12/28 18:32:42 1.4
+++ view.php 2001/12/31 15:58:13 1.5
@@ -23,17 +23,18 @@
</head>
<body>
<div id="header">
-<h1>
- <a href="<?php print viewURL($HomePage); ?>">
- <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
- </a>
- <a class="title" href="<?php print findURL($page); ?>">
+ <div class="logo">
+ <a href="<?php print viewURL($HomePage); ?>"><img
+ src="<?php print $WikiLogo; ?>" alt="[Home]" /></a>
+ </div>
+ <h1>
+ <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
<?php
if($archive)
{ print '(' . html_timestamp($time) . ')'; }
?>
-</h1>
+ </h1>
<?php print html_toolbar_top(); ?>
<hr />
</div>
Index: wiki.css
===================================================================
RCS file: /cvsroot/tavi/tavi/template/wiki.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- wiki.css 2001/12/28 18:37:19 1.1
+++ wiki.css 2001/12/31 15:58:13 1.2
@@ -12,19 +12,17 @@
background: transparent; }
a.title
{ text-decoration: none; }
-img.logo
- { border: 0;
- float: right; }
img
- { border: 0;
- float: none; }
-div.diff-added
- { width: 95%;
- background-color: #cfffcf;
+ { border: 0; }
+div.logo
+ { float: right; }
+table.diff
+ { width: 95%; }
+td.diff-added
+ { background-color: #cfffcf;
color: #000000; }
-div.diff-removed
- { width: 95%;
- background-color: #ffffaf;
+td.diff-removed
+ { background-color: #ffffaf;
color: #000000; }
h1
{ margin-bottom: 0; }
|
|
From: Scott M. <sm...@us...> - 2001-12-28 18:37:22
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv13024/template
Added Files:
wiki.css
Log Message:
Add style sheet to repository.
--- NEW FILE: wiki.css ---
body
{ background-color: #f5f5f5;
color: #000000; }
a:link
{ color: #97694f;
background: transparent; }
a:visited
{ color: #4e2f2f;
background: transparent; }
a:active
{ color: #7f3030;
background: transparent; }
a.title
{ text-decoration: none; }
img.logo
{ border: 0;
float: right; }
img
{ border: 0;
float: none; }
div.diff-added
{ width: 95%;
background-color: #cfffcf;
color: #000000; }
div.diff-removed
{ width: 95%;
background-color: #ffffaf;
color: #000000; }
h1
{ margin-bottom: 0; }
textarea
{ width: 100%; }
|
|
From: Scott M. <sm...@us...> - 2001-12-28 18:35:29
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv12424/tavi
Modified Files:
ChangeLog
Log Message:
Update change log.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- ChangeLog 2001/12/19 16:16:12 1.13
+++ ChangeLog 2001/12/28 18:35:27 1.14
@@ -3,6 +3,15 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2001-12-28 Scott Moonen <sm...@an...>
+
+ * Removed formatting markup to bring 'Tavi from XHTML-Transitional
+ to XHTML-Strict.
+ * Moved formatting information to 'template/wiki.css'.
+ * 'Tavi now validates as XTHML-Strict and CSS compliant (except for
+ wrap="virtual" attribute on text areas, which I don't think can
+ be accomplished using CSS).
+
2001-12-19 Scott Moonen <sm...@an...>
* Thoroughly rework list (indent, bullet, numbered) parsing.
|
|
From: Scott M. <sm...@us...> - 2001-12-28 18:32:45
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv11365/tavi/parse
Modified Files:
html.php
Log Message:
XHTML-Strict, CSS.
Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- html.php 2001/12/19 15:51:29 1.11
+++ html.php 2001/12/28 18:32:42 1.12
@@ -57,11 +57,11 @@
function html_raw($text)
{ return $text; }
function html_diff_old_start()
- { return "<table width=\"95%\" bgcolor=\"#ffffaf\"><tr><td>\n"; }
-function html_diff_end()
- { return '</td></tr></table>'; }
+ { return "<div class=\"diff-removed\">\n"; }
function html_diff_new_start()
- { return "<table width=\"95%\" bgcolor=\"#cfffcf\"><tr><td>\n"; }
+ { return "<div class=\"diff-added\">\n"; }
+function html_diff_end()
+ { return '</div>'; }
function html_diff_add()
{ return html_bold_start() . 'Added:' . html_bold_end(); }
function html_diff_change()
@@ -218,6 +218,7 @@
global $AdminScript;
return '<form method="post" action="' . $AdminScript . "\">\n" .
+ '<div class="form">' . "\n" .
'<input type="hidden" name="locking" value="1" />' . "\n" .
html_bold_start() . 'Locked' . html_bold_end() . html_newline();
}
@@ -225,6 +226,7 @@
{
return '<input type="hidden" name="count" value="' . $count . '" />' . "\n" .
'<input type="submit" name="Save" value="Save" />' . "\n" .
+ '</div>' . "\n" .
'</form>' . "\n";
}
function html_lock_page($page, $mutable)
@@ -248,6 +250,7 @@
return "</dl>\n" .
'<form method="post" action="' . $AdminScript . "\">\n" .
+ '<div class="form">' . "\n" .
'<input type="hidden" name="blocking" value="1" />' . "\n" .
'Enter IP address range in form <tt>12.*</tt>, <tt>34.56.*</tt>, or ' .
'<tt>78.90.123.*</tt><br />' . "\n" .
@@ -255,6 +258,7 @@
"\n" .
'<input type="submit" name="Block" value="Block" />' . "\n" .
'<input type="submit" name="Unblock" value="Unblock" />' . "\n" .
+ '</div>' . "\n";
'</form>' . "\n";
}
function html_rate_entry($address)
|
|
From: Scott M. <sm...@us...> - 2001-12-28 18:32:45
|
Update of /cvsroot/tavi/tavi/template
In directory usw-pr-cvs1:/tmp/cvs-serv11365/tavi/template
Modified Files:
admin.php conflict.php diff.php edit.php find.php history.php
prefs.php preview.php view.php
Log Message:
XHTML-Strict, CSS.
Index: admin.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/admin.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- admin.php 2001/11/30 22:10:16 1.3
+++ admin.php 2001/12/28 18:32:42 1.4
@@ -4,22 +4,24 @@
function template_admin($html)
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
+ global $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>Administering <?php print $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
+<body>
<div id="body">
-<h1 style="margin-bottom:0">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
Administering <?php print $WikiName; ?>
</h1>
Index: conflict.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/conflict.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- conflict.php 2001/11/30 22:10:17 1.3
+++ conflict.php 2001/12/28 18:32:42 1.4
@@ -4,35 +4,39 @@
function template_conflict($page, $text, $html, $usertext, $time, $nextver)
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
- global $EditRows, $EditCols, $UserName, $PrefsScript;
+ global $EditRows, $EditCols, $UserName, $PrefsScript, $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>Editing <?php print $page . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
- Editing <a href="<?php print findURL($page); ?>" style="text-decoration:none">
+ Editing <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
</h1>
<?php print html_toolbar_top(); ?>
<hr />
+</div>
+<div id="body">
<font color="ff3f3f">
Warning: since you started editing, this document has been changed by someone
else. Please merge your edits into the current version of this document.
</font>
<h1>Current Version</h1>
<form method="post" action="<?php print saveURL($page); ?>">
+<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
<?php
@@ -47,7 +51,7 @@
<input type="hidden" name="nextver" value="<?php print $nextver; ?>" />
<textarea name="document" rows="<?php
print $EditRows; ?>" cols="<?php
- print $EditCols; ?>" style="width:100%" wrap="virtual"><?php
+ print $EditCols; ?>" wrap="virtual"><?php
print str_replace('<', '<', str_replace('&', '&', $text));
?></textarea><br />
Summary of change:
@@ -58,20 +62,25 @@
<h1>Your changes</h1>
<textarea name="discard" rows="<?php
print $EditRows; ?>" cols="<?php
- print $EditCols; ?>" style="width:100%" wrap="virtual"><?php
+ print $EditCols; ?>" wrap="virtual"><?php
print str_replace('<', '<', str_replace('&', '&', $usertext));
?></textarea><br />
+</div>
</form>
<h1>Preview of Current Version</h1>
<?php
print $html;
?>
+</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<a href="<?php print historyURL($page); ?>">View document history</a><br />
Document last modified <?php print html_time($time); ?><br />
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
Index: diff.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/diff.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- diff.php 2001/11/30 22:10:17 1.3
+++ diff.php 2001/12/28 18:32:42 1.4
@@ -4,35 +4,41 @@
function template_diff($page, $diff_html, $html, $editable, $time)
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
- global $FindScript;
+ global $FindScript, $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title><?php print $page . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
- <a href="<?php print findURL($page); ?>" style="text-decoration:none">
+ <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
</h1>
<?php print html_toolbar_top(); ?>
<hr />
+</div>
+<div id="body">
<strong>Difference between versions:</strong><br /><br />
<?php print $diff_html; ?>
<hr />
<?php print $html; ?>
+</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<?php
if($editable)
{
@@ -48,6 +54,7 @@
Document last modified <?php print html_time($time); ?><br />
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
Index: edit.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/edit.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- edit.php 2001/11/30 22:10:17 1.3
+++ edit.php 2001/12/28 18:32:42 1.4
@@ -4,30 +4,34 @@
function template_edit($page, $text, $time, $nextver, $archive)
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
- global $EditRows, $EditCols, $UserName, $PrefsScript;
+ global $EditRows, $EditCols, $UserName, $PrefsScript, $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>Editing <?php print $page . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
- Editing <a href="<?php print findURL($page); ?>" style="text-decoration:none">
+ Editing <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
</h1>
<?php print html_toolbar_top(); ?>
<hr />
+</div>
+<div id="body">
<form method="post" action="<?php print saveURL($page); ?>">
+<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
<?php
@@ -46,20 +50,25 @@
<?php }?>
<textarea name="document" rows="<?php
print $EditRows; ?>" cols="<?php
- print $EditCols; ?>" style="width:100%" wrap="virtual"><?php
+ print $EditCols; ?>" wrap="virtual"><?php
print str_replace('<', '<', str_replace('&', '&', $text));
?></textarea><br />
Summary of change:
<input type="text" name="comment" size="40" value="" /><br />
Add document to category:
<input type="text" name="categories" size="40" value="" />
+</div>
</form>
+</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<a href="<?php print historyURL($page); ?>">View document history</a><br />
Document last modified <?php print html_time($time); ?><br />
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
Index: find.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/find.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- find.php 2001/11/30 22:10:17 1.3
+++ find.php 2001/12/28 18:32:42 1.4
@@ -4,33 +4,40 @@
function template_find($find, $pages)
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
- global $FindScript;
+ global $FindScript, $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>Find <?php print $find . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
Find <?php print $find; ?>
</h1>
<?php print html_toolbar_top(); ?>
<hr />
+</div>
+<div id="body">
<?php print $pages; ?>
+</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
Index: history.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/history.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- history.php 2001/12/03 20:15:10 1.4
+++ history.php 2001/12/28 18:32:42 1.5
@@ -4,29 +4,34 @@
function template_history($page, $history, $diff)
{
global $FindScript, $DiffScript, $WikiName, $HomePage, $WikiLogo;
+ global $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>History of <?php print $page . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
- History of <a href="<?php print findURL($page); ?>" style="text-decoration:none">
+ History of <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
</h1>
<?php print html_toolbar_top(); ?>
<hr />
+</div>
+<div id="body">
<form method="get" action="<?php print $DiffScript; ?>">
+ <div class="form">
<input type="hidden" name="action" value="diff" />
<input type="hidden" name="page" value="<?php print $page; ?>" />
<table border="0">
@@ -39,16 +44,21 @@
<tr><td colspan="3">
<input type="submit" value="Compute Difference" /></td></tr>
</table>
+ </div>
</form>
<hr /><br />
<strong>Changes by last author:</strong><br /><br />
<?php print $diff; ?>
+</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
Index: prefs.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/prefs.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- prefs.php 2001/12/14 21:04:03 1.4
+++ prefs.php 2001/12/28 18:32:42 1.5
@@ -4,29 +4,33 @@
function template_prefs()
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
- global $PrefsScript, $HTTP_REFERER, $HistMax, $TimeZoneOff;
+ global $PrefsScript, $HTTP_REFERER, $HistMax, $TimeZoneOff, $StyleSheet;
global $AuthorDiff, $EditRows, $EditCols, $UserName, $DayLimit, $MinEntries;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>Preferences - <?php print $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
Preferences
</h1>
<hr />
+</div>
+<div id="body">
<form action="<?php print $PrefsScript; ?>" method="post">
+<div class="form">
<input type="hidden" name="referrer" value="<?php print $HTTP_REFERER; ?>" />
<strong>User name</strong><br /><br />
@@ -77,6 +81,7 @@
<hr /><br />
<input type="submit" name="Save" value="Save" />
+</div>
</form>
</div>
</body>
Index: preview.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/preview.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- preview.php 2001/11/30 22:10:17 1.3
+++ preview.php 2001/12/28 18:32:42 1.4
@@ -5,29 +5,34 @@
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
global $EditRows, $EditCols, $categories, $UserName, $comment, $PrefsScript;
+ global $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
<meta name="DESCRIPTION" content="<?php print $MetaDescription; ?>" />
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" />
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title>Previewing <?php print $page . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
- Previewing <a href="<?php print findURL($page); ?>" style="text-decoration:none">
+ Previewing <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
</h1>
<?php print html_toolbar_top(); ?>
<hr />
+</div>
+<div id="body">
<form method="post" action="<?php print saveURL($page); ?>">
+<div class="form">
<input type="submit" name="Save" value="Save" />
<input type="submit" name="Preview" value="Preview" />
<?php
@@ -46,7 +51,7 @@
<?php }?>
<textarea name="document" rows="<?php
print $EditRows; ?>" cols="<?php
- print $EditCols; ?>" style="width:100%" wrap="virtual"><?php
+ print $EditCols; ?>" wrap="virtual"><?php
print str_replace('<', '<', str_replace('&', '&', $text));
?></textarea><br />
Summary of change:
@@ -55,16 +60,21 @@
Add document to category:
<input type="text" name="categories" size="40" value="<?php
print $categories; ?>" />
+</div>
</form>
<h1>Preview</h1>
<hr />
<?php print $html; ?>
+</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<a href="<?php print historyURL($page); ?>">View document history</a><br />
Document last modified <?php print html_time($time); ?><br />
<input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
Index: view.php
===================================================================
RCS file: /cvsroot/tavi/tavi/template/view.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- view.php 2001/11/30 22:10:17 1.3
+++ view.php 2001/12/28 18:32:42 1.4
@@ -4,11 +4,11 @@
function template_view($page, $html, $editable, $time, $archive, $version)
{
global $WikiName, $HomePage, $WikiLogo, $MetaKeywords, $MetaDescription;
- global $FindScript, $pagestore;
+ global $FindScript, $pagestore, $StyleSheet;
?>
-<!DOCTYPE html PUBLIC
- "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "DTD/xhtml1-transitional.dtd" >
+<!DOCTYPE html
+ PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns = "http://www.w3.org/1999/xhtml">
<head>
<meta name="KEYWORDS" content="<?php print $MetaKeywords; ?>" />
@@ -18,15 +18,16 @@
{?>
<meta name="ROBOTS" content="NOINDEX, NOFOLLOW" /><?php
}?>
+<link rel="STYLESHEET" href="<? print $StyleSheet; ?>" type="text/css" />
<title><?php print $page . ' - ' . $WikiName; ?></title>
</head>
-<body bgcolor="whitesmoke" link="#97694F" vlink="#4E2F2F" alink="#7F3030">
-<div id="body">
-<h1 style="margin-bottom:0">
+<body>
+<div id="header">
+<h1>
<a href="<?php print viewURL($HomePage); ?>">
- <img src="<?php print $WikiLogo; ?>" border="0" align="right" alt="[Home]" />
+ <img class="logo" src="<?php print $WikiLogo; ?>" alt="[Home]" />
</a>
- <a href="<?php print findURL($page); ?>" style="text-decoration:none">
+ <a class="title" href="<?php print findURL($page); ?>">
<?php print $page; ?></a>
<?php
if($archive)
@@ -35,11 +36,14 @@
</h1>
<?php print html_toolbar_top(); ?>
<hr />
-<div id="page">
+</div>
+<div id="body">
<?php print $html; ?>
</div>
+<div id="footer">
<hr />
<form method="get" action="<?php print $FindScript; ?>">
+<div class="form">
<?php
if($editable)
{
@@ -68,6 +72,7 @@
}
?> <input type="hidden" name="action" value="find" />
Search: <input type="text" name="find" size="20" />
+</div>
</form>
</div>
</body>
|
|
From: Scott M. <sm...@us...> - 2001-12-28 18:32:45
|
Update of /cvsroot/tavi/tavi In directory usw-pr-cvs1:/tmp/cvs-serv11365/tavi Modified Files: config.php Log Message: XHTML-Strict, CSS. Index: config.php =================================================================== RCS file: /cvsroot/tavi/tavi/config.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- config.php 2001/12/19 16:16:12 1.8 +++ config.php 2001/12/28 18:32:42 1.9 @@ -85,6 +85,10 @@ // to configure it. $WikiLogo = '/tavi.png'; +// $StyleSheet contains the URL for your wiki's CSS style sheet. It is +// typically a relative URL, such as '/wiki/wiki.css'. +$StyleSheet = ''; + // $WikiName determines the name of your wiki. If you use a template other // than the default wiki template, you may have to set other variables to // configure it. This name is used in the browser title bar. Often, it |
|
From: Scott M. <sm...@us...> - 2001-12-19 16:16:15
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv32731/tavi
Modified Files:
ChangeLog config.php
Log Message:
Change $Unicode config variable to $Charset.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- ChangeLog 2001/12/19 15:51:29 1.12
+++ ChangeLog 2001/12/19 16:16:12 1.13
@@ -8,6 +8,8 @@
* Thoroughly rework list (indent, bullet, numbered) parsing.
Engine output is now entirely XHTML-Transitional-compliant.
* Add definition lists (syntax is ";term:definition").
+ * Change $Unicode configuration option to $Charset configuration
+ option, to allow engine to always emit a character set.
2001-12-18 Scott Moonen <sm...@an...>
Index: config.php
===================================================================
RCS file: /cvsroot/tavi/tavi/config.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- config.php 2001/12/19 15:51:29 1.7
+++ config.php 2001/12/19 16:16:12 1.8
@@ -42,10 +42,12 @@
// If $AdminEnabled is set to 0, administrator control will be disallowed.
$AdminEnabled = 0;
-// If $Unicode is set to 0, text will be treated as Latin text. If not set
-// to zero, all text will be treated as UTF-8 text. Note that this feature
-// does not work properly in Netscape, so it is turned off by default.
-$Unicode = 0;
+// Set $Charset to indicate the character set used for storage, editing,
+// and display in your wiki. The default is "ISO-8859-1" (Latin-1).
+// "utf-8" is supported, and is recommended for international text,
+// however you should be cautioned that Netscape does not behave correctly
+// when editing utf-8 text. Hence, "utf-8" is not currently the default.
+$Charset = 'ISO-8859-1';
// Old versions of pages will be deleted after $ExpireLen days. If $ExpireLen
// is set to 0, old versions of pages (and pages set to empty) will never
|
|
From: Scott M. <sm...@us...> - 2001-12-19 16:16:15
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv32731/tavi/lib
Modified Files:
init.php
Log Message:
Change $Unicode config variable to $Charset.
Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- init.php 2001/12/18 16:57:20 1.5
+++ init.php 2001/12/19 16:16:13 1.6
@@ -56,7 +56,7 @@
{ $TimeZoneOff = $result[1]; }
}
-if($Unicode)
- { header("Content-Type: text/html; charset=utf-8"); }
+if($Charset != '')
+ { header("Content-Type: text/html; charset=$Charset"); }
?>
|
|
From: Scott M. <sm...@us...> - 2001-12-19 15:55:20
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv26382/parse
Modified Files:
transforms.php
Log Message:
Minor tweak to fix broken interwiki parsing.
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- transforms.php 2001/12/19 15:51:29 1.9
+++ transforms.php 2001/12/19 15:55:17 1.10
@@ -98,7 +98,7 @@
{
global $pagestore;
- if(($url = $pagestore->interwiki($base)) != '')
+ if(($url = $pagestore->interwiki($prefix)) != '')
{
return new_entity(array('interwiki', $url . $ref, $prefix . ':' . $ref));
}
|
|
From: Scott M. <sm...@us...> - 2001-12-19 15:51:32
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv25294/tavi/parse
Modified Files:
html.php transforms.php
Log Message:
Rework list parsing. Output is now XHTML-Transitional-compliant.
Add definition lists.
Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- html.php 2001/12/18 21:26:39 1.10
+++ html.php 2001/12/19 15:51:29 1.11
@@ -38,6 +38,10 @@
{ return '<dd>'; }
function html_dd_end()
{ return "</dd>\n"; }
+function html_dt_start()
+ { return '<dt>'; }
+function html_dt_end()
+ { return '</dt>'; }
function html_hr()
{ return "<hr />\n"; }
function html_newline()
@@ -136,14 +140,9 @@
{ return '(' . $appearance . ')<a href="' . editURL($page) . '"' . $hover . '>?</a>'; }
}
}
-function html_interwiki($base, $ref)
+function html_interwiki($url, $text)
{
- global $pagestore;
-
- if(($url = $pagestore->interwiki($base)) != '')
- { return '<a href="' . $url . $ref . '">' . $base . ':' . $ref . '</a>'; }
-
- return $base . ':' . $ref;
+ return '<a href="' . $url . '">' . $text . '</a>';
}
function html_twin($base, $ref)
{
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- transforms.php 2001/12/18 16:57:20 1.8
+++ transforms.php 2001/12/19 15:51:29 1.9
@@ -90,10 +90,22 @@
global $InterwikiPtn;
return preg_replace("/(^|[^A-Za-z])($InterwikiPtn)(\$|[^\\/=&~A-Za-z0-9])/e",
- "q1('\\1').new_entity(array('interwiki',q1('\\3'),q1('\\4'))).q1('\\6')",
+ "q1('\\1').interwiki_token(q1('\\3'),q1('\\4')).q1('\\6')",
$text, -1);
}
+function interwiki_token($prefix, $ref)
+{
+ global $pagestore;
+
+ if(($url = $pagestore->interwiki($base)) != '')
+ {
+ return new_entity(array('interwiki', $url . $ref, $prefix . ':' . $ref));
+ }
+
+ return $prefix . ':' . $ref;
+}
+
function parse_hyperlink_ref($text)
{
global $UrlPtn;
@@ -301,21 +313,35 @@
static $steal = ''; // Stealing the next line?
static $skip_blank = 0;
+// Lists automatically cause a newline to appear after their end.
+// If we ended a list, and there's a blank line here, ignore it,
+// since it'll appear anyway.
+
if($steal == '' && $skip_blank && $text == "\n")
{ $text = ''; }
$skip_blank = 0;
- preg_match('/^([:\\*#]*)(.*\\n?$)/', $text, $result);
+// Locate the indent prefix characters.
+
+ preg_match('/^([:\\*#]*)(;([^:]*):)?(.*\\n?$)/', $text, $result);
+ if($result[2] != '') // Definition list.
+ { $result[1] = $result[1] . ';'; }
+
+// No list on last line, no list on this line. Bail out:
+
if($steal == '' && $last_prefix == '' && $result[1] == '')
{ return $text; } // Common case fast.
if($steal == '') // Not slurping up line.
{
- $text = $result[2];
+ $text = $result[4];
$fixup = '';
+// Loop through and look for prefix characters in common with the
+// previous line.
+
for($i = 0;
$i < $MaxNesting && ($last_prefix[$i] != '' || $result[1][$i] != '');
$i++)
@@ -326,15 +352,53 @@
{ break; }
if($last_prefix[$i] != $result[1][$i])
{
+// Uh-oh. We're different. End any dangling lists from the previous
+// line.
+
for($j = $i; $j < $MaxNesting && $last_prefix[$j] != ''; $j++)
- { $fixup = $fixup . entity_list($last_prefix[$j], 'end'); }
+ {
+ $fixup = entity_listitem($last_prefix[$j], 'end')
+ . entity_list($last_prefix[$j], 'end')
+ . $fixup;
+ }
break;
}
}
- for(; $i < $MaxNesting && $result[1][$i] != ''; $i++)
- { $fixup = $fixup . entity_list($result[1][$i], 'start'); }
+// End the preceding line's list item if we're starting another one
+// at the same level.
+
+ if($i > 0 && $result[1][$i] == '')
+ { $fixup = $fixup . entity_listitem($last_prefix[$i - 1], 'end'); }
+
+// Start fresh new lists for this line as needed.
+// We start all but the last one as *indents* (definition lists)
+// instead of what they really may appear as, since their function is
+// really just to indent.
+
+ for(; $i < $MaxNesting - 1 && $result[1][$i + 1] != ''; $i++)
+ {
+ $result[1][$i] = ':'; // Pretend to be an indent.
+ $fixup = $fixup
+ . entity_list(':', 'start')
+ . entity_listitem(':', 'start');
+ }
+ if($result[1][$i] != '')
+ {
+ $fixup = $fixup
+ . entity_list($result[1][$i], 'start');
+ }
+// Start the list *item*.
+
+ if($result[2] != '') // Definition list.
+ {
+ $fixup = $fixup
+ . new_entity(array('term_item_start'))
+ . $result[3]
+ . new_entity(array('term_item_end'));
+ }
+
if($result[1] != '')
{ $text = entity_listitem(substr($result[1], -1), 'start') . $text; }
@@ -345,15 +409,20 @@
if($steal != '' || $result[1] != '')
{
+// Check if a previous line used a trailing '\' to "steal" us;
+// i.e., to insert a new line while continuing with the same list item.
+
if($steal == '')
{ $steal = substr($result[1], -1); }
+// Check if *we* have a trailing '\' to "steal" the next line. If not,
+// end ourselves right here.
+
if(preg_match('/(^|[^\\\\])(\\\\\\\\)*\\\\$/', $text))
{ $text = preg_replace('/\\\\$/', "\n", $text); }
else
{
$text = str_replace("\n", '', $text);
- $text = $text . entity_listitem($steal, 'end');
$steal = '';
$skip_blank = 1;
}
@@ -366,7 +435,7 @@
{
if($type == '*')
{ return new_entity(array('bullet_list_' . $fn)); }
- else if($type == ':')
+ else if($type == ':' || $type == ';')
{ return new_entity(array('indent_list_' . $fn)); }
else if($type == '#')
{ return new_entity(array('numbered_list_' . $fn)); }
@@ -376,7 +445,7 @@
{
if($type == '*')
{ return new_entity(array('bullet_item_' . $fn)); }
- else if($type == ':')
+ else if($type == ':' || $type == ';')
{ return new_entity(array('indent_item_' . $fn)); }
else if($type == '#')
{ return new_entity(array('numbered_item_' . $fn)); }
|
|
From: Scott M. <sm...@us...> - 2001-12-19 15:51:32
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv25294/tavi
Modified Files:
ChangeLog config.php
Log Message:
Rework list parsing. Output is now XHTML-Transitional-compliant.
Add definition lists.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- ChangeLog 2001/12/18 21:26:39 1.11
+++ ChangeLog 2001/12/19 15:51:29 1.12
@@ -3,6 +3,12 @@
WikkiTikkiTavi - ChangeLog
--------------------------
+2001-12-19 Scott Moonen <sm...@an...>
+
+ * Thoroughly rework list (indent, bullet, numbered) parsing.
+ Engine output is now entirely XHTML-Transitional-compliant.
+ * Add definition lists (syntax is ";term:definition").
+
2001-12-18 Scott Moonen <sm...@an...>
* Fix minor formatting glitches in the parse engine.
Index: config.php
===================================================================
RCS file: /cvsroot/tavi/tavi/config.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config.php 2001/12/14 21:04:03 1.6
+++ config.php 2001/12/19 15:51:29 1.7
@@ -256,6 +256,8 @@
'indent_list_end' => 'html_dl_end',
'indent_item_start' => 'html_dd_start',
'indent_item_end' => 'html_dd_end',
+ 'term_item_start' => 'html_dt_start',
+ 'term_item_end' => 'html_dt_end',
'numbered_list_start' => 'html_ol_start',
'numbered_list_end' => 'html_ol_end',
'numbered_item_start' => 'html_li_start',
|
|
From: Scott M. <sm...@us...> - 2001-12-18 21:26:42
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv24393
Modified Files:
ChangeLog
Log Message:
Required ALT tag on images.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- ChangeLog 2001/12/18 16:58:56 1.10
+++ ChangeLog 2001/12/18 21:26:39 1.11
@@ -7,6 +7,9 @@
* Fix minor formatting glitches in the parse engine.
Code now uses chr(255) to flag elements, rather than '\{n}'.
+ * Include 'alt=' property on img tags, since this is a required
+ XHTML attribute. The property's value is set to the basename of
+ the image's URL.
2001-12-14 Scott Moonen <sm...@an...>
|
|
From: Scott M. <sm...@us...> - 2001-12-18 21:26:42
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv24393/parse
Modified Files:
html.php
Log Message:
Required ALT tag on images.
Index: html.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/html.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- html.php 2001/12/14 21:04:03 1.9
+++ html.php 2001/12/18 21:26:39 1.10
@@ -110,7 +110,7 @@
if($url == $text
&& preg_match('/(.jpg|.png|.gif)$/', $text))
{
- return "<img src=\"$url\" />";
+ return "<img src=\"$url\" alt=\"" . basename($url) . "\" />";
}
return "<a href=\"$url\">$text</a>";
}
|
|
From: Christopher C. <to...@us...> - 2001-12-18 20:02:19
|
Update of /cvsroot/tavi/CVSROOT In directory usw-pr-cvs1:/tmp/cvs-serv30001 Removed Files: commit_prep log_accum Log Message: Removed the files 'commit_prep' and 'log_accum', as they are no longer necessary since we are using syncmail. --- commit_prep DELETED --- --- log_accum DELETED --- |
|
From: Christopher C. <to...@us...> - 2001-12-18 19:27:16
|
Update of /cvsroot/tavi/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv20459
Modified Files:
syncmail.py
Log Message:
Change a variable so the script will actually do unified diffs when told to.
Index: syncmail.py
===================================================================
RCS file: /cvsroot/tavi/CVSROOT/syncmail.py,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- syncmail.py 2001/12/05 09:49:11 1.2
+++ syncmail.py 2001/12/18 19:27:13 1.3
@@ -154,7 +154,12 @@
# scan args for options
def main():
- contextlines = 2
+ #
+ # This was previously defaulted to 2, and wasn't getting properly
+ # changed by the option passed to it from the loginfo file that
+ # calls the script. Hopefully this will get it to behave properly.
+ #
+ contextlines = 0
try:
opts, args = getopt.getopt(sys.argv[1:], 'hC:cu',
['context=', 'cvsroot=', 'help'])
|
|
From: Christopher C. <to...@us...> - 2001-12-18 19:18:32
|
Update of /cvsroot/tavi/CVSROOT
In directory usw-pr-cvs1:/tmp/cvs-serv18210
Modified Files:
loginfo
Log Message:
Turn on unified diffs.
Index: loginfo
===================================================================
RCS file: /cvsroot/tavi/CVSROOT/loginfo,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** loginfo 2001/12/14 21:21:40 1.6
--- loginfo 2001/12/18 19:18:30 1.7
***************
*** 25,29 ****
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
! #DEFAULT $CVSROOT/CVSROOT/log_accum -D -m tav...@li... -F tav...@li... %{Vvts}
! #DEFAULT $CVSROOT/CVSROOT/syncmail.py %{sVv} tav...@li...
! DEFAULT $CVSROOT/CVSROOT/syncmail.py %{sVv} tav...@li...
--- 25,27 ----
# or
#DEFAULT (echo ""; id; echo %{sVv}; date; cat) >> $CVSROOT/CVSROOT/commitlog
! DEFAULT $CVSROOT/CVSROOT/syncmail.py -u %{sVv} tav...@li...
|
|
From: Scott M. <sm...@us...> - 2001-12-18 16:58:59
|
Update of /cvsroot/tavi/tavi
In directory usw-pr-cvs1:/tmp/cvs-serv10459/tavi
Modified Files:
ChangeLog
Log Message:
Change log.
Index: ChangeLog
===================================================================
RCS file: /cvsroot/tavi/tavi/ChangeLog,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** ChangeLog 2001/12/14 21:04:03 1.9
--- ChangeLog 2001/12/18 16:58:56 1.10
***************
*** 4,7 ****
--- 4,12 ----
--------------------------
+ 2001-12-18 Scott Moonen <sm...@an...>
+
+ * Fix minor formatting glitches in the parse engine.
+ Code now uses chr(255) to flag elements, rather than '\{n}'.
+
2001-12-14 Scott Moonen <sm...@an...>
|
|
From: Scott M. <sm...@us...> - 2001-12-18 16:57:24
|
Update of /cvsroot/tavi/tavi/parse
In directory usw-pr-cvs1:/tmp/cvs-serv9788/tavi/parse
Modified Files:
macros.php transforms.php
Log Message:
Fix minor formatting glitches.
Change parser formatting flag from \{n} to '0xFF' n '0xFF'.
Index: macros.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/macros.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** macros.php 2001/11/30 22:10:16 1.3
--- macros.php 2001/12/18 16:57:20 1.4
***************
*** 6,9 ****
--- 6,10 ----
{
global $pagestore, $MinEntries, $DayLimit, $full, $page, $Entity;
+ global $FlgChr;
$text = '';
***************
*** 24,28 ****
$parsed = parseText($args, array('parse_wikiname', 'parse_freelink'));
$pagenames = array();
! preg_replace('/\\\\{(\\d+)}/e', '$pagenames[]=$Entity[$1][1]', $parsed);
$list = $pagestore->givenpages($pagenames);
}
--- 25,29 ----
$parsed = parseText($args, array('parse_wikiname', 'parse_freelink'));
$pagenames = array();
! preg_replace('/' . $FlgChr . '(\\d+)' . $FlgChr . '/e', '$pagenames[]=$Entity[$1][1]', $parsed);
$list = $pagestore->givenpages($pagenames);
}
Index: transforms.php
===================================================================
RCS file: /cvsroot/tavi/tavi/parse/transforms.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** transforms.php 2001/12/14 20:27:19 1.7
--- transforms.php 2001/12/18 16:57:20 1.8
***************
*** 3,10 ****
// The main parser components. Each of these takes a line of text and scans it
! // for particular wiki markup. It converts markup elements to "\{x}", where
! // x is an index into the global array $Entity, which contains descriptions
! // of each markup entity. Later, these will be converted back into HTML
! // (or, in the future, perhaps some other representation such as XML).
function parse_noop($text)
--- 3,11 ----
// The main parser components. Each of these takes a line of text and scans it
! // for particular wiki markup. It converts markup elements to
! // $FlgChr . x . $FlgChr, where x is an index into the global array $Entity,
! // which contains descriptions of each markup entity. Later, these will be
! // converted back into HTML (or, in the future, perhaps some other
! // representation such as XML).
function parse_noop($text)
***************
*** 23,31 ****
function validate_page($page)
{
$p = parse_wikiname($page);
! if(preg_match('/^\\\\{\\d+}$/', $p))
{ return 1; }
$p = parse_freelink('((' . $page . '))');
! if(preg_match('/^\\\\{\\d+}$/', $p))
{ return 2; }
return 0;
--- 24,34 ----
function validate_page($page)
{
+ global $FlgChr;
+
$p = parse_wikiname($page);
! if(preg_match('/^' . $FlgChr . '\\d+' . $FlgChr . '$/', $p))
{ return 1; }
$p = parse_freelink('((' . $page . '))');
! if(preg_match('/^' . $FlgChr . '\\d+' . $FlgChr . '$/', $p))
{ return 2; }
return 0;
***************
*** 34,47 ****
function parse_elem_flag($text)
{
! // Hide element flags ('\{') from view.
! return preg_replace('/\\\\{/e', "new_entity(array('raw', '\\{'))", $text, -1);
}
function new_entity($array)
{
! global $Entity;
$Entity[count($Entity)] = $array;
! return '\{' . (count($Entity) - 1) . '}';
}
--- 37,52 ----
function parse_elem_flag($text)
{
! global $FlgChr;
! // Hide element flags (0xFF) from view.
! return preg_replace('/' . $FlgChr . '/e', "new_entity(array('raw', '$FlgChr'))", $text, -1);
}
function new_entity($array)
{
! global $Entity, $FlgChr;
!
$Entity[count($Entity)] = $array;
! return $FlgChr . (count($Entity) - 1) . $FlgChr;
}
***************
*** 150,155 ****
{ return $text; }
$reenter = 0;
! $text2 = preg_replace('/%%([^%]+)%%/e', "transclude_token(q1('\\1'))", $text, -1)
! ;
if($text2 != $text)
{ $text2 = str_replace("\n", '', $text2); }
--- 155,159 ----
{ return $text; }
$reenter = 0;
! $text2 = preg_replace('/%%([^%]+)%%/e', "transclude_token(q1('\\1'))", $text, -1);
if($text2 != $text)
{ $text2 = str_replace("\n", '', $text2); }
***************
*** 186,190 ****
function parse_teletype($text)
{
! return preg_replace("/{{(()|[^{].*(\\{\\d+})?)}}/Ue",
"pair_tokens('tt', q1('\\1'))", $text, -1);
}
--- 190,194 ----
function parse_teletype($text)
{
! return preg_replace("/{{(()|[^{].*)}}/Ue",
"pair_tokens('tt', q1('\\1'))", $text, -1);
}
***************
*** 192,202 ****
function pair_tokens($type, $text)
{
! global $Entity;
$Entity[count($Entity)] = array($type . '_start');
$Entity[count($Entity)] = array($type . '_end');
! return '\{' . (count($Entity) - 2) . '}' . $text .
! '\{' . (count($Entity) - 1) . '}';
}
--- 196,206 ----
function pair_tokens($type, $text)
{
! global $Entity, $FlgChr;
$Entity[count($Entity)] = array($type . '_start');
$Entity[count($Entity)] = array($type . '_end');
! return $FlgChr . (count($Entity) - 2) . $FlgChr . $text .
! $FlgChr . (count($Entity) - 1) . $FlgChr;
}
***************
*** 224,228 ****
function parse_nowiki($text)
{
! return preg_replace("/```(.*)```/Ue", "new_entity(array('nowiki', q1('\\1')))",
$text, -1);
}
--- 228,233 ----
function parse_nowiki($text)
{
! return preg_replace("/```(.*)```/Ue",
! "new_entity(array('nowiki', parse_elements(q1('\\1'))))",
$text, -1);
}
***************
*** 230,234 ****
function parse_code($text)
{
! global $Entity;
static $in_code = 0;
static $buffer = '';
--- 235,239 ----
function parse_code($text)
{
! global $Entity, $FlgChr;
static $in_code = 0;
static $buffer = '';
***************
*** 241,248 ****
$buffer = '';
$in_code = 0;
! return '\{' . (count($Entity) - 1) . '}';
}
! $buffer = $buffer . $text;
return '';
}
--- 246,253 ----
$buffer = '';
$in_code = 0;
! return $FlgChr . (count($Entity) - 1) . $FlgChr;
}
! $buffer = $buffer . parse_elements($text);
return '';
}
***************
*** 261,265 ****
function parse_raw_html($text)
{
! global $Entity;
static $in_html = 0;
static $buffer = '';
--- 266,270 ----
function parse_raw_html($text)
{
! global $Entity, $FlgChr;
static $in_html = 0;
static $buffer = '';
***************
*** 272,279 ****
$buffer = '';
$in_html = 0;
! return '\{' . (count($Entity) - 1) . '}';
}
! $buffer = $buffer . $text;
return '';
}
--- 277,284 ----
$buffer = '';
$in_html = 0;
! return $FlgChr . (count($Entity) - 1) . $FlgChr;
}
! $buffer = $buffer . parse_elements($text);
return '';
}
***************
*** 405,409 ****
function parse_elements($text)
{
! return preg_replace("/\\\\{(\\d+)}/e", "generate_element(q1('\\1'))", $text, -1);
}
--- 410,415 ----
function parse_elements($text)
{
! global $FlgChr;
! return preg_replace("/$FlgChr(\\d+)$FlgChr/e", "generate_element(q1('\\1'))", $text, -1);
}
***************
*** 455,463 ****
function parse_diff_message($text)
{
! $text = preg_replace('/(^(\\\\{\\d+})?)\\d[0-9,]*c[0-9,]*$/e',
"q1('\\1').new_entity(array('diff_change'))", $text, -1);
! $text = preg_replace('/(^(\\\\{\\d+})?)\\d[0-9,]*a[0-9,]*$/e',
"q1('\\1').new_entity(array('diff_add'))", $text, -1);
! $text = preg_replace('/(^(\\\\{\\d+})?)\\d[0-9,]*d[0-9,]*$/e',
"q1('\\1').new_entity(array('diff_delete'))", $text, -1);
--- 461,471 ----
function parse_diff_message($text)
{
! global $FlgChr;
!
! $text = preg_replace('/(^(' . $FlgChr . '\\d+' . $FlgChr . ')?)\\d[0-9,]*c[0-9,]*$/e',
"q1('\\1').new_entity(array('diff_change'))", $text, -1);
! $text = preg_replace('/(^(' . $FlgChr . '\\d+' . $FlgChr . ')?)\\d[0-9,]*a[0-9,]*$/e',
"q1('\\1').new_entity(array('diff_add'))", $text, -1);
! $text = preg_replace('/(^(' . $FlgChr . '\\d+' . $FlgChr . ')?)\\d[0-9,]*d[0-9,]*$/e',
"q1('\\1').new_entity(array('diff_delete'))", $text, -1);
|
|
From: Scott M. <sm...@us...> - 2001-12-18 16:57:23
|
Update of /cvsroot/tavi/tavi/lib
In directory usw-pr-cvs1:/tmp/cvs-serv9788/tavi/lib
Modified Files:
category.php init.php
Log Message:
Fix minor formatting glitches.
Change parser formatting flag from \{n} to '0xFF' n '0xFF'.
Index: category.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/category.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** category.php 2001/11/30 22:10:15 1.3
--- category.php 2001/12/18 16:57:20 1.4
***************
*** 7,16 ****
function add_to_category($page, $catlist)
{
! global $pagestore, $Entity, $UserName, $REMOTE_ADDR;
// Parse the category list for category names.
$parsed = parseText($catlist, array('parse_wikiname', 'parse_freelink'));
$pagenames = array();
! preg_replace('/\\\\{(\\d+)}/e', '$pagenames[]=$Entity[$1][1]', $parsed);
if(validate_page($page) == 2)
--- 7,17 ----
function add_to_category($page, $catlist)
{
! global $pagestore, $Entity, $UserName, $REMOTE_ADDR, $FlgChr;
// Parse the category list for category names.
$parsed = parseText($catlist, array('parse_wikiname', 'parse_freelink'));
$pagenames = array();
! preg_replace('/' . $FlgChr . '(\\d+)' . $FlgChr . '/e',
! '$pagenames[]=$Entity[$1][1]', $parsed);
if(validate_page($page) == 2)
Index: init.php
===================================================================
RCS file: /cvsroot/tavi/tavi/lib/init.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** init.php 2001/12/14 21:04:03 1.4
--- init.php 2001/12/18 16:57:20 1.5
***************
*** 16,19 ****
--- 16,21 ----
$RemTbl = $DBTablePrefix . 'remote_pages';
+ $FlgChr = chr(255); // Flag character for parse engine.
+
$pagestore = new PageStore();
$db = $pagestore->dbh;
|
12 messages has been excluded from this view by a project administrator.
