Merge branch 'advanced-search'

sites/all/modules/gui/materiobasemod/materio_personalnotes.info

@@ -1,4 +1,8 @@
+<<<<<<< HEAD
 name = Materio Personal Notes
+=======
+name = Materio Personal Notes Module
+>>>>>>> advanced-search
 description = "Materio per user notes on node module"
 
 ; Core version (required)

sites/all/modules/gui/materiobasemod/materio_search_api.module

@@ -1183,10 +1183,18 @@ function materio_search_api_advanced_search_select_callback($form, &$form_state)
   return $form['filters'];
 }
 function materio_search_api_advanced_search_addfilter_callback($form, &$form_state) {
-  return $form['filters'];
+  $commands = array();
+  $commands[] = ajax_command_replace('#advancedsearch-filters-wrapper', render($form['filters']));
+  $commands[] = array('command'=>'ajaxAfterAddedFilterLine');
+  return array("#type"=>'ajax', "#commands"=>$commands);
+  // return $form['filters'];
 }
 function materio_search_api_advanced_search_rmline_callback($form, &$form_state) {
-  return $form['filters'];
+  $commands = array();
+  $commands[] = ajax_command_replace('#advancedsearch-filters-wrapper', render($form['filters']));
+  $commands[] = array('command'=>'ajaxAfterRemovedFilterLine');
+  return array("#type"=>'ajax', "#commands"=>$commands);
+  // return $form['filters'];
 }
 
 function materio_search_api_advanced_search_form_validate($form, &$form_state){

sites/all/themes/gui/materiobasetheme/css/styles.css

@@ -3320,8 +3320,7 @@ body.node-type-publication #footer {
 */
 #utilities {
   background-color: #fff;
-  margin-top: 60px;
-  max-height: 100px; }
+  margin-top: 60px; }
   .not-logged-in #utilities {
     overflow: hidden; }
   #utilities > .inner {

sites/all/themes/gui/materiobasetheme/js/script.js

@@ -428,12 +428,11 @@
         // if(!_max_480() && !_touch ){
           height += $('#utilities').h();//+15;
         // }
-
         //$('#main').css('margin-top', height+15);
         // $('#container').css('padding-top', height+15);
 
         if(!$('html').is(".ie8")){
-          $('#container').animate({'padding-top':height}, 300);
+          $('#container').animate({'padding-top':height}, 150);
         }
       // }
     };
@@ -518,6 +517,16 @@
         $(this).parents('.block').removeClass('hovered');
         $('.hovered').not($(this).parents('.block')).removeClass('hovered');
       });
+
+      // @see http://www.jaypan.com/tutorial/calling-function-after-ajax-event-drupal-7
+    	Drupal.ajax.prototype.commands.ajaxAfterAddedFilterLine = function(ajax, response, status){
+    		// console.log('ajax after added filter line');
+        initLayout();
+    	};
+      Drupal.ajax.prototype.commands.ajaxAfterRemovedFilterLine = function(ajax, response, status){
+        // console.log('ajax after removed filter line');
+        initLayout();
+      };
     };
 
     function onLoadingContent(event){

sites/all/themes/gui/materiobasetheme/scss/styles.scss

@@ -573,7 +573,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
   @media #{$small-only}{
     margin-top:0;
   }
-  max-height: 100px;
+  // max-height: 100px;
 }
 /*
                     _