Update of /cvsroot/phpwiki/phpwiki/templates In directory usw-pr-cvs1:/tmp/cvs-serv31659/templates Modified Files: browse.html editpage.html message.html Log Message: XHTML fixes. At this point, PhpWiki's output is almost valid XHTML. (Most of these changes are based on patches by Tara/Steph.) Index: browse.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** browse.html 2001年09月18日 19:16:24 1.20 --- browse.html 2001年11月14日 21:05:38 1.21 *************** *** 1,16 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> ! <html> <head> <!-- phpwiki source: ${RCS_IDS} --> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <!-- <meta name="robots" content="index,follow"> --> ! <base href="${BASE_URL}"> <title>${SPLIT_PAGE}</title> <!-- --> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css"> </head> <body> --- 1,17 ---- ! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> ! <html xmlns="http://www.w3.org/1999/xhtml"> <head> <!-- phpwiki source: ${RCS_IDS} --> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <!-- <meta name="robots" content="index,follow" /> --> ! <base href="${BASE_URL}" /> <title>${SPLIT_PAGE}</title> <!-- --> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" /> </head> <body> *************** *** 19,42 **** href="${BROWSE}HomePage" ><img src="${LOGO}" ! border=0 alt="[phpwiki]" ! align="right" width=50 height=50></a></div> ! <!--FIXME: this link is broken unless pages are in pathinfo --> ! <!--<a title="Get BackLinks for ${PAGE}" ! onmouseover="window.status='Get BackLinks for ${PAGE}';return true;" ! class="backlinks" ! href="${BROWSE}BackLinks?page=${PAGEURL}" ! ><span class="wikiword">${SPLIT_PAGE}</span></a>--> <?plugin-link BackLinks description="Get BackLinks for [pagename]" page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?> </h1> ! <div class="br"><br clear="both" class="ignore"></div> <?php if (! $IS_CURRENT) { ?> ! <p><b>Note</b>: You are viewing an old revision of this page. Click <a href="${BROWSE}${PAGEURL}">here</a> to view the current version.</p> ! <hr class="ignore" noshade> <?php } ?> <div class="wikitext">${CONTENT}</div> ! <hr class="ignore" noshade> <form action="<?php echo WikiURL('TitleSearch'); ?>" method="get"> <!-- I would like not to have to use these tables, and managed to --- 20,37 ---- href="${BROWSE}HomePage" ><img src="${LOGO}" ! border="0" alt="[phpwiki]" ! align="right" width="50" height="50" /></a></div> <?plugin-link BackLinks description="Get BackLinks for [pagename]" page="[pagename]" class="backlinks" linktext="${SPLIT_PAGE}" ?> </h1> ! <div class="br"><br clear="all" class="ignore" /></div> <?php if (! $IS_CURRENT) { ?> ! <p><strong>Note</strong>: You are viewing an old revision of this page. Click <a href="${BROWSE}${PAGEURL}">here</a> to view the current version.</p> ! <hr class="ignore" noshade="noshade" /> <?php } ?> <div class="wikitext">${CONTENT}</div> ! <hr class="ignore" noshade="noshade" /> <form action="<?php echo WikiURL('TitleSearch'); ?>" method="get"> <!-- I would like not to have to use these tables, and managed to *************** *** 46,50 **** So, we use tables... --> <table class="toolbar" width="100%" ! cellpadding=0 cellspacing=0 border=0><tr valign="baseline"> <td> <?php if ($IS_CURRENT) { ?> --- 41,45 ---- So, we use tables... --> <table class="toolbar" width="100%" ! cellpadding="0" cellspacing="0" border="0"><tr valign="baseline"> <td> <?php if ($IS_CURRENT) { ?> *************** *** 56,70 **** <td align="right"> <?php echo LinkExistingWikiWord('FindPage') ?> ! | <span><input type="hidden" name="auto_redirect" value="1"> <input type="text" name="s" size="12" title="Quick Search" onmouseover="window.status='Quick Search'; return true;" ! onmouseout="window.status=''; return true;"></span> ! <!-- | <a class="wikiaction" href="${BROWSE}LikePages?page=${PAGEURL}">LikePages</a> --> | <?plugin-link LikePages page="[pagename]" description="List LikePages for [pagename]"?> </td> </tr></table> <table class="toolbar" width="100%" ! cellpadding=0 cellspacing=0 border=0><tr valign="baseline"> <td> <?php if ($page->get('locked') && !$user->is_admin()) { ?> --- 51,64 ---- <td align="right"> <?php echo LinkExistingWikiWord('FindPage') ?> ! | <span><input type="hidden" name="auto_redirect" value="1" /> <input type="text" name="s" size="12" title="Quick Search" onmouseover="window.status='Quick Search'; return true;" ! onmouseout="window.status=''; return true;" /></span> | <?plugin-link LikePages page="[pagename]" description="List LikePages for [pagename]"?> </td> </tr></table> <table class="toolbar" width="100%" ! cellpadding="0" cellspacing="0" border="0"><tr valign="baseline"> <td> <?php if ($page->get('locked') && !$user->is_admin()) { ?> *************** *** 105,109 **** <?php /* ! <hr class="ignore" noshade> <small>${RELATEDPAGES}</small> */ ?> --- 99,103 ---- <?php /* ! <hr class="ignore" noshade="noshade" /> <small>${RELATEDPAGES}</small> */ ?> Index: editpage.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -r1.20 -r1.21 *** editpage.html 2001年09月18日 19:16:24 1.20 --- editpage.html 2001年11月14日 21:05:38 1.21 *************** *** 1,4 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <html> <head> --- 1,5 ---- ! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> *************** *** 6,13 **** ${RCS_IDS} --> ! <base href="${BASE_URL}"> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="robots" content="noindex,nofollow"> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css"> <title>Edit: ${SPLIT_PAGE}</title> --- 7,14 ---- ${RCS_IDS} --> ! <base href="${BASE_URL}" /> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <meta name="robots" content="noindex,nofollow" /> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" /> <title>Edit: ${SPLIT_PAGE}</title> *************** *** 18,23 **** <div><a class="wikilink" href="${BROWSE}HomePage" ! ><img src="${LOGO}" border=0 align="right" ! alt="[phpwiki]" width=50 height=50></a></div> Edit <a href="${BROWSE}${PAGEURL}" class="wikilink"><span class="wikiword">${PAGE}</span></a> --- 19,24 ---- <div><a class="wikilink" href="${BROWSE}HomePage" ! ><img src="${LOGO}" border="0" align="right" ! alt="[phpwiki]" width="50" height="50" /></a></div> Edit <a href="${BROWSE}${PAGEURL}" class="wikilink"><span class="wikiword">${PAGE}</span></a> *************** *** 25,37 **** <?php if (!empty($PREVIEW_CONTENT)) { ?> ! <p><b>Preview only! Changes not saved.</b></p> <div class="wikitext">${PREVIEW_CONTENT}</div> ! <hr class="ignore" noshade> <?php } ?> <?php if (!$IS_CURRENT) { ?> ! <p><b>Warning: You are editing an old revision. ! Saving this page will overwrite the current version.</b></p> ! <hr class="ignore" noshade> <?php } ?> --- 26,38 ---- <?php if (!empty($PREVIEW_CONTENT)) { ?> ! <p><strong>Preview only! Changes not saved.</strong></p> <div class="wikitext">${PREVIEW_CONTENT}</div> ! <hr class="ignore" noshade /> <?php } ?> <?php if (!$IS_CURRENT) { ?> ! <p><strong>Warning: You are editing an old revision. ! Saving this page will overwrite the current version.</strong></p> ! <hr class="ignore" noshade /> <?php } ?> *************** *** 44,48 **** */ ?> ! <form method="POST" action="${BROWSE}EditPage"> <textarea class="wikiedit" name="content" --- 45,49 ---- */ ?> ! <form method="post" action="${BROWSE}EditPage"> <textarea class="wikiedit" name="content" *************** *** 53,67 **** <div class="toolbar" style="text-align: center;"> Summary:<input type="text" class="wikitext" ! name="summary" value="$FORMVARS[summary]" size=50> </div> <table class="toolbar" width="100%" ! cellpadding=0 cellspacing=0 border=0><tr valign="baseline"> <td> ! <input type="checkbox" name="minor_edit" value="checked" $FORMVARS[minor_edit]> This is a minor change. </td> <td align="center"> ! <input type="submit" class="button" name="preview" value="Preview"> ! | <input type="submit" class="button" value="Save"> </td> <td align="right"> --- 54,68 ---- <div class="toolbar" style="text-align: center;"> Summary:<input type="text" class="wikitext" ! name="summary" value="$FORMVARS[summary]" size="50" /> </div> <table class="toolbar" width="100%" ! cellpadding="0" cellspacing="0" border="0"><tr valign="baseline"> <td> ! <input type="checkbox" name="minor_edit" value="checked" $FORMVARS[minor_edit] /> This is a minor change. </td> <td align="center"> ! <input type="submit" class="button" name="preview" value="Preview" /> ! | <input type="submit" class="button" value="Save" /> </td> <td align="right"> *************** *** 78,82 **** Also see <?php echo LinkExistingWikiWord('GoodStyle') ?> tips for editing. </p> ! <hr noshade> <small> <b>Emphasis:</b> --- 79,83 ---- Also see <?php echo LinkExistingWikiWord('GoodStyle') ?> tips for editing. </p> ! <hr noshade="noshade" /> <small> <b>Emphasis:</b> *************** *** 84,111 **** __ for bold, ''__ for both ! <br><b>Lists:</b> * for bullet lists, # for numbered lists, ''; term : definition'' for definition lists ! <br><b>References:</b> JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/]. ! <br><b>Footnotes:</b> Use [1],[2],[3],... ! <br><b>Preventing linking:</b> Avoid linking with "!": !DoNotHyperlink, name links like [[text | URL] (double up on the "[") ! <br><b>Misc:</b> "!", "!!", "!!!" make headings, "%%%" makes a linebreak, "- - - -" makes a horizontal rule ! <br> more on <?php echo LinkExistingWikiWord('TextFormattingRules') ?> </small> ! <input type="hidden" name="action" value="save"> ! <input type="hidden" name="pagename" value="$FORMVARS[pagename]"> ! <input type="hidden" name="editversion" value="$FORMVARS[editversion]"> ! <input type="hidden" name="version" value="$FORMVARS[version]"> </form> </body> --- 85,112 ---- __ for bold, ''__ for both ! <br /><b>Lists:</b> * for bullet lists, # for numbered lists, ''; term : definition'' for definition lists ! <br /><b>References:</b> JoinCapitalizedWords or use square brackets for a [page link] or URL [http://cool.wiki.int/]. ! <br /><b>Footnotes:</b> Use [1],[2],[3],... ! <br /><b>Preventing linking:</b> Avoid linking with "!": !DoNotHyperlink, name links like [[text | URL] (double up on the "[") ! <br /><b>Misc:</b> "!", "!!", "!!!" make headings, "%%%" makes a linebreak, "- - - -" makes a horizontal rule ! <br /> more on <?php echo LinkExistingWikiWord('TextFormattingRules') ?> </small> ! <input type="hidden" name="action" value="save" /> ! <input type="hidden" name="pagename" value="$FORMVARS[pagename]" /> ! <input type="hidden" name="editversion" value="$FORMVARS[editversion]" /> ! <input type="hidden" name="version" value="$FORMVARS[version]" /> </form> </body> Index: message.html =================================================================== RCS file: /cvsroot/phpwiki/phpwiki/templates/message.html,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -r1.12 -r1.13 *** message.html 2001年09月18日 19:16:24 1.12 --- message.html 2001年11月14日 21:05:38 1.13 *************** *** 1,4 **** ! <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" ! "http://www.w3.org/TR/1999/REC-html401-19991224/loose.dtd"> <html> <head> --- 1,5 ---- ! <?php echo "<?xml version='1.0' encoding='ISO-8859-1'?>\n"; ?> ! <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" ! "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html> <head> *************** *** 6,13 **** ${RCS_IDS} --> ! <base href="${BASE_URL}"> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> ! <meta name="robots" content="noindex,nofollow"> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css"> <title>${TITLE}</title> </head> --- 7,14 ---- ${RCS_IDS} --> ! <base href="${BASE_URL}" /> ! <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> ! <meta name="robots" content="noindex,nofollow" /> ! <link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" /> <title>${TITLE}</title> </head> *************** *** 17,23 **** href="${BROWSE}HomePage" ><img src="${LOGO}" align="right" ! border=0 alt="[phpwiki]" ! width=50 height=50 ! ></a></div> ${TITLE} </h1> --- 18,24 ---- href="${BROWSE}HomePage" ><img src="${LOGO}" align="right" ! border="0" alt="[phpwiki]" ! width="50" height="50" ! /></a></div> ${TITLE} </h1>