diff -ruwbBN -x CVS -x CDO -x .cvsignore -x createweb ../twiki.cvs/bin/get-a-web bin/get-a-web --- ../twiki.cvs/bin/get-a-web Thu Jan 1 01:00:00 1970 +++ bin/get-a-web Sat Aug 12 07:05:50 2000 @@ -0,0 +1,125 @@ +#!/usr/bin/perl -wT -I. +# +# TWiki WikiClone (see $wikiversion in wiki.pm for version) +# +# Copyright (C) 2000 Sterbini, Andrea a.sterbini@flashnet.it +# Modified from 'createwikiweb' by Gottschalk, Harold heg@sirlabs.com, +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details, published at +# http://www.gnu.ai.mit.edu/copyleft/gpl.html + +use CGI; +use wiki; + +do "wikicfg.pm"; + +$query = new CGI; + +#open(STDERR,'>&STDOUT'); # redirect error to browser +$| = 1; # no buffering + +&main(); + + + +sub main +{ + my $thePathInfo = $query->path_info(); + my $theRemoteUser = $query->remote_user(); + my $theTopic = $query->param( 'topic' ); + my $theUrl = $query->url; + + ( $topic, $webName ) = + &wiki::initialize( $thePathInfo, $theRemoteUser, $theTopic, $theUrl ); + + my $webName = ""; + + $tmpl= &wiki::readTemplate( "get-a-web" ); + + #Process webname parameter + $webName = $query->param( 'webname' ) || ""; + + if(length($webName) != 0){ + # untaint webName + if ($webName =~ /^([\w\/]+)$/) { + $webName =~ s/$securityFilter//go; + $webName =~ /(.*)/; + $webName = $1; + } + else { + print "Content-type: text/html\n\n"; + $tmpl =~ s/%TITLETEXT%/Get-A-Web Error/go; + $tmpl =~ s/%RESULTTEXT%/Taint Error/go; + $tmpl =~ s/%MSGTEXT%/Webname has tainted data!/go; + $tmpl = &wiki::handleCommonTags( $tmpl, $topic ); + print $tmpl; + return; + } + } + + my $zipType; + my $zipCommand; + my $zipOpts; + + # FIXME this doesn't work ... + my $xFiles = ""; + + #Process zipType parameter + my $zipKind = $query->param( 'ziptype' ) || "gzip"; + if($zipKind eq "zip") { + # zip command settings + #zip + $zipType = "application/zip"; + $zipCommand = "zip -9qr -"; + $zipOpts = "-x .htaccess .htpasswd"; + } elsif($zipKind eq "bzip2") { + #bzip2 + $zipType = "application/x-bzip2"; + $zipCommand = "tar cf -"; + $zipOpts = "--exclude .htaccess --exclude .htpasswd | bzip2"; + } elsif($zipKind eq "gzip") { + #gzip (boh) + $zipType = "application/x-gzip"; + $zipCommand = "tar cf -"; + $zipOpts = "--exclude .htaccess --exclude .htpasswd | gzip"; + } else { + print "Content-type: text/html\n\n"; + $tmpl =~ s/%TITLETEXT%/Get-A-Web Error/go; + $tmpl =~ s/%RESULTTEXT%/Zip Error/go; + $tmpl =~ s/%MSGTEXT%/Unknown zip type! (known are: zip, gzip, bzip2)/go; + $tmpl = &wiki::handleCommonTags( $tmpl, $topic ); + print $tmpl; + return; + } + + # check for Web existence + if( ! &wiki::webExists( $webName ) ) { + print "Content-type: text/html\n\n"; + $tmpl = &wiki::readTemplate( "noweb" ); + $tmpl = &wiki::handleCommonTags( $tmpl, $topic ); + print $tmpl; + return; + } + + # sets response header + print $query->header(-type=>$zipType, -expire=>'now'); + + # zips the files to stdout + # NOTE: use this if the dirs are in 3 different places +# system("$zipCommand $dataDir/$webName $pubDir/$webName $templateDir/$webName $zipOpts 2> /dev/null"); + + # NOTE: use the following 2 lines ONLY if the 3 dirs are in the same place + my $webDir = "$dataDir/.."; + system("cd $webDir >& /dev/null ; $zipCommand data/$webName pub/$webName templates/$webName $zipOpts 2> /dev/null"); + + return; +} + diff -ruwbBN -x CVS -x CDO -x .cvsignore -x createweb ../twiki.cvs/bin/wiki.pm bin/wiki.pm --- ../twiki.cvs/bin/wiki.pm Sat Jul 29 06:24:06 2000 +++ bin/wiki.pm Sat Aug 19 23:17:53 2000 @@ -50,6 +50,17 @@ # # See http://twiki.sourceforge.net/cgi-bin/view/Codev/UniqueTopicTemplates # for further details +# +# 19 Aug 2000 AndreaSterbini : a.sterbini@flashnet.it +# With this patches WebPreferences, templates and include files are looked +# for in all directories along the path contained in $webName. +# (templates and includes starting from the leaf to the root, +# WebPreferences starting from the root to the leaf) +# This is helpful for having hyerarchical webs with default +# template/includes/WebPreferences +# +# See Codev.MultiLevelWikiWebs for further details +# package wiki; @@ -165,7 +176,19 @@ @prefsKeys = (); @prefsValues = (); getPrefsList( "$twikiWebname\.$wikiPrefsTopicname" ); # site-level - getPrefsList( "$webName\.$webPrefsTopicname" ); # web-level + +#AS + # look for preferences in all path from the root to the web + my ($pathItem, @pathList) = split(/\//, $webName); + my $path = "$pathItem"; + getPrefsList( "$path\.$webPrefsTopicname" ); + foreach $pathItem (@pathList) + { + $path = "$path/$pathItem"; + getPrefsList( "$path\.$webPrefsTopicname" ); + }; +# getPrefsList( "$webName\.$webPrefsTopicname" ); # web-level +#AS getPrefsList( $wikiUserName ); # user-level # some remaining init @@ -607,6 +630,25 @@ return &readFile( $webtmpl ); } +#AS + # look for template in all path from the web to the templates root dir -- Andrea Sterbini + my $webPath = "$webName"; + foreach (split(/\//, $webPath)) + { + $webPath =~ s#(\.*)\/[^\/]*#$1#; + $webtmpl = "$templateDir/$webPath/$name.$topic.tmpl"; + if( -e $webtmpl ) + { + return &readFile( $webtmpl); + } + $webtmpl = "$templateDir/$webPath/$name.tmpl"; + if( -e $webtmpl ) + { + return &readFile( $webtmpl); + } + }; +#AS + $webtmpl = "$templateDir/$name.$topic.tmpl"; if( -e $webtmpl ) { return &readFile( $webtmpl ); @@ -926,11 +969,38 @@ $incfile =~ s/\.([^\.]*)$/\/$1/go; $fileName = "$dataDir/$incfile.txt"; # Web.TopicName if( ! -e $fileName ) { - return ""; +#AS + $fileName = ""; +# return ""; +#AS + } } } } + +#AS + # look for the include file in all path from the web to the data root dir -- Andrea Sterbini + my $webPath = "$webName"; + foreach (split(/\//, $webPath)) + { + if( $fileName eq "" ) { # file not yet found + $webPath =~ s#(\.*)\/[^\/]*#$1#; + # test for different usage + $fileName = "$dataDir/$webPath/$incfile"; # TopicName.txt + if( ! -e $fileName ) { + $fileName = "$dataDir/$webPath/$incfile.txt"; # TopicName + if( ! -e $fileName ) { + $fileName = ""; + } } + } + }; + + if( $fileName eq "" ) { # file not yet found + return ""; + } +#AS + my $text = &readFile( $fileName ); $fileName =~ s/\/([^\/]*)\/([^\/]*)(\.txt)$/$1/go; diff -ruwbBN -x CVS -x CDO -x .cvsignore -x createweb ../twiki.cvs/bin/wikicfg.pm bin/wikicfg.pm --- ../twiki.cvs/bin/wikicfg.pm Sun Jul 23 11:07:26 2000 +++ bin/wikicfg.pm Sat Aug 19 01:33:35 2000 @@ -57,19 +57,21 @@ # variables that need to be changed when installing on a new server: # ================================================================== # %WIKIHOMEURL% : link of TWiki icon in upper left corner : -$wikiHomeUrl = "http://your.domain.com/twiki"; +$wikiHomeUrl = "http://localhost/twikibeta"; # Host of TWiki URL : (Example "http://myhost.com:123") -$defaultUrlHost = "http://your.domain.com"; +$defaultUrlHost = "http://localhost"; # %SCRIPTURLPATH% : cgi-bin path of TWiki URL: -$scriptUrlPath = "/twiki/bin"; +$scriptUrlPath = "/twikibeta/bin"; # %PUBURLPATH% : Public data path of TWiki URL (root of attachments) : -$pubUrlPath = "/twiki/pub"; +$pubUrlPath = "/twikibeta/pub"; +#AS added a common root dir +my $wikiDir = "/home/httpd/twikibeta"; # Public data directory, must match $pubUrlPath : -$pubDir = "/home/httpd/twiki/pub"; +$pubDir = "$wikiDir/pub"; # Template directory : -$templateDir = "/home/httpd/twiki/templates"; +$templateDir = "$wikiDir/templates"; # Data (topic files) root directory : -$dataDir = "/home/httpd/twiki/data"; +$dataDir = "$wikiDir/data"; # variables that might need to be changed: # ================================================================== @@ -183,6 +185,44 @@ # NOTE: Don't forget to customize also the Main.TWikiPreferences topic. +#AS +# ========================= +sub renderSubWebNames +{ + # 18-08-00 (c) Andrea Sterbini a.sterbini@flashnet.it + # Sub to format subweb names (web/web1 -> web.web1) + # with automatic construction of links to the above webs + # It transforms a dotted or slashed name to a rendered link + # $theWeb is the string to be transformed + # if $lastIsTopic is true then the last piece is a topic instead than a web + + my( $theWeb, $lastIsTopic ) = @_; + $theWeb =~ s/\./\//go ; + + my $topic = $theWeb; + + if( $lastIsTopic ) { + $topic =~ s/(.*)\/([^\/]*)/$2/go ; + $theWeb =~ s/(.*)\/([^\/]*)/$1/go ; + }; + + my ($item , @list) = split(/\//, $theWeb); + + my $webPath = $item; + my $webName = internalLink("$webPath","$mainTopicname",$item,"",1); + foreach $item (@list) + { + $webPath = $webPath . "/" . $item ; + $webName = $webName . "." . internalLink("$webPath","$mainTopicname",$item,"",1) ; + }; + + if( $lastIsTopic ) { + $webName = $webName . "." . internalLink("$webPath","$topic","$topic","",1) ; + }; + + return "$webName"; +} +#AS # ========================= sub extendHandleCommonTags @@ -199,6 +239,10 @@ # do custom extension rule, like for example: # $text=~ s/%WIKIWEB%/$wikiToolName.$theWeb/go; +#AS + $text=~ s/%WEBNAME%/&renderSubWebNames("$theWeb",0)/geo; +#AS + return $text; } @@ -216,6 +259,11 @@ # render *_text_* as "bold italic" text: s/(^|\s)\*_([^\s].*?[^\s])_\*(\s|$)/$1$2<\/EM><\/STRONG>$3/go; + +#AS + # render a dotted topic name as a link (with links to the above webs) + s#(^|\s)([A-Z][a-zA-Z0-9]*((\.|\/)[A-Z][a-zA-Z0-9]*)*((\.|\/)[A-Z][a-zA-Z0-9]*[A-Z][a-zA-Z0-9]*))(\s|$)#$1.&renderSubWebNames("$2",1)#geo; +#AS # Use alternate %Web:WikiName% syntax (versus the standard Web.WikiName). # This is an old JosWiki render option. (Uncomment for JosWiki compatibility) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/Know/notedited.tmpl templates/Know/notedited.tmpl --- ../twiki.cvs/templates/Know/notedited.tmpl Thu Jan 1 01:00:00 1970 +++ templates/Know/notedited.tmpl Tue Jun 8 07:11:00 1999 @@ -0,0 +1,19 @@ +*Problem* + +. + +*Solution* + +. + +-- %USERNAME% - %DATE%
+

TWikiCategory

+ + + + + + + + +
TopicClassification:
Select one...
OperatingSystem:
OsVersion:
 
\ No newline at end of file diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/Know/twikicatedit.tmpl templates/Know/twikicatedit.tmpl --- ../twiki.cvs/templates/Know/twikicatedit.tmpl Thu Jan 1 01:00:00 1970 +++ templates/Know/twikicatedit.tmpl Tue Jun 8 07:11:00 1999 @@ -0,0 +1,5 @@ + +%REPEAT% + +%REPEAT% +
%CATNAME%:
%CATMODIFIER%		 %CATVALUE%
\ No newline at end of file diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/Know/twikicatitems.tmpl templates/Know/twikicatitems.tmpl --- ../twiki.cvs/templates/Know/twikicatitems.tmpl Thu Jan 1 01:00:00 1970 +++ templates/Know/twikicatitems.tmpl Fri Jul 16 18:34:00 1999 @@ -0,0 +1,27 @@ +# Categoy items definition template + +radio|UseCategory|0|Yes|No, delete this category table +select|TopicClassification|1|Select one...|NoDisclosure|PublicSupported|PublicFAQ +checkbox|OperatingSystem|true|0|OsHPUX|OsLinux|OsSolaris|OsSunOS|OsWin +text|OsVersion|16 + +# syntax: +# +# - valid lines: +# select|{name}|{selSize}|{val1}|{val2}|{val3}... +# checkbox|{name}|{checkFlag}|{itemsPerLine}|{val1}|{val2}|{val3}... +# radio|{name}|{itemsPerLine}|{val1}|{val2}|{val3}... +# text|{name}|{charSize} +# +# - explanation: +# {name} name of tag +# {selSize} vertical size of SELECT tag +# {val1}|{val2}... values +# {checkFlag} set to true if [Set] [Clear] buttons, else set to false +# {itemsPerLine} input items per line before wrap around, 0 if no wrap around +# {charSize} number of characters for text fields +# +# - remark: +# Line "radio|use Category|0|Yes|No, delete this category table" +# has a special meaning. If present, it is possible to choose in "edit" +# if the category section is included or not diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/Know/twikicatview.tmpl templates/Know/twikicatview.tmpl --- ../twiki.cvs/templates/Know/twikicatview.tmpl Thu Jan 1 01:00:00 1970 +++ templates/Know/twikicatview.tmpl Tue Jun 8 07:11:00 1999 @@ -0,0 +1,6 @@ +

TWikiCategory

+ +%REPEAT% + +%REPEAT% +
%CATNAME%:
%CATMODIFIER%		 %CATVALUE%
\ No newline at end of file diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/attach.tmpl templates/attach.tmpl --- ../twiki.cvs/templates/attach.tmpl Sat May 6 12:39:39 2000 +++ templates/attach.tmpl Thu Aug 17 23:58:53 2000 @@ -18,7 +18,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (attach) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (attach) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/changes.tmpl templates/changes.tmpl --- ../twiki.cvs/templates/changes.tmpl Sat Jul 29 06:19:44 2000 +++ templates/changes.tmpl Thu Aug 17 23:57:56 2000 @@ -11,7 +11,7 @@ - %WIKITOOLNAME% . %WEB% . Changes + %WIKITOOLNAME% . %WEBNAME% . Changes %WIKIWEBLIST% diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/create.tmpl templates/create.tmpl --- ../twiki.cvs/templates/create.tmpl Thu Jan 1 01:00:00 1970 +++ templates/create.tmpl Thu Aug 17 23:34:32 2000 @@ -0,0 +1,27 @@ + + + %WIKITOOLNAME% %TITLETEXT% + + + + + + + + + + + + +
+ + + %WIKITOOLNAME% . %WEBNAME% . CreateWeb + + %WIKIWEBLIST% +
+ %WEBTOPICLIST% +
+
+

%WIKITOOLNAME% %RESULTTEXT%

+%MSGTEXT% diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/edit.tmpl templates/edit.tmpl --- ../twiki.cvs/templates/edit.tmpl Sat Jul 22 21:54:27 2000 +++ templates/edit.tmpl Thu Aug 17 23:58:25 2000 @@ -37,7 +37,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (edit) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (edit) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/get-a-web.tmpl templates/get-a-web.tmpl --- ../twiki.cvs/templates/get-a-web.tmpl Thu Jan 1 01:00:00 1970 +++ templates/get-a-web.tmpl Thu Aug 17 23:33:44 2000 @@ -0,0 +1,27 @@ + + + %WIKITOOLNAME% %TITLETEXT% + + + + + + + + + + + + +
+ + + %WIKITOOLNAME% . %WEBNAME% . Get-A-Web + + %WIKIWEBLIST% +
+ %WEBTOPICLIST% +
+
+

%WIKITOOLNAME% %RESULTTEXT%

+%MSGTEXT% diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oops.tmpl templates/oops.tmpl --- ../twiki.cvs/templates/oops.tmpl Sat May 6 12:39:13 2000 +++ templates/oops.tmpl Thu Aug 17 23:57:48 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsdel.tmpl templates/oopsdel.tmpl --- ../twiki.cvs/templates/oopsdel.tmpl Sat May 6 12:39:13 2000 +++ templates/oopsdel.tmpl Thu Aug 17 23:58:44 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopslocked.tmpl templates/oopslocked.tmpl --- ../twiki.cvs/templates/oopslocked.tmpl Mon May 29 10:34:36 2000 +++ templates/oopslocked.tmpl Thu Aug 17 23:59:05 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsregexist.tmpl templates/oopsregexist.tmpl --- ../twiki.cvs/templates/oopsregexist.tmpl Sat May 6 12:39:13 2000 +++ templates/oopsregexist.tmpl Thu Aug 17 23:59:32 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsregpasswd.tmpl templates/oopsregpasswd.tmpl --- ../twiki.cvs/templates/oopsregpasswd.tmpl Sat May 6 12:39:13 2000 +++ templates/oopsregpasswd.tmpl Thu Aug 17 23:59:25 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsregrequ.tmpl templates/oopsregrequ.tmpl --- ../twiki.cvs/templates/oopsregrequ.tmpl Sat May 6 12:39:13 2000 +++ templates/oopsregrequ.tmpl Thu Aug 17 23:59:13 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsregthanks.tmpl templates/oopsregthanks.tmpl --- ../twiki.cvs/templates/oopsregthanks.tmpl Sat May 6 12:40:04 2000 +++ templates/oopsregthanks.tmpl Thu Aug 17 23:59:38 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (note) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (note) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsregwiki.tmpl templates/oopsregwiki.tmpl --- ../twiki.cvs/templates/oopsregwiki.tmpl Sat Jul 22 21:54:27 2000 +++ templates/oopsregwiki.tmpl Thu Aug 17 23:59:19 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsrev.tmpl templates/oopsrev.tmpl --- ../twiki.cvs/templates/oopsrev.tmpl Sat May 6 12:39:13 2000 +++ templates/oopsrev.tmpl Thu Aug 17 23:59:44 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (revision) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (revision) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/oopsupload.tmpl templates/oopsupload.tmpl --- ../twiki.cvs/templates/oopsupload.tmpl Sat May 6 12:39:13 2000 +++ templates/oopsupload.tmpl Thu Aug 17 23:58:33 2000 @@ -10,7 +10,7 @@ - %WIKITOOLNAME% . %WEB% . %TOPIC% (oops) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (oops) diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/preview.tmpl templates/preview.tmpl --- ../twiki.cvs/templates/preview.tmpl Sat Jul 22 21:54:27 2000 +++ templates/preview.tmpl Thu Aug 17 23:58:05 2000 @@ -3,14 +3,14 @@ %WIKITOOLNAME% . %WEB% . %TOPIC% (preview) - +
- %WIKITOOLNAME% . %WEB% . %TOPIC% (preview) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (preview)
    @@ -29,7 +29,16 @@

+ + + + + +
+%INCLUDE{"TWiki.TWikiLeftMenu"}% + %TEXT% +

diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/rdiff.tmpl templates/rdiff.tmpl --- ../twiki.cvs/templates/rdiff.tmpl Sat May 6 12:39:13 2000 +++ templates/rdiff.tmpl Thu Aug 17 23:59:00 2000 @@ -11,7 +11,7 @@ diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/register.tmpl templates/register.tmpl --- ../twiki.cvs/templates/register.tmpl Sat Jul 22 21:54:27 2000 +++ templates/register.tmpl Thu Aug 17 23:28:49 2000 @@ -10,5 +10,5 @@ __Related topics__ * %TWIKIWEB%.%WIKIPREFSTOPIC% has site-level preferences of %WIKITOOLNAME%. - * %WEBPREFSTOPIC% has preferences of the %WIKITOOLNAME%.%WEB% web. + * %WEBPREFSTOPIC% has preferences of the %WIKITOOLNAME%.%WEBNAME% web. * TWikiUsers has a list of other TWiki users. diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/search.tmpl templates/search.tmpl --- ../twiki.cvs/templates/search.tmpl Sat Jul 29 06:19:44 2000 +++ templates/search.tmpl Thu Aug 17 23:58:16 2000 @@ -11,7 +11,7 @@ @@ -29,7 +29,7 @@ %SPLIT%
- %WIKITOOLNAME% . %WEB% . %TOPIC% (%REVTITLE2% vs. %REVTITLE1%) + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% (%REVTITLE2% vs. %REVTITLE1%) %WIKIWEBLIST% - %WIKITOOLNAME% . %WEB% . SearchResult + %WIKITOOLNAME% . %WEBNAME% . SearchResult %WIKIWEBLIST%
@@ -29,7 +29,7 @@ %SPLIT%
- Topics in %WEB% web: + Topics in %WEBNAME% web: Changed: now %GMTIME{"hour:min"}% GMT diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/searchbookview.tmpl templates/searchbookview.tmpl --- ../twiki.cvs/templates/searchbookview.tmpl Sat Jul 29 06:19:44 2000 +++ templates/searchbookview.tmpl Fri Aug 18 00:00:12 2000 @@ -11,7 +11,7 @@ - %WIKITOOLNAME% . %WEB% . BookView + %WIKITOOLNAME% . %WEBNAME% . BookView %WIKIWEBLIST%
- Topics in %WEB% web: + Topics in %WEBNAME% web: Changed: GMT diff -ruwbBN -x CVS -x CDO -x .cvsignore ../twiki.cvs/templates/view.tmpl templates/view.tmpl --- ../twiki.cvs/templates/view.tmpl Sat May 6 12:39:50 2000 +++ templates/view.tmpl Fri Aug 18 00:02:04 2000 @@ -3,7 +3,7 @@ %WIKITOOLNAME% . %WEB% . %TOPIC% %REVTITLE% - + @@ -11,7 +11,7 @@ @@ -24,7 +24,16 @@
- %WIKITOOLNAME% . %WEB% . %TOPIC% %REVTITLE% + %WIKITOOLNAME% . %WEBNAME% . %TOPIC% %REVTITLE% %WIKIWEBLIST%

+ + + + + +
+%INCLUDE{"TWiki.TWikiLeftMenu"}% + %TEXT% +