From: <var...@us...> - 2014-06-12 15:39:59
|
Revision: 8895 http://sourceforge.net/p/phpwiki/code/8895 Author: vargenau Date: 2014-06-12 15:39:51 +0000 (Thu, 12 Jun 2014) Log Message: ----------- HTML::tt --> HTML::samp Modified Paths: -------------- trunk/lib/BlockParser.php trunk/lib/PagePerm.php trunk/lib/PageType.php trunk/lib/diff.php trunk/lib/plugin/LinkSearch.php trunk/lib/plugin/SemanticSearch.php trunk/lib/plugin/TeX2png.php trunk/lib/plugin/WatchPage.php trunk/lib/plugin/WikiAdminDeleteAcl.php trunk/lib/plugin/WikiAdminSetAcl.php trunk/lib/plugin/WikiAdminSetAclSimple.php trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin trunk/pgsrc/Help%2FHelloWorldPlugin Modified: trunk/lib/BlockParser.php =================================================================== --- trunk/lib/BlockParser.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/BlockParser.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -246,7 +246,7 @@ $where = $this->where(); $tab = str_repeat('____', $this->getDepth()) . $tab; printXML(HTML::div("$tab $msg: at: '", - HTML::tt($where), + HTML::samp($where), "'")); flush(); } Modified: trunk/lib/PagePerm.php =================================================================== --- trunk/lib/PagePerm.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/PagePerm.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -115,10 +115,10 @@ } */ if ($type == 'page') - return HTML::tt(HTML::strong($perm->asRwxString($owner, $group))); + return HTML::samp(HTML::strong($perm->asRwxString($owner, $group))); elseif ($type == 'default') - return HTML::tt($perm->asRwxString($owner, $group)); elseif ($type == 'inherited') { - return HTML::tt(array('class' => 'inherited', 'style' => 'color:#aaa;'), + return HTML::samp($perm->asRwxString($owner, $group)); elseif ($type == 'inherited') { + return HTML::samp(array('class' => 'inherited', 'style' => 'color:#aaa;'), $perm->asRwxString($owner, $group)); } } Modified: trunk/lib/PageType.php =================================================================== --- trunk/lib/PageType.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/PageType.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -432,7 +432,7 @@ HTML::th($url_attr, _("InterWiki Address")))); foreach ($map as $moniker => $interurl) { $rows[] = HTML::tr(HTML::td($mon_attr, new Cached_WikiLinkIfKnown($moniker)), - HTML::td($url_attr, HTML::tt($interurl))); + HTML::td($url_attr, HTML::samp($interurl))); } return HTML::table(array('class' => 'interwiki-map'), Modified: trunk/lib/diff.php =================================================================== --- trunk/lib/diff.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/diff.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -149,7 +149,7 @@ function _start_block($header) { $this->_block = HTML::div(array('class' => 'block'), - HTML::tt($header)); + HTML::samp($header)); } function _end_block() @@ -167,7 +167,7 @@ if ($elem) $line = new HtmlElement($elem, $line); $div->pushContent(HTML::div(array('class' => $class), - HTML::tt(array('class' => 'prefix'), + HTML::samp(array('class' => 'prefix'), $prefix), $line, HTML::raw(' '))); } Modified: trunk/lib/plugin/LinkSearch.php =================================================================== --- trunk/lib/plugin/LinkSearch.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/LinkSearch.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -116,7 +116,7 @@ $hiddenfield, $instructions, HTML::br(), $pagefilter, - HTML::strong(HTML::tt(array('id' => 'dirsign'), $dirsign)), + HTML::strong(HTML::samp(array('id' => 'dirsign'), $dirsign)), $query, HTML::raw(' '), $direction, HTML::raw(' '), $submit); Modified: trunk/lib/plugin/SemanticSearch.php =================================================================== --- trunk/lib/plugin/SemanticSearch.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/SemanticSearch.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -155,7 +155,7 @@ (HTML::tr( HTML::td($pagefilter, _(": ")), HTML::td($relation), - HTML::td(HTML::strong(HTML::tt(' :: '))), + HTML::td(HTML::strong(HTML::samp(' :: '))), HTML::td($queryrel), HTML::td($nbsp, $relsubmit, $nbsp, $enhancements))))); @@ -332,7 +332,7 @@ $relquery = $this->regex_query($attribute, $args['case_exact'], $args['regex']); if (!in_array($attr_op, $this->_supported_operators)) { return HTML($form, $this->error(fmt("Illegal operator: %s", - HTML::tt($attr_op)))); + HTML::samp($attr_op)))); } $s_base = preg_replace("/,/", "", $s); $units = new Units(); @@ -379,7 +379,7 @@ } else { $querydesc = $attribute . " " . $attr_op . " " . $s; return HTML($form, $this->error(fmt("Only text operators can be used with strings: %s", - HTML::tt($querydesc)))); + HTML::samp($querydesc)))); } if ($linkquery) { Modified: trunk/lib/plugin/TeX2png.php =================================================================== --- trunk/lib/plugin/TeX2png.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/TeX2png.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -191,7 +191,7 @@ // or mathematical expression is wrong switch ($this->isMathExp($text)) { case 0: // not a mathematical expression - $html = HTML::tt(array('class' => 'tex', + $html = HTML::samp(array('class' => 'tex', 'style' => 'color:red;'), $text); break; case 1: // an inlined mathematical expression Modified: trunk/lib/plugin/WatchPage.php =================================================================== --- trunk/lib/plugin/WatchPage.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/WatchPage.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -54,7 +54,7 @@ // This could be expanded as in Mediawiki to a list of each page with a remove button. function showWatchList($pagelist) { - return HTML::strong(HTML::tt(empty($pagelist) ? _("<empty>") : $pagelist)); + return HTML::strong(HTML::samp(empty($pagelist) ? _("<empty>") : $pagelist)); } function addpagelist($page, $pagelist) Modified: trunk/lib/plugin/WikiAdminDeleteAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/WikiAdminDeleteAcl.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -145,7 +145,7 @@ if ($checked) $pages[] = $name; } - $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br()); + $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br()); return $header; } } Modified: trunk/lib/plugin/WikiAdminSetAcl.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAcl.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/WikiAdminSetAcl.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -235,7 +235,7 @@ } $perm_tree = pagePermissions($name); $table = pagePermissionsAclFormat($perm_tree, !empty($pages)); - $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br()); + $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br()); $first_page = $GLOBALS['request']->_dbi->getPage($name); $owner = $first_page->getOwner(); list($type, $perm) = pagePermissionsAcl($perm_tree[0], $perm_tree); @@ -245,8 +245,8 @@ elseif ($type == 'page') $type = _("individual page permission"); elseif ($type == 'default') $type = _("default page permission"); - $header->pushContent(HTML::strong(_("Type") . _(": ")), HTML::tt($type), HTML::br()); - $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::tt($perm->asAclLines()), HTML::br()); + $header->pushContent(HTML::strong(_("Type") . _(": ")), HTML::samp($type), HTML::br()); + $header->pushContent(HTML::strong(_("ACL") . _(": ")), HTML::samp($perm->asAclLines()), HTML::br()); $header->pushContent(HTML::p(HTML::strong(_("Description") . _(": ")), _("Selected Grant checkboxes allow access, unselected checkboxes deny access."), Modified: trunk/lib/plugin/WikiAdminSetAclSimple.php =================================================================== --- trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/lib/plugin/WikiAdminSetAclSimple.php 2014-06-12 15:39:51 UTC (rev 8895) @@ -171,7 +171,7 @@ if ($checked) $pages[] = $name; } - $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::tt(join(', ', $pages)), HTML::br()); + $header->pushContent(HTML::strong(_("Selected Pages: ")), HTML::samp(join(', ', $pages)), HTML::br()); return $header; } } Modified: trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin =================================================================== --- trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/locale/de/pgsrc/Hilfe%2FHalloWeltPlugin 2014-06-12 15:39:51 UTC (rev 8895) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Thu, 12 Jun 2014 17:38:19 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Hilfe%2FHalloWeltPlugin; @@ -68,7 +68,7 @@ // Any text that is returned will not be further transformed, // so use html where necessary. - $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), + $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), THE_END); return $html; } Modified: trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde =================================================================== --- trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/locale/fr/pgsrc/Aide%2FPluginBonjourLeMonde 2014-06-12 15:39:51 UTC (rev 8895) @@ -1,4 +1,4 @@ -Date: Mon, 8 Jul 2013 17:59:05 +0000 +Date: Thu, 12 Jun 2014 17:37:58 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Aide%2FPluginBonjourLeMonde; @@ -69,7 +69,7 @@ // Any text that is returned will not be further transformed, // so use html where necessary. - $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), + $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), THE_END); return $html; } Modified: trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin =================================================================== --- trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/locale/zh/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:39:51 UTC (rev 8895) @@ -1,4 +1,4 @@ -Date: Fri, 4 Feb 2011 16:44:25 +0000 +Date: Thu, 12 Jun 2014 17:37:12 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FHelloWorldPlugin; @@ -69,7 +69,7 @@ // Any text that is returned will not be further transformed, // so use html where necessary. - $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), + $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), THE_END); return $html; } Modified: trunk/pgsrc/Help%2FHelloWorldPlugin =================================================================== --- trunk/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:12:50 UTC (rev 8894) +++ trunk/pgsrc/Help%2FHelloWorldPlugin 2014-06-12 15:39:51 UTC (rev 8895) @@ -1,4 +1,4 @@ -Date: Fri, 10 Sep 2010 13:46:13 +0000 +Date: Thu, 12 Jun 2014 17:36:49 +0000 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0) Content-Type: application/x-phpwiki; pagename=Help%2FHelloWorldPlugin; @@ -66,7 +66,7 @@ // Any text that is returned will not be further transformed, // so use html where necessary. - $html = HTML::tt(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), + $html = HTML::samp(fmt('%s: %s', $salutation, WikiLink($name, 'auto')), THE_END); return $html; } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |