diff --git a/sites/all/modules/gui/materiobasemod/materio_personalnotes.info b/sites/all/modules/gui/materiobasemod/materio_personalnotes.info new file mode 100644 index 00000000..5e7938bc --- /dev/null +++ b/sites/all/modules/gui/materiobasemod/materio_personalnotes.info @@ -0,0 +1,23 @@ +name = Materio Personal Notes Module +description = "Materio per user notes on node module" + +; Core version (required) +core = 7.x + +; Package name (see http://drupal.org/node/542202 for a list of names) +package = Materio + +; PHP version requirement (optional) +; php = 5.2 + +; Loadable code files +; files[] = materio_ctools_automodal.module + +; Module dependencies +dependencies[] = user + +; Configuration page +; configure = admin/config/materiobasemod + +; For further information about configuration options, see +; - http://drupal.org/node/542202 diff --git a/sites/all/modules/gui/materiobasemod/materio_search_api.module b/sites/all/modules/gui/materiobasemod/materio_search_api.module index f0e118c3..577a88f9 100755 --- a/sites/all/modules/gui/materiobasemod/materio_search_api.module +++ b/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){ diff --git a/sites/all/themes/gui/materiobasetheme/css/styles.css b/sites/all/themes/gui/materiobasetheme/css/styles.css index 2c874894..2956b0ad 100644 --- a/sites/all/themes/gui/materiobasetheme/css/styles.css +++ b/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 { diff --git a/sites/all/themes/gui/materiobasetheme/js/script.js b/sites/all/themes/gui/materiobasetheme/js/script.js index 8b7a3b39..fb3d7cd8 100644 --- a/sites/all/themes/gui/materiobasetheme/js/script.js +++ b/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){ diff --git a/sites/all/themes/gui/materiobasetheme/js/script.min.js b/sites/all/themes/gui/materiobasetheme/js/script.min.js index 4393c4ef..d8d0bd20 100644 --- a/sites/all/themes/gui/materiobasetheme/js/script.min.js +++ b/sites/all/themes/gui/materiobasetheme/js/script.min.js @@ -8,7 +8,7 @@ initDoubleSearchFormTabs();if(_isBreveMateriauNodePage) $.event.trigger({type:'resultschanged',container:'#content>.inner-content'});setTimeout(function(){$.event.trigger({type:'theme-ready'});},100);};function checkIE(){if($('.oldie body').size()&&!readCookie('oldie_checked')){setTimeout(function(){createCookie('oldie_checked',1);alert('Afin de profiter pleinement des fonctionalités de materio.com, nous vous invitons a mettre a jour votre navigateur dans ça denière version. Celui ci n\'étant pas compatible avec les technologie employer par materio.com, vous risquer de rencontrer des difficulter de navigation.');},4000);}};function initHistoryNav(){trace("initHistoryNav _History",_History);var state=_History.getState();_History.Adapter.bind(window,'statechange',onHistoryStateChange);$(document).bind('new-history-page',onNewHistoryPage);};function onNewHistoryPage(event){trace('theme :: onNewHistoryPage',event);var title=event.title.replace(/<(?:.|\n)*?>/gm,'')+' | '+_strings.site_name;_statePushed=true;_History.pushState({content:event.content,pagetitle:event.title},title,event.path);};function onHistoryStateChange(event){trace('theme :: onHistoryStateChange',event);var state=_History.getState();_History.log('statechange:',state.data,state.title,state.url);$.event.trigger({type:'record-stat',path:state.url});$('input[name=location]','#feedback-form').attr('value',state.url);$.event.trigger({type:'materio-page-title-refresh-block',title:state.data.pagetitle});if(!_statePushed){_statePushed=false;$('.inner-content',_$content).html(state.data.content);$.event.trigger('history-state-change');}};function initHome(){$('img.lazy','#block-materio-didactique-materio-didactique-home').each(function(){var $img=$(this);$img.attr('src',$img.attr('data-original'));});if(_max_768()){initHomeDidactiqueMobile();}else{initHomeDidactiqueDesktop();}};function initHomeDidactiqueMobile(){_$homeBlockDidactique=$('#block-materio-didactique-materio-didactique-home');$('.node-didactique',_$homeBlockDidactique).find('.field-name-title-field').bind('click',clickOnHomeDidactiqueTitle);};function clickOnHomeDidactiqueTitle(e){var $node=$(this).parent('.node-didactique');if($node.is('.opened')){$node.removeClass('opened');}else{$('.node-didactique',_$homeBlockDidactique).removeClass('opened');$node.addClass('opened');$('html,body').animate({scrollTop:$node.offset().top-$('#header').h()});}};function initHomeDidactiqueDesktop(){_$homeUtilities=$('#utilities');_$homeBlockDidactique=$('#block-materio-didactique-materio-didactique-home').append('
').append('').bind('mouseenter',function(event){_hoverHomeDidactique=true;}).bind('mouseleave',function(event){_hoverHomeDidactique=false;});$('.node-didactique',_$homeBlockDidactique).each(function(index){if(index){$(this).addClass('op-hidden');}else{$(this).addClass('op-visible');} $('.field-name-title-field',this).clone().addClass(index?'':'active').click(function(event){$(this).addClass('active').siblings().removeClass('active');_$homeBlockDidactique.find('.node-didactique').removeClass('op-visible').addClass('op-hidden').eq(index).removeClass('op-hidden').addClass('op-visible');}).appendTo($('.tabs',_$homeBlockDidactique));}).appendTo($('.slides',_$homeBlockDidactique));if(!_touch){$(document).bind('scroll',function(event){if($(window).scrollTop()==0){if(_$homeUtilities.is('.closed')){_$homeUtilities.removeClass('closed');launchHomeDidactiqueInterval();initLayout();}}else{if(!_$homeUtilities.is('.closed')){_$homeUtilities.addClass('closed');clearInterval(_homeTimeInterval);initLayout();}}});} $(document).bind('cbox_complete',function(){clearInterval(_homeTimeInterval);}).bind('cbox_closed',function(){launchHomeDidactiqueInterval();});$('.side.oops a').click(function(event){event.preventDefault();window.location.href=$(this).attr('href');return false;});};function launchHomeDidactiqueInterval(){_homeTimeInterval=setInterval(function(){if(!_hoverHomeDidactique){var $next=$('.tabs .active',_$homeBlockDidactique).next();if(!$next.length) -$next=$('.tabs .active',_$homeBlockDidactique).siblings().eq(0);$next.trigger('click');}},15000);};function initHomeV2(){initCards('#home-v2 .panel-pane.news-panel .panel-col-first .views-row');$('.panel-pane.showroom .group-content-wrapper','#home-v2').attr('data-400-center-top','transform:translateX(-43em);opacity:0;').attr('data-100-center-center','transform[quadratic]:translateX(0em);opacity[quadratic]:1;').attr('data-top-bottom','transform[quadratic]:translateX(10em);');$('.panel-pane.showroom .field-name-field-bandeau img','#home-v2').attr('data-400-bottom-top','transform:translateY(-20em);').attr('data-200-top-bottom','transform:translateY(5em);');$('.panel-pane.bdd .group-content-wrapper','#home-v2').attr('data-400-center-top','transform:translateX(40em);opacity:0;').attr('data-200-center-center','transform[quadratic]:translateX(0em);opacity[quadratic]:1;');$('.panel-pane.bdd .field-name-field-bandeau img','#home-v2').attr('data-400-bottom-top','transform:translateX(0em);').attr('data-100-top-bottom','transform[quadratic]:translateX(-40em);');$('.panel-pane.news-panel .center-wrapper .panel-panel','#home-v2').each(function(i,e){$(this).attr('data-anchor-target',"#news-pane").attr('data--'+(i+1)*75+'-bottom-top','transform:translateY(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateY(0em);opacity:1;');});$('.panel-pane.formations .group-content-wrapper','#home-v2').attr('data-50-bottom-top','transform:translateX(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateX(0em);opacity:1;');$('.panel-pane.services .group-content-wrapper','#home-v2').attr('data-50-bottom-top','transform:translateX(20em);opacity:0;').attr('data-center-top','transform[quadratic]:translateX(0em);opacity:1;');$('.panel-pane.publication .views-row','#home-v2').each(function(i,e){$(this).attr('data--'+i*100+'-bottom-top','opacity:0;').attr('data-'+i*50+'-center-center','opacity:1;');});_skrollr=skrollr.init({skrollrBody:"root"});};function initLayout(){trace("initLayout");var height=$('#header').h()+$('#tasks').h();height+=$('#utilities').h();if(!$('html').is(".ie8")){$('#container').animate({'padding-top':height},300);}};function initInfinitScroller(){$.event.trigger({type:'init-scroller-pager',pager:$('ul.pager','#content')});$(document).bind('scroll',function(event){checkInfinitScroller();});};function checkInfinitScroller(){if($(window).scrollTop()+$(window).height()>getDocHeight()-200){infinitScrollPager();}};function infinitScrollPager(){if($('ul.pager','#content').length){var $nextpage=$('ul.pager .pager-current','#content').next(),href=$('a',$nextpage).attr('href');if(href){$.event.trigger({type:'record-stat',path:href});$.event.trigger({type:'load-scroller-pager',href:href});}}};function initEvents(){$(document).bind('init-layout',initLayout).bind('loading-content',onLoadingContent).bind('loaded-content',onLoadedContent).bind('resultschanged',onResultsChanged).bind('resultscompleted',onResultsCompleted).bind('mybookmarks-block-updated',onMybookmarksBlockUpdate).bind('mylists-block-builded',onMyListsBlockBuilded).bind('mylists-block-updated',onMyListsBlockUpdate).bind('flagGlobalAfterLinkUpdate',onAfterFlaging).bind('record-stat',onRecordStat).bind('view-mode-changed',onViewModeChanged).bind('ajax-register-block-loaded',onAjaxRegisterBlockLoaded);$(window).bind('resize',onResizeWindow);initFlagsEvent();$('#block-user-login h2, #block-menu-menu-top-menu h2').bind('click',function(event){event.preventDefault();$(this).parent('.block').toggleClass('hovered');$('.hovered').not($(this).parent('.block')).removeClass('hovered');return false;});$('#block-materio-search-api-materio-search-api-viewmode .viewmode-link').bind('vm-clicked-active',function(event){$(this).parents('.block').toggleClass('hovered');$('.hovered').not($(this).parents('.block')).removeClass('hovered');});$('#block-materio-search-api-materio-search-api-viewmode .viewmode-link').bind('vm-clicked',function(event){$(this).parents('.block').removeClass('hovered');$('.hovered').not($(this).parents('.block')).removeClass('hovered');});};function onLoadingContent(event){_$content.addClass('faded');$('#materio-search-api-search-form, #materio-search-api-advanced-search-form').addClass('loading');};function onLoadedContent(event){_$content.removeClass('faded');$('#materio-search-api-search-form, #materio-search-api-advanced-search-form').removeClass('loading');};function onResultsChanged(event){trace('MaterioBaseTheme :: onResultsChanged',event);$(document).scrollTop(0);focusCard($('#content .search-results, #content .actuality-items').children('.node:first-child'));onResultsCompleted(event);};function onResultsCompleted(event){checkInfinitScroller();if(event.container!=undefined){setTimeout(function(){initCards(event.container);setUpGrid(event.container);},100);}};function initCards(container){trace('theme :: initCards',container);var $container=$(container);$container.children('.node:not(.listened)').bind('mouseenter focused mousemove click mouseleave',onCardEventDispatcher).each(function(i){protectFigures(this);if(_isLoggedIn){if(!$container.is('.modal-content')){initPreview(this);}else{if(!$(this).is(":first-child")){var $closebtn=$('