Merge branch 'prod' into solr4

This commit is contained in:
Bachir Soussi Chiadmi
2015-10-21 19:44:25 +02:00
50 changed files with 836 additions and 808 deletions
@@ -592,13 +592,20 @@ function materio_search_api_search_form($form, &$form_state){
$default_value = '';
}
// add a back tu search/base home bouton if on explore/foo
// if ($path == 'explore') {
// $form['actu'] = array(
// '#type' => 'markup',
// '#markup' => '<a href="/actuality"><i class="fi-home"></i></a>'
// );
// }
// add a back to search/base home bouton if on explore/foo
if ($path == 'explore') {
$link = l('<i class="fi-home"></i>', base_path().'actuality', array(
'html'=>true,
'attributes'=>array('class'=>'back-search-home')
));
$form['actu'] = array(
'#type' => 'markup',
'#markup' => $link,
//'<a href="'.base_path().'actuality" class="back-search-home"><i class="fi-home"></i></a>'
);
}
$form['searchfield'] = array(
'#type' => 'textfield',