You can subscribe to this list here.
2000 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(43) |
Nov
(73) |
Dec
(10) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2001 |
Jan
(34) |
Feb
(110) |
Mar
(24) |
Apr
(44) |
May
(37) |
Jun
(22) |
Jul
(20) |
Aug
(28) |
Sep
(50) |
Oct
(11) |
Nov
(132) |
Dec
(595) |
2002 |
Jan
(1099) |
Feb
(579) |
Mar
(63) |
Apr
|
May
|
Jun
|
Jul
|
Aug
(125) |
Sep
(101) |
Oct
(25) |
Nov
(34) |
Dec
(47) |
2003 |
Jan
(82) |
Feb
(182) |
Mar
(71) |
Apr
(3) |
May
(1) |
Jun
(3) |
Jul
|
Aug
|
Sep
(14) |
Oct
(6) |
Nov
(124) |
Dec
(68) |
2004 |
Jan
(64) |
Feb
(191) |
Mar
(199) |
Apr
(298) |
May
(252) |
Jun
(426) |
Jul
(134) |
Aug
(13) |
Sep
(96) |
Oct
(75) |
Nov
(232) |
Dec
(171) |
2005 |
Jan
(205) |
Feb
(165) |
Mar
(8) |
Apr
(74) |
May
(21) |
Jun
(19) |
Jul
(37) |
Aug
(69) |
Sep
(141) |
Oct
(118) |
Nov
(31) |
Dec
(7) |
2006 |
Jan
(5) |
Feb
(10) |
Mar
(35) |
Apr
(24) |
May
(34) |
Jun
(29) |
Jul
(5) |
Aug
(38) |
Sep
(30) |
Oct
(37) |
Nov
(30) |
Dec
(86) |
2007 |
Jan
(414) |
Feb
(40) |
Mar
(18) |
Apr
(10) |
May
(66) |
Jun
(60) |
Jul
(105) |
Aug
(55) |
Sep
(64) |
Oct
(7) |
Nov
(11) |
Dec
(5) |
2008 |
Jan
(26) |
Feb
(28) |
Mar
(79) |
Apr
(34) |
May
(61) |
Jun
(24) |
Jul
(29) |
Aug
(160) |
Sep
(62) |
Oct
(70) |
Nov
(32) |
Dec
(14) |
2009 |
Jan
(140) |
Feb
(135) |
Mar
(153) |
Apr
(53) |
May
(24) |
Jun
(138) |
Jul
(90) |
Aug
(46) |
Sep
(72) |
Oct
(84) |
Nov
(32) |
Dec
(4) |
2010 |
Jan
(13) |
Feb
(7) |
Mar
(14) |
Apr
(55) |
May
(89) |
Jun
(131) |
Jul
(41) |
Aug
(38) |
Sep
(42) |
Oct
(11) |
Nov
(27) |
Dec
(54) |
2011 |
Jan
(127) |
Feb
(16) |
Mar
(71) |
Apr
(52) |
May
(32) |
Jun
(31) |
Jul
(4) |
Aug
|
Sep
(45) |
Oct
(26) |
Nov
(36) |
Dec
(10) |
2012 |
Jan
(23) |
Feb
(6) |
Mar
(13) |
Apr
(18) |
May
(1) |
Jun
(4) |
Jul
(3) |
Aug
(12) |
Sep
(57) |
Oct
(96) |
Nov
(163) |
Dec
(124) |
2013 |
Jan
(11) |
Feb
(17) |
Mar
(7) |
Apr
(48) |
May
(15) |
Jun
(29) |
Jul
(12) |
Aug
|
Sep
(9) |
Oct
|
Nov
|
Dec
(3) |
2014 |
Jan
(4) |
Feb
(1) |
Mar
(2) |
Apr
(1) |
May
(8) |
Jun
(90) |
Jul
(104) |
Aug
(12) |
Sep
(81) |
Oct
(139) |
Nov
(111) |
Dec
(64) |
2015 |
Jan
(46) |
Feb
(74) |
Mar
(56) |
Apr
(61) |
May
(3) |
Jun
(7) |
Jul
(11) |
Aug
(5) |
Sep
(15) |
Oct
(1) |
Nov
(1) |
Dec
(15) |
2016 |
Jan
(25) |
Feb
(33) |
Mar
(24) |
Apr
(4) |
May
(24) |
Jun
(3) |
Jul
(75) |
Aug
|
Sep
(2) |
Oct
(38) |
Nov
(4) |
Dec
(18) |
2017 |
Jan
(8) |
Feb
(1) |
Mar
(1) |
Apr
|
May
(14) |
Jun
|
Jul
(5) |
Aug
(9) |
Sep
|
Oct
(23) |
Nov
|
Dec
|
2018 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2019 |
Jan
|
Feb
|
Mar
(9) |
Apr
(60) |
May
(1) |
Jun
|
Jul
(13) |
Aug
|
Sep
(11) |
Oct
|
Nov
|
Dec
|
2020 |
Jan
|
Feb
|
Mar
(15) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(47) |
2021 |
Jan
(24) |
Feb
(33) |
Mar
(1) |
Apr
|
May
(1) |
Jun
(64) |
Jul
(71) |
Aug
(114) |
Sep
(82) |
Oct
(32) |
Nov
(76) |
Dec
(86) |
2022 |
Jan
(162) |
Feb
(41) |
Mar
(11) |
Apr
(9) |
May
|
Jun
|
Jul
(1) |
Aug
(2) |
Sep
|
Oct
|
Nov
|
Dec
(7) |
2023 |
Jan
|
Feb
(1) |
Mar
(2) |
Apr
|
May
|
Jun
|
Jul
(25) |
Aug
|
Sep
|
Oct
|
Nov
(7) |
Dec
|
2024 |
Jan
(7) |
Feb
(3) |
Mar
(3) |
Apr
(1) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
2025 |
Jan
|
Feb
(90) |
Mar
(19) |
Apr
|
May
(6) |
Jun
|
Jul
(1) |
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
From: <var...@us...> - 2010-07-02 08:05:14
|
Revision: 7591 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7591&view=rev Author: vargenau Date: 2010-07-02 08:05:07 +0000 (Fri, 02 Jul 2010) Log Message: ----------- <? --> <?php Modified Paths: -------------- trunk/doc/INSTALL.flatfile trunk/doc/THEMES trunk/themes/MacOSX/images/index.php trunk/themes/MonoBook/templates/actionbar.tmpl trunk/themes/Sidebar/templates/debug.tmpl trunk/themes/Sidebar/templates/search.tmpl trunk/themes/alphatest.php trunk/themes/default/templates/actionbar.tmpl trunk/themes/default/templates/debug.tmpl trunk/themes/default/templates/search.tmpl Modified: trunk/doc/INSTALL.flatfile =================================================================== --- trunk/doc/INSTALL.flatfile 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/doc/INSTALL.flatfile 2010-07-02 08:05:07 UTC (rev 7591) @@ -106,7 +106,7 @@ <title>Make a directory</title> </head> -<? +<?php /* I created this to set up server-writable files Modified: trunk/doc/THEMES =================================================================== --- trunk/doc/THEMES 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/doc/THEMES 2010-07-02 08:05:07 UTC (rev 7591) @@ -32,11 +32,11 @@ Only one template is called, ususally the "html.tmpl" template, which includes all other templates then. -WikiTheme templates are regular xhtml, but the php parts within "<?" and "?>" +WikiTheme templates are regular xhtml, but the php parts within "<?php" and "?>" are treated especially by phpwiki. HTML entities within the php parts should be created by our HtmlElement methods, which create well-formed HTML objects. -Pure HTML entities, e.g. <? echo "<br>" ?> will be escaped to <br>. +Pure HTML entities, e.g. <?php echo "<br>" ?> will be escaped to <br>. You can easily embed other templates by your own, e.g. <?php echo Template('body') ?> Modified: trunk/themes/MacOSX/images/index.php =================================================================== --- trunk/themes/MacOSX/images/index.php 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/MacOSX/images/index.php 2010-07-02 08:05:07 UTC (rev 7591) @@ -12,7 +12,7 @@ function changebg(color) { document.bgColor = backgroundcolor[color]; } //--></script> </head><body bgcolor="#8888aa"> -<? +<?php $dir = opendir("."); while($fileName = readdir($dir)) if (!(strcmp(substr($fileName, -4), ".png"))) Modified: trunk/themes/MonoBook/templates/actionbar.tmpl =================================================================== --- trunk/themes/MonoBook/templates/actionbar.tmpl 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/MonoBook/templates/actionbar.tmpl 2010-07-02 08:05:07 UTC (rev 7591) @@ -53,7 +53,7 @@ <?php } ?> - <? if ( $user->isSignedIn() ) { ?> + <?php if ( $user->isSignedIn() ) { ?> <?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 } ?> Modified: trunk/themes/Sidebar/templates/debug.tmpl =================================================================== --- trunk/themes/Sidebar/templates/debug.tmpl 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/Sidebar/templates/debug.tmpl 2010-07-02 08:05:07 UTC (rev 7591) @@ -16,7 +16,7 @@ </div> </td><td> <span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?> -<? if (substr(PHP_OS,0,3) != 'WIN') { $mem = @getMemoryUsage(); PrintXml(fmt(", Memory: %s", $mem)); } ?> +<?php if (substr(PHP_OS,0,3) != 'WIN') { $mem = @getMemoryUsage(); PrintXml(fmt(", Memory: %s", $mem)); } ?> </span> </td></tr></table> <br class="clear-floats" /> Modified: trunk/themes/Sidebar/templates/search.tmpl =================================================================== --- trunk/themes/Sidebar/templates/search.tmpl 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/Sidebar/templates/search.tmpl 2010-07-02 08:05:07 UTC (rev 7591) @@ -1,7 +1,7 @@ <?php // -*-php-*- // rcs_id('$Id$'); ?> -<!--{{{ LiveSearch --> <? // -*- php -*- ?> +<!--{{{ LiveSearch --> <?php // -*- php -*- ?> <div id="searchholder"> <form id="searchform" action="<?php echo WikiURL(_("FindPage"))?>" method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform"> Modified: trunk/themes/alphatest.php =================================================================== --- trunk/themes/alphatest.php 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/alphatest.php 2010-07-02 08:05:07 UTC (rev 7591) @@ -20,7 +20,7 @@ ' <a href="#" onmouseover="javascript:changebg(' + n + ')">' + backgroundcolor[n] + '</a>' ); } //--></script> -<? +<?php function find_pngs($dir) { $file_list = ''; Modified: trunk/themes/default/templates/actionbar.tmpl =================================================================== --- trunk/themes/default/templates/actionbar.tmpl 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/default/templates/actionbar.tmpl 2010-07-02 08:05:07 UTC (rev 7591) @@ -14,7 +14,7 @@ <div id="actionbuttons"> <?php if ((!$page->get('locked') || $user->isAdmin()) and $revision) { ?> <?php echo Button("edit", $revision->isCurrent() ? _("Edit") : _("Edit Old Revision"), false, array('id'=>'btn-edit')) ?> - <? if (ENABLE_WYSIWYG) { ?> + <?php if (ENABLE_WYSIWYG) { ?> <?php echo $SEP?><?php echo Button(array("action" => "edit", "mode"=> "wysiwyg"), "Wysiwyg Editor", false, array('id' => 'btn-wysiwyg-edit')) ?> <?php } ?> <?php } else { ?> Modified: trunk/themes/default/templates/debug.tmpl =================================================================== --- trunk/themes/default/templates/debug.tmpl 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/default/templates/debug.tmpl 2010-07-02 08:05:07 UTC (rev 7591) @@ -16,9 +16,9 @@ </div> </td><td> <span class="debug"><?php echo fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?> -<? $mem = @getMemoryUsage(); if ($mem) { ?> +<?php $mem = @getMemoryUsage(); if ($mem) { ?> <?php echo fmt(", Memory: %s", $mem) ?> -<? } ?> +<?php } ?> </span> </td></tr></table> <br class="clear-floats" /> Modified: trunk/themes/default/templates/search.tmpl =================================================================== --- trunk/themes/default/templates/search.tmpl 2010-07-02 07:53:09 UTC (rev 7590) +++ trunk/themes/default/templates/search.tmpl 2010-07-02 08:05:07 UTC (rev 7591) @@ -1,4 +1,4 @@ -<!--{{{ LiveSearch --> <? // -*- php -*- ?> +<!--{{{ LiveSearch --> <?php // -*- php -*- ?> <div id="searchholder"> <form id="searchform" action="<?php echo WikiURL(_("TitleSearch"))?>" method="get" accept-charset="<?php echo $charset?>" style="display:inline" class="searchform"> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-07-02 07:53:15
|
Revision: 7590 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7590&view=rev Author: vargenau Date: 2010-07-02 07:53:09 +0000 (Fri, 02 Jul 2010) Log Message: ----------- public static Modified Paths: -------------- trunk/lib/HtmlElement5.php Modified: trunk/lib/HtmlElement5.php =================================================================== --- trunk/lib/HtmlElement5.php 2010-07-02 07:31:33 UTC (rev 7589) +++ trunk/lib/HtmlElement5.php 2010-07-02 07:53:09 UTC (rev 7590) @@ -132,7 +132,7 @@ return isset($props[$tag]) ? $props[$tag] : 0; } - function _setTagProperty($prop_flag, $tags) { + public static function _setTagProperty($prop_flag, $tags) { $props = &$GLOBALS['HTML_TagProperties']; if (is_string($tags)) $tags = preg_split('/\s+/', $tags); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
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] |
From: <var...@us...> - 2010-06-28 12:33:58
|
Revision: 7588 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7588&view=rev Author: vargenau Date: 2010-06-28 12:33:51 +0000 (Mon, 28 Jun 2010) Log Message: ----------- No border for <img> Modified Paths: -------------- trunk/lib/PageList.php trunk/lib/WikiPluginCached.php trunk/lib/WikiTheme.php trunk/lib/plugin/DynamicIncludePage.php trunk/lib/plugin/PhotoAlbum.php trunk/lib/plugin/RecentChanges.php trunk/lib/plugin/WhoIsOnline.php Modified: trunk/lib/PageList.php =================================================================== --- trunk/lib/PageList.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/PageList.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -148,7 +148,6 @@ $noimg_src = $WikiTheme->getButtonURL('no_order'); if ($noimg_src) $noimg = HTML::img(array('src' => $noimg_src, - 'border' => 0, 'alt' => '.')); else $noimg = $nbsp; @@ -167,7 +166,6 @@ $img->setAttr('alt', "."); } else { $img = HTML::img(array('src' => $src, - 'border' => 0, 'alt' => _("Click to reverse sort order"))); } $s = HTML::a(array('href' => Modified: trunk/lib/WikiPluginCached.php =================================================================== --- trunk/lib/WikiPluginCached.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/WikiPluginCached.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -417,7 +417,6 @@ return HTML(HTML::map(array( 'name' => $key ), $map ), HTML::img( array( 'src' => $url, - 'border' => 0, // 'alt' => htmlspecialchars($this->getAlt($dbi,$argarray,$request)) 'usemap' => '#'.$key )) ); @@ -442,7 +441,6 @@ function embedImg($url, $dbi, $argarray, $request) { return HTML::img( array( 'src' => $url, - 'border' => 0, 'alt' => htmlspecialchars($this->getAlt($dbi, $argarray, $request)) ) ); } Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/WikiTheme.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -1715,7 +1715,6 @@ $img_attr['src'] = $img_url; $img_attr['alt'] = $text; $img_attr['class'] = 'wiki-button'; - $img_attr['border'] = 0; $this->pushContent(HTML::img($img_attr)); } }; Modified: trunk/lib/plugin/DynamicIncludePage.php =================================================================== --- trunk/lib/plugin/DynamicIncludePage.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/DynamicIncludePage.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -74,7 +74,6 @@ 'onclick' => ENABLE_AJAX ? "showHideAsync('".$ajaxuri."','$id')" : "showHideFolder('$id')", - 'border' => 0, 'alt' => _("Click to hide/show"), 'title' => _("Click to hide/show"))); $header = HTML::p(array('class' => 'transclusion-title', Modified: trunk/lib/plugin/PhotoAlbum.php =================================================================== --- trunk/lib/plugin/PhotoAlbum.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/PhotoAlbum.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -251,7 +251,6 @@ // $params will be used for each <img > tag $params = array('src' => $value["name"], 'src_tile' => $value["name_tile"], - 'border' => "0", 'alt' => ($value["desc"] != "" and in_array("alt", $attributes)) ? $value["desc"] : basename($value["name"])); Modified: trunk/lib/plugin/RecentChanges.php =================================================================== --- trunk/lib/plugin/RecentChanges.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/RecentChanges.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -605,7 +605,6 @@ //logo click opens the HomePage in the main browser frame global $WikiTheme; $img = HTML::img(array('src' => $WikiTheme->getImageURL('logo'), - 'border' => 0, 'align' => 'right', 'style' => 'height:2.5ex' )); Modified: trunk/lib/plugin/WhoIsOnline.php =================================================================== --- trunk/lib/plugin/WhoIsOnline.php 2010-06-28 12:32:23 UTC (rev 7587) +++ trunk/lib/plugin/WhoIsOnline.php 2010-06-28 12:33:51 UTC (rev 7588) @@ -60,9 +60,7 @@ // todo: check which arguments are really needed in the template. $stats = $this->getStats($dbi,$request,$args['mode']); if ($src = $WikiTheme->getImageURL("whosonline")) - $img = HTML::img(array('src' => $src, - 'alt' => $this->getName(), - 'border' => 0)); + $img = HTML::img(array('src' => $src, 'alt' => $this->getName())); else $img = ''; $other = array(); $other['ONLINE_ICON'] = $img; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-28 12:32:30
|
Revision: 7587 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7587&view=rev Author: vargenau Date: 2010-06-28 12:32:23 +0000 (Mon, 28 Jun 2010) Log Message: ----------- name => id Modified Paths: -------------- trunk/lib/plugin/PageHistory.php Modified: trunk/lib/plugin/PageHistory.php =================================================================== --- trunk/lib/plugin/PageHistory.php 2010-06-28 08:29:08 UTC (rev 7586) +++ trunk/lib/plugin/PageHistory.php 2010-06-28 12:32:23 UTC (rev 7587) @@ -141,7 +141,7 @@ return HTML(HTML::form(array('method' => 'get', 'action' => $action, - 'name' => 'diff-select'), + 'id' => 'diff-select'), $html), "\n", JavaScript(' This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-28 08:29:14
|
Revision: 7586 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7586&view=rev Author: vargenau Date: 2010-06-28 08:29:08 +0000 (Mon, 28 Jun 2010) Log Message: ----------- Use CSS instaed if <br /> Modified Paths: -------------- trunk/themes/gforge/templates/userprefs.tmpl Modified: trunk/themes/gforge/templates/userprefs.tmpl =================================================================== --- trunk/themes/gforge/templates/userprefs.tmpl 2010-06-27 17:37:47 UTC (rev 7585) +++ trunk/themes/gforge/templates/userprefs.tmpl 2010-06-28 08:29:08 UTC (rev 7586) @@ -187,7 +187,7 @@ <form action="<?=$request->getPostURL()?>" method="post"> <?php } ?> -<fieldset> +<fieldset style="margin-bottom: 1em;"> <legend><strong>User preferences for this project</strong></legend> <table border="0" width="100%"> @@ -207,8 +207,8 @@ </table> </fieldset> -<br /> -<fieldset> + +<fieldset style="margin-bottom: 1em;"> <legend><strong>Global user preferences (for all projects)</strong></legend> <table border="0" width="100%"> @@ -363,11 +363,11 @@ </fieldset> <?php if ($isForm) { ?> - <br /> - <p><?=Button("submit:", _("Update Preferences"), 'wikiadmin')?> +<p> + <?=Button("submit:", _("Update Preferences"), 'wikiadmin')?> <?=Button("submit:delete", _("Reset Preferences"), 'wikiadmin')?> - <?=Button("submit:cancel", _("Cancel"), 'button')?></p> - -<?= HiddenInputs($request->getArgs(), false, array('pref')) ?> + <?=Button("submit:cancel", _("Cancel"), 'button')?> + <?= HiddenInputs($request->getArgs(), false, array('pref')) ?> +</p> </form> <?php } ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-27 17:37:53
|
Revision: 7585 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7585&view=rev Author: vargenau Date: 2010-06-27 17:37:47 +0000 (Sun, 27 Jun 2010) Log Message: ----------- No noshade for <hr> Modified Paths: -------------- trunk/themes/default/templates/blogform.tmpl trunk/themes/default/templates/browse-footer.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/default/templates/login.tmpl trunk/themes/default/templates/savepage.tmpl Modified: trunk/themes/default/templates/blogform.tmpl =================================================================== --- trunk/themes/default/templates/blogform.tmpl 2010-06-27 17:32:09 UTC (rev 7584) +++ trunk/themes/default/templates/blogform.tmpl 2010-06-27 17:37:47 UTC (rev 7585) @@ -19,7 +19,7 @@ name="edit[save]" class="wikiaction" /> </div> -<hr noshade="noshade" /> +<hr /> <div id="newMarkup" class="wiki-edithelp"> <p><?= fmt("See %s tips for editing.", WikiLink(_("Help/GoodStyle"))) ?></p> <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> Modified: trunk/themes/default/templates/browse-footer.tmpl =================================================================== --- trunk/themes/default/templates/browse-footer.tmpl 2010-06-27 17:32:09 UTC (rev 7584) +++ trunk/themes/default/templates/browse-footer.tmpl 2010-06-27 17:37:47 UTC (rev 7585) @@ -1,13 +1,13 @@ <?php // -*-php-*- // rcs_id('$Id$'); ?> -<hr class="printer" noshade="noshade" /> +<hr class="printer" /> <p class="editdate"><?= $WikiTheme->getOwnerMessage($page) ?> <?= $WikiTheme->getLastModifiedMessage($revision) ?> <?= $WikiTheme->getAuthorMessage($revision) ?></p> <?php global $HIDE_TOOLBARS; if (!$HIDE_TOOLBARS) { ?> -<hr class="toolbar" noshade="noshade" /> +<hr class="toolbar" /> <div class="toolbar"> <?= Template('actionbar') ?> </div> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2010-06-27 17:32:09 UTC (rev 7584) +++ trunk/themes/default/templates/editpage.tmpl 2010-06-27 17:37:47 UTC (rev 7585) @@ -9,9 +9,9 @@ <?= 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" /> + <hr class="printer" /> <?= $PREVIEW_CONTENT ?> - <hr class="printer" noshade="noshade" /> + <hr class="printer" /> <?php } ?> <?= $PAGE_LOCKED_MESSAGE ?> @@ -94,7 +94,7 @@ </form> <div style="width:100%;text-align:center;"><?php /*plugin UpLoad autolink=0 mode=edit size=30 */?></div> -<hr noshade="noshade" /> +<hr /> <script type="text/javascript"> <!-- Modified: trunk/themes/default/templates/login.tmpl =================================================================== --- trunk/themes/default/templates/login.tmpl 2010-06-27 17:32:09 UTC (rev 7584) +++ trunk/themes/default/templates/login.tmpl 2010-06-27 17:37:47 UTC (rev 7585) @@ -3,7 +3,7 @@ ?> <?php if ($fail_message) { ?> <p><strong><?=$fail_message?></strong></p> - <hr noshade="noshade" /> + <hr /> <?php } ?> <br class="clear-floats" /> Modified: trunk/themes/default/templates/savepage.tmpl =================================================================== --- trunk/themes/default/templates/savepage.tmpl 2010-06-27 17:32:09 UTC (rev 7584) +++ trunk/themes/default/templates/savepage.tmpl 2010-06-27 17:37:47 UTC (rev 7585) @@ -19,5 +19,5 @@ <p><?=$LOCK_CHANGED_MSG?></p> <?php } ?> -<hr noshade="noshade" /> +<hr /> <?= Template('browse') ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-27 17:32:15
|
Revision: 7584 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7584&view=rev Author: vargenau Date: 2010-06-27 17:32:09 +0000 (Sun, 27 Jun 2010) Log Message: ----------- No border and align for img Modified Paths: -------------- trunk/themes/default/templates/top.tmpl Modified: trunk/themes/default/templates/top.tmpl =================================================================== --- trunk/themes/default/templates/top.tmpl 2010-06-27 17:17:30 UTC (rev 7583) +++ trunk/themes/default/templates/top.tmpl 2010-06-27 17:32:09 UTC (rev 7584) @@ -8,7 +8,7 @@ <div id="logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" ><img src="<?=$WikiTheme->getImageURL('logo')?>" id="logo-img" - border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="right" /></a></div> + alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div> <!-- The top navigation/search bar --> <div class="toolbar"> <?= Template('navbar') ?> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-27 17:17:37
|
Revision: 7583 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7583&view=rev Author: vargenau Date: 2010-06-27 17:17:30 +0000 (Sun, 27 Jun 2010) Log Message: ----------- Use CSS to underline Modified Paths: -------------- trunk/lib/WikiTheme.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-26 22:09:45 UTC (rev 7582) +++ trunk/lib/WikiTheme.php 2010-06-27 17:17:30 UTC (rev 7583) @@ -624,7 +624,8 @@ } if ($this->DUMP_MODE) { // HTML, PDF or XML - $link = HTML::u( empty($linktext) ? $wikiword : $linktext); + $link = HTML::span( empty($linktext) ? $wikiword : $linktext); + $link->setAttr('style', 'text-decoration: underline'); $link->addTooltip(sprintf(_("Empty link to: %s"), $wikiword)); $link->setAttr('class', empty($linktext) ? 'wikiunknown' : 'named-wikiunknown'); return $link; @@ -646,11 +647,13 @@ $link = HTML::span(); if (!empty($linktext)) { - $link->pushContent(HTML::u($linktext)); + $link->pushContent(HTML::span($linktext)); + $link->setAttr('style', 'text-decoration: underline'); $link->setAttr('class', 'named-wikiunknown'); } else { - $link->pushContent(HTML::u($this->maybeSplitWikiWord($default_text))); + $link->pushContent(HTML::span($this->maybeSplitWikiWord($default_text))); + $link->setAttr('style', 'text-decoration: underline'); $link->setAttr('class', 'wikiunknown'); } if (!isa($button, "ImageButton")) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-26 22:09:51
|
Revision: 7582 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7582&view=rev Author: rurban Date: 2010-06-26 22:09:45 +0000 (Sat, 26 Jun 2010) Log Message: ----------- Revert r7575 "No target _top" There are target _tops in custom themes, esp. in frame'd wiki's. Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/lib/display.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-26 19:47:57 UTC (rev 7581) +++ trunk/lib/WikiTheme.php 2010-06-26 22:09:45 UTC (rev 7582) @@ -606,6 +606,8 @@ $link->pushContent($this->maybeSplitWikiWord($default_text)); $link->setAttr('class', 'wiki'); } + if ($request->getArg('frame')) + $link->setAttr('target', '_top'); return $link; } @@ -660,6 +662,8 @@ $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword)); $link->pushContent($gbutton); } + if ($request->getArg('frame')) + $link->setAttr('target', '_top'); return $link; } @@ -1666,6 +1670,8 @@ } if ($class) $this->setAttr('class', $class); + if ($request->getArg('frame')) + $this->setAttr('target', '_top'); if (!empty($options) and is_array($options)) { foreach ($options as $key => $val) $this->setAttr($key, $val); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2010-06-26 19:47:57 UTC (rev 7581) +++ trunk/lib/display.php 2010-06-26 22:09:45 UTC (rev 7582) @@ -266,6 +266,8 @@ 'class' => 'backlinks'), $WikiTheme->maybeSplitWikiWord($pagename)); $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename)); + if ($request->getArg('frame')) + $pageheader->setAttr('target', '_top'); } $pagetitle = SplitPagename($pagename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 19:48:03
|
Revision: 7581 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7581&view=rev Author: vargenau Date: 2010-06-26 19:47:57 +0000 (Sat, 26 Jun 2010) Log Message: ----------- No align Modified Paths: -------------- trunk/themes/Sidebar/templates/logo.tmpl Modified: trunk/themes/Sidebar/templates/logo.tmpl =================================================================== --- trunk/themes/Sidebar/templates/logo.tmpl 2010-06-26 18:20:01 UTC (rev 7580) +++ trunk/themes/Sidebar/templates/logo.tmpl 2010-06-26 19:47:57 UTC (rev 7581) @@ -2,4 +2,4 @@ // rcs_id('$Id$'); ?> <div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" title="Visit the Home Page [<?= $WikiTheme->tooltipAccessKeyPrefix() ?>-z]" accesskey="z"><span class="logo"><?= WIKI_NAME ?></span></a></div> -<img id="img-logo-right" src="<?= $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" align="right" height="86" width="86" /> +<img id="img-logo-right" src="<?= $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" height="86" width="86" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 18:20:07
|
Revision: 7580 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7580&view=rev Author: vargenau Date: 2010-06-26 18:20:01 +0000 (Sat, 26 Jun 2010) Log Message: ----------- No target _top Modified Paths: -------------- trunk/themes/Wordpress/themeinfo.php trunk/themes/default/templates/debug.tmpl trunk/themes/default/templates/top.tmpl Modified: trunk/themes/Wordpress/themeinfo.php =================================================================== --- trunk/themes/Wordpress/themeinfo.php 2010-06-26 18:15:25 UTC (rev 7579) +++ trunk/themes/Wordpress/themeinfo.php 2010-06-26 18:20:01 UTC (rev 7580) @@ -39,9 +39,7 @@ $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($default_text))); $link->setAttr('class', 'wikiunknown'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); - + return $link; } function getRecentChangesFormatter ($format) { Modified: trunk/themes/default/templates/debug.tmpl =================================================================== --- trunk/themes/default/templates/debug.tmpl 2010-06-26 18:15:25 UTC (rev 7579) +++ trunk/themes/default/templates/debug.tmpl 2010-06-26 18:20:01 UTC (rev 7580) @@ -5,12 +5,12 @@ <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?> -<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer" target="_top"><img - id="xhtml" border="0" +<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img + id="xhtml" src="<?=$WikiTheme->_findData('buttons/valid-xhtml10.png')?>" alt="Valid XHTML 1.0!" height="31" width="88" /></a> -<a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top"><img - id="css" border="0" +<a href="http://jigsaw.w3.org/css-validator/check/referer"><img + id="css" src="<?=$WikiTheme->_findData('buttons/vcss.png')?>" alt="Valid CSS!" height="31" width="88" /></a> </div> Modified: trunk/themes/default/templates/top.tmpl =================================================================== --- trunk/themes/default/templates/top.tmpl 2010-06-26 18:15:25 UTC (rev 7579) +++ trunk/themes/default/templates/top.tmpl 2010-06-26 18:20:01 UTC (rev 7580) @@ -6,7 +6,7 @@ ?> <!-- The logo --> <div id="logo"><a class="wikilink" - href="<?=WikiURL(HOME_PAGE)?>" target="_top" + href="<?=WikiURL(HOME_PAGE)?>" ><img src="<?=$WikiTheme->getImageURL('logo')?>" id="logo-img" border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="right" /></a></div> <!-- The top navigation/search bar --> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 18:15:32
|
Revision: 7579 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7579&view=rev Author: vargenau Date: 2010-06-26 18:15:25 +0000 (Sat, 26 Jun 2010) Log Message: ----------- No target _top Modified Paths: -------------- trunk/themes/Crao/templates/navbar.tmpl trunk/themes/MacOSX/themeinfo.php trunk/themes/MonoBook/templates/logo.tmpl trunk/themes/Portland/templates/debug.tmpl trunk/themes/Portland/themeinfo.php trunk/themes/Sidebar/templates/debug.tmpl trunk/themes/Sidebar/templates/logo.tmpl trunk/themes/blog/templates/debug.tmpl trunk/themes/blog/themeinfo.php trunk/themes/shamino_com/templates/debug.tmpl trunk/themes/shamino_com/templates/top.tmpl trunk/themes/wikilens/templates/top.tmpl Modified: trunk/themes/Crao/templates/navbar.tmpl =================================================================== --- trunk/themes/Crao/templates/navbar.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/Crao/templates/navbar.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -2,8 +2,8 @@ // rcs_id('$Id$'); ?> <!-- The top navigation/search bar --> -<form action="<?= WikiURL(_("TitleSearch"))?>" target="_top" - method="get" accept-charset="<?=$charset?>" id="searchform" name="searchform"> +<form action="<?= WikiURL(_("TitleSearch"))?>" + method="get" accept-charset="<?=$charset?>" id="searchform"> <input type="hidden" name="auto_redirect" value="1" /> <?php if (! USE_PATH_INFO) { ?> <input type="hidden" name="pagename" value="<?=_("TitleSearch")?>" /> Modified: trunk/themes/MacOSX/themeinfo.php =================================================================== --- trunk/themes/MacOSX/themeinfo.php 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/MacOSX/themeinfo.php 2010-06-26 18:15:25 UTC (rev 7579) @@ -87,8 +87,6 @@ $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($default_text))); $link->setAttr('class', 'wikiunknown'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } Modified: trunk/themes/MonoBook/templates/logo.tmpl =================================================================== --- trunk/themes/MonoBook/templates/logo.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/MonoBook/templates/logo.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -1,6 +1,6 @@ <?php // -*-php-*- // rcs_id('$Id$'); ?> -<div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" target="_top"><img src="<?= $WikiTheme->getImageURL('logo') ?>" id="logo-img" border="0" alt="<?= +<div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>"><img src="<?= $WikiTheme->getImageURL('logo') ?>" id="logo-img" alt="<?= fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" /></a></div> <div id="img-logo-right" /> Modified: trunk/themes/Portland/templates/debug.tmpl =================================================================== --- trunk/themes/Portland/templates/debug.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/Portland/templates/debug.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -4,8 +4,8 @@ <?php global $RUNTIMER; ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> -<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer" target="_top">Valid XHTML 1.0</a> -<a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">Valid CSS</a> +<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a> +<a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a> </div> </td><td> <span class="debug"><?=fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?></span> Modified: trunk/themes/Portland/themeinfo.php =================================================================== --- trunk/themes/Portland/themeinfo.php 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/Portland/themeinfo.php 2010-06-26 18:15:25 UTC (rev 7579) @@ -37,8 +37,6 @@ $link->unshiftContent(HTML::u($this->maybeSplitWikiWord($default_text))); $link->setAttr('class', 'wikiunknown'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } Modified: trunk/themes/Sidebar/templates/debug.tmpl =================================================================== --- trunk/themes/Sidebar/templates/debug.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/Sidebar/templates/debug.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -5,12 +5,12 @@ <table width="%100" border="0" cellpadding="0" cellspacing="0"> <tr><td> <?php /* Note: The Portland theme's debug.tmpl overrides this file with it's own non-graphical variant. */ ?> -<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer" target="_top"><img - id="xhtml" border="0" +<div id="xhtml-validator"><a href="http://validator.w3.org/check/referer"><img + id="xhtml" src="<?=$WikiTheme->_findData('buttons/valid-xhtml10.png')?>" alt="Valid XHTML 1.0!" height="31" width="88" /></a> -<a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top"><img - id="css" border="0" +<a href="http://jigsaw.w3.org/css-validator/check/referer"><img + id="css" src="<?=$WikiTheme->_findData('buttons/vcss.png')?>" alt="Valid CSS!" height="31" width="88" /></a> </div> Modified: trunk/themes/Sidebar/templates/logo.tmpl =================================================================== --- trunk/themes/Sidebar/templates/logo.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/Sidebar/templates/logo.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -1,5 +1,5 @@ <?php // -*-php-*- // rcs_id('$Id$'); ?> -<div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" target="_top" title="Visit the Home Page [<?= $WikiTheme->tooltipAccessKeyPrefix() ?>-z]" accesskey="z"><span class="logo"><?= WIKI_NAME ?></span></a></div> -<img id="img-logo-right" src="<?= $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" align="right" height="86" width="86" border="0" /> +<div class="portlet" id="p-logo"><a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" title="Visit the Home Page [<?= $WikiTheme->tooltipAccessKeyPrefix() ?>-z]" accesskey="z"><span class="logo"><?= WIKI_NAME ?></span></a></div> +<img id="img-logo-right" src="<?= $WikiTheme->_findData('images/wiki_stamp.png')?>" alt="This is a WIKI! Edit every page" align="right" height="86" width="86" /> Modified: trunk/themes/blog/templates/debug.tmpl =================================================================== --- trunk/themes/blog/templates/debug.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/blog/templates/debug.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -2,6 +2,6 @@ // rcs_id('$Id$'); ?> <?php global $RUNTIMER; ?> -<p align="center" id="xhtml-validator"><a href="http://validator.w3.org/check/referer" target="_top">Valid XHTML 1.0</a> <a href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">Valid CSS!</a> +<p align="center" id="xhtml-validator"><a href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a> <a href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS!</a> <span class="debug"><?=fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?></span> </p> Modified: trunk/themes/blog/themeinfo.php =================================================================== --- trunk/themes/blog/themeinfo.php 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/blog/themeinfo.php 2010-06-26 18:15:25 UTC (rev 7579) @@ -115,8 +115,6 @@ $link->pushContent($this->maybeSplitWikiWord($default_text)); $link->setAttr('class', 'wiki'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } Modified: trunk/themes/shamino_com/templates/debug.tmpl =================================================================== --- trunk/themes/shamino_com/templates/debug.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/shamino_com/templates/debug.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -4,7 +4,7 @@ <!-- shamino.com debug --> <div class="debug"> <?php global $RUNTIMER; ?> -<span id="xhtml-validator"><a class="wikilink" href="http://validator.w3.org/check/referer" target="_top">Valid XHTML 1.0</a> <a class="wikilink" href="http://jigsaw.w3.org/css-validator/check/referer" target="_top">Valid CSS</a> +<span id="xhtml-validator"><a class="wikilink" href="http://validator.w3.org/check/referer">Valid XHTML 1.0</a> <a class="wikilink" href="http://jigsaw.w3.org/css-validator/check/referer">Valid CSS</a> </span> <span><?=fmt("Page Execution took %s seconds", $RUNTIMER->getStats()) ?> <?php $mem = @getMemoryUsage(); if ($mem) { ?> Modified: trunk/themes/shamino_com/templates/top.tmpl =================================================================== --- trunk/themes/shamino_com/templates/top.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/shamino_com/templates/top.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -3,13 +3,13 @@ ?> <!-- The logo --> <div id="logo"><a class="wikilink" - href="<?=WikiURL(HOME_PAGE)?>" target="_top" + href="<?=WikiURL(HOME_PAGE)?>" ><img src="<?=$WikiTheme->getImageURL('logo')?>" id="logo-img" border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="right" /></a></div> <!-- The top navigation/search bar --> <div class="wikinavbar"> -<a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>" target="_top"> +<a class="wikilink" href="<?=WikiURL(HOME_PAGE)?>"> <?= WIKI_NAME ?></a> - <!-- Wiki description here --> <!-- Page title --> Modified: trunk/themes/wikilens/templates/top.tmpl =================================================================== --- trunk/themes/wikilens/templates/top.tmpl 2010-06-26 15:00:16 UTC (rev 7578) +++ trunk/themes/wikilens/templates/top.tmpl 2010-06-26 18:15:25 UTC (rev 7579) @@ -6,7 +6,7 @@ <div id="logo" style="height: 51px; background-image: url(<?=$WikiTheme->getImageURL('splice')?>); background-repeat: repeat-x;" ><a class="wikilink" - href="<?=WikiURL(HOME_PAGE)?>" target="_top" + href="<?=WikiURL(HOME_PAGE)?>" ><img src="<?=$WikiTheme->getImageURL('logo')?>" id="logo-img" border="0" alt="<?=fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>" align="right" /></a> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 15:00:22
|
Revision: 7578 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7578&view=rev Author: vargenau Date: 2010-06-26 15:00:16 +0000 (Sat, 26 Jun 2010) Log Message: ----------- id is enough Modified Paths: -------------- trunk/themes/Sidebar/templates/search.tmpl trunk/themes/default/templates/search.tmpl Modified: trunk/themes/Sidebar/templates/search.tmpl =================================================================== --- trunk/themes/Sidebar/templates/search.tmpl 2010-06-26 14:55:07 UTC (rev 7577) +++ trunk/themes/Sidebar/templates/search.tmpl 2010-06-26 15:00:16 UTC (rev 7578) @@ -3,7 +3,7 @@ ?> <!--{{{ LiveSearch --> <? // -*- php -*- ?> <div id="searchholder"> -<form id="searchform" name="searchform" action="<?= WikiURL(_("FindPage"))?>" +<form id="searchform" action="<?= WikiURL(_("FindPage"))?>" method="get" accept-charset="<?=$charset?>" style="display:inline" class="searchform"> <?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); Modified: trunk/themes/default/templates/search.tmpl =================================================================== --- trunk/themes/default/templates/search.tmpl 2010-06-26 14:55:07 UTC (rev 7577) +++ trunk/themes/default/templates/search.tmpl 2010-06-26 15:00:16 UTC (rev 7578) @@ -1,6 +1,6 @@ <!--{{{ LiveSearch --> <? // -*- php -*- ?> <div id="searchholder"> -<form id="searchform" name="searchform" action="<?= WikiURL(_("TitleSearch"))?>" +<form id="searchform" action="<?= WikiURL(_("TitleSearch"))?>" method="get" accept-charset="<?=$charset?>" style="display:inline" class="searchform"> <?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 14:55:13
|
Revision: 7577 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7577&view=rev Author: vargenau Date: 2010-06-26 14:55:07 +0000 (Sat, 26 Jun 2010) Log Message: ----------- name --> id Modified Paths: -------------- trunk/lib/plugin/RateIt.php Modified: trunk/lib/plugin/RateIt.php =================================================================== --- trunk/lib/plugin/RateIt.php 2010-06-26 14:54:14 UTC (rev 7576) +++ trunk/lib/plugin/RateIt.php 2010-06-26 14:55:07 UTC (rev 7577) @@ -372,9 +372,8 @@ $img_attr['onmouseout'] = "displayRating('$reImgId','$reImgPrefix',0,0,1)"; } //$imgName = 'RateIt'.$reImgId.$i; - $img_attr['name'] = $imgId . $i; - $img_attr['alt'] = $img_attr['name']; - $img_attr['border'] = 0; + $img_attr['id'] = $imgId . $i; + $img_attr['alt'] = $img_attr['id']; $a1->pushContent(HTML::img($img_attr)); //$a1->addToolTip(_("Rate the topic of this page")); $html->pushContent($a1); @@ -388,8 +387,7 @@ ."'$reImgId','$dimension','X')")); $msg = _("Cancel your rating"); $imgprops = array('src' => $WikiTheme->getImageUrl("RateIt".$imgPrefix."Cancel"), - 'name' => $imgId.$imgPrefix.'Cancel', - 'border'=> 0, + 'id' => $imgId.$imgPrefix.'Cancel', 'alt' => $msg, 'title' => $msg); if (!$this->rating) @@ -401,16 +399,15 @@ /*} elseif ($pred) { $msg = _("No opinion"); $html->pushContent(HTML::img(array('src' => $WikiTheme->getImageUrl("RateItCancelN"), - 'name'=> $imgPrefix.'Cancel', + 'id' => $imgPrefix.'Cancel', 'alt' => $msg))); //$a0->addToolTip($msg); //$html->pushContent($a0); }*/ $img_attr = array(); $img_attr['src'] = $WikiTheme->_findData("images/spacer.png"); - $img_attr['name'] = $actionImgName; - $img_attr['alt'] = $img_attr['name']; - $img_attr['border'] = 0; + $img_attr['id'] = $actionImgName; + $img_attr['alt'] = $img_attr['id']; $img_attr['height'] = 15; $img_attr['width'] = 20; $html->pushContent(HTML::img($img_attr)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 14:54:20
|
Revision: 7576 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7576&view=rev Author: vargenau Date: 2010-06-26 14:54:14 +0000 (Sat, 26 Jun 2010) Log Message: ----------- No border Modified Paths: -------------- trunk/lib/stdlib.php Modified: trunk/lib/stdlib.php =================================================================== --- trunk/lib/stdlib.php 2010-06-26 14:53:21 UTC (rev 7575) +++ trunk/lib/stdlib.php 2010-06-26 14:54:14 UTC (rev 7576) @@ -298,7 +298,7 @@ list ($proto) = explode(':', $protocol_or_url, 2); $src = $WikiTheme->getLinkIconURL($proto); if ($src) - return HTML::img(array('src' => $src, 'alt' => "", 'class' => 'linkicon', 'border' => 0)); + return HTML::img(array('src' => $src, 'alt' => "", 'class' => 'linkicon')); else return false; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 14:53:27
|
Revision: 7575 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7575&view=rev Author: vargenau Date: 2010-06-26 14:53:21 +0000 (Sat, 26 Jun 2010) Log Message: ----------- No target _top Modified Paths: -------------- trunk/lib/WikiTheme.php trunk/lib/display.php Modified: trunk/lib/WikiTheme.php =================================================================== --- trunk/lib/WikiTheme.php 2010-06-26 14:51:42 UTC (rev 7574) +++ trunk/lib/WikiTheme.php 2010-06-26 14:53:21 UTC (rev 7575) @@ -606,8 +606,6 @@ $link->pushContent($this->maybeSplitWikiWord($default_text)); $link->setAttr('class', 'wiki'); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } @@ -662,8 +660,6 @@ $gbutton->addTooltip(sprintf(_("Google:%s"), $wikiword)); $link->pushContent($gbutton); } - if ($request->getArg('frame')) - $link->setAttr('target', '_top'); return $link; } @@ -1670,8 +1666,6 @@ } if ($class) $this->setAttr('class', $class); - if ($request->getArg('frame')) - $this->setAttr('target', '_top'); if (!empty($options) and is_array($options)) { foreach ($options as $key => $val) $this->setAttr($key, $val); Modified: trunk/lib/display.php =================================================================== --- trunk/lib/display.php 2010-06-26 14:51:42 UTC (rev 7574) +++ trunk/lib/display.php 2010-06-26 14:53:21 UTC (rev 7575) @@ -266,8 +266,6 @@ 'class' => 'backlinks'), $WikiTheme->maybeSplitWikiWord($pagename)); $pageheader->addTooltip(sprintf(_("BackLinks for %s"), $pagename)); - if ($request->getArg('frame')) - $pageheader->setAttr('target', '_top'); } $pagetitle = SplitPagename($pagename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-26 14:51:48
|
Revision: 7574 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7574&view=rev Author: vargenau Date: 2010-06-26 14:51:42 +0000 (Sat, 26 Jun 2010) Log Message: ----------- id is enough Modified Paths: -------------- trunk/admin/README Modified: trunk/admin/README =================================================================== --- trunk/admin/README 2010-06-25 11:56:05 UTC (rev 7573) +++ trunk/admin/README 2010-06-26 14:51:42 UTC (rev 7574) @@ -36,7 +36,7 @@ This is a sample template section for search.tmpl to use xapian as external search engine. <h5>Fulltext Search</h5> - <form id="searchform2" name="searchform2" action="/cgi-bin/omega" + <form id="searchform2" action="/cgi-bin/omega" method="get" accept-charset="<?=$charset?>" style="display:inline" class="searchform"> <?php $s = $request->getArg('s') ? $request->getArg('s') : _("Search"); ?> <input type="hidden" name="DEFAULTOP" value="AND" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-25 11:56:11
|
Revision: 7573 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7573&view=rev Author: vargenau Date: 2010-06-25 11:56:05 +0000 (Fri, 25 Jun 2010) Log Message: ----------- Use "id" instead of "name" for <a> Modified Paths: -------------- trunk/lib/plugin/CreateToc.php Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2010-06-25 11:52:55 UTC (rev 7572) +++ trunk/lib/plugin/CreateToc.php 2010-06-25 11:56:05 UTC (rev 7573) @@ -451,7 +451,7 @@ if ($extracollapse) $toclink = HTML(_("Table of Contents"), " ", - HTML::a(array('name'=>'TOC')), + HTML::a(array('id'=>'TOC')), HTML::img(array( 'id'=>$toctoggleid, 'class'=>'wikiaction', This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-25 11:53:02
|
Revision: 7572 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7572&view=rev Author: vargenau Date: 2010-06-25 11:52:55 +0000 (Fri, 25 Jun 2010) Log Message: ----------- Use "id" instead of "name" for <a> Modified Paths: -------------- trunk/lib/plugin/CreateToc.php Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2010-06-24 16:31:07 UTC (rev 7571) +++ trunk/lib/plugin/CreateToc.php 2010-06-25 11:52:55 UTC (rev 7572) @@ -311,9 +311,9 @@ if (($hstart === 0) && is_string($markup->_content[$j])) { if ($backlink) { if ($counter) - $anchorString = "<a href=\"$url\" name=\"$manchor\">$counterString</a> - \$2"; + $anchorString = "<a href=\"$url\" id=\"$manchor\">$counterString</a> - \$2"; else - $anchorString = "<a href=\"$url\" name=\"$manchor\">\$2</a>"; + $anchorString = "<a href=\"$url\" id=\"$manchor\">\$2</a>"; } else { $anchorString = "<a id=\"$manchor\"></a>"; if ($counter) @@ -334,7 +334,7 @@ if ($backlink) { if ($counter) { - $anchorString = "\$1<a href=\"$url\" name=\"$manchor\">$counterString</a> - "; + $anchorString = "\$1<a href=\"$url\" id=\"$manchor\">$counterString</a> - "; } else { /* Not possible to make a backlink on a * title with a WikiWord */ @@ -457,11 +457,10 @@ 'class'=>'wikiaction', 'title'=>_("Click to display to TOC"), 'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')", - 'border' => 0, 'alt' => 'toctoggle', 'src' => $jshide ? $close : $open ))); else - $toclink = HTML::a(array('name'=>'TOC', + $toclink = HTML::a(array('id'=>'TOC', 'class'=>'wikiaction', 'title'=>_("Click to display"), 'onclick'=>"toggletoc(this, '".$open."', '".$close."', '".$toclistid."')"), This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-24 16:31:14
|
Revision: 7571 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7571&view=rev Author: vargenau Date: 2010-06-24 16:31:07 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Use "id" instead of "name" for <a> Modified Paths: -------------- trunk/lib/plugin/CreateToc.php trunk/themes/Crao/templates/editpage.tmpl trunk/themes/MonoBook/templates/top.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Sidebar/templates/signin.tmpl trunk/themes/Sidebar/templates/top.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/blog/templates/blogform.tmpl trunk/themes/default/templates/blogform.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/gforge/templates/blogform.tmpl trunk/themes/gforge/templates/body.tmpl trunk/themes/gforge/templates/editpage.tmpl Modified: trunk/lib/plugin/CreateToc.php =================================================================== --- trunk/lib/plugin/CreateToc.php 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/lib/plugin/CreateToc.php 2010-06-24 16:31:07 UTC (rev 7571) @@ -315,7 +315,7 @@ else $anchorString = "<a href=\"$url\" name=\"$manchor\">\$2</a>"; } else { - $anchorString = "<a name=\"$manchor\"></a>"; + $anchorString = "<a id=\"$manchor\"></a>"; if ($counter) $anchorString .= "$counterString - "; } @@ -338,11 +338,11 @@ } else { /* Not possible to make a backlink on a * title with a WikiWord */ - $anchorString = "\$1<a name=\"$manchor\"></a>"; + $anchorString = "\$1<a id=\"$manchor\"></a>"; } } else { - $anchorString = "\$1<a name=\"$manchor\"></a>"; + $anchorString = "\$1<a id=\"$manchor\"></a>"; if ($counter) $anchorString .= "$counterString - "; } Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -42,7 +42,7 @@ </div></td></tr></table> <fieldset class="editarea"> <legend><?=_("Page Content: ")?></legend> - <a name="editarea"></a><?=$EDIT_TEXTAREA?> + <a id="editarea"></a><?=$EDIT_TEXTAREA?> </fieldset> <!-- FIXME: fix layout, move CSS to CSS --> <fieldset class="editarea"> Modified: trunk/themes/MonoBook/templates/top.tmpl =================================================================== --- trunk/themes/MonoBook/templates/top.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/MonoBook/templates/top.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -2,5 +2,5 @@ // rcs_id('$Id$'); ?> <!-- Page title --> -<a name="top"></a> +<a id="top"></a> <h1 class="firstHeading"><?= $HEADER ?></h1> Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -32,7 +32,7 @@ </td> </tr> </table> -<a name="editarea" id="editarea"><?=$EDIT_TEXTAREA?></a> +<a id="editarea"><?=$EDIT_TEXTAREA?></a> <br /> <?=_("Summary")?>: <?= $SUMMARY_INPUT ?> <br /> Modified: trunk/themes/Sidebar/templates/signin.tmpl =================================================================== --- trunk/themes/Sidebar/templates/signin.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/Sidebar/templates/signin.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -16,7 +16,7 @@ <!-- Login --> <li id="pt-login"><?= HTML::a(array('href'=>'?auth[login]=1'),$sp,_("Login"),$sp) ?></li> <?php } else { ?> - <li id="pt-login"><a name="login"><?= _("Login required...") ?></a></li> + <li id="pt-login"><a id="login"><?= _("Login required...") ?></a></li> <?php } ?> </ul> </div> Modified: trunk/themes/Sidebar/templates/top.tmpl =================================================================== --- trunk/themes/Sidebar/templates/top.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/Sidebar/templates/top.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -13,7 +13,7 @@ $rating = 0; ?> <!-- Page title --> -<a name="top" id="contentTop"></a> +<a id="contentTop"></a> <?php if ($page->_pagename != "HomePage") { ?> <h1 class="firstHeading<?= $rating ? '-rating' : '' ?><?= $public ? '-public' : '' ?>"><?= $HEADER ?></h1> <?php } ?> @@ -25,4 +25,4 @@ $loader = new WikiPluginLoader(); printXML($loader->expandPI("<"."?plugin RateIt show=text ?".">", $request, $dbi->_markup)); ?></div> -<?php } ?> \ No newline at end of file +<?php } ?> Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -42,7 +42,7 @@ <noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript> </div></td></tr></table> </p> -<a name="editarea" id="editarea"><?=$EDIT_TEXTAREA?></a> +<a id="editarea"><?=$EDIT_TEXTAREA?></a> <br /><small> <?=_("Summary")?>: <?= $SUMMARY_INPUT ?> <br /> Modified: trunk/themes/blog/templates/blogform.tmpl =================================================================== --- trunk/themes/blog/templates/blogform.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/blog/templates/blogform.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -11,7 +11,7 @@ <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60" maxlength="256" name="edit[summary]" value="" /> <?= $EDIT_TOOLBAR ?> - <a name="editarea"></a> + <a id="editarea"></a> <textarea id="edit-content" class="edit-content" rows="8" style="width:540px" name="edit[content]"></textarea> <br /> Modified: trunk/themes/default/templates/blogform.tmpl =================================================================== --- trunk/themes/default/templates/blogform.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/default/templates/blogform.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -11,7 +11,7 @@ <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60" maxlength="256" name="edit[summary]" value="" /> <?= $EDIT_TOOLBAR ?> - <a name="editarea"></a> + <a id="editarea"></a> <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px" name="edit[content]"></textarea> <br /> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/default/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -45,7 +45,7 @@ <?php if (!empty($WYSIWYG_B)) { ?> <br /><div class="hint"><strong>Warning:</strong> Switching to the Wysiwyg editor will not keep your changes.</div> <?php } ?> - <a name="editarea"></a><?=$EDIT_TEXTAREA?> + <a id="editarea"></a><?=$EDIT_TEXTAREA?> <!-- FIXME: fix layout, move CSS to CSS --> <div class="toolbar" style="text-align: center;"> <label for="edit-summary"><?=_("Summary").':'?></label> <?=$SUMMARY_INPUT?> Modified: trunk/themes/gforge/templates/blogform.tmpl =================================================================== --- trunk/themes/gforge/templates/blogform.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/gforge/templates/blogform.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -11,7 +11,7 @@ <input id="wikiblog-summary" class="wikitext" type="text" style="width:540px" size="60" maxlength="256" name="edit[summary]" value="" /> <?= $EDIT_TOOLBAR ?> - <a name="editarea"></a> + <a id="editarea"></a> <textarea id="edit-content" class="edit-content" rows="8" cols="68" style="width:540px" name="edit[content]"></textarea> <br /> Modified: trunk/themes/gforge/templates/body.tmpl =================================================================== --- trunk/themes/gforge/templates/body.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/gforge/templates/body.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -21,7 +21,7 @@ else $rating = 0; ?> -<a name="top" id="contentTop"></a> +<a id="contentTop"></a> <h1> <span class="firstHeading<?= $rating ? '-rating' : '' ?>"> <span style="float: left;"><?= $HEADER ?></span> Modified: trunk/themes/gforge/templates/editpage.tmpl =================================================================== --- trunk/themes/gforge/templates/editpage.tmpl 2010-06-24 15:49:00 UTC (rev 7570) +++ trunk/themes/gforge/templates/editpage.tmpl 2010-06-24 16:31:07 UTC (rev 7571) @@ -37,7 +37,7 @@ <label for="pref-editWidth"><b><?=_("W")?></b></label> <?=$WIDTH_PREF?> <noscript><?=Button("submit:", _("Adjust"), 'wikiaction')?></noscript> </div></td></tr></table> - <a name="editarea"></a><?=$EDIT_TEXTAREA?> + <a id="editarea"></a><?=$EDIT_TEXTAREA?> <div class="toolbar" style="text-align: center;"> <label for="edit-summary"><?=_("Summary").':'?></label> <?=$SUMMARY_INPUT?> </div> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-24 15:49:06
|
Revision: 7570 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7570&view=rev Author: vargenau Date: 2010-06-24 15:49:00 +0000 (Thu, 24 Jun 2010) Log Message: ----------- Use displayRating2 Modified Paths: -------------- trunk/themes/gforge/wikilens-min.js trunk/themes/gforge/wikilens.js Modified: trunk/themes/gforge/wikilens-min.js =================================================================== --- trunk/themes/gforge/wikilens-min.js 2010-06-24 15:25:31 UTC (rev 7569) +++ trunk/themes/gforge/wikilens-min.js 2010-06-24 15:49:00 UTC (rev 7570) @@ -1 +1 @@ -var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_chg_rating="Change your rating from ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/gforge/images/RateIt";var rateit_action="RateIt";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){document[l].title=m;var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,n,0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,0,0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a}; \ No newline at end of file +var rating=new Array;var prediction=new Array;var avg=new Array;var numusers=new Array;var canRate=new Array;var msg_rating_votes="Rating: %.1f (%d votes)";var msg_curr_rating="Your current rating: ";var msg_curr_prediction="Your current prediction: ";var msg_to=" to ";var msg_add_rating="Add your rating: ";var msg_thanks="Thanks!";var msg_rating_deleted="Rating deleted!";var rateit_imgsrc="/plugins/wiki/themes/gforge/images/RateIt";var rateit_action="RateIt";var idTop="";function displayRating(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(canRate[a]){if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(g<=(k*2)){e="O"}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function displayRating2(a,d,k,b,q){var c=new Array("Not Rated","Awful","Very Poor","Poor","Below Average","Average","Above Average","Good","Very Good","Excellent","Outstanding");var r=a+d+"Cancel";var n=rating[a];var h=prediction[a];var m="";var p=rateit_imgsrc;if(q){m=msg_curr_rating+n+" "+c[n*2];var o=". ";if(b){m=m+" "+msg_curr_prediction+h+" "+c[h*2]}if(n){document[r].style.display="inline"}else{document[r].style.display="none"}}for(var g=1;g<=10;g++){var l=a+g;if(q){var f=g/2;if(k>0){if(n){document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)}}else{if(h){document[l].onmouseout=function(){displayRating(a,d,h,1,0)}}}if(n!=k&&typeof(msg_chg_rating)!="undefined"){document[l].title=msg_chg_rating+n+" "+c[n*2]+msg_to+f+" "+c[g]}}else{document[l].onmouseout=function(){displayRating(a,d,avg[a],0,0)};document[l].title=msg_add_rating+f+" "+c[g]}}var e="N";if(b){if(q){document[l].title=m+o+msg_add_rating+c[g]}e="R"}else{if(k<=n){if(g<=(k*2)){e="Rp"}else{if(g<=(n*2)){e="R"}}}else{if(g<=(n*2)){e="Rp"}else{if(g<=(k*2)){e="Rm"}}}}document[l].src=p+d+e+((g%2)?"k1":"k0")+".png"}}function sprintfRating(b,a,c){var d=Math.round(a*10)/10;if(c<2){b=b.replace(/votes/,"vote")}return b.replace(/\%.1f/,d).replace(/\%d/,c)}function clickRating(c,f,i,a,e,g){var h=a+"Action";var j=document.getElementById("rateit-widget-top");var k=numusers[a];var b=rating[a];if(g=="X"){deleteRating(h,f,e);if(j&&k){var d=avg[a]*k;var l;if(b&&b>0){if(k>1){l=(d-b)/(k-1);numusers[a]--}else{l=0;numusers[a]=0}}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,k-1)}}rating[a]=0;displayRating2(a,c,0,0,1)}else{submitRating(h,f,i,e,g);if(j&&k){var d=avg[a]*k;var l;if(b&&(b>0)){l=(d+g-b)/k}else{l=(d+g)/(k+1);numusers[a]++}if(l.toString()!="NaN"&&idTop==a){avg[a]=l;if(g!=rating[a]){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,l,numusers[a])}}}else{if(j&&idTop==a){j.childNodes[0].innerHTML=sprintfRating(msg_rating_votes,g,1);avg[a]=g;numusers[a]=1}}rating[a]=g;displayRating2(a,c,g,0,1)}}function submitRating(d,e,a,f,g){var c=Math.round(Math.random()*(1000000));var b=WikiURL(e)+"version="+a+"&action="+rateit_action+"&mode=add&rating="+g+"&dimension="+f+"&nocache=1&nopurge=1&rand="+c;document[d].title=msg_thanks;document[d].src=b}function deleteRating(c,d,e){var b=Math.round(Math.random()*(1000000));var a=WikiURL(d)+"action="+rateit_action+"&mode=delete&dimension="+e+"&nocache=1&nopurge=1&rand="+b;document[c].title=msg_rating_deleted;document[c].src=a}; \ No newline at end of file Modified: trunk/themes/gforge/wikilens.js =================================================================== --- trunk/themes/gforge/wikilens.js 2010-06-24 15:25:31 UTC (rev 7569) +++ trunk/themes/gforge/wikilens.js 2010-06-24 15:49:00 UTC (rev 7570) @@ -12,6 +12,7 @@ var rating = new Array; var prediction = new Array; var avg = new Array; var numusers = new Array; +var canRate = new Array; var msg_rating_votes = "Rating: %.1f (%d votes)"; var msg_curr_rating = "Your current rating: "; var msg_curr_prediction = "Your current prediction: "; @@ -24,6 +25,7 @@ //var rateit_imgsrc = '/phpwiki-cvs/themes/MonoBook/images/RateIt'; var rateit_imgsrc = '/plugins/wiki/themes/gforge/images/RateIt'; var rateit_action = 'RateIt'; +var idTop = ''; // function displayRating(imgId, imgPrefix, ratingvalue, pred, init) { @@ -40,12 +42,14 @@ if (pred) { title = title+' '+msg_curr_prediction+ curr_pred+' '+ratings[curr_pred*2]; } - if (curr_rating) { - document[cancel].style.display = 'inline'; + if (canRate[imgId]) { + if (curr_rating) { + document[cancel].style.display = 'inline'; + } + else { + document[cancel].style.display = 'none'; + } } - else { - document[cancel].style.display = 'none'; - } } for (var i=1; i<=10; i++) { var imgName = imgId + i; @@ -168,13 +172,13 @@ numusers[imgId] = 0; } } - if (new_avg.toString() != "NaN") { + if (new_avg.toString() != "NaN" && idTop == imgId) { avg[imgId] = new_avg; top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, new_avg, nusers-1); } } rating[imgId] = 0; - displayRating(imgId,imgPrefix,0,0,1); + displayRating2(imgId,imgPrefix,0,0,1); } else { submitRating(actionImg,pagename,version,dimension,newrating); if (top && nusers) { @@ -186,19 +190,19 @@ new_avg = (sum1 + newrating) / (nusers + 1); numusers[imgId]++; } - if (new_avg.toString() != "NaN") { + if (new_avg.toString() != "NaN" && idTop == imgId) { avg[imgId] = new_avg; if (newrating != rating[imgId]) { top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, new_avg, numusers[imgId]); } } - } else if (top) { + } else if (top && idTop == imgId) { top.childNodes[0].innerHTML = sprintfRating(msg_rating_votes, newrating, 1); avg[imgId] = newrating; numusers[imgId] = 1; } rating[imgId] = newrating; - displayRating(imgId,imgPrefix,newrating,0,1); + displayRating2(imgId,imgPrefix,newrating,0,1); } } function submitRating(actionImg,page,version,dimension,newrating) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-24 15:25:38
|
Revision: 7569 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7569&view=rev Author: vargenau Date: 2010-06-24 15:25:31 +0000 (Thu, 24 Jun 2010) Log Message: ----------- No "clear" attribute for <br> Modified Paths: -------------- trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Crao/templates/wikiblog.tmpl trunk/themes/MonoBook/templates/viewsource.tmpl trunk/themes/Portland/templates/browse.tmpl trunk/themes/Portland/templates/debug.tmpl trunk/themes/Sidebar/templates/debug.tmpl trunk/themes/Wordpress/templates/browse.tmpl trunk/themes/blog/templates/viewsource.tmpl trunk/themes/blog/templates/wikiblog.tmpl trunk/themes/default/templates/comment.tmpl trunk/themes/default/templates/debug.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/default/templates/login.tmpl trunk/themes/default/templates/viewsource.tmpl trunk/themes/default/templates/wikiblog.tmpl trunk/themes/gforge/templates/debug.tmpl trunk/themes/gforge/templates/editpage.tmpl trunk/themes/shamino_com/templates/debug.tmpl Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -31,7 +31,7 @@ accept-charset="<?=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 clear="all" class="clear-floats" /> + <br class="clear-floats" /> <table width="100%"> <tr><td><?= $EDIT_TOOLBAR ?></td> <td align="right"><div id="editarea-size"> Modified: trunk/themes/Crao/templates/wikiblog.tmpl =================================================================== --- trunk/themes/Crao/templates/wikiblog.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/Crao/templates/wikiblog.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -29,7 +29,7 @@ <div class="wikiblog-header"> <strong class="floatleft"><?= WikiLink($page, 'known', $CDATE) ?></strong> <strong class="floatright"><?= WikiLink($BLOG_CREATOR, 'if_known') ?></strong> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> <div class="wikiblog-body"> <?php if ($rev->get('summary')) { ?> @@ -42,7 +42,7 @@ <div class="wikiblog-footer"> <?= $buttons ?> <?= $modified ?> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> <?php } ?> Modified: trunk/themes/MonoBook/templates/viewsource.tmpl =================================================================== --- trunk/themes/MonoBook/templates/viewsource.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/MonoBook/templates/viewsource.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -14,8 +14,7 @@ <!-- Dummy form else NS4 does not like the textarea --> <form method="post" action="<?=$request->getPostURL()?>" accept-charset="<?=CHARSET?>"> <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> -<br clear="all" class="clear-floats" /> -<!-- wrap=virtual is not HTML4, but without it NS4 does not wrap long lines --> +<br class="clear-floats" /> <textarea class="wikiedit" name="content" rows="<?=$request->getPref('editHeight')?>" Modified: trunk/themes/Portland/templates/browse.tmpl =================================================================== --- trunk/themes/Portland/templates/browse.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/Portland/templates/browse.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -2,7 +2,7 @@ // rcs_id('$Id$'); ?> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> <?php if ($revision and !$revision->isCurrent()) { ?> <p><strong><?=_("Note:")?></strong> Modified: trunk/themes/Portland/templates/debug.tmpl =================================================================== --- trunk/themes/Portland/templates/debug.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/Portland/templates/debug.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -10,5 +10,4 @@ </td><td> <span class="debug"><?=fmt("Page Execution took %s seconds", $RUNTIMER->getStats())?></span> </td></tr></table> -<?php // This keeps the valid XHTML! icons from "hanging off the bottom of the screen" ?> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> Modified: trunk/themes/Sidebar/templates/debug.tmpl =================================================================== --- trunk/themes/Sidebar/templates/debug.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/Sidebar/templates/debug.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -19,5 +19,4 @@ <? if (substr(PHP_OS,0,3) != 'WIN') { $mem = @getMemoryUsage(); PrintXml(fmt(", Memory: %s", $mem)); } ?> </span> </td></tr></table> -<?php // This keeps the valid XHTML! icons from "hanging off the bottom of the screen" ?> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> Modified: trunk/themes/Wordpress/templates/browse.tmpl =================================================================== --- trunk/themes/Wordpress/templates/browse.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/Wordpress/templates/browse.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -2,7 +2,7 @@ // rcs_id('$Id$'); ?> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> <?php if ($revision and !$revision->isCurrent()) { ?> <p><strong><?=_("Note:")?></strong> Modified: trunk/themes/blog/templates/viewsource.tmpl =================================================================== --- trunk/themes/blog/templates/viewsource.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/blog/templates/viewsource.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -16,8 +16,7 @@ <!-- Dummy form else NS4 does not like the textarea --> <form method="post" id="editcontent" action="<?=$request->getPostURL()?>" accept-charset="<?=CHARSET?>"> -<?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> -<!br clear="all" class="clear-floats" /> +<br class="clear-floats" /> <textarea class="wikiedit" name="content" rows="<?=$request->getPref('editHeight')?>" Modified: trunk/themes/blog/templates/wikiblog.tmpl =================================================================== --- trunk/themes/blog/templates/wikiblog.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/blog/templates/wikiblog.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -27,7 +27,7 @@ <!-- <div class="wikiblog-header"> <strong class="floatleft"><?= WikiLink($page, 'known', $CDATE) ?></strong> <strong class="floatright"><?= WikiLink($BLOG_CREATOR, 'if_known') ?></strong> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> --> <div class="wikiblog-body"> <?php if ($rev->get('summary')) { ?> @@ -40,7 +40,7 @@ <div class="wikiblog-footer"> <?= $buttons ?> <?= $modified ?> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> <?php } ?> Modified: trunk/themes/default/templates/comment.tmpl =================================================================== --- trunk/themes/default/templates/comment.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/default/templates/comment.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -26,13 +26,13 @@ <div class="wikicomment-footer"> <span class="floatright"> <?= fmt("%s by %s", WikiLink($page, 'known', $CDATE), WikiLink($COMMENT_CREATOR, 'if_known')) ?></span> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> <?php if ($buttons or $modified) { ?> <div class="floatright"> <?= $buttons ?> <?= $modified ?> - <br clear="all" /> + <br class="clear-floats" /> </div> <?php } ?> <div class="wikicomment-body"> Modified: trunk/themes/default/templates/debug.tmpl =================================================================== --- trunk/themes/default/templates/debug.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/default/templates/debug.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -21,5 +21,4 @@ <? } ?> </span> </td></tr></table> -<?php // This keeps the valid XHTML! icons from "hanging off the bottom of the screen" ?> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/default/templates/editpage.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -33,7 +33,7 @@ accept-charset="<?=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 clear="all" class="clear-floats" /> + <br class="clear-floats" /> <table width="100%"> <tr><td><?= $EDIT_TOOLBAR ?></td> <td align="right"><div id="editarea-size"> Modified: trunk/themes/default/templates/login.tmpl =================================================================== --- trunk/themes/default/templates/login.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/default/templates/login.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -5,7 +5,6 @@ <p><strong><?=$fail_message?></strong></p> <hr noshade="noshade" /> <?php } ?> -<?php /* br past the logo */ ?> <br class="clear-floats" /> <?php Modified: trunk/themes/default/templates/viewsource.tmpl =================================================================== --- trunk/themes/default/templates/viewsource.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/default/templates/viewsource.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -15,7 +15,7 @@ <!-- Dummy form else NS4 does not like the textarea --> <form method="post" action="<?=$request->getPostURL()?>" accept-charset="<?=CHARSET?>"> <?php /* To clear beyond a larger logo, such as in the Hawaiian theme */ ?> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> <textarea class="wikiedit" name="content" rows="<?=$request->getPref('editHeight')?>" Modified: trunk/themes/default/templates/wikiblog.tmpl =================================================================== --- trunk/themes/default/templates/wikiblog.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/default/templates/wikiblog.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -25,7 +25,7 @@ <!-- <div class="wikiblog-header"> <strong class="floatleft"><?= WikiLink($page, 'known', $CDATE) ?></strong> <strong class="floatright"><?= WikiLink($BLOG_CREATOR, 'if_known') ?></strong> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> --> <div class="wikiblog-body"> <?php if ($rev->get('summary')) { ?> @@ -38,7 +38,7 @@ <div class="wikiblog-footer"> <?= $buttons ?> <?= $modified ?> - <br clear="all" class="clear-floats" /> + <br class="clear-floats" /> </div> <?php } ?> Modified: trunk/themes/gforge/templates/debug.tmpl =================================================================== --- trunk/themes/gforge/templates/debug.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/gforge/templates/debug.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -10,4 +10,4 @@ <?php } ?> </span> </td></tr></table> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> Modified: trunk/themes/gforge/templates/editpage.tmpl =================================================================== --- trunk/themes/gforge/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/gforge/templates/editpage.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -28,7 +28,7 @@ accept-charset="<?=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 clear="all" class="clear-floats" /> + <br class="clear-floats" /> <table width="100%"> <tr><td><?= $EDIT_TOOLBAR ?></td> <td align="right"><div id="editarea-size"> Modified: trunk/themes/shamino_com/templates/debug.tmpl =================================================================== --- trunk/themes/shamino_com/templates/debug.tmpl 2010-06-24 14:45:19 UTC (rev 7568) +++ trunk/themes/shamino_com/templates/debug.tmpl 2010-06-24 15:25:31 UTC (rev 7569) @@ -10,4 +10,4 @@ <?php $mem = @getMemoryUsage(); if ($mem) { ?> <?=fmt(", Memory: %s", $mem) ?> <?php } ?></span></div> -<br clear="all" class="clear-floats" /> +<br class="clear-floats" /> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <var...@us...> - 2010-06-24 14:45:25
|
Revision: 7568 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7568&view=rev Author: vargenau Date: 2010-06-24 14:45:19 +0000 (Thu, 24 Jun 2010) Log Message: ----------- No "language" attribute for <script> Modified Paths: -------------- trunk/configurator.php trunk/lib/nusoap/nusoap.php trunk/themes/Crao/templates/editpage.tmpl trunk/themes/Crao/templates/signin.tmpl trunk/themes/Portland/templates/editpage.tmpl trunk/themes/Wordpress/templates/editpage.tmpl trunk/themes/Wordpress/templates/signin.tmpl trunk/themes/default/templates/editpage.tmpl trunk/themes/default/templates/login.tmpl Modified: trunk/configurator.php =================================================================== --- trunk/configurator.php 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/configurator.php 2010-06-24 14:45:19 UTC (rev 7568) @@ -181,7 +181,7 @@ td.unchangeable-variable-left { border-top: none; background-color: #ffffee; color:inherit; } --> </style> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- function update(accepted, error, value, output) { var msg = document.getElementById(output); Modified: trunk/lib/nusoap/nusoap.php =================================================================== --- trunk/lib/nusoap/nusoap.php 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/lib/nusoap/nusoap.php 2010-06-24 14:45:19 UTC (rev 7568) @@ -2162,7 +2162,7 @@ a:visited { color: #666666; font-weight: bold; } a:hover { color: cc3300; font-weight: bold; } </style> - <script language="JavaScript" type="text/javascript"> + <script type="text/javascript"> <!-- // POP-UP CAPTIONS... function lib_bwcheck(){ //Browsercheck (needed) @@ -4082,4 +4082,4 @@ // c-hanging-comment-ender-p: nil // indent-tabs-mode: nil // End: -?> \ No newline at end of file +?> Modified: trunk/themes/Crao/templates/editpage.tmpl =================================================================== --- trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/Crao/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -73,7 +73,7 @@ <label><?= Template('signin', array('FORMNAME' => 'editpage')) ?></label> </fieldset> <hr noshade="noshade" /> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- function showOldMarkupRules(show) { if (document.getElementById) { @@ -100,7 +100,7 @@ </div> <?=$HIDDEN_INPUTS?> </form> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- if (document.getElementById) { showOldMarkupRules(document.getElementById('useOldMarkup').checked); Modified: trunk/themes/Crao/templates/signin.tmpl =================================================================== --- trunk/themes/Crao/templates/signin.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/Crao/templates/signin.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -17,7 +17,7 @@ <?= fmt("You are signed in as %s", WikiLink($user->getId(), 'auto')) ?> <?=$SEP?> </span> - <script language="JavaScript" type="text/javascript"><!-- + <script type="text/javascript"><!-- document.write('<input type="hidden" name="auth[logout]" value="0" />'); function SignOut(form) { var form = document.forms["<?=$FORMNAME?>"]; Modified: trunk/themes/Portland/templates/editpage.tmpl =================================================================== --- trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/Portland/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -57,7 +57,7 @@ <hr /> <?php } ?> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- function showOldMarkupRules(show) { if (document.getElementById) { @@ -86,7 +86,7 @@ <?=$HIDDEN_INPUTS?> </form> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- if (document.getElementById) { showOldMarkupRules(document.getElementById('useOldMarkup').checked); Modified: trunk/themes/Wordpress/templates/editpage.tmpl =================================================================== --- trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/Wordpress/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -70,7 +70,7 @@ <hr /> <?php } ?> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- function showOldMarkupRules(show) { if (document.getElementById) { @@ -100,7 +100,7 @@ </form> </div> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- if (document.getElementById) { showOldMarkupRules(document.getElementById('useOldMarkup').checked); Modified: trunk/themes/Wordpress/templates/signin.tmpl =================================================================== --- trunk/themes/Wordpress/templates/signin.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/Wordpress/templates/signin.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -20,7 +20,7 @@ <?= fmt("Authenticated as %s", WikiLink($user->getAuthenticatedId(), 'auto')) ?> <?=$SEP?> </span> - <script language="JavaScript" type="text/javascript"><!-- + <script type="text/javascript"><!-- document.write('<br /><input type="hidden" name="auth[logout]" value="0" />'); function SignOut() { var form = document.forms["<?=$FORMNAME?>"]; Modified: trunk/themes/default/templates/editpage.tmpl =================================================================== --- trunk/themes/default/templates/editpage.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/default/templates/editpage.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -96,7 +96,7 @@ <hr noshade="noshade" /> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- function showOldMarkupRules(show) { if (document.getElementById) { @@ -123,7 +123,7 @@ <?plugin IncludePage page=_("Help/TextFormattingRules") section=_("Synopsis") quiet=1?> </div> -<script language="JavaScript1.3" type="text/javascript"> +<script type="text/javascript"> <!-- if (document.getElementById) { showOldMarkupRules(document.getElementById('useOldMarkup').checked); Modified: trunk/themes/default/templates/login.tmpl =================================================================== --- trunk/themes/default/templates/login.tmpl 2010-06-24 06:35:40 UTC (rev 7567) +++ trunk/themes/default/templates/login.tmpl 2010-06-24 14:45:19 UTC (rev 7568) @@ -100,7 +100,7 @@ </table> </form> -<script language="JavaScript" type="text/javascript"> +<script type="text/javascript"> <!-- // Really there's got to be a simpler way to do this.... function select_input (type) { var elements = document.forms['login'].elements; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ru...@us...> - 2010-06-24 06:35:46
|
Revision: 7567 http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7567&view=rev Author: rurban Date: 2010-06-24 06:35:40 +0000 (Thu, 24 Jun 2010) Log Message: ----------- revert r7565, deletion of fixThemeTemplate. This is optionally needed by custom themes, not by the standard. Modified Paths: -------------- trunk/lib/upgrade.php Modified: trunk/lib/upgrade.php =================================================================== --- trunk/lib/upgrade.php 2010-06-23 19:43:46 UTC (rev 7566) +++ trunk/lib/upgrade.php 2010-06-24 06:35:40 UTC (rev 7567) @@ -1204,6 +1204,29 @@ $replace = $args[1]; $template = $args[2]; } + + function fixThemeTemplate($match, $new, $template) { + // for all custom themes + $ourthemes = explode(":","blog:Crao:default:Hawaiian:MacOSX:MonoBook:Portland:shamino_com:SpaceWiki:wikilens:Wordpress"); + $themedir = NormalizeLocalFileName("themes"); + $dh = opendir($themedir); + while ($r = readdir($dh)) { + if (filetype($r) == 'dir' and $r[0] != '.' and !is_array($r, $ourthemes)) + $customthemes[] = $r; + } + $success = true; + $errors = ''; + foreach ($customthemes as $customtheme) { + $template = FindFile("themes/$customtheme/templates/$template"); + $do = $this->parent->fixLocalFile($match, $new, template); + if (!$do[0]) { + $success = false; + $errors .= $do[1]." "; + echo $do[1]; + } + } + return array($success, $errors); + } } /** This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |