[phpwiki-checkins] SF.net SVN: phpwiki:[7063] trunk/lib/plugin/WikiAdminSearchReplace.php

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

Revision: 7063
          http://phpwiki.svn.sourceforge.net/phpwiki/?rev=7063&view=rev
Author:   vargenau
Date:     2009-08-06 15:18:47 +0000 (Thu, 06 Aug 2009)

Log Message:
-----------
Do not display content at start; display content if found; put buttons inside fieldset

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

Modified: trunk/lib/plugin/WikiAdminSearchReplace.php
===================================================================
--- trunk/lib/plugin/WikiAdminSearchReplace.php	2009-08-06 09:46:59 UTC (rev 7062)
+++ trunk/lib/plugin/WikiAdminSearchReplace.php	2009-08-06 15:18:47 UTC (rev 7063)
@@ -169,7 +169,9 @@
         }
 
         if ($next_action == 'verify') {
-            $args['info'] = "checkbox,pagename,hi_content";
+            $args['info'] = "checkbox,pagename";
+        } else {
+            $args['info'] = "checkbox,pagename,hi_content,mtime,author";
         }
         $pagelist = new PageList_Selectable
 	    ($args['info'], $args['exclude'],
@@ -191,23 +193,21 @@
             $button_label = _("Yes");
             $header->pushContent(
               HTML::p(HTML::strong(
-                                   _("Are you sure you want to permanently search & replace text in the selected files?"))));
+                                   _("Are you sure you want to permanently replace text in the selected files?"))));
             $this->replaceForm($header, $post_args);
-        }
-        else {
+        } else {
             $button_label = _("Search & Replace");
             $this->replaceForm($header, $post_args);
             $header->pushContent(HTML::legend(_("Select the pages to search and replace")));
         }
 
-
-        $buttons = HTML::p(Button('submit:admin_replace[rename]', $button_label, 'wikiadmin'),
+        $buttons = HTML::p(Button('submit:admin_replace[replace]', $button_label, 'wikiadmin'),
                            Button('submit:admin_replace[cancel]', _("Cancel"), 'button'));
+        $header->pushContent($buttons);
 
         return HTML::form(array('action' => $request->getPostURL(),
                                 'method' => 'post'),
                           $header,
-                          $buttons,
                           $pagelist->getContent(),
                           HiddenInputs($request->getArgs(),
                                         false,
@@ -245,7 +245,6 @@
         $this->_tablePush($table, '', $this->checkBox($post_args, 'case_exact', _("Case exact?")));
 	$this->_tablePush($table, '', $this->checkBox($post_args, 'regex', _("Regex?")));
         $header->pushContent($table);
-        $header->pushContent(HTML::br());
         return $header;
     }
 }


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