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

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

Revision: 9708
          http://sourceforge.net/p/phpwiki/code/9708
Author:   vargenau
Date:     2015-07-10 10:04:59 +0000 (Fri, 10 Jul 2015)
Log Message:
-----------
Help/SearchHighlightPlugin: add default values" pgsrc/Help%2FSearchHighlightPlugin

Modified Paths:
--------------
    trunk/lib/plugin/CreateToc.php
    trunk/lib/plugin/FullTextSearch.php
    trunk/pgsrc/Help%2FFullTextSearchPlugin
    trunk/pgsrc/Help%2FSearchHighlightPlugin
    trunk/pgsrc/ReleaseNotes

Modified: trunk/lib/plugin/CreateToc.php
===================================================================
--- trunk/lib/plugin/CreateToc.php	2015-07-09 16:02:09 UTC (rev 9707)
+++ trunk/lib/plugin/CreateToc.php	2015-07-10 10:04:59 UTC (rev 9708)
@@ -407,6 +407,9 @@
         ) {
             return $this->error(_("Error: firstlevelstyle must be 'number', 'letter' or 'roman'"));
         }
+        if ($extracollapse == 'false') {
+            $extracollapse = false;
+        }
 
         // Check if page exists.
         if (!($dbi->isWikiPage($pagename))) {
@@ -486,25 +489,20 @@
         if ($noheader) {
         } else {
             $toctoggleid = GenerateId("toctoggle");
-            if ($extracollapse)
+            if ($extracollapse) {
                 $toclink = HTML(_("Table of Contents"),
                     " ",
                     HTML::a(array('id' => 'TOC')),
                     HTML::img(array(
                         'id' => $toctoggleid,
                         'class' => 'wikiaction',
-                        'title' => _("Click to display the TOC"),
+                        'title' => ($jshide ? _('Click to display the TOC') : _('Click to hide the TOC')),
                         'onclick' => "toggletoc(this, '" . $open . "', '" . $close . "', '" . $toclistid . "', '" . _('Click to display the TOC') . "', '" . _('Click to hide the TOC') . "')",
                         'alt' => 'toctoggle',
                         'src' => $jshide ? $close : $open)));
-            else
-                $toclink = HTML::a(array('id' => 'TOC',
-                        'class' => 'wikiaction',
-                        'title' => _("Click to display"),
-                        'onclick' => "toggletoc(this, '" . $open . "', '" . $close . "', '" . $toclistid . "', '" . _('Click to display the TOC') . "', '" . _('Click to hide the TOC') . "')"),
-                    _("Table of Contents"),
-                    HTML::span(array('style' => 'display:none',
-                        'id' => $toctoggleid), " "));
+            } else {
+                $toclink = HTML(_("Table of Contents"), HTML::a(array('id' => 'TOC')));
+            }
             $html->pushContent(HTML::p(array('class' => 'toctitle'), $toclink));
         }
         $html->pushContent($list);

Modified: trunk/lib/plugin/FullTextSearch.php
===================================================================
--- trunk/lib/plugin/FullTextSearch.php	2015-07-09 16:02:09 UTC (rev 9707)
+++ trunk/lib/plugin/FullTextSearch.php	2015-07-10 10:04:59 UTC (rev 9708)
@@ -75,6 +75,9 @@
                            _("You must enter a search term."));
         }
         extract($args);
+        if ($quiet == 'false') {
+            $quiet = false;
+        }
 
         $query = new TextSearchQuery($s, $case_exact, $regex);
         $pages = $dbi->fullSearch($query, $sortby, $limit, $exclude);

Modified: trunk/pgsrc/Help%2FFullTextSearchPlugin
===================================================================
--- trunk/pgsrc/Help%2FFullTextSearchPlugin	2015-07-09 16:02:09 UTC (rev 9707)
+++ trunk/pgsrc/Help%2FFullTextSearchPlugin	2015-07-10 10:04:59 UTC (rev 9708)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Jun 2015 12:04:28 +0000
+Date: Fri, 10 Jul 2015 10:59:51 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FFullTextSearchPlugin;
@@ -60,10 +60,10 @@
 == Example ==
 
 {{{
-<<FullTextSearch>>
+<<FullTextSearch s=boolean>>
 }}}
 
-<<FullTextSearch>>
+<<FullTextSearch s=boolean>>
 
 == Author ==
 * [[Help:Reini Urban|Reini Urban]]

Modified: trunk/pgsrc/Help%2FSearchHighlightPlugin
===================================================================
--- trunk/pgsrc/Help%2FSearchHighlightPlugin	2015-07-09 16:02:09 UTC (rev 9707)
+++ trunk/pgsrc/Help%2FSearchHighlightPlugin	2015-07-10 10:04:59 UTC (rev 9708)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Jun 2015 12:04:28 +0000
+Date: Fri, 10 Jul 2015 11:26:54 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
   pagename=Help%2FSearchHighlightPlugin;
@@ -11,7 +11,7 @@
 
 When someone is referred from a search engine like Google, Yahoo
 or our own fulltextsearch, the terms the user searched for are highlighted.
-See also http://wordpress.org/about/shots/1.2/plugins.png
+See also [[http://wordpress.org/about/shots/1.2/plugins.png]].
 
 == Arguments ==
 
@@ -23,15 +23,15 @@
 |-
 | **s**
 | The search term
-|
+| //none//
 |-
 | **case_exact**
 | boolean
-|
+| false
 |-
 | **regex**
 | boolean
-|
+| false
 |}
 
 <noinclude>

Modified: trunk/pgsrc/ReleaseNotes
===================================================================
--- trunk/pgsrc/ReleaseNotes	2015-07-09 16:02:09 UTC (rev 9707)
+++ trunk/pgsrc/ReleaseNotes	2015-07-10 10:04:59 UTC (rev 9708)
@@ -1,4 +1,4 @@
-Date: Mon, 29 Jun 2015 12:04:28 +0000
+Date: Fri, 10 Jul 2015 11:05:03 +0000
 Mime-Version: 1.0 (Produced by PhpWiki 1.5.4)
 Content-Type: application/x-phpwiki;
   pagename=ReleaseNotes;
@@ -8,6 +8,10 @@
 
 <<CreateToc with_toclink||=1 headers||=1,2,3 width=300px position=right>>
 
+== 1.5.5 2015-XX-XX Marc-Etienne Vargenau ==
+
+* Fix tooltip translation in ~CreateToc plugin
+
 == 1.5.4 2015-06-29 Marc-Etienne Vargenau ==
 
 * Fix ~WantedPages for Fusionforge

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