Commits

Jason Green committed baf0648

Fixing labels. Also restoring animation on clicking advanced search button.

  • Participants
  • Parent commits faf92d8
  • Branches searchrefactor

Comments (0)

Files changed (3)

File app/protected/extensions/zurmoinc/framework/views/SearchView.php

 
         protected function renderViewToolBarLinksForAdvancedSearch($form)
         {
-            $content  = CHtml::link(Yii::t('Default', 'Close'), '#', array('id' => 'cancel-advanced-search'));
             $params = array();
             $params['label']       = Yii::t('Default', 'Search');
-            $params['htmlOptions'] = array('id' => 'search-advanced-search');
+            $params['htmlOptions'] = array('id' => 'search-advanced-search', 'onclick' => 'js:$(this).addClass("attachLoadingTarget");');
             $searchElement = new SaveButtonActionElement(null, null, null, $params);
-            $content .= $searchElement->render();
+            $content  = $searchElement->render();
+            $content .= CHtml::link(Yii::t('Default', 'Close'), '#', array('id' => 'cancel-advanced-search'));
             return $content;
         }
 

File app/protected/modules/zurmo/views/search/DynamicSearchView.php

             {
                 $style3 = 'display:none;';
             }
-            $content  = CHtml::link(Yii::t('Default', 'More Options'), '#',
+            $content  = CHtml::link(Yii::t('Default', 'Modify Structure'), '#',
                             array('id'    => 'show-dynamic-search-structure-div-link-' . $this->getSearchFormId() . '',
                                   'style' => $style1));
             $content .= CHtml::tag('div',

File app/protected/modules/zurmo/views/search/SavedDynamicSearchView.php

 
         protected function renderAfterAddExtraRowContent($form)
         {
-            $content  = '<strong class="mp-divider"> · </strong>' . CHtml::link(Yii::t('Default', 'Save this search'), '#', array('id' => 'save-as-advanced-search'));
+            $content  = '<strong class="mp-divider"> · </strong>' . CHtml::link(Yii::t('Default', 'Save search'), '#', array('id' => 'save-as-advanced-search'));
             $content  = CHtml::tag('div', array('class' => 'search-save-container'), $content);
             $content .= '<div id="save-search-area" class="view-toolbar-container clearfix" style="display:none;">';
             $content .= $this->renderSaveInputAndSaveButtonContentForAdvancedSearch($form);
             return $content;
         }
 
-        protected function renderViewToolBarLinksForAdvancedSearch($form)
-        {
-            $params = array();
-            $params['label']       = Yii::t('Default', 'Search');
-            $params['htmlOptions'] = array('id' => 'search-advanced-search');
-            $searchElement = new SaveButtonActionElement(null, null, null, $params);
-            $content  = $searchElement->render();
-            $content .= CHtml::link(Yii::t('Default', 'Close'), '#', array('id' => 'cancel-advanced-search'));
-
-
-            return $content;
-        }
-
         protected function renderSaveInputAndSaveButtonContentForAdvancedSearch($form)
         {
             $content               = $form->textField($this->model, 'savedSearchName');