Update of /cvsroot/phpwiki/phpwiki/templates
In directory usw-pr-cvs1:/tmp/cvs-serv15690/templates
Modified Files:
browse.html editpage.html
Log Message:
Language independent templates.
Support for get-textification of strings within templates.
$_("string")
[ -> htmlspecialchars(gettext("string")) ]
<tag attrib=_("string") [...]>
[ ->
<tag attrib="<?php echo htmlspecialchars(gettext("string")); ?>"
[...] >
]
<?plugin{-form,-link,} PluginName arg=_("string") [...]?>
[ ->
<?plugin PluginName arg="<?php echo gettext("string"); ?>"
[...] ?>
]
Index: browse.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/browse.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** browse.html 2001年11月14日 21:25:32 1.22
--- browse.html 2001年11月29日 02:59:21 1.23
***************
*** 23,27 ****
align="right" width="50" height="50" /></a></div>
<h1>
! <?plugin-link BackLinks description="Get BackLinks for [pagename]"
page="[pagename]" class="backlinks"
linktext="${SPLIT_PAGE}" ?>
--- 23,27 ----
align="right" width="50" height="50" /></a></div>
<h1>
! <?plugin-link BackLinks description=_("Get BackLinks for [pagename]")
page="[pagename]" class="backlinks"
linktext="${SPLIT_PAGE}" ?>
***************
*** 29,42 ****
<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
get this stuff to work more or less correctly using
! CSS's float:left; and float:right;. However float:right; seems
to cause MSIE4.01/NT to hang.
So, we use tables... -->
--- 29,42 ----
<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
get this stuff to work more or less correctly using
! CSSs float:left; and float:right;. However float:right; seems
to cause MSIE4.01/NT to hang.
So, we use tables... -->
***************
*** 45,61 ****
<td>
<?php if ($IS_CURRENT) { ?>
! Last edited on ${LASTMODIFIED}
<?php } else { ?>
! Version ${VERSION}, saved on ${LASTMODIFIED}
<?php } ?>
</td>
<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>
--- 45,61 ----
<td>
<?php if ($IS_CURRENT) { ?>
! $_("Last edited on") ${LASTMODIFIED}
<?php } else { ?>
! $_("Version") ${VERSION} $_(", saved on") ${LASTMODIFIED}
<?php } ?>
</td>
<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>
***************
*** 64,98 ****
<td>
<?php if ($page->get('locked') && !$user->is_admin()) { ?>
! Page locked
<?php } else { ?>
<?php if ($IS_CURRENT) { ?>
! <a class="wikiaction" href="${ACTION}edit">Edit</a>
<?php } else { ?>
<a class="wikiaction" href="${ACTION}edit&version=${VERSION}"
! >Edit old revision</a>
<?php } ?>
<?php } ?>
<?php if ($user->is_admin()) { ?>
<?php if ($page->get('locked')) { ?>
! | <a class="wikiadmin" href="${ACTION}unlock">Unlock page</a>
<?php } else { ?>
! | <a class="wikiadmin" href="${ACTION}lock">Lock page</a>
<?php } ?>
! | <a class="wikiadmin" href="${ACTION}remove">Remove page</a>
<?php } ?>
! | <a class="wikiaction" href="${ACTION}info">History</a>
<?php if ($IS_CURRENT) { ?>
! | <a class="wikiaction" href="${ACTION}diff&previous=major">Diff</a>
<?php } else { ?>
| <a class="wikiaction"
! href="${ACTION}diff&version=${VERSION}&previous=major">Diff</a>
<?php } ?>
</td>
<td align="right">
<?php if ($user->is_authenticated()) { ?>
! You are signed in as <?php echo LinkWikiWord($USERID); ?>
! | <a class="wikiaction" href="${ACTION}logout">SignOut</a>
<?php } else { ?>
! <a class="wikiaction" href="${ACTION}login">SignIn</a>
<?php } ?>
</td>
--- 64,98 ----
<td>
<?php if ($page->get('locked') && !$user->is_admin()) { ?>
! $_("Page locked")
<?php } else { ?>
<?php if ($IS_CURRENT) { ?>
! <a class="wikiaction" href="${ACTION}edit">$_("Edit")</a>
<?php } else { ?>
<a class="wikiaction" href="${ACTION}edit&version=${VERSION}"
! >$_("Edit old revision")</a>
<?php } ?>
<?php } ?>
<?php if ($user->is_admin()) { ?>
<?php if ($page->get('locked')) { ?>
! | <a class="wikiadmin" href="${ACTION}unlock">$_("Unlock page")</a>
<?php } else { ?>
! | <a class="wikiadmin" href="${ACTION}lock">$_("Lock page")</a>
<?php } ?>
! | <a class="wikiadmin" href="${ACTION}remove">$_("Remove page")</a>
<?php } ?>
! | <a class="wikiaction" href="${ACTION}info">$_("History")</a>
<?php if ($IS_CURRENT) { ?>
! | <a class="wikiaction" href="${ACTION}diff&previous=major">$_("Diff")</a>
<?php } else { ?>
| <a class="wikiaction"
! href="${ACTION}diff&version=${VERSION}&previous=major">$_("Diff")</a>
<?php } ?>
</td>
<td align="right">
<?php if ($user->is_authenticated()) { ?>
! $_("You are signed in as") <?php echo LinkWikiWord($USERID); ?>
! | <a class="wikiaction" href="${ACTION}logout">$_("SignOut")</a>
<?php } else { ?>
! <a class="wikiaction" href="${ACTION}login">$_("SignIn")</a>
<?php } ?>
</td>
***************
*** 110,122 ****
ob_end_clean();
if ($errmsgs)
! echo "<div class='errors'><h4>PHP Warnings</h4>$errmsgs</div>";
?>
<div class="toolbar">
<!-- For debugging only, really: -->
<?plugin-link _BackendInfo
! linktext=DebugInfo
! targetpage=DebugInfo
page=[pagename]
! description="Get debugging information for [pagename]."?>
</div>
</form>
--- 110,124 ----
ob_end_clean();
if ($errmsgs)
! echo Element('div', array('class' => 'errors'),
! QElement('h4', _("PHP Warnings"))
! . $errmsgs);
?>
<div class="toolbar">
<!-- For debugging only, really: -->
<?plugin-link _BackendInfo
! linktext=_("DebugInfo")
! targetpage=_("DebugInfo")
page=[pagename]
! description=_("Get debugging information for [pagename].")?>
</div>
</form>
Index: editpage.html
===================================================================
RCS file: /cvsroot/phpwiki/phpwiki/templates/editpage.html,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** editpage.html 2001年11月14日 21:25:32 1.22
--- editpage.html 2001年11月29日 02:59:21 1.23
***************
*** 13,17 ****
<link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
! <title>Edit: ${SPLIT_PAGE}</title>
</head>
--- 13,17 ----
<link rel="stylesheet" title="phpwiki" href="${CSS_URL}" type="text/css" />
! <title>$_("Edit:") ${SPLIT_PAGE}</title>
</head>
***************
*** 22,31 ****
alt="[phpwiki]" width="50" height="50" /></a></div>
<h1>
! Edit <a href="${BROWSE}${PAGEURL}"
class="wikilink"><span class="wikiword">${PAGE}</span></a>
</h1>
<?php if (!empty($PREVIEW_CONTENT)) { ?>
! <p><strong>Preview only! Changes not saved.</strong></p>
<div class="wikitext">${PREVIEW_CONTENT}</div>
<hr class="ignore" noshade />
--- 22,31 ----
alt="[phpwiki]" width="50" height="50" /></a></div>
<h1>
! $_("Edit") <a href="${BROWSE}${PAGEURL}"
class="wikilink"><span class="wikiword">${PAGE}</span></a>
</h1>
<?php if (!empty($PREVIEW_CONTENT)) { ?>
! <p><strong>$_("Preview only! Changes not saved.")</strong></p>
<div class="wikitext">${PREVIEW_CONTENT}</div>
<hr class="ignore" noshade />
***************
*** 33,38 ****
<?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 } ?>
--- 33,38 ----
<?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 } ?>
***************
*** 54,59 ****
<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%"
--- 54,59 ----
<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%"
***************
*** 61,107 ****
<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">
<?php if ($user->is_authenticated()) { ?>
! You are signed in as <?php echo LinkWikiWord($USERID); ?>
<?php } else { ?>
! Author will be logged as <i>${USERID}</i>.
<?php } ?>
</td>
</tr></table>
<p style="clear: both; padding: 2ex 0ex 0ex;">
! You can change the size of the editing area.
! See <?php echo LinkExistingWikiWord('UserPreferences'); ?>.
! Also see <?php echo LinkExistingWikiWord('GoodStyle') ?> tips for editing.
</p>
<hr noshade="noshade" />
<small>
! <b>Emphasis:</b>
! '' for italics,
! __ 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>
--- 61,106 ----
<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">
<?php if ($user->is_authenticated()) { ?>
! $_("You are signed in as") <?php echo LinkWikiWord($USERID); ?>
<?php } else { ?>
! $_("Author will be logged as") <i>${USERID}</i>.
<?php } ?>
</td>
</tr></table>
<p style="clear: both; padding: 2ex 0ex 0ex;">
! $_("You can change the size of the editing area.")
! $_("See") <?php echo LinkExistingWikiWord(_("UserPreferences")); ?>.
! $_("Also see") <?php echo LinkExistingWikiWord(_("GoodStyle")) ?> $_("tips for editing.")
</p>
<hr noshade="noshade" />
<small>
! <b>$_("Emphasis:")</b>
! '' $_("for italics"),
! __ $_("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>