Update of /cvsroot/phpwiki/phpwiki/templates In directory usw-pr-cvs1:/tmp/cvs-serv20420/templates Modified Files: README browse.html editpage.html message.html Log Message: Jeff hacks again: LOT's of changes. Highlights: * Pagename in PATH_INFO support added. * Redid the user (admin) authentication stuff. All access now through index.php. See HISTORY for (a few) more details. Index: README =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/README,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -r1.3 -r1.4 *** README 2000年11月08日 16:19:01 1.3 --- README 2001年02月10日 22:15:08 1.4 *************** *** 42,49 **** the search result, or a message text. ! ###ALLOWEDPROTOCOLS### ! Protocols allowed for external links and references. ! Default: http|https|mailto|ftp|news|gopher Conditional placeholders: --- 42,69 ---- the search result, or a message text. ! ###USERID### ! The userid of the current users. For non-authenticated users, ! the userid is the host name or IP number of the user. ! ! ###LOGO### ! URL of the phpwiki logo image. ! ! ###RCS_IDS### ! The RCS ids of the php source files which contributed to the current ! page. ! ! ###BROWSE_PAGE### ! The URL to use to browse the current page. ! ! ###ACTION### ! The leading part of the URL for performing an action on the current page. ! Eg. <a href="###ACTION###edit">Edit this page</a>. ! ! ###BROWSE### ! The leading part of the URL for browsing to another page. ! Eg. <a href="###BROWSE###FindPage">Edit this page</a>. + ###BASE_URL### + The base URL for the current page. Conditional placeholders: *************** *** 68,79 **** Conditions to test: - COPY If page has a copy in the archive. Usually used to display/omit - the EditCopy link in the editpage template. - ADMIN If the current user is an admin. Used in e.g. browse template to display admin buttons at the top. LOCK If current page is locked and thus cannot be edited. For examples see browse.html and editpage.html --- 88,110 ---- Conditions to test: ADMIN If the current user is an admin. Used in e.g. browse template to display admin buttons at the top. + ANONYMOUS + If the current user is not authenticated. + + COPY If page has a copy in the archive. Usually used to display/omit + the EditCopy link in the editpage template. + LOCK If current page is locked and thus cannot be edited. + MINOR_EDIT_CHECKBOX + If the current user is the same as the last editor of this + page, this will contain the complete HTML for a checkbox, + which, when checked will prevent a backup copy from being made. + + If the current user is different than the last editor, + MINOR_EDIT_CHECKBOX will be blank. + For examples see browse.html and editpage.html *************** *** 96,114 **** Note: this is also used for detecting concurrent updates to a page. See hidden input field in EDITPAGE template for how to use it. - - - Only for EditLinks: - - ###1###, ###2###, .... - Placeholder for references. Up to NUM_LINKS placeholders will be - substituted. NUM_LINKS is defined in lib/config.php Examples: ! <A HREF="###SCRIPTURL###">the entry (default) page</A> ! <A HREF="###SCRIPTURL###?###PAGEURL###">the current page</A> ! <A HREF="###SCRIPTURL###?FindPage">the FindPage page</A> <head><title>PhpWiki Page: ###PAGE###</title></head> --- 127,142 ---- Note: this is also used for detecting concurrent updates to a page. See hidden input field in EDITPAGE template for how to use it. + ###HITS### + The hit count of the current page. + ###RELATEDPAGES### + The related pages list for the current page. Examples: ! <A HREF="###BROWSE###FrontPage">the entry (default) page</A> ! <A HREF="###BROWSE_PAGE###">the current page</A> ! <A HREF="###BROWSE###FindPage">the FindPage page</A> <head><title>PhpWiki Page: ###PAGE###</title></head> Index: browse.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -r1.9 -r1.10 *** browse.html 2000年11月09日 16:29:10 1.9 --- browse.html 2001年02月10日 22:15:08 1.10 *************** *** 1,31 **** <html> <head> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <title>###PAGE###</title> </head> <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta> ! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a> ! <a href="###SCRIPTURL###?full=###PAGEURL###">###PAGE###</a></h1> ! ###IF:ADMIN###<FORM ACTION="###SCRIPTURL###" METHOD=POST> ! ###IF LOCK###[<a href="###SCRIPTURL###?unlock=###PAGEURL###">Unlock page</a>] ! ###IF !LOCK###[<a href="###SCRIPTURL###?lock=###PAGEURL###">Lock page</a>] - - ! [<a href="###SCRIPTURL###?remove=###PAGEURL###">Remove page</A>] ! <hr noshade> ###ENDIF:ADMIN### <P> ###CONTENT### <hr noshade> ! ###IF ADMIN###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditText</a> of this page ###IF:!ADMIN### ###IF LOCK###Page locked ! ###IF !LOCK###<a href="###SCRIPTURL###?edit=###PAGEURL###">EditText</a> of this page ###ENDIF:!ADMIN### (last edited ###LASTMODIFIED###) ! [<a href="###SCRIPTURL###?info=###PAGEURL###">info</a>] ! [<a href="###SCRIPTURL###?diff=###PAGEURL###">diff</a>]) <br> ! <a href="###SCRIPTURL###?FindPage">FindPage</a> by browsing or searching <hr noshade> <small>###RELATEDPAGES###</small> --- 1,40 ---- + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> + <!-- phpwiki source: + ###RCS_IDS### + --> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <base href="###BASE_URL###"> <title>###PAGE###</title> </head> <body bgcolor=ivory text=black alink=red link=darkblue vlink=darkmagenta> ! <h1><a href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" align=middle width=50 height=50></a> ! <a href="###ACTION###search&searchtype=full&searchterm=###PAGEURL###">###PAGE###</a></h1> ! ###IF:!ANONYMOUS### ! <p>You are logged in as <em>###USERID###</em>. ! [<a href="###ACTION###logout">Log Out</a>]</p> ! ###IF:ADMIN### ! ###IF LOCK###[<a href="###ACTION###unlock">Unlock page</a>] ! ###IF !LOCK###[<a href="###ACTION###lock">Lock page</a>] - - ! [<a href="###ACTION###remove">Remove page</a>] ###ENDIF:ADMIN### + <hr noshade> + ###ENDIF:!ANONYMOUS### <P> ###CONTENT### <hr noshade> ! ###IF ADMIN###<a href="###ACTION###edit">EditText</a> of this page ###IF:!ADMIN### ###IF LOCK###Page locked ! ###IF !LOCK###<a href="###ACTION###edit">EditText</a> of this page ###ENDIF:!ADMIN### (last edited ###LASTMODIFIED###) ! [<a href="###ACTION###info">info</a>] ! [<a href="###ACTION###diff">diff</a>]) <br> ! <a href="###BROWSE###FindPage">FindPage</a> by browsing or searching <hr noshade> <small>###RELATEDPAGES###</small> Index: editpage.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -r1.8 -r1.9 *** editpage.html 2001年02月08日 08:51:50 1.8 --- editpage.html 2001年02月10日 22:15:08 1.9 *************** *** 1,5 **** --- 1,10 ---- + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> + <!-- phpwiki source: + ###RCS_IDS### + --> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <base href="###BASE_URL###"> <title>###PAGE###</title> </head> *************** *** 7,13 **** <body> ! <form method="POST" action="###SCRIPTURL###"> ! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a> Edit ###PAGE### <input type="submit" value=" Save "></h1> --- 12,18 ---- <body> ! <form method="POST" action="###BROWSE_PAGE###"> ! <h1><a href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a> Edit ###PAGE### <input type="submit" value=" Save "></h1> *************** *** 15,30 **** <textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea> <br> ! <input type="checkbox" name="minor_edit" value="yes" ! ###IF MINOR_EDIT### checked ! > ! This is a minor change, don't archive old version. ! <br> <input type="checkbox" name="convert" value="tabs" > I can't type tabs. ! Please <a href="###SCRIPTURL###?ConvertSpacesToTabs">ConvertSpacesToTabs</a> for me when I save. ! <p><a href="###SCRIPTURL###?GoodStyle">GoodStyle</a> tips for editing. ! ###IF COPY###<br><a href="###SCRIPTURL###?copy=###PAGEURL###">EditCopy</a> from previous author <hr noshade> --- 20,34 ---- <textarea name="content" ROWS="22" COLS="80" wrap="virtual">###CONTENT###</textarea> <br> ! ###IF:MINOR_EDIT_CHECKBOX### ! ###MINOR_EDIT_CHECKBOX### This is a minor change, don't archive old version. ! <br> ! ###ENDIF:MINOR_EDIT_CHECKBOX### <input type="checkbox" name="convert" value="tabs" > I can't type tabs. ! Please <a href="###BROWSE###ConvertSpacesToTabs">ConvertSpacesToTabs</a> for me when I save. ! <p><a href="###BROWSE###GoodStyle">GoodStyle</a> tips for editing. ! ###IF COPY###<br><a href="###ACTION###edit&version=archive">EditCopy</a> from previous author <hr noshade> *************** *** 40,44 **** </small> ! <input type="hidden" name="post" value="###PAGEURL###"> <input type="hidden" name="editversion" value="###VERSION###"> </form> --- 44,49 ---- </small> ! <input type="hidden" name="action" value="save"> ! <input type="hidden" name="pagename" value="###PAGEURL###"> <input type="hidden" name="editversion" value="###VERSION###"> </form> Index: message.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -r1.4 -r1.5 *** message.html 2000年10月22日 13:30:57 1.4 --- message.html 2001年02月10日 22:15:08 1.5 *************** *** 1,5 **** --- 1,10 ---- + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <html> <head> + <!-- phpwiki source: + ###RCS_IDS### + --> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> + <base href="###BASE_URL###"> <title>###PAGE###</title> </head> *************** *** 7,11 **** <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta> ! <h1><a href="###SCRIPTURL###"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a> ###PAGE###</h1> --- 12,16 ---- <body bgcolor=linen text=black alink=red link=darkblue vlink=darkmagenta> ! <h1><a href="###BROWSE###FrontPage"><img src="###LOGO###" border=0 alt="[phpwiki]" width=50 height=50></a> ###PAGE###</h1>