phpwiki-checkins — Automatic notification of CVS checkins on PhpWiki.

[phpwiki-checkins] SF.net SVN: phpwiki:[8913] trunk/lib/plugin/PrevNext.php

[<var...@us...>]

Revision: 8913
          http://sourceforge.net/p/phpwiki/code/8913
Author:   vargenau
Date:     2014-06-13 15:31:36 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/plugin/PrevNext.php

Modified: trunk/lib/plugin/PrevNext.php
===================================================================
--- trunk/lib/plugin/PrevNext.php	2014-06-13 15:15:35 UTC (rev 8912)
+++ trunk/lib/plugin/PrevNext.php	2014-06-13 15:31:36 UTC (rev 8913)
@@ -79,7 +79,7 @@
             $tr = HTML::tr();
             $links = HTML::table(array('class' => 'fullwidth'), $tr);
         } elseif ($align == 'right') {
-            $td = HTML::td(array('align' => $align));
+            $td = HTML::td(array('class' => 'align-'.$align));
             $links = HTML::table(array('class' => 'fullwidth'), HTML::tr($td));
         } else {
             $links = HTML();
@@ -90,7 +90,7 @@
                 $sep = " | "; // force some kind of separator
             }
             if ($align == 'center') {
-                $tr->pushContent(HTML::td(array('align' => $align), " [ "));
+                $tr->pushContent(HTML::td(array('class' => 'align-'.$align), " [ "));
             } elseif ($align == 'right') {
                 $td->pushcontent(" [ ");
             } else {
@@ -108,7 +108,7 @@
                     if ($imgurl = $WikiTheme->getButtonURL($label)) {
                         if ($last_is_text) {
                             if ($align == 'center') {
-                                $tr->pushContent(HTML::td(array('align' => $align), $sep));
+                                $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
                             } elseif ($align == 'right') {
                                 $td->pushcontent($sep);
                             } else {
@@ -116,7 +116,7 @@
                             }
                         }
                         if ($align == 'center') {
-                            $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
+                            $tr->pushContent(HTML::td(array('class' => 'align-'.$align), new ImageButton($label, $url, false, $imgurl)));
                         } elseif ($align == 'right') {
                             $td->pushContent(new ImageButton($label, $url, false, $imgurl));
                         } else {
@@ -127,7 +127,7 @@
                     } elseif ($imgurl = $WikiTheme->getButtonURL($dir)) {
                         if ($last_is_text) {
                             if ($align == 'center') {
-                                $tr->pushContent(HTML::td(array('align' => $align), $sep));
+                                $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
                             } elseif ($align == 'right') {
                                 $td->pushcontent($sep);
                             } else {
@@ -135,7 +135,7 @@
                             }
                         }
                         if ($align == 'center') {
-                            $tr->pushContent(HTML::td(array('align' => $align), new ImageButton($label, $url, false, $imgurl)));
+                            $tr->pushContent(HTML::td(array('class' => 'align-'.$align), new ImageButton($label, $url, false, $imgurl)));
                         } elseif ($align == 'right') {
                             $td->pushContent(new ImageButton($label, $url, false, $imgurl));
                         } else {
@@ -145,7 +145,7 @@
                     } else { // text only
                         if (!$this_is_first) {
                             if ($align == 'center') {
-                                $tr->pushContent(HTML::td(array('align' => $align), $sep));
+                                $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
                             } elseif ($align == 'right') {
                                 $td->pushcontent($sep);
                             } else {
@@ -153,7 +153,7 @@
                             }
                         }
                         if ($align == 'center') {
-                            $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
+                            $tr->pushContent(HTML::td(array('class' => 'align-'.$align), new Button($label, $url, $class)));
                         } elseif ($align == 'right') {
                             $td->pushContent(new Button($label, $url, $class));
                         } else {
@@ -164,7 +164,7 @@
                 } else {
                     if (!$this_is_first) {
                         if ($align == 'center') {
-                            $tr->pushContent(HTML::td(array('align' => $align), $sep));
+                            $tr->pushContent(HTML::td(array('class' => 'align-'.$align), $sep));
                         } elseif ($align == 'right') {
                             $td->pushcontent($sep);
                         } else {
@@ -172,7 +172,7 @@
                         }
                     }
                     if ($align == 'center') {
-                        $tr->pushContent(HTML::td(array('align' => $align), new Button($label, $url, $class)));
+                        $tr->pushContent(HTML::td(array('class' => 'align-'.$align), new Button($label, $url, $class)));
                     } elseif ($align == 'right') {
                         $td->pushContent(new Button($label, $url, $class));
                     } else {
@@ -185,7 +185,7 @@
         }
         if ($style == 'text') {
             if ($align == 'center') {
-                $tr->pushContent(HTML::td(array('align' => $align), " ] "));
+                $tr->pushContent(HTML::td(array('class' => 'align-'.$align), " ] "));
             } elseif ($align == 'right') {
                 $td->pushcontent(" ] ");
             } else {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8912] trunk/lib/plugin

[<var...@us...>]

Revision: 8912
          http://sourceforge.net/p/phpwiki/code/8912
Author:   vargenau
Date:     2014-06-13 15:15:35 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/plugin/DebugAuthInfo.php
    trunk/lib/plugin/NewPagesPerUser.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/PreferenceApp.php
    trunk/lib/plugin/RecentChanges.php
    trunk/lib/plugin/SemanticSearchAdvanced.php
    trunk/lib/plugin/TeX2png.php
    trunk/lib/plugin/WantedPagesOld.php
    trunk/lib/plugin/WikiAdminUtils.php
    trunk/lib/plugin/WikiPoll.php

Modified: trunk/lib/plugin/DebugAuthInfo.php
===================================================================
--- trunk/lib/plugin/DebugAuthInfo.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/DebugAuthInfo.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -161,7 +161,7 @@
                         $val = $heading;
                     }
                 }
-                $rows[] = HTML::tr(HTML::td(array('align' => 'right',
+                $rows[] = HTML::tr(HTML::td(array('class' => 'align-right',
                             'bgcolor' => '#ccc',
                             'style' => 'color:#000000'),
                         HTML(HTML::raw(' '), $key,

Modified: trunk/lib/plugin/NewPagesPerUser.php
===================================================================
--- trunk/lib/plugin/NewPagesPerUser.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/NewPagesPerUser.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -96,7 +96,8 @@
             $pages[$monthnum]['author'][$author]['pages'][] = $pagename;
         }
         $iter->free();
-        $html = HTML::table(HTML::col(array('span' => 2, 'align' => 'left')));
+        $html = HTML::table(HTML::col(array('span' => 2,
+                                            'class' => 'align-left')));
         $nbsp = HTML::raw(' ');
         krsort($pages);
         foreach ($pages as $monthname => $parr) {

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/OldStyleTable.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -131,11 +131,11 @@
                 $attr['rowspan'] = strlen($m[2]) + 1;
 
             if ($m[3] == '^')
-                $attr['align'] = 'center';
+                $attr['class'] = 'align-center';
             else if ($m[3] == '>')
-                $attr['align'] = 'right';
+                $attr['class'] = 'align-right';
             else
-                $attr['align'] = 'left';
+                $attr['class'] = 'align-left';
 
             $content = TransformInline($m[4], $basepage);
 

Modified: trunk/lib/plugin/PreferenceApp.php
===================================================================
--- trunk/lib/plugin/PreferenceApp.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/PreferenceApp.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -203,7 +203,7 @@
         for ($i = 0; $i < count($pageids); $i++) {
             $total_cans = 0;
             for ($j = 0; $j < count($people); $j++) {
-                $td = HTML::td(array('align' => 'right'));
+                $td = HTML::td(array('class' => 'align-right'));
                 $cans_per_soda = $peopleTotals[$people[$j]][$pageids[$i]];
                 $total_cans = $total_cans + $cans_per_soda;
                 $outputArray[$people[$j]][$pageids[$i]] = $cans_per_soda;
@@ -255,23 +255,23 @@
             if ($total_voters == "") {
                 $total_voters = "-";
             }
-            $td = HTML::td(array('align' => 'right'));
+            $td = HTML::td(array('class' => 'align-right'));
             $td->pushContent($total_cans);
             $tr->pushContent($td);
-            $td = HTML::td(array('align' => 'right'));
+            $td = HTML::td(array('class' => 'align-right'));
             $td->pushContent($total_voters);
             $tr->pushContent($td);
             $table->pushContent($tr);
         }
 
         $tr = HTML::tr();
-        $td = HTML::td(array('align' => 'left'));
+        $td = HTML::td(array('class' => 'align-left'));
         $td->pushContent(HTML::strong(_("Total Budget")));
         $tr->pushContent($td);
         $cans_total = 0;
         $total_voters = 0;
         for ($i = 0; $i < count($people); $i++) {
-            $td = HTML::td(array('align' => 'right'));
+            $td = HTML::td(array('class' => 'align-right'));
             $cans_for_soda = 0;
             foreach ($pageids as $page) {
                 $cans_for_soda = $cans_for_soda + $outputArray[$people[$i]][$page];

Modified: trunk/lib/plugin/RecentChanges.php
===================================================================
--- trunk/lib/plugin/RecentChanges.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/RecentChanges.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -663,7 +663,7 @@
         //logo click opens the HomePage in the main browser frame
         global $WikiTheme;
         $img = HTML::img(array('src' => $WikiTheme->getImageURL('logo'),
-            'align' => 'right',
+            'class' => 'align-right',
             'style' => 'height:2.5ex'
         ));
         $linkurl = WikiLink(HOME_PAGE, false, $img);

Modified: trunk/lib/plugin/SemanticSearchAdvanced.php
===================================================================
--- trunk/lib/plugin/SemanticSearchAdvanced.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/SemanticSearchAdvanced.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -115,12 +115,12 @@
             $instructions, HTML::br(),
             HTML::table(array('class' => 'fullwidth'),
                 HTML::tr(HTML::td(_("Page Name")._(': '), $pagefilter),
-                    HTML::td(array('align' => 'right'),
+                    HTML::td(array('class' => 'align-right'),
                         $help)),
                 HTML::tr(HTML::td(array('colspan' => 2),
                     $querybox))),
             HTML::br(),
-            HTML::div(array('align' => 'center'), $submit));
+            HTML::div(array('class' => 'align-center'), $submit));
         return $form;
     }
 

Modified: trunk/lib/plugin/TeX2png.php
===================================================================
--- trunk/lib/plugin/TeX2png.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/TeX2png.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -203,7 +203,7 @@
                 $html = HTML::img(array('class' => 'tex',
                     'src' => $url,
                     'alt' => $text));
-                $html = HTML::div(array('align' => 'center'), $html);
+                $html = HTML::div(array('class' => 'align-center'), $html);
                 break;
             default:
                 break;

Modified: trunk/lib/plugin/WantedPagesOld.php
===================================================================
--- trunk/lib/plugin/WantedPagesOld.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/WantedPagesOld.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -120,7 +120,7 @@
                 // Enclose any FullTextSearch keys containing a space
                 // with quotes in oder to request a defnitive search.
                 $searchkey = (strstr($key, ' ') === false) ? $key : "\"$key\"";
-                $row = HTML::tr(HTML::td(array('align' => 'right'),
+                $row = HTML::tr(HTML::td(array('class' => 'align-right'),
                     Button(array('s' => $searchkey),
                         $val, _("FullTextSearch")),
                     // Alternatively, get BackLinks

Modified: trunk/lib/plugin/WikiAdminUtils.php
===================================================================
--- trunk/lib/plugin/WikiAdminUtils.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/WikiAdminUtils.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -134,7 +134,7 @@
         // FIXME: this should be moved into WikiDB::normalize() or something...
         $dbi = $request->getDbh();
         $count = 0;
-        $list = HTML::ol(array('align' => 'left'));
+        $list = HTML::ol(array('class' => 'align-left'));
         $pages = $dbi->getAllPages('include_empty'); // Do we really want the empty ones too?
         while (($page = $pages->next())) {
             $pagename = $page->getName();
@@ -150,7 +150,7 @@
             return _("No pages with bad names had to be deleted.");
         else {
             return HTML(fmt("Deleted %d pages with invalid names:", $count),
-                HTML::div(array('align' => 'left'), $list));
+                HTML::div(array('class' => 'align-left'), $list));
         }
     }
 
@@ -162,7 +162,7 @@
         $dbi = $request->getDbh();
         $count = 0;
         $notpurgable = 0;
-        $list = HTML::ol(array('align' => 'left'));
+        $list = HTML::ol(array('class' => 'align-left'));
         $pages = $dbi->getAllPages('include_empty');
         while (($page = $pages->next())) {
             if (!$page->exists()
@@ -185,7 +185,7 @@
             return _("No empty, unreferenced pages were found.");
         else
             return HTML(fmt("Deleted %d unreferenced pages:", $count),
-                HTML::div(array('align' => 'left'), $list),
+                HTML::div(array('class' => 'align-left'), $list),
                 ($notpurgable ?
                     fmt("The %d not-purgable pages/links are links in some page(s). You might want to edit them.",
                         $notpurgable)
@@ -205,7 +205,7 @@
             return _("No old _cached_html pagedata found.");
         else {
             return HTML(fmt("Converted successfully %d pages", $count),
-                HTML::div(array('align' => 'left'), $list));
+                HTML::div(array('class' => 'align-left'), $list));
         }
     }
 

Modified: trunk/lib/plugin/WikiPoll.php
===================================================================
--- trunk/lib/plugin/WikiPoll.php	2014-06-13 14:13:58 UTC (rev 8911)
+++ trunk/lib/plugin/WikiPoll.php	2014-06-13 15:15:35 UTC (rev 8912)
@@ -272,13 +272,13 @@
                 else
                     list($percent, $count, $all) = $this->getResult($page, $i, 1);
                 $print = sprintf(_("  %d%% (%d/%d)"), $percent, $count, $all);
-                $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'align' => 'left'), $q)));
+                $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'class' => 'align-left'), $q)));
                 $html->pushContent(HTML::tr(HTML::td($checkbox),
                     HTML::td($a),
                     HTML::td($this->bar($percent)),
                     HTML::td($print)));
             } else {
-                $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'align' => 'left'), $q)));
+                $html->pushContent(HTML::tr(HTML::th(array('colspan' => 4, 'class' => 'align-left'), $q)));
                 $row = HTML();
                 if (!$readonly)
                     $this->storeResult($page, $i, $answers[$i]);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8911] trunk

[<var...@us...>]

Revision: 8911
          http://sourceforge.net/p/phpwiki/code/8911
Author:   vargenau
Date:     2014-06-13 14:13:58 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Table summary attribute is obsolete in HTML 5

Modified Paths:
--------------
    trunk/lib/plugin/MediawikiTable.php
    trunk/lib/plugin/OldStyleTable.php
    trunk/lib/plugin/RichTable.php
    trunk/pgsrc/Help%2FMediawikiTablePlugin
    trunk/pgsrc/Help%2FOldStyleTablePlugin

Modified: trunk/lib/plugin/MediawikiTable.php
===================================================================
--- trunk/lib/plugin/MediawikiTable.php	2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/lib/plugin/MediawikiTable.php	2014-06-13 14:13:58 UTC (rev 8911)
@@ -102,7 +102,7 @@
                 if (in_array($key, array("id", "class", "title", "style",
                     "bgcolor", "frame", "rules", "border",
                     "cellspacing", "cellpadding",
-                    "summary", "align", "width"))
+                    "align", "width"))
                 ) {
                     $table->setAttr($key, $value);
                 }
@@ -153,12 +153,6 @@
                 continue;
             }
 
-            // Table summary
-            if (substr($line, 0, 2) == "|=") {
-                $line = substr($line, 2);
-                $table->setAttr("summary", trim($line));
-            }
-
             // Table caption
             if (substr($line, 0, 2) == "|+") {
 

Modified: trunk/lib/plugin/OldStyleTable.php
===================================================================
--- trunk/lib/plugin/OldStyleTable.php	2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/lib/plugin/OldStyleTable.php	2014-06-13 14:13:58 UTC (rev 8911)
@@ -58,7 +58,6 @@
             'cellpadding' => '1',
             'cellspacing' => '1',
             'border' => '1',
-            'summary' => '',
         );
     }
 
@@ -92,7 +91,7 @@
         $table = HTML::table($table_args);
         if (!empty($caption))
             $table->pushContent(HTML::caption($caption));
-        if (preg_match("/^\s*(cellpadding|cellspacing|border|caption|summary)/", $lines[0]))
+        if (preg_match("/^\s*(cellpadding|cellspacing|border|caption)/", $lines[0]))
             $lines[0] = '';
         foreach ($lines as $line) {
             if (!$line)

Modified: trunk/lib/plugin/RichTable.php
===================================================================
--- trunk/lib/plugin/RichTable.php	2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/lib/plugin/RichTable.php	2014-06-13 14:13:58 UTC (rev 8911)
@@ -54,7 +54,7 @@
                 if (in_array($key, array("id", "class", "title", "style",
                     "bgcolor", "frame", "rules", "border",
                     "cellspacing", "cellpadding",
-                    "summary", "align", "width"))
+                    "align", "width"))
                 ) {
                     $table->setAttr($key, $value);
                 }

Modified: trunk/pgsrc/Help%2FMediawikiTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FMediawikiTablePlugin	2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/pgsrc/Help%2FMediawikiTablePlugin	2014-06-13 14:13:58 UTC (rev 8911)
@@ -1,4 +1,4 @@
-Date: Tue,  9 Nov 2010 14:24:02 +0000
+Date: Fri, 13 Jun 2014 16:12:42 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FMediawikiTablePlugin;
@@ -13,16 +13,11 @@
 
 * The table starts with a line ##{|##.
 * An optional table caption is made with a line starting with a pipe and a plus sign ##|+## followed by the caption.
-* An optional table summary is made with a line starting with a pipe and an equal sign ##|=## followed by the summary.
 * A table row starts with a pipe and a hyphen: ##|-##.
 * A table cell starts with a pipe on a new line, or a double bar ##||## on the same line.
 * A header table cell starts with an exclamation mark, or a double exclamation mark ##!!## on the same line.
 * The table ends with a line ##|}##.
 
-The summary syntax is an extension to the Mediawiki syntax.
-You can also simply put the summary as an attribute to the table.
-The summary is necessary to be able to create accessible tables.
-
 If the first row of the table as made with header cells only, this row will be put in a //thead//.
 In that case, this row will be repeated on every page when printing the table.
 
@@ -76,7 +71,6 @@
 
 {| border="1" style="width: 100%"
 |+ style="font-weight: bold; font-size: 150%;" | This is the table caption
-|= This is the table summary
 |- style="white-space: nowrap"
 ! Header 1
 ! Header 2
@@ -94,7 +88,6 @@
 {{{
 {| border="1" style="width: 100%"
 |+ style="font-weight: bold; font-size: 150%;" | This is the table caption
-|= This is the table summary
 |- style="white-space: nowrap"
 ! Header 1
 ! Header 2

Modified: trunk/pgsrc/Help%2FOldStyleTablePlugin
===================================================================
--- trunk/pgsrc/Help%2FOldStyleTablePlugin	2014-06-13 13:56:02 UTC (rev 8910)
+++ trunk/pgsrc/Help%2FOldStyleTablePlugin	2014-06-13 14:13:58 UTC (rev 8911)
@@ -1,4 +1,4 @@
-Date: Thu, 16 Dec 2010 12:53:03 +0000
+Date: Fri, 13 Jun 2014 16:12:42 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FOldStyleTablePlugin;
@@ -61,10 +61,6 @@
 | **cellpadding**
 | Any number
 | 1
-|-
-| **summary**
-| Any string
-| Empty string
 |}
 
 == Syntax ==

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8910] trunk/themes/Wordpress/templates/editpage.tmpl

[<var...@us...>]

Revision: 8910
          http://sourceforge.net/p/phpwiki/code/8910
Author:   vargenau
Date:     2014-06-13 13:56:02 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Remove extra </p>

Modified Paths:
--------------
    trunk/themes/Wordpress/templates/editpage.tmpl

Modified: trunk/themes/Wordpress/templates/editpage.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/editpage.tmpl	2014-06-13 13:02:09 UTC (rev 8909)
+++ trunk/themes/Wordpress/templates/editpage.tmpl	2014-06-13 13:56:02 UTC (rev 8910)
@@ -39,8 +39,7 @@
     <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>
-</p>
-<a id="editarea"><?php echo $EDIT_TEXTAREA?></a>
+<a id="editarea"></a><?php echo $EDIT_TEXTAREA?>
 <br /><small>
 <?php echo _("Summary")?>: <?php echo $SUMMARY_INPUT ?>
 <br />

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8909] trunk/pgsrc/PhpWikiManual

[<var...@us...>]

Revision: 8909
          http://sourceforge.net/p/phpwiki/code/8909
Author:   vargenau
Date:     2014-06-13 13:02:09 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/pgsrc/PhpWikiManual

Modified: trunk/pgsrc/PhpWikiManual
===================================================================
--- trunk/pgsrc/PhpWikiManual	2014-06-13 12:57:16 UTC (rev 8908)
+++ trunk/pgsrc/PhpWikiManual	2014-06-13 13:02:09 UTC (rev 8909)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 18:07:00 +0000
+Date: Fri, 13 Jun 2014 15:00:58 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=PhpWikiManual;
@@ -34,7 +34,7 @@
 <<IncludePage page="Help/Advice for Mediawiki users">>
 <<IncludePages pages=<!plugin-list BackLinks page=CategoryWikiPlugin sortby=pagename exclude="Template/*" !> >>
 
-{| width="100%"
-|- align="center"
+{| style="width:100%"
+|- class="align-center"
 | **END OF DOCUMENT**
 |}

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8908] trunk/lib/plugin/CreateBib.php

[<var...@us...>]

Revision: 8908
          http://sourceforge.net/p/phpwiki/code/8908
Author:   vargenau
Date:     2014-06-13 12:57:16 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/plugin/CreateBib.php

Modified: trunk/lib/plugin/CreateBib.php
===================================================================
--- trunk/lib/plugin/CreateBib.php	2014-06-13 12:52:03 UTC (rev 8907)
+++ trunk/lib/plugin/CreateBib.php	2014-06-13 12:57:16 UTC (rev 8908)
@@ -119,7 +119,7 @@
         $dump_button = $WikiTheme->makeButton("To File",
             $dump_url, 'foo');
 
-        $html = HTML::div(array('class' => 'bib', 'align' => 'left'));
+        $html = HTML::div(array('class' => 'bib align-left'));
         $html->pushContent($dump_button, ' ');
         $list = HTML::pre(array('id' => 'biblist', 'class' => 'bib'));
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8907] trunk/lib/plugin/AddComment.php

[<var...@us...>]

Revision: 8907
          http://sourceforge.net/p/phpwiki/code/8907
Author:   vargenau
Date:     2014-06-13 12:52:03 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use 'id', not 'name', for HTML::a

Modified Paths:
--------------
    trunk/lib/plugin/AddComment.php

Modified: trunk/lib/plugin/AddComment.php
===================================================================
--- trunk/lib/plugin/AddComment.php	2014-06-13 12:19:46 UTC (rev 8906)
+++ trunk/lib/plugin/AddComment.php	2014-06-13 12:52:03 UTC (rev 8907)
@@ -97,7 +97,7 @@
     a.title='" . _("Click to display all comments") . "';
   }
 }"));
-            $html->pushContent(HTML::h4(HTML::a(array('name' => 'comment-header',
+            $html->pushContent(HTML::h4(HTML::a(array('id' => 'comment-header',
                     'class' => 'wikiaction',
                     'title' => _("Click to display"),
                     'onclick' => "togglecomments(this)"),

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8906] trunk/themes

[<var...@us...>]

Revision: 8906
          http://sourceforge.net/p/phpwiki/code/8906
Author:   vargenau
Date:     2014-06-13 12:19:46 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Remove comments in templates

Modified Paths:
--------------
    trunk/themes/Crao/templates/body.tmpl
    trunk/themes/MonoBook/templates/body.tmpl
    trunk/themes/Portland/templates/body.tmpl
    trunk/themes/Sidebar/templates/body.tmpl
    trunk/themes/Sidebar/templates/search.tmpl
    trunk/themes/Wordpress/templates/body.tmpl
    trunk/themes/blog/templates/body.tmpl
    trunk/themes/blog/templates/browse-footer.tmpl
    trunk/themes/blog/templates/browse.tmpl
    trunk/themes/default/templates/body.tmpl
    trunk/themes/default/templates/search.tmpl
    trunk/themes/wikilens/templates/body.tmpl

Modified: trunk/themes/Crao/templates/body.tmpl
===================================================================
--- trunk/themes/Crao/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/Crao/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,4 +1,4 @@
-<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
 <div id="header"><?php // for top toolbars style sheet ?>
   <?php echo Template('top') ?>
 </div>

Modified: trunk/themes/MonoBook/templates/body.tmpl
===================================================================
--- trunk/themes/MonoBook/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/MonoBook/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,7 +1,7 @@
 <?php
 // Todo: set the body attr dynamically. here class="ns-2" for mozilla
 ?>
-<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
     <div id="global-wrapper">
       <div id="column-content">
 	<div id="content">

Modified: trunk/themes/Portland/templates/body.tmpl
===================================================================
--- trunk/themes/Portland/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/Portland/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,4 +1,4 @@
-<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
 <!-- Page title and logo -->
 <h1><a class="wikilink"
        href="<?php echo WikiURL(HOME_PAGE)?>"

Modified: trunk/themes/Sidebar/templates/body.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/Sidebar/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,7 +1,4 @@
-<?php
-// Set the body attr dynamically. here class="ns-2" for Mozilla
-?>
-  <body <?php echo $WikiTheme->getMoreAttr('body') ?>>
+  <body <?php echo $WikiTheme->getMoreAttr('body') ?> >
     <div id="global-wrapper">
       <div id="column-content">
 	<div id="content">

Modified: trunk/themes/Sidebar/templates/search.tmpl
===================================================================
--- trunk/themes/Sidebar/templates/search.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/Sidebar/templates/search.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,4 +1,3 @@
-<!--{{{ LiveSearch -->
 <div id="searchholder">
 <form id="searchform" action="<?php echo WikiURL(_("FindPage"))?>"
       method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
@@ -34,4 +33,3 @@
 <?php } ?> <?php echo $SEARCH_AFTER ?>
 </form>
 </div>
-<!--}}}-->

Modified: trunk/themes/Wordpress/templates/body.tmpl
===================================================================
--- trunk/themes/Wordpress/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/Wordpress/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,16 +1,9 @@
-<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
 
 <!-- Page title -->
 <h1 id="header"><?php echo $HEADER ?></h1>
 
 <!-- Page title and logo -->
-<!--
-<h1><a class="wikilink"
-       href="<?php echo WikiURL(HOME_PAGE)?>"
-       ><img src="<?php echo $WikiTheme->getImageURL('logo')?>"
-             alt="<?php echo fmt(_("%s: %s"), WIKI_NAME, HOME_PAGE) ?>"
-             align="bottom" /></a> <?php echo $HEADER?></h1>
--->
 <?php echo $CONTENT ?>
 <?php echo Template('navbar') ?>
 <!-- RELATEDPAGES were here. -->

Modified: trunk/themes/blog/templates/body.tmpl
===================================================================
--- trunk/themes/blog/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/blog/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,26 +1,20 @@
-<body <?php echo $WikiTheme->getMoreAttr('body') ?>>
-<!--{{{ Page-->
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
 <div id="page">
 <?php echo Template('top') ?>
 
 <?php // $CONTENT includes browse.tmpl ?>
-<!--{{{ PageTitle-->
 <div id="pagetitle">
 <h1 id="pagetitleText"><?php echo $HEADER ?></h1></div>
-<!--}}}-->
 <div id="bodyContent">
 <?php echo $CONTENT?>
 </div>
 
-<!--{{{ Bottom errors and debugging info-->
 <div id="bottom">
 <?php echo Template('bottom') ?>
 </div>
-<!--}}}-->
-<!--{{{ Footer-->
 <div id="footer">
 <?php echo Template('browse-footer') ?>
-</div><!--}}} Footer-->
+</div>
 
-</div><!--}}} Page-->
+</div>
 </body>

Modified: trunk/themes/blog/templates/browse-footer.tmpl
===================================================================
--- trunk/themes/blog/templates/browse-footer.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/blog/templates/browse-footer.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,6 +1,5 @@
-<!--{{{ Edit Date-->
 <p class="editdate">
 <?php if( $page->getName() != _("HomePage")) { ?>
 <?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?><br />
 <?php } ?>
-This site is powered by <a href="http://phpwiki.sourceforge.net">PhpWiki</a>. Page design based on <a href="http://binarybonsai.com/kubrick/">Kubrick</a>,<br />adapted by <a href="http://the.taoofmac.com">Rui Carmo</a> from an original design by <a href="http://binarybonsai.com">Michael Heilemann</a>.</p><!--}}} Edit Date-->
+This site is powered by <a href="http://phpwiki.sourceforge.net">PhpWiki</a>. Page design based on <a href="http://binarybonsai.com/kubrick/">Kubrick</a>,<br />adapted by <a href="http://the.taoofmac.com">Rui Carmo</a> from an original design by <a href="http://binarybonsai.com">Michael Heilemann</a>.</p>

Modified: trunk/themes/blog/templates/browse.tmpl
===================================================================
--- trunk/themes/blog/templates/browse.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/blog/templates/browse.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -11,20 +11,14 @@
   <p><?php echo $redirected ?></p>
 <?php } ?>
 
-<!--{{{ Content-->
 <div id="content" class="narrowcolumn">
 
 <?php echo $CONTENT?>
 
-<!--{{{ Comments-->
 <div class="comments">
 </div>
-<!--}}} Comments-->
 
 <hr class="printer" />
-<!--}}} Content-->
 </div>
 
-<!--{{{ Sidebar-->
 <?php echo Template('sidebar')?>
-<!--}}}-->

Modified: trunk/themes/default/templates/body.tmpl
===================================================================
--- trunk/themes/default/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/default/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,4 +1,4 @@
-<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
 
 <div id="header">
   <?php echo Template('top') ?>

Modified: trunk/themes/default/templates/search.tmpl
===================================================================
--- trunk/themes/default/templates/search.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/default/templates/search.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,4 +1,3 @@
-<!--{{{ LiveSearch --> <?php // -*- php -*- ?>
 <div id="searchholder">
 <form id="searchform" action="<?php echo WikiURL(_("TitleSearch"))?>"
       method="get" accept-charset="UTF-8" style="display:inline" class="searchform">
@@ -34,4 +33,3 @@
 <?php } ?> <?php echo empty($SEARCH_AFTER) ? '' : $SEARCH_AFTER ?> 
 </form>
 </div>
-<!--}}}-->

Modified: trunk/themes/wikilens/templates/body.tmpl
===================================================================
--- trunk/themes/wikilens/templates/body.tmpl	2014-06-13 12:01:58 UTC (rev 8905)
+++ trunk/themes/wikilens/templates/body.tmpl	2014-06-13 12:19:46 UTC (rev 8906)
@@ -1,4 +1,4 @@
-<body<?php echo $WikiTheme->getMoreAttr('body') ?>>
+<body <?php echo $WikiTheme->getMoreAttr('body') ?> >
 
 <table><tr><td colspan="2" class="header">
 <div id="header">

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8905] trunk/lib/InlineParser.php

[<var...@us...>]

Revision: 8905
          http://sourceforge.net/p/phpwiki/code/8905
Author:   vargenau
Date:     2014-06-13 12:01:58 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
'acronym' is deprecated in HTML 5, replace by 'abbr'

Modified Paths:
--------------
    trunk/lib/InlineParser.php

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2014-06-13 09:42:38 UTC (rev 8904)
+++ trunk/lib/InlineParser.php	2014-06-13 12:01:58 UTC (rev 8905)
@@ -911,10 +911,8 @@
 
     function markup($match, $body)
     {
-        if (substr($match, 1, 4) == 'abbr')
-            $tag = 'abbr';
-        else
-            $tag = 'acronym';
+        // 'acronym' is deprecated in HTML 5, replace by 'abbr'
+        $tag = 'abbr';
         $rest = substr($match, 1 + strlen($tag), -1);
         $attrs = parse_attributes($rest);
         // Remove attributes other than title and lang

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8904] trunk/lib/InlineParser.php

[<var...@us...>]

Revision: 8904
          http://sourceforge.net/p/phpwiki/code/8904
Author:   vargenau
Date:     2014-06-13 09:42:38 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
No name attribute for HTML::a

Modified Paths:
--------------
    trunk/lib/InlineParser.php

Modified: trunk/lib/InlineParser.php
===================================================================
--- trunk/lib/InlineParser.php	2014-06-13 09:28:23 UTC (rev 8903)
+++ trunk/lib/InlineParser.php	2014-06-13 09:42:38 UTC (rev 8904)
@@ -464,8 +464,7 @@
     if ($hash) {
         // It's an anchor, not a link...
         $id = MangleXmlIdentifier($link);
-        return HTML::a(array('name' => $id, 'id' => $id),
-            $bar ? $label : $link);
+        return HTML::a(array('id' => $id), $bar ? $label : $link);
     }
 
     if (preg_match("#^(" . ALLOWED_PROTOCOLS . "):#", $link)) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8903] trunk/lib/BlockParser.php

[<var...@us...>]

Revision: 8903
          http://sourceforge.net/p/phpwiki/code/8903
Author:   vargenau
Date:     2014-06-13 09:28:23 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
No border for table

Modified Paths:
--------------
    trunk/lib/BlockParser.php

Modified: trunk/lib/BlockParser.php
===================================================================
--- trunk/lib/BlockParser.php	2014-06-13 09:14:38 UTC (rev 8902)
+++ trunk/lib/BlockParser.php	2014-06-13 09:28:23 UTC (rev 8903)
@@ -840,7 +840,6 @@
 
     function finish()
     {
-
         $defs = &$this->_content;
 
         $ncols = 0;
@@ -850,9 +849,7 @@
         foreach ($defs as $key => $defn)
             $defs[$key]->setWidth($ncols);
 
-        return HTML::table(array('class' => 'wiki-dl-table',
-                'border' => 1),
-            $defs);
+        return HTML::table(array('class' => 'wiki-dl-table'), $defs);
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8902] trunk/pgsrc/Help%2FTextFormattingRules

[<var...@us...>]

Revision: 8902
          http://sourceforge.net/p/phpwiki/code/8902
Author:   vargenau
Date:     2014-06-13 09:14:38 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/pgsrc/Help%2FTextFormattingRules

Modified: trunk/pgsrc/Help%2FTextFormattingRules
===================================================================
--- trunk/pgsrc/Help%2FTextFormattingRules	2014-06-13 08:51:17 UTC (rev 8901)
+++ trunk/pgsrc/Help%2FTextFormattingRules	2014-06-13 09:14:38 UTC (rev 8902)
@@ -1,4 +1,4 @@
-Date: Mon,  8 Jul 2013 17:58:18 +0000
+Date: Fri, 13 Jun 2014 11:12:56 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FTextFormattingRules;
@@ -97,7 +97,7 @@
 {| class="bordered"
 |-
 | %color=aqua% aqua %%
-| bgcolor="#565c5e" | %color=beige% beige %%
+| style="background-color:#565c5e" | %color=beige% beige %%
 | %color=black% black %%
 | %color=blue% blue %%
 | %color=brown% brown %%
@@ -108,7 +108,7 @@
 | %color=gray% gray %%
 |-
 | %color=green% green %%
-| bgcolor="#565c5e" | %color=ivory% ivory %%
+| style="background-color:#565c5e" | %color=ivory% ivory %%
 | %color=indigo% indigo %%
 | %color=lime% lime %%
 | %color=magenta% magenta %%
@@ -122,11 +122,11 @@
 | %color=red% red %%
 | %color=salmon% salmon %%
 | %color=silver% silver %%
-| bgcolor="#565c5e" | %color=snow% snow %%
+| style="background-color:#565c5e" | %color=snow% snow %%
 | %color=teal% teal %%
 | %color=turquoise% turquoise %%
 | %color=violet% violet %%
-| bgcolor="#565c5e" | %color=white% white %%
+| style="background-color:#565c5e" | %color=white% white %%
 | %color=yellow% yellow %%
 |}
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8901] trunk/lib/PageType.php

[<var...@us...>]

Revision: 8901
          http://sourceforge.net/p/phpwiki/code/8901
Author:   vargenau
Date:     2014-06-13 08:51:17 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Replace space by %20 in interwikis

Modified Paths:
--------------
    trunk/lib/PageType.php

Modified: trunk/lib/PageType.php
===================================================================
--- trunk/lib/PageType.php	2014-06-12 19:18:59 UTC (rev 8900)
+++ trunk/lib/PageType.php	2014-06-13 08:51:17 UTC (rev 8901)
@@ -241,6 +241,7 @@
         else
             $url .= $page_enc;
 
+        $url = str_replace(' ', '%20', $url);
         $link = HTML::a(array('href' => $url));
 
         if (!$linktext) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8900] trunk/pgsrc/ Help%2FAdvice%20for%20Mediawiki%20users

[<var...@us...>]

Revision: 8900
          http://sourceforge.net/p/phpwiki/code/8900
Author:   vargenau
Date:     2014-06-12 19:18:59 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
<tt> --> <samp>

Modified Paths:
--------------
    trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users

Modified: trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users
===================================================================
--- trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users	2014-06-12 19:12:34 UTC (rev 8899)
+++ trunk/pgsrc/Help%2FAdvice%20for%20Mediawiki%20users	2014-06-12 19:18:59 UTC (rev 8900)
@@ -1,4 +1,4 @@
-Date: Mon, 13 Jan 2014 13:36:51 +0000
+Date: Thu, 12 Jun 2014 21:17:47 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FAdvice%20for%20Mediawiki%20users;
@@ -16,8 +16,8 @@
 * Italics are ##//## (but you can also use ##''## like in Wikipedia)
 * Bold is ##~*~*## (you //cannot use// ##'''## like in Wikipedia)
 * Line break is ##~\~\## in Wikicreole, ##~<br />## in Mediawiki
-* There is **no automatic capitalisation** of first character of page name. Pages *<tt>~[~[foo~]~]</tt>* and *<tt>~[~[Foo~]~]</tt>* are different.
-* A space in a page name in not equivalent to an underscore. Pages *<tt>~[~[foo bar~]~]</tt>* and *<tt>~[~[foo_bar~]~]</tt>* are different. We recommend to use a space in the page names.
+* There is **no automatic capitalisation** of first character of page name. Pages *<samp>~[~[foo~]~]</samp>* and *<samp>~[~[Foo~]~]</samp>* are different.
+* A space in a page name in not equivalent to an underscore. Pages *<samp>~[~[foo bar~]~]</samp>* and *<samp>~[~[foo_bar~]~]</samp>* are different. We recommend to use a space in the page names.
 * Many things that are built-in in Mediawiki use plug-ins in Phpwiki (table of contents, redirections, back links, etc.).
 * Redirections are less sophisticated in Phpwiki (e.g. backlinks do not show redirected pages)
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8899] trunk/themes/default/templates/login.tmpl

[<var...@us...>]

Revision: 8899
          http://sourceforge.net/p/phpwiki/code/8899
Author:   vargenau
Date:     2014-06-12 19:12:34 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
$charset is UTF-8

Modified Paths:
--------------
    trunk/themes/default/templates/login.tmpl

Modified: trunk/themes/default/templates/login.tmpl
===================================================================
--- trunk/themes/default/templates/login.tmpl	2014-06-12 15:58:52 UTC (rev 8898)
+++ trunk/themes/default/templates/login.tmpl	2014-06-12 19:12:34 UTC (rev 8899)
@@ -37,9 +37,9 @@
 if (ALLOW_BOGO_LOGIN && $require_level <= WIKIAUTH_BOGO) {
   require_once("lib/BlockParser.php");
   // This sample covers French, Spanish, Italian, German, and probably others
-  $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, $charset);
+  $examplechars = htmlentities("ÀñíçéàÖãæôßøü", ENT_QUOTES, 'UTF-8');
   // Japanese login requires utf-8 and ALLOW_NONWIKIWORD_LOGINS
-  if (($charset == 'utf-8') && defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
+  if (defined('ALLOW_NONWIKIWORD_LOGINS') && ALLOW_NONWIKIWORD_LOGINS) {
     // sample Japanese login name
     $examplechars = $examplechars . "天道あかね";
   }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8898] trunk/lib/plugin/Calendar.php

[<var...@us...>]

Revision: 8898
          http://sourceforge.net/p/phpwiki/code/8898
Author:   vargenau
Date:     2014-06-12 15:58:52 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/plugin/Calendar.php

Modified: trunk/lib/plugin/Calendar.php
===================================================================
--- trunk/lib/plugin/Calendar.php	2014-06-12 15:58:17 UTC (rev 8897)
+++ trunk/lib/plugin/Calendar.php	2014-06-12 15:58:52 UTC (rev 8898)
@@ -92,15 +92,15 @@
                 'title' => _("Next Month")),
             '>');
 
-        $row = HTML::tr(HTML::td(array('align' => 'left'), $prev),
-            HTML::td(array('align' => 'center'),
+        $row = HTML::tr(HTML::td(array('class' => 'align-left'), $prev),
+            HTML::td(array('class' => 'align-center'),
                 HTML::strong(array('class' => 'cal-header'),
                     strftime($args['month_format'],
                         $time))),
-            HTML::td(array('align' => 'right'), $next));
+            HTML::td(array('class' => 'align-right'), $next));
 
         return HTML::tr(HTML::td(array('colspan' => $args['display_weeknum'] ? 8 : 7,
-                'align' => 'center'),
+                'class' => 'align-center'),
             HTML::table(array('class' => 'cal-header fullwidth'), $row)));
     }
 
@@ -117,12 +117,10 @@
         $row = HTML::tr();
         $row->setattr('class', 'cal-dayname');
         if ($this->args['display_weeknum'])
-            $row->pushContent(HTML::td(array('class' => 'cal-dayname',
-                    'align' => 'center'),
+            $row->pushContent(HTML::td(array('class' => 'cal-dayname align-center'),
                 _("Wk")));
         for ($i = 0; $i < 7; $i++) {
-            $row->pushContent(HTML::td(array('class' => 'cal-dayname',
-                    'align' => 'center'),
+            $row->pushContent(HTML::td(array('class' => 'cal-dayname align-center'),
                 strftime($fs, $time)));
             $time += SECONDS_PER_DAY;
         }
@@ -137,7 +135,7 @@
             $time);
         $t = localtime($time, 1);
 
-        $td = HTML::td(array('align' => 'center'));
+        $td = HTML::td(array('class' => 'align-center'));
 
         $mday = $t['tm_mday'];
         if ($mday == $this->_today) {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8897] trunk/pgsrc/Help%2FCalendarPlugin

[<var...@us...>]

Revision: 8897
          http://sourceforge.net/p/phpwiki/code/8897
Author:   vargenau
Date:     2014-06-12 15:58:17 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/pgsrc/Help%2FCalendarPlugin

Modified: trunk/pgsrc/Help%2FCalendarPlugin
===================================================================
--- trunk/pgsrc/Help%2FCalendarPlugin	2014-06-12 15:43:56 UTC (rev 8896)
+++ trunk/pgsrc/Help%2FCalendarPlugin	2014-06-12 15:58:17 UTC (rev 8897)
@@ -1,4 +1,4 @@
-Date: Fri,  7 Dec 2012 15:16:29 +0000
+Date: Thu, 12 Jun 2014 17:57:14 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.4.0)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FCalendarPlugin;
@@ -30,7 +30,7 @@
 ! Description
 ! Default value
 |-
-| colspan="3" align="center" | **Selection of Month**
+| colspan="3" class="align-center" | **Selection of Month**
 |-
 | **year**
 | Specify the year for the calendar.
@@ -44,7 +44,7 @@
 | Added to //month//. Can be used to include several months worth of calendars on a single wiki page.
 | 0
 |-
-| colspan="3" align="center" | **"Day Page" Names**
+| colspan="3" class="align-center" | **"Day Page" Names**
 |-
 | **date_format**
 | [[php-function:strftime|strftime]] style format string used to generate page names for the "day pages."
@@ -54,7 +54,7 @@
 | Prepended to the date (formatted per //date_format//) to generate the "day page" names.
 | The default value is =~[pagename]/=.
 |-
-| colspan="3" align="center" | **Appearance**
+| colspan="3" class="align-center" | **Appearance**
 |-
 | **month_format**
 | [[php-function:strftime|strftime]] style format string used to generate the title of the calendar.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8896] trunk/lib

[<var...@us...>]

Revision: 8896
          http://sourceforge.net/p/phpwiki/code/8896
Author:   vargenau
Date:     2014-06-12 15:43:56 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/diff.php
    trunk/lib/plugin/Diff.php

Modified: trunk/lib/diff.php
===================================================================
--- trunk/lib/diff.php	2014-06-12 15:39:51 UTC (rev 8895)
+++ trunk/lib/diff.php	2014-06-12 15:43:56 UTC (rev 8896)
@@ -203,7 +203,7 @@
 {
     global $WikiTheme;
 
-    $row = HTML::tr(HTML::td(array('align' => 'right'), $label));
+    $row = HTML::tr(HTML::td(array('class' => 'align-right'), $label));
     if ($rev) {
         $author = $rev->get('author');
         $dbi = $request->getDbh();

Modified: trunk/lib/plugin/Diff.php
===================================================================
--- trunk/lib/plugin/Diff.php	2014-06-12 15:39:51 UTC (rev 8895)
+++ trunk/lib/plugin/Diff.php	2014-06-12 15:43:56 UTC (rev 8896)
@@ -54,7 +54,7 @@
 
         global $WikiTheme;
 
-        $row = HTML::tr(HTML::td(array('align' => 'right'), $label));
+        $row = HTML::tr(HTML::td(array('class' => 'align-right'), $label));
         if ($rev) {
             $author = $rev->get('author');
             $dbi = $request->getDbh();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8895] trunk

[<var...@us...>]

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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8894] trunk/lib/plugin/HelloWorld.php

[<var...@us...>]

Revision: 8894
          http://sourceforge.net/p/phpwiki/code/8894
Author:   vargenau
Date:     2014-06-12 15:12:50 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
HTML::tt --> HTML::samp

Modified Paths:
--------------
    trunk/lib/plugin/HelloWorld.php

Modified: trunk/lib/plugin/HelloWorld.php
===================================================================
--- trunk/lib/plugin/HelloWorld.php	2014-06-12 15:10:07 UTC (rev 8893)
+++ trunk/lib/plugin/HelloWorld.php	2014-06-12 15:12:50 UTC (rev 8894)
@@ -24,9 +24,9 @@
  * A simple demonstration WikiPlugin.
  *
  * Usage:
- * <<HelloWorld?>
+ * <<HelloWorld>>
  * <<HelloWorld
- *          salutation="Greetings, "
+ *          salutation="Greetings"
  *          name=Wikimeister
  * >>
  * <<HelloWorld salutation=Hi >>
@@ -48,8 +48,8 @@
     // Establish default values for each of this plugin's arguments.
     function getDefaultArguments()
     {
-        return array('salutation' => "Hello,",
-            'name' => "World");
+        return array('salutation' => "Hello",
+                     'name' => "World");
     }
 
     function run($dbi, $argstr, &$request, $basepage)
@@ -58,7 +58,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.

[phpwiki-checkins] SF.net SVN: phpwiki:[8893] trunk/lib/PageList.php

[<var...@us...>]

Revision: 8893
          http://sourceforge.net/p/phpwiki/code/8893
Author:   vargenau
Date:     2014-06-12 15:10:07 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
Use CSS

Modified Paths:
--------------
    trunk/lib/PageList.php

Modified: trunk/lib/PageList.php
===================================================================
--- trunk/lib/PageList.php	2014-06-12 14:33:34 UTC (rev 8892)
+++ trunk/lib/PageList.php	2014-06-12 15:10:07 UTC (rev 8893)
@@ -1677,13 +1677,13 @@
             for ($i = $offset; $i < $offset + $count; $i += $length) {
                 $this->_saveOptions(array('cols' => 0, 'paging' => 'none'));
                 $this->_pages = array_slice($this->_pages, $i, $length);
-                $cols->pushContent(HTML::td( /*array('width' => $width),*/
-                    $this->_generateList()));
+                $cols->pushContent(HTML::td($this->_generateList()));
                 $this->_restoreOptions();
             }
             // speed up table rendering by defining colgroups
             $out->pushContent(HTML::table(HTML::colgroup
-                (array('span' => $this->_options['cols'], 'width' => $width)),
+                (array('span' => $this->_options['cols'],
+                       'style' => 'width: '.$width)),
                 $cols));
             return $out;
         }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8892] trunk/lib/HtmlElement.php

[<var...@us...>]

Revision: 8892
          http://sourceforge.net/p/phpwiki/code/8892
Author:   vargenau
Date:     2014-06-12 14:33:34 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
HtmlElement: implement more tags

Modified Paths:
--------------
    trunk/lib/HtmlElement.php

Modified: trunk/lib/HtmlElement.php
===================================================================
--- trunk/lib/HtmlElement.php	2014-06-12 13:45:42 UTC (rev 8891)
+++ trunk/lib/HtmlElement.php	2014-06-12 14:33:34 UTC (rev 8892)
@@ -3,9 +3,6 @@
  * Code for writing the HTML subset of XML.
  * @author: Jeff Dairiki
  *
- * This code is now php5 compatible. --2004-04-19 23:51:43 rurban
- * Specialized for php-5.3: added public static 2010-06-07 09:51:37 rurban
- *
  * Todo: Add support for a JavaScript backend, a php2js compiler.
  * HTML::div(array('onclick' => 'HTML::div(...)'))
  */
@@ -17,7 +14,6 @@
 /**
  * An XML element.
  */
-//apd_set_session_trace(35);
 
 class HtmlElement extends XmlElement
 {
@@ -78,7 +74,6 @@
 
         // FIXME: this should be initialized from title by an onLoad() function.
         //        (though, that may not be possible.)
-        $qtooltip = str_replace("'", "\\'", $tooltip_text);
         $this->setAttr('onmouseover',
             sprintf('window.status="%s"; return true;',
                 addslashes($tooltip_text)));
@@ -303,6 +298,48 @@
         return $el->_init2(func_get_args());
     }
 
+    public static function abbr( /*...*/)
+    {
+        $el = new HtmlElement('abbr');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function acronym( /*...*/)
+    {
+        $el = new HtmlElement('acronym');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function cite( /*...*/)
+    {
+        $el = new HtmlElement('cite');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function code( /*...*/)
+    {
+        $el = new HtmlElement('code');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function dfn( /*...*/)
+    {
+        $el = new HtmlElement('dfn');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function kbd( /*...*/)
+    {
+        $el = new HtmlElement('kbd');
+        return $el->_init2(func_get_args());
+    }
+
+    public static function samp( /*...*/)
+    {
+        $el = new HtmlElement('samp');
+        return $el->_init2(func_get_args());
+    }
+
     /****************************************/
     public static function tt( /*...*/)
     {

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8891] trunk/lib/plugin/HtmlConverter.php

[<var...@us...>]

Revision: 8891
          http://sourceforge.net/p/phpwiki/code/8891
Author:   vargenau
Date:     2014-06-12 13:45:42 +0000 (Thu, 12 Jun 2014)
Log Message:
-----------
Remove size for file input

Modified Paths:
--------------
    trunk/lib/plugin/HtmlConverter.php

Modified: trunk/lib/plugin/HtmlConverter.php
===================================================================
--- trunk/lib/plugin/HtmlConverter.php	2014-06-11 16:21:02 UTC (rev 8890)
+++ trunk/lib/plugin/HtmlConverter.php	2014-06-12 13:45:42 UTC (rev 8891)
@@ -52,8 +52,7 @@
             'name' => 'MAX_FILE_SIZE',
             'value' => MAX_UPLOAD_SIZE)));
         $contents->pushContent(HTML::input(array('name' => 'userfile',
-            'type' => 'file',
-            'size' => '50')));
+            'type' => 'file')));
         $contents->pushContent(HTML::raw(" "));
         $contents->pushContent(HTML::input(array('value' => _("Convert"),
             'type' => 'submit')));

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8890] trunk/lib/plugin

[<var...@us...>]

Revision: 8890
          http://sourceforge.net/p/phpwiki/code/8890
Author:   vargenau
Date:     2014-06-11 16:21:02 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
Update PHP Doc

Modified Paths:
--------------
    trunk/lib/plugin/FoafViewer.php
    trunk/lib/plugin/RateIt.php

Modified: trunk/lib/plugin/FoafViewer.php
===================================================================
--- trunk/lib/plugin/FoafViewer.php	2014-06-11 16:20:15 UTC (rev 8889)
+++ trunk/lib/plugin/FoafViewer.php	2014-06-11 16:21:02 UTC (rev 8890)
@@ -188,8 +188,8 @@
     /**
      * Renders array elements as HTML. May be used recursively.
      *
-     * @param $array Source array
-     * @param $index Element Index to use.
+     * @param array $array Source array
+     * @param int $index Element Index to use.
      * @param null $dc
      * @return \RawXml
      * @todo Make sure it can look more than 1 layer deep

Modified: trunk/lib/plugin/RateIt.php
===================================================================
--- trunk/lib/plugin/RateIt.php	2014-06-11 16:20:15 UTC (rev 8889)
+++ trunk/lib/plugin/RateIt.php	2014-06-11 16:21:02 UTC (rev 8890)
@@ -309,13 +309,13 @@
      *
      * This needs to be put in the <body> section of the page.
      *
-     * @param $pagename    Name of the page to rate
-     * @param $version     Version of the page to rate (may be "" for current)
-     * @param $imgPrefix   Prefix of the names of the images that display the rating
+     * @param string $pagename    Name of the page to rate
+     * @param int $version     Version of the page to rate (may be "" for current)
+     * @param string $imgPrefix   Prefix of the names of the images that display the rating
      *                    You can have two widgets for the same page displayed at
      *                    once iff the imgPrefix-s are different.
-     * @param $dimension   Id of the dimension to rate
-     * @param $small       Makes a smaller ratings widget if non-false
+     * @param int $dimension   Id of the dimension to rate
+     * @param bool $small       Makes a smaller ratings widget if non-false
      *
      * Limitations: Currently this can only print the current users ratings.
      *              And only the widget, but no value (for buddies) also.

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

[phpwiki-checkins] SF.net SVN: phpwiki:[8889] trunk/lib/plugin

[<var...@us...>]

Revision: 8889
          http://sourceforge.net/p/phpwiki/code/8889
Author:   vargenau
Date:     2014-06-11 16:20:15 +0000 (Wed, 11 Jun 2014)
Log Message:
-----------
Remove unused argument

Modified Paths:
--------------
    trunk/lib/plugin/ExternalSearch.php
    trunk/lib/plugin/SyncWiki.php

Modified: trunk/lib/plugin/ExternalSearch.php
===================================================================
--- trunk/lib/plugin/ExternalSearch.php	2014-06-11 16:04:26 UTC (rev 8888)
+++ trunk/lib/plugin/ExternalSearch.php	2014-06-11 16:20:15 UTC (rev 8889)
@@ -42,7 +42,7 @@
         //fixme: better description
     }
 
-    private function getInterWikiUrl(&$request)
+    private function getInterWikiUrl()
     {
         $intermap = getInterwikiMap();
         $map = $intermap->_map;
@@ -83,7 +83,7 @@
         if (in_array('url', array_keys($posted))) {
             $s = $posted['s'];
             $this->_url = $posted['url'];
-            $this->getInterWikiUrl($request);
+            $this->getInterWikiUrl();
             if (strstr($this->_url, '%s')) {
                 $this->_url = sprintf($this->_url, $s);
             } else
@@ -99,7 +99,7 @@
         if ($formsize < 1)
             $formsize = 30;
         $this->_url = $url;
-        $this->getInterWikiUrl($request);
+        $this->getInterWikiUrl();
         $form = HTML::form(array('action' => $request->getPostURL(),
                 'method' => 'post',
                 //'class'  => 'class', //fixme

Modified: trunk/lib/plugin/SyncWiki.php
===================================================================
--- trunk/lib/plugin/SyncWiki.php	2014-06-11 16:04:26 UTC (rev 8888)
+++ trunk/lib/plugin/SyncWiki.php	2014-06-11 16:20:15 UTC (rev 8889)
@@ -116,7 +116,6 @@
             //$ol = HTML::ol();
             $done = array();
             foreach ($pagelist as $ext) {
-                $reaction = _("<unknown>");
                 // compare existance and dates with local page
                 $extdate = iso8601_decode($ext['lastModified']->scalar, 1);
                 // TODO: urldecode ???
@@ -130,7 +129,7 @@
                     // check date of latest revision if there's one, and > mergepoint
                     if (($ourrev->getVersion() > 1) and ($ourrev->get('mtime') > $merge_point)) {
                         // our was deleted after sync, and changed after last sync.
-                        $this->_addConflict('delete', $args, $our, $extdate);
+                        $this->_addConflict('delete', $args, $our);
                         $reaction = (_(" skipped") . " (" . "locally deleted or moved" . ")");
                     } else {
                         $reaction = $this->_import($args, $our, $extdate);
@@ -143,14 +142,14 @@
                     } elseif ($extdate > $ourdate and $ourdate >= $merge_point) {
                         $rel = '>';
                         // our is older then external but newer than last sync
-                        $reaction = $this->_addConflict('import', $args, $our, $extdate);
+                        $reaction = $this->_addConflict('import', $args, $our);
                     } elseif ($extdate < $ourdate and $extdate < $merge_point) {
                         $rel = '>';
                         $reaction = $this->_export($args, $our);
                     } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
                         $rel = '>';
                         // our is newer and external is also newer
-                        $reaction = $this->_addConflict('export', $args, $our, $extdate);
+                        $reaction = $this->_addConflict('export', $args, $our);
                     } else {
                         $rel = '==';
                         $reaction = _("same date");
@@ -193,7 +192,7 @@
                         $reaction = $this->_export($args, $our);
                     } elseif ($extdate < $ourdate and $extdate >= $merge_point) {
                         // our newer and external newer
-                        $reaction = $this->_addConflict($args, $our, $extdate);
+                        $reaction = $this->_addConflict('', $args, $our);
                     }
                 } else {
                     $reaction = 'xmlrpc error';
@@ -260,7 +259,7 @@
         closedir($dh);
     }
 
-    private function _addConflict($what, $args, $our, $extdate = null)
+    private function _addConflict($what, $args, $our)
     {
         $pagename = $our->getName();
         $meb = Button(array('action' => $args['action'],

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.