refix quicksearch

atk4 · Feb 25, 2014 · 25ddd1b · 25ddd1b
1 parent bc74a53
commit 25ddd1b
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 30 deletions.
diff --git a/lib/Grid/Basic.php b/lib/Grid/Basic.php
@@ -339,7 +339,7 @@ function renderRows()
         if ($this->total_rows) {
             $this->template->del('not_found');
         } elseif ($this->no_records_message) {
-            $this->template->tryDel('all_table');
+            $this->template->del('header');
             $this->template->set('not_found_message', $this->no_records_message);
         }
     }

diff --git a/lib/QuickSearch.php b/lib/QuickSearch.php
@@ -53,9 +53,12 @@ function init()
 
         // cancel button
         if($this->show_cancel && $this->recall($this->search_field->short_name)) {
-            $this->bset->addButton('', array('options'=>array('text'=>false)))
-                ->setHtml('&nbsp;')
-                ->setIcon($this->cancel_icon)
+            $this->add('View',null,'cancel_button')
+                ->setClass('atk-cell')
+                ->add('HtmlElement')
+                ->setElement('A')
+                ->setClass('atk-button')
+                ->setHtml('<span class="icon-cancel atk-swatch-red"></span>')
                 ->js('click', array(
                     $this->search_field->js()->val(null),
                     $this->js()->submit()
@@ -65,8 +68,8 @@ function init()
         // search button
         $this->add('HtmlElement',null,'form_buttons')
             ->setElement('A')
-            ->setHtml('&nbsp;')
-            ->setClass('icon-search atk-swatch-ink')
+            ->setClass('atk-button')
+            ->setHtml('<span class="icon-search"></span>')
             ->js('click', $this->js()->submit());
     }
 

diff --git a/templates/form/quicksearch.html b/templates/form/quicksearch.html
@@ -1,5 +1,4 @@
-<span id="{$_name}" style="{$style}" class="{$class}"><form name="{$form_name}" action="{$form_action}" method="POST">{$Hint}
-{Content}
+<span id="{$_name}" style="{$style}" class="{$class} span_3"><form name="{$form_name}" action="{$form_action}" method="POST"><div class="atk-cells atk-input-combo">{$cancel_button}<div class="atk-cell atk-jackscrew">{Content}
 {form_line}
 {$before_field}
 {field_input}<input type="text" name="loginemail" value="" placeholder="{field_caption}Search...{/}" class="logintext"/>{/}
@@ -9,5 +8,4 @@
 {form_separator}
 {separator} Personal information{/}
 {/form_separator}
-{/Content}
-{form_buttons}<a href="javascript:void(0)" class="icon-search atk-swatch-ink"></a>{/form_buttons}</form></span>
+{/Content}</div><div class="atk-cell">{$form_buttons}</div></div></form></span>
diff --git a/templates/form/quicksearch.jade b/templates/form/quicksearch.jade
@@ -1,21 +1,22 @@
-span(id="{$_name}" style="{$style}" class="{$class}")
+span(id="{$_name}" style="{$style}" class="{$class} span_3")
     form(name="{$form_name}" action="{$form_action}" method="POST")
-        {$Hint}
-        {Content}
-        {form_line}
-        {$before_field}
-        {field_input}
-        input(type="text" name="loginemail" class="logintext" value="" placeholder="{field_caption}Search...{/}")
-        {/}
-        {$after_field}
-        {field_error}
-        span.form_error {field_error_str}Error{/}
-        {/}
-        {/form_line}
-        {form_separator}
-        {separator} Personal information{/}
-        {/form_separator}
-        {/Content}
-        {form_buttons}
-        a(href="javascript:void(0)" class="icon-search atk-swatch-ink")
-        {/form_buttons}
+        .atk-cells.atk-input-combo
+            {$cancel_button}
+            .atk-cell.atk-jackscrew
+                {Content}
+                {form_line}
+                {$before_field}
+                {field_input}
+                input(type="text" name="loginemail" class="logintext" value="" placeholder="{field_caption}Search...{/}")
+                {/}
+                {$after_field}
+                {field_error}
+                span.form_error {field_error_str}Error{/}
+                {/}
+                {/form_line}
+                {form_separator}
+                {separator} Personal information{/}
+                {/form_separator}
+                {/Content}
+            .atk-cell
+                {$form_buttons}