From: <var...@us...> - 2010-07-02 07:31:41
|
Revision: 7589 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7589&view=rev Author: vargenau Date: 2010-07-02 07:31:33 +0000 (Fri, 02 Jul 2010) Log Message: ----------- <?= --> <?php echo Modified Paths: -------------- trunk/admin/README trunk/doc/THEMES trunk/themes/Crao/templates/actionbar.tmpl trunk/themes/Crao/templates/body.tmpl trunk/themes/Crao/templates/bottom.tmpl trunk/themes/Crao/templates/browse.tmpl trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Crao/templates/head.tmpl trunk/themes/Crao/templates/htmldump.tmpl trunk/themes/Crao/templates/navbar.tmpl trunk/themes/Crao/templates/signin.tmpl trunk/themes/Crao/templates/top.tmpl trunk/themes/Crao/templates/wikiblog.tmpl trunk/themes/MonoBook/templates/actionbar.tmpl trunk/themes/MonoBook/templates/body.tmpl trunk/themes/MonoBook/templates/browse-footer.tmpl trunk/themes/MonoBook/templates/browse.tmpl trunk/themes/MonoBook/templates/editpage.tmpl trunk/themes/MonoBook/templates/info.tmpl trunk/themes/MonoBook/templates/logo.tmpl trunk/themes/MonoBook/templates/navbar.tmpl trunk/themes/MonoBook/templates/signin.tmpl trunk/themes/MonoBook/templates/tags.tmpl trunk/themes/MonoBook/templates/top.tmpl trunk/themes/MonoBook/templates/viewsource.tmpl trunk/themes/Portland/templates/actionbar.tmpl trunk/themes/Portland/templates/body.tmpl trunk/themes/Portland/templates/browse.tmpl trunk/themes/Portland/templates/debug.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Portland/templates/navbar.tmpl trunk/themes/Portland/templates/viewsource.tmpl trunk/themes/Sidebar/clock.php trunk/themes/Sidebar/hyperapplet.php trunk/themes/Sidebar/hyperwiki.php trunk/themes/Sidebar/templates/actionbar.tmpl trunk/themes/Sidebar/templates/body.tmpl trunk/themes/Sidebar/templates/browse.tmpl trunk/themes/Sidebar/templates/calendar.tmpl trunk/themes/Sidebar/templates/content.tmpl trunk/themes/Sidebar/templates/debug.tmpl trunk/themes/Sidebar/templates/dump-footer.tmpl trunk/themes/Sidebar/templates/frame-left.tmpl trunk/themes/Sidebar/templates/frameset.tmpl trunk/themes/Sidebar/templates/html.tmpl trunk/themes/Sidebar/templates/htmldump.tmpl trunk/themes/Sidebar/templates/logo.tmpl trunk/themes/Sidebar/templates/navbar.tmpl trunk/themes/Sidebar/templates/rc.tmpl trunk/themes/Sidebar/templates/search.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Sidebar/templates/tags.tmpl trunk/themes/Sidebar/templates/top.tmpl trunk/themes/Wordpress/templates/actionbar.tmpl trunk/themes/Wordpress/templates/body.tmpl trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/Wordpress/templates/signin.tmpl trunk/themes/Wordpress/templates/viewsource.tmpl trunk/themes/blog/templates/actionbar.tmpl trunk/themes/blog/templates/blogform.tmpl trunk/themes/blog/templates/body.tmpl trunk/themes/blog/templates/bottom.tmpl trunk/themes/blog/templates/browse-footer.tmpl trunk/themes/blog/templates/browse.tmpl trunk/themes/blog/templates/debug.tmpl trunk/themes/blog/templates/info.tmpl trunk/themes/blog/templates/navbar.tmpl trunk/themes/blog/templates/sidebar.tmpl trunk/themes/blog/templates/top.tmpl trunk/themes/blog/templates/viewsource.tmpl trunk/themes/blog/templates/wikiblog.tmpl trunk/themes/default/templates/README trunk/themes/default/templates/actionbar.tmpl trunk/themes/default/templates/addcomment.tmpl trunk/themes/default/templates/blogform.tmpl trunk/themes/default/templates/body.tmpl trunk/themes/default/templates/bottom.tmpl trunk/themes/default/templates/browse-footer.tmpl trunk/themes/default/templates/browse.tmpl trunk/themes/default/templates/categorypage.tmpl trunk/themes/default/templates/comment.tmpl trunk/themes/default/templates/content.tmpl trunk/themes/default/templates/debug.tmpl trunk/themes/default/templates/dialog.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/default/templates/forumadd.tmpl trunk/themes/default/templates/frameset.tmpl trunk/themes/default/templates/head.tmpl trunk/themes/default/templates/homepage.tmpl trunk/themes/default/templates/html.tmpl trunk/themes/default/templates/htmldump.tmpl trunk/themes/default/templates/info.tmpl trunk/themes/default/templates/login.tmpl trunk/themes/default/templates/navbar.tmpl trunk/themes/default/templates/nochanges.tmpl trunk/themes/default/templates/online.tmpl trunk/themes/default/templates/pagelink.tmpl trunk/themes/default/templates/redirect.tmpl trunk/themes/default/templates/savepage.tmpl trunk/themes/default/templates/search.tmpl trunk/themes/default/templates/signin.tmpl trunk/themes/default/templates/top.tmpl trunk/themes/default/templates/userprefs.tmpl trunk/themes/default/templates/viewsource.tmpl trunk/themes/default/templates/wikiblog.tmpl trunk/themes/default/templates/wikiforum.tmpl trunk/themes/gforge/templates/actionbar.tmpl trunk/themes/gforge/templates/blogform.tmpl trunk/themes/gforge/templates/body.tmpl trunk/themes/gforge/templates/bottom.tmpl trunk/themes/gforge/templates/browse-footer.tmpl trunk/themes/gforge/templates/browse.tmpl trunk/themes/gforge/templates/debug.tmpl trunk/themes/gforge/templates/editpage.tmpl trunk/themes/gforge/templates/html.tmpl trunk/themes/gforge/templates/login.tmpl trunk/themes/gforge/templates/navbar.tmpl trunk/themes/gforge/templates/pagelink.tmpl trunk/themes/gforge/templates/userprefs.tmpl trunk/themes/shamino_com/templates/actionbar.tmpl trunk/themes/shamino_com/templates/browse-footer.tmpl trunk/themes/shamino_com/templates/debug.tmpl trunk/themes/shamino_com/templates/info.tmpl trunk/themes/shamino_com/templates/signin.tmpl trunk/themes/shamino_com/templates/top.tmpl trunk/themes/smaller/templates/actionbar.tmpl trunk/themes/smaller/templates/info.tmpl trunk/themes/smaller/templates/navbar.tmpl trunk/themes/smaller/templates/signin.tmpl trunk/themes/wikilens/templates/body.tmpl trunk/themes/wikilens/templates/categorypage.tmpl trunk/themes/wikilens/templates/head.tmpl trunk/themes/wikilens/templates/navbar.tmpl trunk/themes/wikilens/templates/newuserwelcomepage.tmpl trunk/themes/wikilens/templates/top.tmpl Modified: trunk/admin/README =================================================================== --- trunk/admin/README 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/admin/README 2010-07-02 07:31:33 UTC (rev 7589) @@ -37,16 +37,16 @@ <h5>Fulltext Search</h5> <form id="searchform2" action="/cgi-bin/omega" - method="get" accept-charset="<?=$charset?>" style="display:inline" class="searchform"> + method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform"> <?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); ?> <input type="hidden" name="DEFAULTOP" value="AND" /> <input name="P" size="18" maxlength="256" - value="<?=$s?>" - onfocus="if (this.value == '<?=_("Search")?>') {this.value = '';}" + value="<?php echo $s?>" + onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}" onmouseout="window.status=''; return true;" - onmouseover="window.status='<?=_("Quick Search")?>'; return true;" + onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;" type="text" id="search2" - title="<?=_("Search term(s)") ?>" /> + title="<?php echo _("Search term(s)") ?>" /> <div align="right" style="padding-right:10px;"> <input type="submit" name="searchtype" value="fulltext" class="searchButton" title="External Fulltext Search"> </div> Modified: trunk/doc/THEMES =================================================================== --- trunk/doc/THEMES 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/doc/THEMES 2010-07-02 07:31:33 UTC (rev 7589) @@ -38,7 +38,7 @@ HTML objects. Pure HTML entities, e.g. <? echo "<br>" ?> will be escaped to <br>. -You can easily embed other templates by your own, e.g. <?= Template('body') ?> +You can easily embed other templates by your own, e.g. <?php echo Template('body') ?> Templates are used * by the master action (html and htmldump), which include most other @@ -48,7 +48,7 @@ * by certain pagetypes (e.g. wikiblog, comment, wikiforum) To include templates from other themes use this syntax: - <?= Template('default/search') ?> + <?php echo Template('default/search') ?> includes the search template from the default theme. Warning! Modified: trunk/themes/Crao/templates/actionbar.tmpl =================================================================== --- trunk/themes/Crao/templates/actionbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/actionbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -13,31 +13,31 @@ <?php } else { ?> <div id="actionbuttons"> <?php } ?> -<?= $EditB ?> +<?php echo $EditB ?> <?php if ($user->isAdmin() or mayAccessPage('change',$page->getName())) { ?> -<?=$SEP?><?= Button($page->get('locked') ? 'unlock' : 'lock') ?> +<?php echo $SEP?><?php echo Button($page->get('locked') ? 'unlock' : 'lock') ?> <?php if (ENABLE_PAGEPERM) { ?> -<?=$SEP?><?= Button('chown') ?> -<?=$SEP?><?= Button('setacl') ?> +<?php echo $SEP?><?php echo Button('chown') ?> +<?php echo $SEP?><?php echo Button('setacl') ?> <?php }} ?> <?php if ($user->isAdmin() or mayAccessPage('remove',$page->getName())) { ?> -<?=$SEP?><?= Button('remove') ?> +<?php echo $SEP?><?php echo Button('remove') ?> <?php } ?> -<?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?> -<?=$SEP?><?= Button("diff") ?> -<?=$SEP?><?= Button("PageInfo", _("PageInfo")) ?> +<?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> +<?php echo $SEP?><?php echo Button("diff") ?> +<?php echo $SEP?><?php echo Button("PageInfo", _("PageInfo")) ?> <?php if ((DEBUG and $request->getArg('action') == 'browse') || $user->isAdmin()) { ?> <!-- Buttons really only for debugging --> -<?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?> -<?=$SEP?><?= Button("PageDump", _("PageDump")) ?> +<?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> +<?php echo $SEP?><?php echo Button("PageDump", _("PageDump")) ?> <?php $purgeb = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); $purgeb->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?> -<?=$SEP?><?= $purgeb ?> +<?php echo $SEP?><?php echo $purgeb ?> <!-- End debugging buttons --> <?php } ?> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> - <?=$SEP?><?= Button("pdf") ?> + <?php echo $SEP?><?php echo Button("pdf") ?> <?php } ?> </div> Modified: trunk/themes/Crao/templates/body.tmpl =================================================================== --- trunk/themes/Crao/templates/body.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/body.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -1,22 +1,22 @@ <?php // -*-php-*- // rcs_id('$Id$'); ?> -<body<?= $WikiTheme->getMoreAttr('body') ?>> +<body<?php echo $WikiTheme->getMoreAttr('body') ?>> <div id="header"><?php // for top toolbars style sheet ?> - <?= Template('top') ?> + <?php echo Template('top') ?> </div> -<div class="toolbar"><?= Template('navbar') ?></div> +<div class="toolbar"><?php echo Template('navbar') ?></div> <!-- Page content --> <div id="content"> <?php if (isset($HEADER)) { ?> <!-- Page title --> -<h1><?= $HEADER ?></h1> +<h1><?php echo $HEADER ?></h1> <?php } ?> -<?= $CONTENT ?> -<?= Template('bottom') ?> +<?php echo $CONTENT ?> +<?php echo Template('bottom') ?> </div> <?php if (isset($revision)) { ?> <!-- Actionbar --> -<?= Template('actionbar') ?> +<?php echo Template('actionbar') ?> <?php } ?> </body> Modified: trunk/themes/Crao/templates/bottom.tmpl =================================================================== --- trunk/themes/Crao/templates/bottom.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/bottom.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -7,5 +7,5 @@ -<?= $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> -<?php if (defined('DEBUG') and DEBUG) { ?><?= Template('debug') ?><?php } ?> +<?php echo $GLOBALS['ErrorManager']->getPostponedErrorsAsHTML() ?> +<?php if (defined('DEBUG') and DEBUG) { ?><?php echo Template('debug') ?><?php } ?> Modified: trunk/themes/Crao/templates/browse.tmpl =================================================================== --- trunk/themes/Crao/templates/browse.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/browse.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -3,18 +3,18 @@ ?> <?php if ($revision and !$revision->isCurrent()) { ?> - <p><strong><?=_("Note:")?></strong> - <?=_("You are viewing an old revision of this page.")?> - <?= Button('browse', _("View the current version"), $page)?>. + <p><strong><?php echo _("Note:")?></strong> + <?php echo _("You are viewing an old revision of this page.")?> + <?php echo Button('browse', _("View the current version"), $page)?>. </p> <?php } ?> <?php if (!empty($redirected)) { ?> - <p><?= $redirected ?></p> + <p><?php echo $redirected ?></p> <?php } ?> -<?=$CONTENT?> +<?php echo $CONTENT?> <div id="revision"> -<p class="editdate"><?= $WikiTheme->getLastModifiedMessage($revision) ?></p> +<p class="editdate"><?php echo $WikiTheme->getLastModifiedMessage($revision) ?></p> <?php global $HIDE_TOOLBARS; if (!$HIDE_TOOLBARS) { Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/editpage.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -2,22 +2,22 @@ // rcs_id('$Id$'); ?> <?php if (isset($PREVIEW_CONTENT)) { ?> - <p><strong><?=_("Preview only! Changes not saved.")?></strong> + <p><strong><?php echo _("Preview only! Changes not saved.")?></strong> <!-- FIXME: it would be nice to put a link to the #editarea anchor below, but it does not work currently with the <base> declared in top.tmpl. I think we need to do away with using <base> altogether... --> - <?= fmt("Please continue editing. (You'll find your %s at the bottom of the page.)", + <?php echo fmt("Please continue editing. (You'll find your %s at the bottom of the page.)", /* HTML::a(array("href" => "#editarea"), */ _("edit area") /*) */) ?> </p> <hr class="printer" noshade="noshade" /> - <?= $PREVIEW_CONTENT ?> + <?php echo $PREVIEW_CONTENT ?> <hr class="printer" noshade="noshade" /> <?php } ?> -<?= $PAGE_LOCKED_MESSAGE ?> -<?= $CONCURRENT_UPDATE_MESSAGE ?> +<?php echo $PAGE_LOCKED_MESSAGE ?> +<?php echo $CONCURRENT_UPDATE_MESSAGE ?> <?php if (! $IS_CURRENT) { ?> - <p><strong><?=_("Warning: You are editing an old revision.")?> - <?=_("Saving this page will overwrite the current version.")?></strong></p> + <p><strong><?php echo _("Warning: You are editing an old revision.")?> + <?php echo _("Saving this page will overwrite the current version.")?></strong></p> <?php } ?> <?php /* * FIXME: Hack! @@ -27,50 +27,50 @@ * a redirect from a page to itself.) */ ?> <form method="post" id="editpage" name="editpage" - action="<?= $request->getPostURL() ?>" - accept-charset="<?=CHARSET?>"> + action="<?php echo $request->getPostURL() ?>" + accept-charset="<?php echo CHARSET?>"> <?php if (!empty($_GET['start_debug'])) echo '<input type="hidden" name="start_debug" value="1" >'; ?> <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> <br class="clear-floats" /> <table width="100%"> - <tr><td><?= $EDIT_TOOLBAR ?></td> + <tr><td><?php echo $EDIT_TOOLBAR ?></td> <td align="right"><div id="editarea-size"> - <?=_("Size").':'?> - <label for="pref-editHeight"><b><?=_("H")?></b></label> <?=$HEIGHT_PREF?> - <label for="pref-editWidth"><b><?=_("W")?></b></label> <?=$WIDTH_PREF?> - <noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript> + <?php echo _("Size").':'?> + <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> + <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?> + <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript> </div></td></tr></table> <fieldset class="editarea"> - <legend><?=_("Page Content: ")?></legend> - <a id="editarea"></a><?=$EDIT_TEXTAREA?> + <legend><?php echo _("Page Content: ")?></legend> + <a id="editarea"></a><?php echo $EDIT_TEXTAREA?> </fieldset> <!-- FIXME: fix layout, move CSS to CSS --> <fieldset class="editarea"> - <legend><?=_("Summary").':'?></legend><br /> - <?=$SUMMARY_INPUT?> + <legend><?php echo _("Summary").':'?></legend><br /> + <?php echo $SUMMARY_INPUT?> </fieldset> <?php if (ENABLE_CAPTCHA) { ?> <fieldset class="toolbar" style="text-align: center;"> <?php echo $CAPTCHA_IMAGE ?><br/> - <?php echo $CAPTCHA_LABEL ?><?= $CAPTCHA_INPUT ?> + <?php echo $CAPTCHA_LABEL ?><?php echo $CAPTCHA_INPUT ?> </fieldset> <?php } ?> <fieldset class="toolbar"> - <?=$MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?=_("This is a minor change.")?></label> - <?=$OLD_MARKUP_CB?> <label for="useOldMarkup"><?=_("Use old markup")?></label> <?=$OLD_MARKUP_CONVERT?> + <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label> + <?php echo $OLD_MARKUP_CB?> <label for="useOldMarkup"><?php echo _("Use old markup")?></label> <?php echo $OLD_MARKUP_CONVERT?> <?php if ($user->isAdmin()) { ?> - <?= $LOCKED_CB ?> <label for="edit-locked"><?=_("Locked")?></label> + <?php echo $LOCKED_CB ?> <label for="edit-locked"><?php echo _("Locked")?></label> <?php } ?> </fieldset> <fieldset class="toolbar"> - <?= $PREVIEW_B ?> + <?php echo $PREVIEW_B ?> <?php if ($SAVE_B) { ?> - <?=$SEP?><?= $SAVE_B ?> + <?php echo $SEP?><?php echo $SAVE_B ?> <?php } ?> </fieldset> <fieldset class="toolbar"> - <?=$AUTHOR_MESSAGE?> - <label><?= Template('signin', array('FORMNAME' => 'editpage')) ?></label> + <?php echo $AUTHOR_MESSAGE?> + <label><?php echo Template('signin', array('FORMNAME' => 'editpage')) ?></label> </fieldset> <hr noshade="noshade" /> <script type="text/javascript"> @@ -90,15 +90,15 @@ </script> <div id="oldMarkup" class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> -<p><?= fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p> +<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p> <?plugin IncludePage page=_("Help/OldTextFormattingRules") section=_("Synopsis") quiet=1?> </div> <div id="newMarkup" class="wiki-edithelp"> <!-- FIXME: do we need this at all? If so, it could probably be moved to TextFormattingRules --> -<p><?= fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p> +<p><?php echo fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p> <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> -<?=$HIDDEN_INPUTS?> +<?php echo $HIDDEN_INPUTS?> </form> <script type="text/javascript"> <!-- Modified: trunk/themes/Crao/templates/head.tmpl =================================================================== --- trunk/themes/Crao/templates/head.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/head.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -2,22 +2,22 @@ // rcs_id('$Id$'); ?> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> <?php $ROBOTS_CONTENT = isset($ROBOTS_META) ? $ROBOTS_META : "noindex,nofollow"; ?> -<meta name="robots" content="<?= $ROBOTS_CONTENT ?>" /> +<meta name="robots" content="<?php echo $ROBOTS_CONTENT ?>" /> <?php if (!empty($PAGE_DESCRIPTION)) { ?> -<meta name="description" content="<?=$PAGE_DESCRIPTION?>" /> +<meta name="description" content="<?php echo $PAGE_DESCRIPTION?>" /> <?php } ?> <?php if (!empty($PAGE_KEYWORDS)) { ?> -<meta name="keywords" content="<?=$PAGE_KEYWORDS?>" /> +<meta name="keywords" content="<?php echo $PAGE_KEYWORDS?>" /> <?php } ?> -<meta name="language" content="<?=DEFAULT_LANGUAGE?>" /> +<meta name="language" content="<?php echo DEFAULT_LANGUAGE?>" /> <meta name="document-type" content="Public" /> <meta name="document-rating" content="General" /> <meta name="generator" content="PhpWiki" /> -<meta name="PHPWIKI_VERSION" content="<?=PHPWIKI_VERSION?>" /> -<base href="<?=PHPWIKI_BASE_URL?>" /> -<link rel="shortcut icon" href="<?=$WikiTheme->getImageURL('favicon.ico')?>" /> +<meta name="PHPWIKI_VERSION" content="<?php echo PHPWIKI_VERSION?>" /> +<base href="<?php echo PHPWIKI_BASE_URL?>" /> +<link rel="shortcut icon" href="<?php echo $WikiTheme->getImageURL('favicon.ico')?>" /> <?php /** * Additional navigation links are provided here in the html header for browsers * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). @@ -26,14 +26,14 @@ * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html */ ?> <?php /* The next few lines are wrapped in an odd manner to allow gettext string extraction: cd locale;make */ ?> -<link rel="home" title="<?=HOME_PAGE?>" href="<?=WikiURL(HOME_PAGE)?>" /> -<link rel="help" title="<?= -_("HowToUseWiki")?>" href="<?=WikiURL( +<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> +<link rel="help" title="<?php echo +_("HowToUseWiki")?>" href="<?php echo WikiURL( _("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?=COPYRIGHTPAGE_TITLE?>" href="<?=COPYRIGHTPAGE_URL?>" /> -<link rel="author" title="<?=AUTHORPAGE_TITLE?>" href="<?=AUTHORPAGE_URL?>" /> -<link rel="search" title="<?= -_("FindPage")?>" href="<?=WikiURL( +<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> +<link rel="search" title="<?php echo +_("FindPage")?>" href="<?php echo WikiURL( _("FindPage"))?>" /> <?php /** * Provide alternate variations of the page content: @@ -51,7 +51,7 @@ $alternatelinkTitle = $page->getName(); $alternatelinkUrl = WikiURL($revision, array('action' => 'browse')); } ?> -<link rel="alternate" title="<?= $alternatelinkTitle ?>" href="<?= $alternatelinkUrl ?>" /> +<link rel="alternate" title="<?php echo $alternatelinkTitle ?>" href="<?php echo $alternatelinkUrl ?>" /> <?php } /** * Link tag for RSS auto-discovery. See @@ -59,38 +59,38 @@ * http://www.oreillynet.com/cs/weblog/view/wlg/1475 */ ?> -<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=WikiURL( +<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo WikiURL( _("RecentChanges"), array('format' => 'rss'))?>" /> <?php /** * Add some user-specific links. */ ?> <?php if (!$user->isSignedIn()) { /* For users not signed in */ ?> -<link rel="bookmark" title="<?= -_("SandBox")?>" href="<?=WikiURL( +<link rel="bookmark" title="<?php echo +_("SandBox")?>" href="<?php echo WikiURL( _("SandBox"))?>" /> -<link rel="bookmark" title="<?= -_("WikiWikiWeb")?>" href="<?=WikiURL( +<link rel="bookmark" title="<?php echo +_("WikiWikiWeb")?>" href="<?php echo WikiURL( _("WikiWikiWeb"))?>" /> <?php } ?> -<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?= WikiURL($page,array('action'=>'edit')) ?>" /> +<link rel="alternate" type="application/x-wiki" title="Edit this page!" href="<?php echo WikiURL($page,array('action'=>'edit')) ?>" /> <?php if ($user->isadmin()) { /* Only for the Administrator */ ?> -<link rel="bookmark" title="<?= -_("PhpWikiAdministration")?>" href="<?=WikiURL( +<link rel="bookmark" title="<?php echo +_("PhpWikiAdministration")?>" href="<?php echo WikiURL( _("PhpWikiAdministration"))?>" /> <?php } ?> <?php if ($user->isSignedIn()) { /* For signed-in users */ ?> -<link rel="bookmark" title="<?= -_("UserPreferences")?>" href="<?=WikiURL( +<link rel="bookmark" title="<?php echo +_("UserPreferences")?>" href="<?php echo WikiURL( _("UserPreferences"))?>" /> <?php /* User's calendar page */ $UserCalPageTitle = $user->getId() . SUBPAGE_SEPARATOR ._("Calendar"); $UserCalPageUrl = WikiURL($UserCalPageTitle); ?> -<link rel="bookmark" title="<?= $UserCalPageTitle ?>" href="<?= $UserCalPageUrl ?>" /> +<link rel="bookmark" title="<?php echo $UserCalPageTitle ?>" href="<?php echo $UserCalPageUrl ?>" /> <?php /* Today's calendar page for the user if it exists */ $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //FIXME @@ -98,10 +98,10 @@ if ($dbi->isWikiPage($UserCalPageTodayTitle)) { $UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle); ?> -<link rel="bookmark" title="<?= $UserCalPageTodayTitle ?>" href="<?= $UserCalPageTodayUrl ?>" /> +<link rel="bookmark" title="<?php echo $UserCalPageTodayTitle ?>" href="<?php echo $UserCalPageTodayUrl ?>" /> <?php } ?> <?php } //end of links for signed-in user ?> -<?= $WikiTheme->getCSS() ?> +<?php echo $WikiTheme->getCSS() ?> <?php // avoid redundant bookmark title for custom home page if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) @@ -109,8 +109,8 @@ else $pagetitle = " - ". AsString($TITLE); ?> -<title><?=WIKI_NAME.$pagetitle?></title> -<meta property="og:title" content="<?= $TITLE ?>"/> -<meta property="og:site_name" content="<?= WIKI_NAME ?>"/> -<?= $WikiTheme->getMoreHeaders() ?> +<title><?php echo WIKI_NAME.$pagetitle?></title> +<meta property="og:title" content="<?php echo $TITLE ?>"/> +<meta property="og:site_name" content="<?php echo WIKI_NAME ?>"/> +<?php echo $WikiTheme->getMoreHeaders() ?> </head> Modified: trunk/themes/Crao/templates/htmldump.tmpl =================================================================== --- trunk/themes/Crao/templates/htmldump.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/htmldump.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -10,7 +10,7 @@ "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml"> <head> -<meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" /> +<meta http-equiv="Content-Type" content="text/html; charset=<?php echo CHARSET?>" /> <?php /** * Additional navigation links are provided here in the html header for browsers * which support them: Mozilla, iCab, Amaya (and certain versions of Opera??). @@ -18,12 +18,12 @@ * See http://www.w3.org/TR/html401/struct/links.html#edef-LINK * http://www.euronet.nl/~tekelenb/WWW/LINK/index.html */ ?> -<link rel="home" title="<?=HOME_PAGE?>" href="<?=WikiURL(HOME_PAGE)?>" /> -<link rel="help" title="<?=_("HowToUseWiki")?>" href="<?=WikiURL(_("HowToUseWiki"))?>" /> -<link rel="copyright" title="<?=COPYRIGHTPAGE_TITLE?>" href="<?=COPYRIGHTPAGE_URL?>" /> -<link rel="author" title="<?=AUTHORPAGE_TITLE?>" href="<?=AUTHORPAGE_URL?>" /> +<link rel="home" title="<?php echo HOME_PAGE?>" href="<?php echo WikiURL(HOME_PAGE)?>" /> +<link rel="help" title="<?php echo _("HowToUseWiki")?>" href="<?php echo WikiURL(_("HowToUseWiki"))?>" /> +<link rel="copyright" title="<?php echo COPYRIGHTPAGE_TITLE?>" href="<?php echo COPYRIGHTPAGE_URL?>" /> +<link rel="author" title="<?php echo AUTHORPAGE_TITLE?>" href="<?php echo AUTHORPAGE_URL?>" /> -<?= $WikiTheme->getCSS() ?> +<?php echo $WikiTheme->getCSS() ?> <?php // avoid redundant bookmark title for custom home page if ($page->getName() == WIKI_NAME && HOME_PAGE == WIKI_NAME) @@ -31,7 +31,7 @@ else $pagetitle = " - ". AsString($TITLE); ?> -<title><?=WIKI_NAME.$pagetitle?></title> +<title><?php echo WIKI_NAME.$pagetitle?></title> </head> -<?= Template('body') ?> +<?php echo Template('body') ?> </html> Modified: trunk/themes/Crao/templates/navbar.tmpl =================================================================== --- trunk/themes/Crao/templates/navbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/navbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -2,26 +2,26 @@ // rcs_id('$Id$'); ?> <!-- The top navigation/search bar --> -<form action="<?= WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?=$charset?>" id="searchform"> +<form action="<?php echo WikiURL(_("TitleSearch"))?>" + method="get" accept-charset="<?php echo $charset?>" id="searchform"> <input type="hidden" name="auto_redirect" value="1" /> <?php if (! USE_PATH_INFO) { ?> - <input type="hidden" name="pagename" value="<?=_("TitleSearch")?>" /> + <input type="hidden" name="pagename" value="<?php echo _("TitleSearch")?>" /> <?php } ?> <div id="navbuttons"> <table width="100%" cellpadding="0" cellspacing="0" border="0"> <tr valign="middle"><td align="left"> -<?= WikiLink(_("RecentChanges"), "button") ?> +<?php echo WikiLink(_("RecentChanges"), "button") ?> <?php if (!empty($revision)) { ?> -<?=$SEP?><?= Button("RelatedChanges", _("RelatedChanges")) ?> -<?=$SEP?><?= Button("LikePages", _("LikePages")) ?> -<?=$SEP?><?= Button("BackLinks", _("BackLinks")) ?> +<?php echo $SEP?><?php echo Button("RelatedChanges", _("RelatedChanges")) ?> +<?php echo $SEP?><?php echo Button("LikePages", _("LikePages")) ?> +<?php echo $SEP?><?php echo Button("BackLinks", _("BackLinks")) ?> <?php } ?> </td> <td align="right" width="150"> <div id="search"> <?php if (!empty($user) && $user->isSignedIn()) { ?> - <?= WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?=$SEP?> + <?php echo WikiLink(_("UserPreferences"),'button',_("Preferences")) ?><?php echo $SEP?> <?php } ?> <?php if (!empty($user)) { ?> <?php @@ -32,24 +32,24 @@ $UserCalPageTodayTitle = $UserCalPageTitle . SUBPAGE_SEPARATOR . strftime("%Y-%m-%d", time()); //$UserCalPageTodayUrl = WikiURL($UserCalPageTodayTitle); ?> -<?= WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?=$SEP?> +<?php echo WikiLink($UserCalPageTodayTitle, "button", _("Today")) ?><?php echo $SEP?> <?php } ?> <?php if (!empty($user) && $user->isAdmin()) { ?> -<?= WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?=$SEP?> +<?php echo WikiLink(_("PhpWikiAdministration"), "button", _("Admin")) ?><?php echo $SEP?> <?php } ?> <?php } ?> -<?= WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12" +<?php echo WikiLink(_("FindPage"), "button") ?><input type="text" id="livesearch" name="s" size="12" maxlength="256" - onfocus="if (this.value == '<?=_("Search")?>') {this.value = '';}" + onfocus="if (this.value == '<?php echo _("Search")?>') {this.value = '';}" onmouseout="window.status=''; return true;" - onmouseover="window.status='<?=_("Search")?>'; return true;" + onmouseover="window.status='<?php echo _("Search")?>'; return true;" <?php if (ENABLE_LIVESEARCH) { ?> - title="<?=_("LiveSearch")?>" + title="<?php echo _("LiveSearch")?>" onKeypress="liveSearchStart()" - onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?=_("Search")?>';}" /> + onblur="setTimeout('closeResults()',2000); if (this.value == '') {this.value = '<?php echo _("Search")?>';}" /> </div><br /><div align="left" id="LSResult"></div> <?php } else { ?> - title="<?=_("TitleSearch")?>" /> + title="<?php echo _("TitleSearch")?>" /> </div> <?php } ?> </td></tr></table></div> Modified: trunk/themes/Crao/templates/signin.tmpl =================================================================== --- trunk/themes/Crao/templates/signin.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/signin.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -7,27 +7,27 @@ $NOFORM = true; ?> <?php if (empty($NOFORM)) { ?> - <form method="post" action="<?= $request->getPostURL() ?>" accept-charset="<?=$charset?>" name="<?=$FORMNAME?>"> - <?= HiddenInputs($request->getArgs(), false, array('auth')) ?> + <form method="post" action="<?php echo $request->getPostURL() ?>" accept-charset="<?php echo $charset?>" name="<?php echo $FORMNAME?>"> + <?php echo HiddenInputs($request->getArgs(), false, array('auth')) ?> <?php } ?> <?php if ($user->isSignedIn()) { $SignOutB = $WikiTheme->makeButton(_("Sign Out"), "javascript:SignOut();", 'wikiaction'); ?> <span> - <?= fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?> - <?=$SEP?> + <?php echo fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?> + <?php echo $SEP?> </span> <script type="text/javascript"><!-- document.write('<input type="hidden" name="auth[logout]" value="0" />'); function SignOut(form) { - var form = document.forms["<?=$FORMNAME?>"]; + var form = document.forms["<?php echo $FORMNAME?>"]; form.elements["auth[logout]"].value = 1; form.submit(); } - document.write('<?=$SignOutB?>'); // --> + document.write('<?php echo $SignOutB?>'); // --> </script> <noscript> - <?= Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?> + <?php echo Button("submit:auth[logout]", _("Sign Out"), 'wikiaction') ?> </noscript> <?php } else { $SignInInput = HTML::input(array('type' => 'text', @@ -49,11 +49,11 @@ form.submit(); } //--> - document.write(' <?= + document.write(' <?php echo _("Sign In") ?>'); </script> - <?= $SignInInput ?> + <?php echo $SignInInput ?> <?php } ?> <?php if (empty($NOFORM)) { ?> </form> Modified: trunk/themes/Crao/templates/top.tmpl =================================================================== --- trunk/themes/Crao/templates/top.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/top.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -8,8 +8,8 @@ <table summary="logo" width="100%" cellpadding="0" cellspacing="0" border="0"> <tr valign="middle"> - <td><div id="logo"><a href="<?=WikiURL(HOME_PAGE)?>"><?=WIKI_NAME?></a></div></td> - <td><div id="signin"><?= Template('signin') ?></div></td> + <td><div id="logo"><a href="<?php echo WikiURL(HOME_PAGE)?>"><?php echo WIKI_NAME?></a></div></td> + <td><div id="signin"><?php echo Template('signin') ?></div></td> </tr> </table> <?php } ?> Modified: trunk/themes/Crao/templates/wikiblog.tmpl =================================================================== --- trunk/themes/Crao/templates/wikiblog.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/Crao/templates/wikiblog.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -24,24 +24,24 @@ ?> <!-- FIXME: move table formatting to css --> -<div title="<?= fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>" +<div title="<?php echo fmt("Comments on %s by %s.", $BLOG_PARENT, $BLOG_CREATOR)?>" class="wikiblog wikitext"> <div class="wikiblog-header"> - <strong class="floatleft"><?= WikiLink($page, 'known', $CDATE) ?></strong> - <strong class="floatright"><?= WikiLink($BLOG_CREATOR, 'if_known') ?></strong> + <strong class="floatleft"><?php echo WikiLink($page, 'known', $CDATE) ?></strong> + <strong class="floatright"><?php echo WikiLink($BLOG_CREATOR, 'if_known') ?></strong> <br class="clear-floats" /> </div> <div class="wikiblog-body"> <?php if ($rev->get('summary')) { ?> - <h3 class="wikiblog-summary"><?= $rev->get('summary') ?></h3> + <h3 class="wikiblog-summary"><?php echo $rev->get('summary') ?></h3> <?php } ?> - <?= $CONTENT ?> + <?php echo $CONTENT ?> </div> <?php if ($buttons or $modified) { ?> <div class="wikiblog-footer"> - <?= $buttons ?> - <?= $modified ?> + <?php echo $buttons ?> + <?php echo $modified ?> <br class="clear-floats" /> </div> <?php } ?> Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -10,79 +10,79 @@ $isBrowse = $request->getArg('action') == 'browse'; ?> <div class="portlet" id="p-cactions"> - <h5><?= _("Views") ?></h5> + <h5><?php echo _("Views") ?></h5> <ul> <?php if (!string_ends_with($pagename, _("/Discussion"))) { ?> <?php $talk = new WikiPageName('Talk:'.$pagename); ?> - <?= ActionButton(array(), + <?php echo ActionButton(array(), $isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('class'=>$isBrowse ? "selected" : "", 'title' => "View the page [alt-c]")) ?> <?php if (!$isActionPage) { ?> <?php if ($dbh->isWikiPage($talk->getName())) { ?> - <?= ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?> + <?php echo ActionButton(array('action'=>'browse'), _("Discussion"), $talk->getName()) ?> <?php } else { ?> - <?= ActionButton(array('action'=>'create', + <?php echo ActionButton(array('action'=>'create', 'template'=>_("TemplateTalk")), _("Discussion"), $talk->getName()) ?> <?php } ?> <?php } ?> <?php } else { $talk = new WikiPageName($pagename); ?> - <?= ActionButton(array(),$isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?> - <?= ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?> + <?php echo ActionButton(array(),$isActionPage ? _("ActionPage") : _("Article"), $talk->getParent(), array('title' => "View the page [alt-c]")) ?> + <?php echo ActionButton(array(),_("Discussion"), $talk->getName(), array('class'=>$isBrowse ? "selected" : "")) ?> <?php } ?> <?php if (($isAdmin or mayAccessPage('edit', $pagename)) and $revision) { ?> - <?= ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, + <?php echo ActionButton("edit", $dbh->isWikiPage($page->getName()) ? ($revision->isCurrent() ? _("Edit") : _("Edit Old Revision")) : _("Create Page"), false, array('id' => 'btn-edit', 'title' => "You can edit this page. Please use the preview button before saving. [alt-e]")) ?> <?php } else { ?> - <?= ActionButton("viewsource", _("View Source")) ?> + <?php echo ActionButton("viewsource", _("View Source")) ?> <?php } ?> <?php if ($dbh->isWikiPage($page->getName())) { ?> - <?= ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page. [alt-h]")) ?> + <?php echo ActionButton(_("PageHistory"),_("History"),false,array('title'=>"Past versions of this page. [alt-h]")) ?> <?php if (!empty($revision) and ($isAdmin or mayAccessPage('purge', $pagename))) { ?> - <?= ActionButton("purge") ?> + <?php echo ActionButton("purge") ?> <?php } ?> <?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?> - <?= ActionButton('rename') ?> - <?= ActionButton($page->get('locked') ? 'unlock' : 'lock') ?> + <?php echo ActionButton('rename') ?> + <?php echo ActionButton($page->get('locked') ? 'unlock' : 'lock') ?> <?php } ?> <?php } ?> <? if ( $user->isSignedIn() ) { ?> - <?= ActionButton("WatchPage", _("Watch"), false, + <?php echo ActionButton("WatchPage", _("Watch"), false, array('title'=>"Add/Remove this to/from the list of pages you're monitoring for changes [alt-l]")) ?> <?php } ?> </ul> </div> <div class="portlet" id="p-tbx"> - <h5><?= _("Special Actions") ?></h5> + <h5><?php echo _("Special Actions") ?></h5> <div class="pBody"> <ul> <?php if ( $user->isSignedIn() ) { ?> <?php if ($isAdmin or mayAccessPage('change', $pagename)) { ?> <?php if (ENABLE_PAGEPERM and mayAccessPage('change', $pagename)) { ?> - <?= ActionButton('chown') ?> - <?= ActionButton('setacl') ?> + <?php echo ActionButton('chown') ?> + <?php echo ActionButton('setacl') ?> <?php }} ?> <?php if (!empty($revision) and ($isAdmin or mayAccessPage('remove', $pagename))) { ?> - <?= ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> - <?= ActionButton('remove') ?> + <?php echo ActionButton('revert',_("Revert"), $revision->isCurrent() ? $page->GetRevisionBefore() : $revision) ?> + <?php echo ActionButton('remove') ?> <?php } ?> <?php } ?> - <?= ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?> - <?= ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?> - <?= ActionButton("diff") ?> - <?= ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?> + <?php echo ActionButton(array('action'=>_("PageInfo")), _("Page info"), $pagename) ?> + <?php echo ActionButton(array('action'=>_("AuthorHistory")), _("Author history"), $pagename) ?> + <?php echo ActionButton("diff") ?> + <?php echo ActionButton(array('action'=>_("PageDump")), _("Page dump"), $pagename) ?> <?php if (DEBUG and USECACHE) { $PurgeCache = ActionButton(array('nocache' => 'purge'), _("Purge HTML cache"), $pagename); $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?> - <?= $PurgeCache ?> + <?php echo $PurgeCache ?> <?php } ?> </ul> </div> Modified: trunk/themes/MonoBook/templates/body.tmpl =================================================================== --- trunk/themes/MonoBook/templates/body.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/body.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -2,35 +2,35 @@ // rcs_id('$Id$'); // Todo: set the body attr dynamically. here class="ns-2" for mozilla ?> -<body <?= $WikiTheme->getMoreAttr('body') ?>> +<body <?php echo $WikiTheme->getMoreAttr('body') ?>> <div id="global-wrapper"> <div id="column-content"> <div id="content"> - <?= Template('top') ?> + <?php echo Template('top') ?> <div id="bodyContent"> - <?= $CONTENT ?> + <?php echo $CONTENT ?> <!-- end content --> <div class="visualClear"></div> </div> </div> <?php if (empty($NOSIGNIN)) { ?> - <?= Template('signin') ?> + <?php echo Template('signin') ?> <?php } ?> - <?= Template('logo') ?> + <?php echo Template('logo') ?> </div> <div id="column-one"> - <?= Template('navbar') ?> + <?php echo Template('navbar') ?> <?php if (empty($GLOBALS['HIDE_TOOLBARS'])) { ?> - <?= Template('actionbar') ?> - <?= Template('tags') ?> + <?php echo Template('actionbar') ?> + <?php echo Template('tags') ?> <?php } ?> </div> <div id="footer"><?php // for top & bottom toolbars stylesheet ?> - <?= Template('browse-footer') ?> + <?php echo Template('browse-footer') ?> </div> <div id="bottom"> - <?= Template('bottom') ?> + <?php echo Template('bottom') ?> </div> </div> </body> Modified: trunk/themes/MonoBook/templates/browse-footer.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse-footer.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/browse-footer.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -4,27 +4,27 @@ <?php // <hr class="printer" noshade="noshade" /> ?> <div class="visualClear"></div> <ul id="f-list"> - <li id="f-lastmod"> <?= $WikiTheme->getOwnerMessage($page) ?> <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?> </li> + <li id="f-lastmod"> <?php echo $WikiTheme->getOwnerMessage($page) ?> <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?> </li> <li id="f-copyright">All text is available under the terms of the <a class="internal" href="http://www.gnu.org/copyleft/fdl.html">GNU Free Documentation License</a> (see <b> <?php if ($request->_dbi->isWikiPage(_("Copyrights"))) { ?> - <?= WikiLink(_("Copyrights")) ?> + <?php echo WikiLink(_("Copyrights")) ?> <?php } else { ?> <a class="internal" href="http://www.phpwiki.org/Copyrights" title ="PhpWiki:Copyrights">Copyrights</a> <?php } ?> </b> for details).<br /></li> <?php if ($request->_dbi->isWikiPage(_("About".WIKI_NAME))) { ?> - <?= WikiLink(_("About".WIKI_NAME)) ?> + <?php echo WikiLink(_("About".WIKI_NAME)) ?> <?php } else { ?> <li id="f-about"><a href="http://www.phpwiki.org/PhpWiki" title ="PhpWiki:About">About PhpWiki</a></li> <?php } ?> <li id="f-disclaimer"> <?php if ($request->_dbi->isWikiPage(_("GeneralDisclaimer"))) { ?> - <?= WikiLink(_("GeneralDisclaimer")) ?> + <?php echo WikiLink(_("GeneralDisclaimer")) ?> <?php } else { ?> <a href="http://www.phpwiki.org/GeneralDisclaimer" title ="PhpWiki:Disclaimer">Disclaimer</a> <?php } ?> </li> </ul> - <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?= $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> - <div id="f-copyrightico"><a href="http://www.gnu.org/copyleft/fdl.html"><img src="<?= $WikiTheme->getImageURL("gnu-fdl.png") ?>" alt="GNU Free Documentation License" /></a></div> + <div id="f-poweredbyico"><a href="http://www.phpwiki.org/"><img src="<?php echo $WikiTheme->getImageURL("poweredby_phpwiki_51x31.png") ?>" alt="Powered by PhpWiki" /></a></div> + <div id="f-copyrightico"><a href="http://www.gnu.org/copyleft/fdl.html"><img src="<?php echo $WikiTheme->getImageURL("gnu-fdl.png") ?>" alt="GNU Free Documentation License" /></a></div> Modified: trunk/themes/MonoBook/templates/browse.tmpl =================================================================== --- trunk/themes/MonoBook/templates/browse.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/browse.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -3,13 +3,13 @@ ?> <?php if ($revision and !$revision->isCurrent()) { ?> - <p><strong><?=_("Note:")?></strong> - <?=_("You are viewing an old revision of this page.")?> - <?= Button('browse', _("View the current version"), $page)?>. + <p><strong><?php echo _("Note:")?></strong> + <?php echo _("You are viewing an old revision of this page.")?> + <?php echo Button('browse', _("View the current version"), $page)?>. </p> <?php } ?> <?php if (!empty($redirected)) { ?> - <p><?= $redirected ?></p> + <p><?php echo $redirected ?></p> <?php } ?> -<?=$CONTENT?> +<?php echo $CONTENT?> Modified: trunk/themes/MonoBook/templates/editpage.tmpl =================================================================== --- trunk/themes/MonoBook/templates/editpage.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/editpage.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -2,4 +2,4 @@ // rcs_id('$Id$'); ?> <div id="contentSub"></div> -<?= Template("default/editpage") ?> +<?php echo Template("default/editpage") ?> Modified: trunk/themes/MonoBook/templates/info.tmpl =================================================================== --- trunk/themes/MonoBook/templates/info.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/info.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -94,61 +94,61 @@ ?> <!-- FIXME: move table formatting to css --> -<table summary="<?= $tableSummary ?>" class="pageinfo" +<table summary="<?php echo $tableSummary ?>" class="pageinfo" border="0" cellspacing="0" cellpadding="3"> <?php if (!$is_current) { ?> <tr> - <td align="right" class="pageinfo"><?=_("Supplanted on:")?></td> - <td><?= $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td> + <td align="right" class="pageinfo"><?php echo _("Supplanted on:")?></td> + <td><?php echo $WikiTheme->formatDateTime($revision->get('_supplanted')) ?></td> </tr> <?php } ?> <tr> - <td align="right" nowrap="nowrap" class="pageinfo"><?= $label['date'] ?></td> - <td><?= $modifed ?><?= $minor_flag ?></td> + <td align="right" nowrap="nowrap" class="pageinfo"><?php echo $label['date'] ?></td> + <td><?php echo $modifed ?><?php echo $minor_flag ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?= $label['author'] ?></td> - <td><?= $authorLink ?> + <td align="right" class="pageinfo"><?php echo $label['author'] ?></td> + <td><?php echo $authorLink ?> <?php if (! ($author == $authorId)) { ?> - <span class="pageinfo-authorid">(<?= $authorId ?>)</span> + <span class="pageinfo-authorid">(<?php echo $authorId ?>)</span> <?php } ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?=_("Page Version:")?></td> - <td><?= $version ?></td> + <td align="right" class="pageinfo"><?php echo _("Page Version:")?></td> + <td><?php echo $version ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?=_("Markup:")?></td> - <td><?= $markupVersion ?></td> + <td align="right" class="pageinfo"><?php echo _("Markup:")?></td> + <td><?php echo $markupVersion ?></td> </tr> <tr> - <td align="right" class="pageinfo"><?=_("Size:")?></td> - <td><?= $wordcount ?>, <?= $size ?></td> + <td align="right" class="pageinfo"><?php echo _("Size:")?></td> + <td><?php echo $wordcount ?>, <?php echo $size ?></td> </tr> <?php if ($is_current) { ?> <tr> - <td align="right" class="pageinfo"><?= _("Hits:") ?></td> - <td><?= $hits ?></td> + <td align="right" class="pageinfo"><?php echo _("Hits:") ?></td> + <td><?php echo $hits ?></td> </tr> <?php } ?> <tr> - <td align="right" valign="top" class="pageinfo"><?= $label['summary'] ?></td> - <td><?= $summary ?></td> + <td align="right" valign="top" class="pageinfo"><?php echo $label['summary'] ?></td> + <td><?php echo $summary ?></td> </tr> <?php if ($is_current) { ?> <tr> - <td align="right"><?= $LOCKED_CB ?></td> - <td class="pageinfo"><?=_("Locked")?></td> + <td align="right"><?php echo $LOCKED_CB ?></td> + <td class="pageinfo"><?php echo _("Locked")?></td> </tr> <tr> <td align="right" class="pageinfo">ACL type</td> - <td><?= $type ?></td> + <td><?php echo $type ?></td> </tr> <tr> <td align="right" valign="top" class="pageinfo">ACL</td> - <td><?= $perm->asAclGroupLines() ?></td> + <td><?php echo $perm->asAclGroupLines() ?></td> </tr> <?php } ?> @@ -174,29 +174,29 @@ <?php if (!empty($pagetype)) { $pagetype = implode(", ", $pagetype); ?> <tr> - <td align="right" class="pageinfo"><?=_("Page Type:")?></td> - <td align="left"><?=$pagetype?></td> + <td align="right" class="pageinfo"><?php echo _("Page Type:")?></td> + <td align="left"><?php echo $pagetype?></td> </tr> <?php } ?> </table> <div id="actionbuttons"> - <?= Button("viewsource", _("View Source")) ?> - <?=$SEP?><?= Button("PageHistory", _("PageHistory")) ?> - <?=$SEP?><?= Button("AuthorHistory", _("AuthorHistory")) ?> - <?=$SEP?><?= Button("Diff") ?> - <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> - <?=$SEP?><?= Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> + <?php echo Button("viewsource", _("View Source")) ?> + <?php echo $SEP?><?php echo Button("PageHistory", _("PageHistory")) ?> + <?php echo $SEP?><?php echo Button("AuthorHistory", _("AuthorHistory")) ?> + <?php echo $SEP?><?php echo Button("Diff") ?> + <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'minor'),_("Diff previous Revision"),$page->getName()) ?> + <?php echo $SEP?><?php echo Button(array('action'=>'diff','previous' => 'author'),_("Diff previous Author"),$page->getName()) ?> <?php if ((defined('DEBUG') && DEBUG) || $user->isAdmin()) { ?> <!-- Buttons really only for debugging --> - <?=$SEP?><?= Button("DebugInfo", _("DebugInfo")) ?> + <?php echo $SEP?><?php echo Button("DebugInfo", _("DebugInfo")) ?> <?php $PurgeCache = Button(array('nocache' => 'purge'), _("PurgeHtmlCache"), $page->getName()); $PurgeCache->addTooltip(_("Purge HTML cache for this page. Regenerate from WikiMarkup when next accessed.")); ?> - <?=$SEP?><?= $PurgeCache ?> + <?php echo $SEP?><?php echo $PurgeCache ?> <!-- End debugging buttons --> <?php } ?> Modified: trunk/themes/MonoBook/templates/logo.tmpl =================================================================== --- trunk/themes/MonoBook/templates/logo.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/logo.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -1,6 +1,6 @@ <?php // -*-php-*- // rcs_id('$Id$'); ?> -<div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>"><img src="<?= $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?= +<div class="portlet" id="p-logo"><a class="wikilink" href="<?php echo WikiURL(HOME_PAGE)?>"><img src="<?php echo $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div> <div id="img-logo-right" /> Modified: trunk/themes/MonoBook/templates/navbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/navbar.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/navbar.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -9,35 +9,35 @@ <!-- The left navigation/search bar --> <!-- Here you should add favorite Links and Categories --> <div class="portlet" id="p-navigation"> - <h5><?= _("Navigation") ?></h5> + <h5><?php echo _("Navigation") ?></h5> <div class="pBody"> <ul> - <li id="n-mainpage"><?= WikiLink(HOME_PAGE, "",_("Home page")) ?></li> - <li><? $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?= $link ?></li> - <li id="n-recentcomments"><?= WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li> - <li id="n-recentnewpages"><?= WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li> - <li id="n-likepages"><?= Button(array('action'=>'LikePages'),_("Like pages"), $page->getName()) ?></li> - <li id="n-randompage"><?= WikiLink(_("RandomPage"), "",_("Random page")) ?></li> -<li id="n-help"><?= WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li> + <li id="n-mainpage"><?php echo WikiLink(HOME_PAGE, "",_("Home page")) ?></li> + <li><? $link = WikiLink(_("RecentChanges"), "",_("Recent changes")); $link->setAttr("accesskey","r"); $link->addTooltip(_("The list of recent changes in the wiki.")." [$p-r]"); ?><?php echo $link ?></li> + <li id="n-recentcomments"><?php echo WikiLink(_("RecentComments"), "",_("Recent comments")) ?></li> + <li id="n-recentnewpages"><?php echo WikiLink(_("RecentNewPages"), "",_("Recent new pages")) ?></li> + <li id="n-likepages"><?php echo Button(array('action'=>'LikePages'),_("Like pages"), $page->getName()) ?></li> + <li id="n-randompage"><?php echo WikiLink(_("RandomPage"), "",_("Random page")) ?></li> +<li id="n-help"><?php echo WikiLink(_("PhpWikiDocumentation"),"",_("Help")) ?></li> </ul> </div> </div> <div class="portlet" id="p-search"> - <h5><?= _("Search") ?></h5> + <h5><?php echo _("Search") ?></h5> <div class="pBody"> -<?= Template("search", +<?php echo Template("search", array('SEARCH_BEFORE' => WikiLink(_("FindPage"), "",_("Find page")), 'SEARCH_AFTER' => HTML::input(array('id' => 'searchGoButton', 'type'=>'submit', 'value'=>_("Go"))))) ?> -<!-- <form action="<?= WikiURL(_("TitleSearch"))?>" - method="get" accept-charset="<?=$charset?>"> - <?= WikiLink(_("FindPage"), "searchButton",_("Search:")) ?> +<!-- <form action="<?php echo WikiURL(_("TitleSearch"))?>" + method="get" accept-charset="<?php echo $charset?>"> + <?php echo WikiLink(_("FindPage"), "searchButton",_("Search:")) ?> <input type="hidden" name="auto_redirect" value="1" /> <input type="text" name="s" size="12" maxlength="256" - title='<?=_("Quick Search")?>' - onmouseover="window.status='<?=_("Quick Search")?>'; return true;" + title='<?php echo _("Quick Search")?>' + onmouseover="window.status='<?php echo _("Quick Search")?>'; return true;" onmouseout="window.status=''; return true;" /> </form> --> @@ -45,37 +45,37 @@ </div> <div class="portlet" id="p-tb"> - <h5><?= _("Toolbox") ?></h5> + <h5><?php echo _("Toolbox") ?></h5> <div class="pBody"> <ul> <?php if ($revision) { ?> - <li id="t-whatlinkshere"><?= Button(array('action'=>'BackLinks'), _("What links here"), $page->getName()) ?></li> + <li id="t-whatlinkshere"><?php echo Button(array('action'=>'BackLinks'), _("What links here"), $page->getName()) ?></li> <?php } ?> <?php $links = $page->getPageLinks(); if ($links->count() > 1) { ?> - <li id="t-recentchangeslinked"><?= $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li> + <li id="t-recentchangeslinked"><?php echo $WikiTheme->makeLinkButton($revision,_("Related changes"),_("RelatedChanges")) ?></li> <?php } ?> <?php if ($user->isAdmin()) { ?> - <li><?= WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li> + <li><?php echo WikiLink(_("PhpWikiAdministration"), "", _("Administration")) ?></li> <?php } ?> <?php if ($user->isSignedIn()) { ?> - <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?= $link ?></li> + <li><? $link = WikiLink(_("UpLoad"),"",_("Upload file")); $link->setAttr("accesskey","u"); $link->addTooltip(_("Upload images or media files")." [$p-u]"); ?><?php echo $link ?></li> <?php } ?> <li> <?php $PrintableLink = $WikiTheme->makeButton(_("Printable version"), "javascript:PrinterStylesheet();", 'wikiaction'); ?> <script type="text/javascript"><!-- -document.write('<?= $PrintableLink ?>'); // --> +document.write('<?php echo $PrintableLink ?>'); // --> </script> <noscript> - <?= $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?> + <?php echo $WikiTheme->makeButton(_("Printable version"), "?format=printable", 'wikiaction') ?> </noscript> </li> <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { // Do not display the pdf icon $btn = new Button(_("Display as Pdf"), WikiURL($page->getName(), array('action' => 'pdf')), 'wikiaction'); ?> - <li><?= $btn ?></li> + <li><?php echo $btn ?></li> <?php } ?> - <li><?= WikiLink(_("AllPages"), "",_("All pages")) ?></li> + <li><?php echo WikiLink(_("AllPages"), "",_("All pages")) ?></li> </ul> </div> </div> Modified: trunk/themes/MonoBook/templates/signin.tmpl =================================================================== --- trunk/themes/MonoBook/templates/signin.tmpl 2010-06-28 12:33:51 UTC (rev 7588) +++ trunk/themes/MonoBook/templates/signin.tmpl 2010-07-02 07:31:33 UTC (rev 7589) @@ -6,17 +6,17 @@ <div class="portlet" id="p-personal"><div class="pBody"> <ul> <?php if ($user->isAuthenticat... [truncated message content] |