Compare commits
3
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
 bachir
|
f7c8728f20 | ||
|
bachir
|
7356c6cec6 | ||
|
bachir
|
7d11684731 |
@@ -1,4 +1,7 @@
|
||||
|
||||
(function($,Drupal,drupalSettings){var settings=drupalSettings.edlp_search;var _$body=$('body');var _$container;var _$form;function init(){initEvents();initAjax();};function initEvents(){$('body').on('new-content-ajax-loaded',initAjax).on('edlp_search_search_form-col-closed',onSearchClosed);};function initAjax(){_$form=$('#edlp-search-form:not(.ajax-enabled)');if(!_$form.length)return false;_$form=$('#edlp-search-form:not(.ajax-enabled)').on('submit',onSubmitForm).addClass('ajax-enabled');_$container=_$form.parents('.row');if(!_$container.length){_$container=_$form.parent();}};function onSubmitForm(e){e.preventDefault();var args={};args.keys=$('input[type="search"]',this).val();args.entries=[];$('input[type="checkbox"]:checked','#edit-entries').each(function(index,el){args.entries.push($(this).val());});args.langues=$('input[name="language"]',this).val();args.genres=$('input[name="genres"]',this).val();loadResults(args);return false;};function loadResults(args){_$form.addClass('ajax-loading');_$body.addClass('ajax-loading');$('[theme="edlp_search_results"]',_$container).addClass('ajax-loading');var path=window.location.origin+drupalSettings.path.baseUrl+settings.results_ajax_url;$.getJSON(path,args).done(function(data){onResultsLoaded(data);}).fail(function(jqxhr,textStatus,error){onResultsLoadFail(jqxhr,textStatus,error);});};function onResultsLoaded(data){_$form.removeClass('ajax-loading');_$body.removeClass('ajax-loading');$prev_results=$('[theme="edlp_search_results"]',_$container);if($prev_results.length){$prev_results.replaceWith(data.rendered);}else{_$container.append(data.rendered);}
|
||||
_$body.trigger({'type':'search-results-loaded','results':data.results_nids});};function onResultsLoadFail(jqxhr,textStatus,error){void 0;};function onSearchClosed(e){$('div[theme="edlp_search_results"]').remove();_$body.trigger({'type':'search-closed'});}
|
||||
_$body.trigger({'type':'search-results-loaded','results':data.results_nids});if(typeof _paq!=='undefined'){var search_name='keys:'+data.keys
|
||||
+';langues:'+data.langues
|
||||
+';genres:'+data.genres
|
||||
+';entries:'+data.entry_names.join(',');_paq.push(['trackEvent','AjaxSearch','Results',search_name,data.results_nids.length]);}};function onResultsLoadFail(jqxhr,textStatus,error){void 0;};function onSearchClosed(e){$('div[theme="edlp_search_results"]').remove();_$body.trigger({'type':'search-closed'});}
|
||||
init();})(jQuery,Drupal,drupalSettings);
|
||||
@@ -92,6 +92,16 @@
|
||||
'results':data.results_nids
|
||||
});
|
||||
|
||||
|
||||
// piwik
|
||||
if(typeof _paq !== 'undefined'){
|
||||
// trackEvent(category, action, [name], [value])
|
||||
var search_name = 'keys:'+data.keys
|
||||
+';langues:'+data.langues
|
||||
+';genres:'+data.genres
|
||||
+';entries:'+data.entry_names.join(',');
|
||||
_paq.push(['trackEvent', 'AjaxSearch', 'Results', search_name, data.results_nids.length]);
|
||||
}
|
||||
};
|
||||
|
||||
function onResultsLoadFail(jqxhr, textStatus, error){
|
||||
|
||||
@@ -249,6 +249,9 @@ class EdlpSearchController extends ControllerBase {
|
||||
'test'=>'search results',
|
||||
'keys'=>$this->keys,
|
||||
'entries' => $this->entries,
|
||||
'entry_names' => $this->entry_names,
|
||||
'langues' => $this->langues,
|
||||
'genres' => $this->genres,
|
||||
'rendered'=> $rendered,
|
||||
'results_nids'=>$results_nids,
|
||||
]);
|
||||
@@ -326,9 +329,12 @@ class EdlpSearchController extends ControllerBase {
|
||||
|
||||
// entries
|
||||
if (!empty($this->entries)){
|
||||
$terms = entity_load_multiple('taxonomy_term', $this->entries);
|
||||
$this->entry_names = [];
|
||||
$entries_condition_group = $query->createConditionGroup();
|
||||
foreach ($this->entries as $tid) {
|
||||
foreach ($terms as $tid => $term) {
|
||||
$entries_condition_group->addCondition('field_entrees', (int)$tid, "=");
|
||||
$this->entry_names[] = $term->getName();
|
||||
}
|
||||
// dpm($entries_condition_group);
|
||||
$query->addConditionGroup($entries_condition_group);
|
||||
|
||||
@@ -13,7 +13,7 @@ if(state.sys_path=="productions"){initProductions();}else{addCloseModalBtnToCols
|
||||
if(data.entity_type=="node"&&data.bundle=="enregistrement"&&data.view_mode=="transcript"){initEnregistrementTranscript();}
|
||||
if(typeof data.translations_links!='undefined'){void 0;var lang_code=drupalSettings.path.currentLanguage;var $links=$(data.translations_links);$links.find('li[hreflang="'+lang_code+'"]').addClass('is-active').find('a').addClass('is-active');if(state.view_mode){$links.find('a').each(function(i,e){var $a=$(this);$a.attr('href',$a.attr('href')+'#'+state.view_mode);});}
|
||||
$('ul','.block.language-switcher-language-url').replaceWith($links);}
|
||||
initAjaxLinks();_$body.trigger({'type':'new-content-ajax-loaded'});Drupal.attachBehaviors(_$row[0]);_$body.attr('booted','booted');_$body.removeClass('ajax-loading');if(state.url){history.pushState(state,null,state.url);}};function initAudioLinksInContent(){_$row.find('a.audio-link').on('mouseover',function(event){event.preventDefault();if(_corpus_ready){_$corpus_canvas.trigger({type:'mouseover-audio-link',nid:$(this).attr('nid')});}}).on('mouseout',function(event){event.preventDefault();if(_corpus_ready){_$corpus_canvas.trigger({type:'mouseout-audio-link',nid:$(this).attr('nid')});}});};function addCloseModalBtnToCols(){$('.col',_$row).each(function(index,el){if($('span.close-col-btn',this).length)
|
||||
initAjaxLinks();_$body.trigger({'type':'new-content-ajax-loaded'});Drupal.attachBehaviors(_$row[0]);_$body.attr('booted','booted');_$body.removeClass('ajax-loading');if(state.url){history.pushState(state,null,state.url);if(typeof _paq!=='undefined'){_paq.push(['trackEvent','AjaxNav','loaded',state.url]);}}};function initAudioLinksInContent(){_$row.find('a.audio-link').on('mouseover',function(event){event.preventDefault();if(_corpus_ready){_$corpus_canvas.trigger({type:'mouseover-audio-link',nid:$(this).attr('nid')});}}).on('mouseout',function(event){event.preventDefault();if(_corpus_ready){_$corpus_canvas.trigger({type:'mouseout-audio-link',nid:$(this).attr('nid')});}});};function addCloseModalBtnToCols(){$('.col',_$row).each(function(index,el){if($('span.close-col-btn',this).length)
|
||||
return true;$(this).children('.wrapper').prepend($('<span>').addClass('close-col-btn').on('click',onCloseModal));});};function onCloseModal(e){var $col=$(this).parents('.col');var theme=$col.attr('theme');if(theme!=''){_$body.trigger({'type':theme+'-col-closed'});}
|
||||
$col.remove();if(!$('.col',_$row).length&&!_$body.is('.entity-type-node.bundle-page')&&!_$body.is('.entity-type-taxonomy_term.bundle-entrees')){backToFrontPage();}};function refreshAllBlocks(){var path=window.location.origin+Drupal.url(_ajax_settings.blocksjson_path);$.getJSON(path,{}).done(function(data){onAjaxBlockLoaded(data);}).fail(function(jqxhr,textStatus,error){onAjaxBlockLoadError(jqxhr,textStatus,error);});};function onAjaxBlockLoadError(jqxhr,textStatus,error){void 0;};function onAjaxBlockLoaded(data){void 0;for(var blockname in data.blocks){var block=data.blocks[blockname];void 0;$(block.id).replaceWith(block.rendered);}};function initHistory(){initFirstLoad();window.addEventListener('popstate',onHistoryPopState);};function initFirstLoad(){void 0;var edlp_origin=JSON.parse(window.localStorage.getItem('edlp_origin'));void 0;if(edlp_origin!=null&&edlp_origin.sys_path){var view_mode=edlp_origin.hash.replace('#','');var state=getSysPathState(edlp_origin.sys_path,view_mode);if(edlp_origin.entity_type=="taxonomy_term"&&edlp_origin.entity_bundle=="entrees"&&view_mode){state.selector='entree-'+view_mode+'-link-'+edlp_origin.entity_id;if(_corpus_ready){_$corpus_canvas.trigger({type:'open-entree',tid:edlp_origin.entity_id});}else{$('li.entree[tid="'+edlp_origin.entity_id+'"] a.term-link').addClass('is-active');}}
|
||||
if(edlp_origin.audio_url){var node={nid:edlp_origin.entity_id,audio_url:edlp_origin.audio_url};_audioPlayer.openDocument(node,'history_first_load');if(view_mode==""){state.audio=true;state.node=node;_$body.attr('booted','booted');}else{ajaxLoadContent(state);}}
|
||||
|
||||
@@ -299,6 +299,12 @@
|
||||
// console.log(window.location);
|
||||
// /!\ we can not pushestate with absolute url /!\
|
||||
history.pushState(state, null, state.url);
|
||||
|
||||
// piwik
|
||||
if(typeof _paq !== 'undefined'){
|
||||
// trackEvent(category, action, [name], [value])
|
||||
_paq.push(['trackEvent', 'AjaxNav', 'loaded', state.url]);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ provider: null
|
||||
plugin: system_branding_block
|
||||
settings:
|
||||
id: system_branding_block
|
||||
label: 'Site branding'
|
||||
label: 'Marque du site'
|
||||
provider: system
|
||||
label_display: '0'
|
||||
use_site_logo: true
|
||||
|
||||
@@ -16,7 +16,7 @@ provider: null
|
||||
plugin: system_branding_block
|
||||
settings:
|
||||
id: system_branding_block
|
||||
label: 'Site branding'
|
||||
label: 'Marque du site'
|
||||
provider: system
|
||||
label_display: '0'
|
||||
use_site_logo: true
|
||||
|
||||
@@ -5,6 +5,6 @@ dependencies: { }
|
||||
_core:
|
||||
default_config_hash: 5VpawMrKPEPCkoO4YpPa0TDFO2dgiIHfTziJtwlmUxc
|
||||
id: html_yearless_date
|
||||
label: 'Date sans année HTML'
|
||||
label: 'Date HTML sans année'
|
||||
locked: true
|
||||
pattern: m-d
|
||||
|
||||
@@ -7,6 +7,6 @@ dependencies:
|
||||
_core:
|
||||
default_config_hash: Mz9qWr1kUYK0mjRAGDsr5XS6PvtZ24en_7ndt-pyWe4
|
||||
id: node.teaser
|
||||
label: Teaser
|
||||
label: Accroche
|
||||
targetEntityType: node
|
||||
cache: true
|
||||
|
||||
@@ -5,7 +5,7 @@ dependencies: { }
|
||||
_core:
|
||||
default_config_hash: CMuvuRCfGZ5k3XgsXmkEc54rI8etDY1Qz2JP7JzKL-g
|
||||
name: linkit_result_thumbnail
|
||||
label: 'Linkit result thumbnail'
|
||||
label: 'Vignette de résultat Linkit'
|
||||
effects:
|
||||
2943df29-38ea-459c-ba1d-290489bb1807:
|
||||
uuid: 2943df29-38ea-459c-ba1d-290489bb1807
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies:
|
||||
_core:
|
||||
default_config_hash: N0RDBTqiK4dKoN4p4oW2j0SGWycdHyALUe9M-Ofp89U
|
||||
id: node_promote_action
|
||||
label: 'Promouvoir un contenu en page d''accueil'
|
||||
label: 'Promouvoir le contenu en page d''accueil'
|
||||
type: node
|
||||
plugin: node_promote_action
|
||||
configuration: { }
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies:
|
||||
_core:
|
||||
default_config_hash: '-SdRoSbsl_FULjbX8mgESZdeoEOjgi7rDhHNdLOJ8n8'
|
||||
id: pathauto_update_alias_node
|
||||
label: 'Update URL alias'
|
||||
label: 'Mettre à jour l''alias d''URL'
|
||||
type: node
|
||||
plugin: pathauto_update_alias
|
||||
configuration: { }
|
||||
|
||||
@@ -7,7 +7,7 @@ dependencies:
|
||||
_core:
|
||||
default_config_hash: fWszFHPeJ_dhZ8kJEEWo4w-FQH_etR4AxTQkQCW9OLk
|
||||
id: pathauto_update_alias_user
|
||||
label: 'Update URL alias'
|
||||
label: 'Mettre à jour l''alias d''URL'
|
||||
type: user
|
||||
plugin: pathauto_update_alias
|
||||
configuration: { }
|
||||
|
||||
@@ -10,7 +10,7 @@ dependencies:
|
||||
_core:
|
||||
default_config_hash: QmBeFeWHnYLbMWN48tWZZJmZIHZw0XEWUfxLYZFXhzQ
|
||||
id: redirect_delete_action
|
||||
label: 'Delete redirect'
|
||||
label: 'Supprimer une redirection'
|
||||
type: redirect
|
||||
plugin: redirect_delete_action
|
||||
configuration: { }
|
||||
|
||||
@@ -193,7 +193,7 @@ display:
|
||||
relationship: none
|
||||
group_type: group
|
||||
admin_label: ''
|
||||
label: From
|
||||
label: 'A partir de'
|
||||
exclude: false
|
||||
alter:
|
||||
alter_text: false
|
||||
|
||||
@@ -11,7 +11,7 @@ dependencies:
|
||||
_core:
|
||||
default_config_hash: rwRoOr3DiobxwoWSmtUcna1LQz5_HxHvS7H5dl7_-Uo
|
||||
id: frontpage
|
||||
label: Frontpage
|
||||
label: 'Page d''accueil'
|
||||
module: node
|
||||
description: 'All content promoted to the front page.'
|
||||
tag: default
|
||||
|
||||
@@ -67,10 +67,10 @@ display:
|
||||
offset: false
|
||||
offset_label: Offset
|
||||
tags:
|
||||
previous: '‹ previous'
|
||||
next: 'next ›'
|
||||
first: '« first'
|
||||
last: 'last »'
|
||||
previous: "‹\_précédent"
|
||||
next: "suivant\_›"
|
||||
first: "«\_premier"
|
||||
last: "dernier\_»"
|
||||
quantity: 9
|
||||
style:
|
||||
type: table
|
||||
@@ -287,7 +287,7 @@ display:
|
||||
relationship: none
|
||||
group_type: group
|
||||
admin_label: ''
|
||||
label: From
|
||||
label: 'A partir de'
|
||||
exclude: false
|
||||
alter:
|
||||
alter_text: false
|
||||
|
||||
@@ -56,10 +56,10 @@ display:
|
||||
id: 0
|
||||
total_pages: null
|
||||
tags:
|
||||
previous: '‹ previous'
|
||||
next: 'next ›'
|
||||
first: '« first'
|
||||
last: 'last »'
|
||||
previous: "‹\_précédent"
|
||||
next: "suivant\_›"
|
||||
first: "«\_premier"
|
||||
last: "dernier\_»"
|
||||
expose:
|
||||
items_per_page: false
|
||||
items_per_page_label: 'Items per page'
|
||||
@@ -195,7 +195,7 @@ display:
|
||||
relationship: none
|
||||
group_type: group
|
||||
admin_label: ''
|
||||
label: From
|
||||
label: 'A partir de'
|
||||
exclude: false
|
||||
alter:
|
||||
alter_text: false
|
||||
@@ -347,7 +347,7 @@ display:
|
||||
exposed: true
|
||||
expose:
|
||||
operator_id: redirect_source__path_op
|
||||
label: From
|
||||
label: 'A partir de'
|
||||
description: ''
|
||||
use_operator: false
|
||||
operator: redirect_source__path_op
|
||||
@@ -455,49 +455,49 @@ display:
|
||||
default_group_multiple: { }
|
||||
group_items:
|
||||
1:
|
||||
title: '300 Multiple Choices'
|
||||
title: '300 Choix Multiples'
|
||||
operator: '='
|
||||
value:
|
||||
value: '300'
|
||||
min: ''
|
||||
max: ''
|
||||
2:
|
||||
title: '301 Moved Permanently'
|
||||
title: '301 Redirection Permanente'
|
||||
operator: '='
|
||||
value:
|
||||
value: '301'
|
||||
min: ''
|
||||
max: ''
|
||||
3:
|
||||
title: '302 Found'
|
||||
title: '302 Trouvé'
|
||||
operator: '='
|
||||
value:
|
||||
value: '302'
|
||||
min: ''
|
||||
max: ''
|
||||
4:
|
||||
title: '303 See Other'
|
||||
title: '303 Voir Ailleurs'
|
||||
operator: '='
|
||||
value:
|
||||
value: '303'
|
||||
min: ''
|
||||
max: ''
|
||||
5:
|
||||
title: '304 Not Modified'
|
||||
title: '304 Non Modifié'
|
||||
operator: '='
|
||||
value:
|
||||
value: '304'
|
||||
min: ''
|
||||
max: ''
|
||||
6:
|
||||
title: '305 Use Proxy'
|
||||
title: '305 Utilise un Proxy'
|
||||
operator: '='
|
||||
value:
|
||||
value: '305'
|
||||
min: ''
|
||||
max: ''
|
||||
7:
|
||||
title: '307 Temporary Redirect'
|
||||
title: '307 Redirection Temporaire'
|
||||
operator: '='
|
||||
value:
|
||||
value: '307'
|
||||
|
||||
@@ -535,7 +535,7 @@ display:
|
||||
relationship: none
|
||||
group_type: group
|
||||
admin_label: ''
|
||||
label: 'Log message'
|
||||
label: 'Message de journal'
|
||||
exclude: false
|
||||
alter:
|
||||
alter_text: false
|
||||
|
||||
Reference in New Issue
Block a user