Fixes #3865 updated logbrowser refine form

diff --git a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
index dadc6cda34da0afbb433c91187b7b5470ffd318d..2be1f33dc0a368d141ac810a0454169272ea6714 100644 (file)
--- a/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
+++ b/mod/logbrowser/views/default/admin/administer_utilities/logbrowser.php
@@ -34,7 +34,7 @@ if ($timeupper) {
        $timeupper = strtotime($timeupper);
 }
 
-$form = elgg_view('logbrowser/form', array(
+$refine = elgg_view('logbrowser/refine', array(
        'user_guid' => $user,
        'timeupper' => $timeupper,
        'timelower' => $timelower,
@@ -54,7 +54,7 @@ $nav = elgg_view('navigation/pagination',array(
 
 // display admin body
 $body = <<<__HTML
-$form
+$refine
 $nav
 $table
 $nav

diff --git a/mod/logbrowser/views/default/logbrowser/form.php b/mod/logbrowser/views/default/logbrowser/form.php
deleted file mode 100644 (file)
index 2cb746e..0000000
--- a/mod/logbrowser/views/default/logbrowser/form.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * Log browser search form
- *
- * @package ElggLogBrowser
- */
-?>
-
-<div id="logbrowser-search-area">
-<?php
-       
-       if ($vars['timelower']) {
-               $lowerval = date('r',$vars['timelower']);
-       } else {
-               $lowerval = "";
-       }
-       if ($vars['timeupper']) {
-               $upperval = date('r',$vars['timeupper']);
-       } else {
-               $upperval = "";
-       }
-       if ($vars['user_guid']) {
-               if ($user = get_entity($vars['user_guid']))
-                       $userval = $user->username;
-       } else {
-               $userval = "";
-       }
-       
-
-       $form = "<p>" . elgg_echo('logbrowser:user');
-       $form .= elgg_view('input/text', array(
-               'name' => 'search_username',
-               'value' => $userval,
-       )) . "</p>";
-               
-       $form .= "<p>" . elgg_echo('logbrowser:starttime');
-       $form .= elgg_view('input/text', array(
-               'name' => 'timelower',
-               'value' => $lowerval,
-       )) . "</p>";
-
-       $form .= "<p>" . elgg_echo('logbrowser:endtime');
-       $form .= elgg_view('input/text', array(
-               'name' => 'timeupper',
-               'value' => $upperval,
-       ))  . "</p>";
-       $form .= elgg_view('input/submit', array(
-               'value' => elgg_echo('search'),
-       ));
-               
-       //@todo Forms 1.8: Convert to use elgg_view_form()
-       $wrappedform = elgg_view('input/form', array(
-               'body' => $form,
-               'method' => 'get',
-               'action' => "admin/utilities/logbrowser",
-               'disable_security' => true,
-       ));
-
-       $toggle_link = elgg_view('output/url', array(
-               'href' => '#log-browser-search-form',
-               'text' => elgg_echo('logbrowser:search'),
-               'rel' => 'toggle',
-       ));
-?>
-       <p>
-               <?php echo $toggle_link; ?>
-       </p>
-       <div id="log-browser-search-form" class="elgg-module elgg-module-inline hidden">
-               <div class="elgg-head">
-                       <h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
-               </div>
-               <div class="elgg-body">
-                       <?php echo $wrappedform; ?>
-               </div>
-       </div>
-</div>
\ No newline at end of file

diff --git a/mod/logbrowser/views/default/logbrowser/refine.php b/mod/logbrowser/views/default/logbrowser/refine.php
new file mode 100644 (file)
index 0000000..27cb604
--- /dev/null
+++ b/mod/logbrowser/views/default/logbrowser/refine.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Log browser search form
+ *
+ * @package ElggLogBrowser
+ */
+
+$form_vars = array(
+       'method' => 'get',
+       'action' => 'admin/administer_utilities/logbrowser',
+       'disable_security' => true,
+);
+$form = elgg_view_form('logbrowser/refine', $form_vars, $vars);
+
+$toggle_link = elgg_view('output/url', array(
+       'href' => '#log-browser-search-form',
+       'text' => elgg_echo('logbrowser:search'),
+       'rel' => 'toggle',
+));
+
+?>
+
+<div id="logbrowser-search-area" class="mbm">
+       <div>
+               <?php echo $toggle_link; ?>
+       </div>
+       <div id="log-browser-search-form" class="elgg-module elgg-module-inline hidden">
+               <div class="elgg-head">
+                       <h3><?php echo elgg_echo('logbrowser:search'); ?></h3>
+               </div>
+               <div class="elgg-body">
+                       <?php echo $form; ?>
+               </div>
+       </div>
+</div>
\ No newline at end of file