bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refined advanced search form display to be more explicite

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi 2017-11-20 17:52:39 +01:00
parent 81810c5af4
commit 106129c27c
3 changed files with 232 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

232
sites/all/modules/gui/materiobasemod/materio_search_api.module
View File

@ -796,14 +796,10 @@ function materio_search_api_search_form_submit($form, &$form_state){
function materio_search_api_advanced_search_form($form, &$form_state){ function materio_search_api_advanced_search_form($form, &$form_state){
// dsm($form_state, 'form_state'); // dsm($form_state, 'form_state');
// dsm($form, 'form'); // dsm($form, 'form');
// global $user;
// $form = array();
// get vid from settings // get vid from settings
$vid = variable_get('msa-advancedsearchvocabulary', null); $vid = variable_get('msa-advancedsearchvocabulary', null);
if($vid){ if($vid){
// global $language;
// dsm($language, "language");
$voc = taxonomy_vocabulary_load($vid); $voc = taxonomy_vocabulary_load($vid);
$voc_machinename = $voc->machine_name; $voc_machinename = $voc->machine_name;
@ -826,25 +822,6 @@ function materio_search_api_advanced_search_form($form, &$form_state){
// get the keywords from args and reconstruct the filter lines with default values // get the keywords from args and reconstruct the filter lines with default values
$args_values = array(); $args_values = array();
if($path == 'explore/filters' && $args[0] !== "ajax"){ if($path == 'explore/filters' && $args[0] !== "ajax"){
// WORKING WITH TERM NAMES instead of tids
// $keywords = explode("+", $args[0]);
// // dsm($keywords, 'keywords');
// foreach ($keywords as $key => $value) {
// $name = str_replace('"', '', $value);
// //Get the term
// $terms = taxonomy_get_term_by_name($name, $voc_machinename);
// $term = array_shift($terms);
// // dsm($term, $term->tid.' : '.$term->name);
// // get parents
// if(isset($term->tid)){
// $parents = taxonomy_get_parents_all($term->tid);
// // dsm($parents, 'parents');
// // build default values
// for ($p=count($parents)-1; $p >=0 ; $p--) {
// $args_values[$key][] = $parents[$p]->tid;
// }
// }
// }
// WORKING WITH TIDS instead of term name // WORKING WITH TIDS instead of term name
$tids = explode("+", $args[0]); $tids = explode("+", $args[0]);
foreach ($tids as $key => $tid) { foreach ($tids as $key => $tid) {
@ -878,13 +855,38 @@ function materio_search_api_advanced_search_form($form, &$form_state){
} }
// dsm($form_state['filterlines'], "form_state['filterlines']"); // dsm($form_state['filterlines'], "form_state['filterlines']");
// filters form container // filters form container
$form['filters'] = array( $form['filters'] = array(
'#type' => 'container', '#type' => 'container',
'#prefix' => '<div id="advancedsearch-filters">', '#attributes' => array('class' => array("advancedsearch-filters")),
'#prefix' => '<div id="advancedsearch-filters-wrapper">',
'#suffix' => '</div>', '#suffix' => '</div>',
); );
$form['filters']['filters-table'] = array(
'#type' => 'container',
'#attributes' => array('class' => array("advanced-search-form-table"))
);
// form headers
// $form['filters']['filters-table']['headers'] = array(
// '#type' => 'container',
// '#attributes' => array('class' => array("advanced-search-form-headers")),
// 'category' => array(
// '#markup' => t("Category"),
// '#prefix' => '<div>','#suffix' => '</div>',
// ),
// 'main' => array(
// '#markup' => t("Main Filter"),
// '#prefix' => '<div>','#suffix' => '</div>',
// ),
// 'child' => array(
// '#markup' => t("Child Filter"),
// '#prefix' => '<div>','#suffix' => '</div>',
// )
// );
$trigger = FALSE; $trigger = FALSE;
if (!empty($form_state['triggering_element']['#name'])) { if (!empty($form_state['triggering_element']['#name'])) {
$trigger = $form_state['triggering_element']; $trigger = $form_state['triggering_element'];
@ -939,11 +941,9 @@ function materio_search_api_advanced_search_form($form, &$form_state){
} }
// dsm("l : ".$l." | ll : ".$ll); // dsm("l : ".$l." | ll : ".$ll);
$form['filters']['filterline-'.$ll] = array( $form['filters']['filters-table']['filterline-'.$ll] = array(
'#type' => 'container', '#type' => 'container',
'#attributes' => array( '#attributes' => array('class' => array("filter-line"))
'class' => array("filter-line")
)
); );
// get the default value // get the default value
@ -959,99 +959,122 @@ function materio_search_api_advanced_search_form($form, &$form_state){
// dsm($default0, "default 0"); // dsm($default0, "default 0");
// form select element for first level // form select element for first level
$form['filters']['filterline-'.$ll]['filter-'.$ll.'-0'] = array( $form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-0'] = array(
'#type' => 'select', '#type' => 'select',
'#options' => $level_0_ops, '#options' => $level_0_ops,
'#name' => 'filter-'.$ll.'-0', '#name' => 'filter-'.$ll.'-0',
'#empty_option' => t("Choose a filter"), '#empty_option' => t("Choose a category"),
// '#empty_values' => 0, // '#empty_values' => 0,
'#default_value' => $default0, '#default_value' => $default0,
'#ajax' => array( '#ajax' => array(
'callback' => 'materio_search_api_advanced_search_select_callback', 'callback' => 'materio_search_api_advanced_search_select_callback',
'wrapper' => 'advancedsearch-filters', 'wrapper' => 'advancedsearch-filters-wrapper',
), ),
); );
// without this line, form api will mess with default values // without this line, form api will mess with default values
$form_state["input"]['filter-'.$ll.'-0'] = $default0; $form_state["input"]['filter-'.$ll.'-0'] = $default0;
// add level 1 filter if level 0 chosen // add level 1 filter if level 0 chosen
if($default0){ if(is_null($default0)){
// $form['filters']['filterline-'.$ll]['filter-'.$ll.'-1']
$form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-1'] = array(
'#markup' => t("Main Filter"),
'#prefix' => '<div class="filter-markup"><span>',
'#suffix' => '</span></div>',
);
// the definition of this markup appears twice, i may avoid that ...
$form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-2'] = array(
'#markup' => t("Child Filter"),
'#prefix' => '<div class="filter-markup"><span>',
'#suffix' => '</span></div>',
);
}else{
// build second level taxonomy tree and select options
$taxotree1 = taxonomy_get_tree($vid, $default0, 1, true);
// dsm($taxotree1, 'taxotree1');
$level_1_ops = array();
foreach ($taxotree1 as $index => $term) {
// TODO: get translated tag name
// $term = taxonomy_term_load($tid);
$level_1_ops[$term->tid] = $term->name;
}
// build second level taxonomy tree and select options // get the default value
$taxotree1 = taxonomy_get_tree($vid, $default0, 1, true); // from from_state values if ajax
// dsm($taxotree1, 'taxotree1'); // or from url args
$level_1_ops = array(); // or 0
foreach ($taxotree1 as $index => $term) { $default1 = null;
// TODO: get translated tag name if(isset($values['filter-'.$l.'-1']) && $values['filter-'.$l.'-1']){
// $term = taxonomy_term_load($tid); $default1 = $values['filter-'.$l.'-1'];
$level_1_ops[$term->tid] = $term->name; }elseif(isset($args_values[$l][1])){
} $default1 = $args_values[$l][1];
}
// dsm($default1, "default 1");
// get the default value // form select element for second level
// from from_state values if ajax $form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-1'] = array(
// or from url args '#type' => 'select',
// or 0 '#options' => $level_1_ops,
$default1 = null; '#name' => 'filter-'.$ll.'-1',
if(isset($values['filter-'.$l.'-1']) && $values['filter-'.$l.'-1']){ '#empty_option' => t("Choose a main filter"),
$default1 = $values['filter-'.$l.'-1']; // '#empty_values' => 0,
}elseif(isset($args_values[$l][1])){ '#default_value' => $default1,
$default1 = $args_values[$l][1]; '#ajax' => array(
} 'callback' => 'materio_search_api_advanced_search_select_callback',
// dsm($default1, "default 1"); 'wrapper' => 'advancedsearch-filters-wrapper',
),
);
// without this line, form api will mess with default values
$form_state["input"]['filter-'.$ll.'-1'] = $default1;
// form select element for second level // add level 2 filter if level 1 chosen
$form['filters']['filterline-'.$ll]['filter-'.$ll.'-1'] = array( if(is_null($default1)){
'#type' => 'select', $form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-2'] = array(
'#options' => $level_1_ops, '#markup' => t("Child Filter"),
'#name' => 'filter-'.$ll.'-1', '#prefix' => '<div class="filter-markup"><span>',
'#empty_option' => t("Choose a filter"), '#suffix' => '</span></div>',
// '#empty_values' => 0,
'#default_value' => $default1,
'#ajax' => array(
'callback' => 'materio_search_api_advanced_search_select_callback',
'wrapper' => 'advancedsearch-filters',
),
); );
// without this line, form api will mess with default values }else{
$form_state["input"]['filter-'.$ll.'-1'] = $default1; // build second level taxonomy tree and select options
$taxotree2 = taxonomy_get_tree($vid, $default1, 1, true);
if(!count($taxotree2)){
$form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-2'] = array(
'#markup' => t("No Child"),
'#prefix' => '<div class="filter-markup"><span>',
'#suffix' => '</span></div>',
);
}else{
// $default2 = isset($args_values[$l][2]) ? $args_values[$l][2] : 0;
$default2 = null;
if(isset($values['filter-'.$l.'-2']) && $values['filter-'.$l.'-2']){
$default2 = $values['filter-'.$l.'-2'];
}elseif(isset($args_values[$l][2])){
$default2 = $args_values[$l][2];
}
// dsm($default2, "default 2");
// add level 2 filter if level 1 chosen $level_2_ops = array();
if($default1){ foreach ($taxotree2 as $index => $term) {
// TODO: get translated tag name
// build second level taxonomy tree and select options $level_2_ops[$term->tid] = t($term->name);
$taxotree2 = taxonomy_get_tree($vid, $default1, 1, true); }
if(count($taxotree2)){ // form select element for third level
// $default2 = isset($args_values[$l][2]) ? $args_values[$l][2] : 0; $form['filters']['filters-table']['filterline-'.$ll]['filter-'.$ll.'-2'] = array(
$default2 = null; '#type' => 'select',
if(isset($values['filter-'.$l.'-2']) && $values['filter-'.$l.'-2']){ '#options' => $level_2_ops,
$default2 = $values['filter-'.$l.'-2']; '#name' => 'filter-'.$ll.'-2',
}elseif(isset($args_values[$l][2])){ '#empty_option' => t("Refine with a child filter"),
$default2 = $args_values[$l][2]; // '#empty_values' => 0,
} '#default_value' => $default2,
// dsm($default2, "default 2"); );
// without this line, form api will mess with default values
$level_2_ops = array(); $form_state["input"]['filter-'.$ll.'-2'] = $default2;
foreach ($taxotree2 as $index => $term) {
// TODO: get translated tag name
$level_2_ops[$term->tid] = t($term->name);
}
// form select element for third level
$form['filters']['filterline-'.$ll]['filter-'.$ll.'-2'] = array(
'#type' => 'select',
'#options' => $level_2_ops,
'#name' => 'filter-'.$ll.'-2',
'#empty_option' => t("Choose a filter"),
// '#empty_values' => 0,
'#default_value' => $default2,
);
// without this line, form api will mess with default values
$form_state["input"]['filter-'.$ll.'-2'] = $default2;
}
} }
}
} }
// add remove the line button // add remove the line button
$form['filters']['filterline-'.$ll]['rm-filter-'.$ll] = array( $form['filters']['filters-table']['filterline-'.$ll]['rm-filter-'.$ll] = array(
'#type' => 'image_button', '#type' => 'image_button',
'#src' => drupal_get_path('module', 'materio_search_api') . '/images/rmfilter.png', '#src' => drupal_get_path('module', 'materio_search_api') . '/images/rmfilter.png',
'#title' => t('Remove this filter line'), '#title' => t('Remove this filter line'),
@ -1060,7 +1083,7 @@ function materio_search_api_advanced_search_form($form, &$form_state){
'#executes_submit_callback' => false, '#executes_submit_callback' => false,
'#ajax' => array( '#ajax' => array(
'callback' => 'materio_search_api_advanced_search_rmline_callback', 'callback' => 'materio_search_api_advanced_search_rmline_callback',
'wrapper' => 'advancedsearch-filters', 'wrapper' => 'advancedsearch-filters-wrapper',
// 'trigger_as' => array("name"=>"rmfilters".$l), // 'trigger_as' => array("name"=>"rmfilters".$l),
), ),
"#attributes" => array('class'=>array('rm-btn')), "#attributes" => array('class'=>array('rm-btn')),
@ -1081,17 +1104,16 @@ function materio_search_api_advanced_search_form($form, &$form_state){
'#return_value' => "add", '#return_value' => "add",
'#ajax' => array( '#ajax' => array(
'callback' => 'materio_search_api_advanced_search_addfilter_callback', 'callback' => 'materio_search_api_advanced_search_addfilter_callback',
'wrapper' => 'advancedsearch-filters', 'wrapper' => 'advancedsearch-filters-wrapper',
), ),
'#executes_submit_callback' => false, '#executes_submit_callback' => false,
'#attributes' => array( '#attributes' => array('class'=>array('add-filter'))
'class'=>array('add-filter')
),
); );
// buttons form container // buttons form container
$form['rightcol'] = array( $form['rightcol'] = array(
'#type' => 'container', '#type' => 'container',
"#attributes" => array('class'=>array('right-col')),
); );
// add a back to search/base home bouton if on explore/foo // add a back to search/base home bouton if on explore/foo
if ($path == 'explore' || $path == 'explore/filters' || $path == 'bookmarks' || $path == 'lists' ) { if ($path == 'explore' || $path == 'explore/filters' || $path == 'bookmarks' || $path == 'lists' ) {
@ -1168,7 +1190,7 @@ function materio_search_api_advanced_search_rmline_callback($form, &$form_state)
function materio_search_api_advanced_search_form_validate($form, &$form_state){ function materio_search_api_advanced_search_form_validate($form, &$form_state){
if($form_state['triggering_element']['#name'] == 'search'){ if($form_state['triggering_element']['#name'] == 'search'){
// dsm($form, '$form'); // dsm($form, '$form');
// dsm($form_state, 'form_state'); dsm($form_state, 'form_state');
if (!isset($form_state['values']['filter-0-1']) || $form_state['values']['filter-0-1'] == '') { if (!isset($form_state['values']['filter-0-1']) || $form_state['values']['filter-0-1'] == '') {
form_set_error('filters', 'Please choose at least 1 keyword.'); form_set_error('filters', 'Please choose at least 1 keyword.');

66
sites/all/themes/gui/materiobasetheme/css/styles.css
View File

@ -3289,7 +3289,8 @@ body.node-type-publication #footer {
*/ */
#utilities { #utilities {
background-color: #fff; background-color: #fff;
margin-top: 60px; } margin-top: 60px;
max-height: 100px; }
.not-logged-in #utilities { .not-logged-in #utilities {
overflow: hidden; } overflow: hidden; }
#utilities > .inner { #utilities > .inner {
@ -3926,44 +3927,69 @@ body.home-v2 #main {
display: none; } } display: none; } }
#tool-bar #materio-search-api-advanced-search-form > div { #tool-bar #materio-search-api-advanced-search-form > div {
position: relative; } position: relative; }
#tool-bar #materio-search-api-advanced-search-form > div #advancedsearch-filters, #tool-bar #materio-search-api-advanced-search-form > div > .form-wrapper { #tool-bar #materio-search-api-advanced-search-form > div #advancedsearch-filters-wrapper, #tool-bar #materio-search-api-advanced-search-form > div .form-wrapper.right-col {
display: inline-block; display: inline-block;
vertical-align: top; } vertical-align: top; }
#tool-bar #materio-search-api-advanced-search-form > div > .form-wrapper { #tool-bar #materio-search-api-advanced-search-form > div .form-wrapper.right-col {
position: relative; position: relative;
text-align: center; } text-align: center; }
#tool-bar #materio-search-api-advanced-search-form > div > .form-wrapper > * { #tool-bar #materio-search-api-advanced-search-form > div .form-wrapper.right-col > * {
display: block; } display: block; }
#tool-bar #materio-search-api-advanced-search-form > div > .form-wrapper a.back-search-home { #tool-bar #materio-search-api-advanced-search-form > div .form-wrapper.right-col a.back-search-home {
color: #000; color: #000;
padding-top: 0.45em; } padding-top: 0.45em; }
#tool-bar #materio-search-api-advanced-search-form > div > .form-wrapper a.back-search-home i:before { #tool-bar #materio-search-api-advanced-search-form > div .form-wrapper.right-col a.back-search-home i:before {
font-size: 1.3em; } font-size: 1.3em; }
#tool-bar #materio-search-api-advanced-search-form > div > .form-wrapper #edit-search { #tool-bar #materio-search-api-advanced-search-form > div .form-wrapper.right-col #edit-search {
margin: 1em 0 0.5em; } margin: 1em 0 0.5em; }
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters { #tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters {
padding-right: 0.5em; padding-right: 0.5em;
margin-right: 0.5em; margin-right: 0.5em;
border-right: 1px solid #ccc; } border-right: 1px solid #ccc; }
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .filter-line { #tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .advanced-search-form-table {
display: table;
border-collapse: separate;
border-spacing: 0 0.2em; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .advanced-search-form-headers {
display: table-header-group;
width: 100%; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .advanced-search-form-headers > div {
display: table-cell;
text-align: left;
text-transform: uppercase;
font-size: 9px; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .advanced-search-form-headers > div:last-child:after {
content: "";
display: table-cell; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line {
margin: 0.3em 0; margin: 0.3em 0;
padding-top: 0.3em; } padding-top: 0.3em;
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .filter-line:not(:first-child) { display: table-row; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line:not(:first-child) {
border-top: 1px solid #ccc; } border-top: 1px solid #ccc; }
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .filter-line .form-item { #tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line > * {
display: inline-block; display: table-cell;
vertical-align: middle; text-align: left; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line > *:not(:last-child) {
padding: 0 1em 0 0; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line .form-item {
font-size: 12px; font-size: 12px;
line-height: 1; line-height: 1;
text-transform: capitalize; text-transform: capitalize;
margin: 0 0em 0 0; } margin: 0 0em 0 0; }
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .filter-line select { #tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line select {
width: auto; } width: auto; }
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .rm-btn { #tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .filter-line .filter-markup span {
float: right; padding: 0.4em 1em;
margin: 0.4em 0 0.4em 0.4em; } display: block;
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .add-filter { font-size: 11px;
margin: 0.5em 0; } background-color: #eee;
color: #777;
text-align: center;
border-radius: 7px; }
#tool-bar #materio-search-api-advanced-search-form .form-wrapper.advancedsearch-filters .add-filter {
margin: 0.5em 0;
display: table-row; }
#tool-bar #materio-search-api-advanced-search-form div.search-btn-wrapper { #tool-bar #materio-search-api-advanced-search-form div.search-btn-wrapper {
display: inline-block; } display: inline-block; }
#tool-bar #materio-search-api-advanced-search-form.loading div.search-btn-wrapper { #tool-bar #materio-search-api-advanced-search-form.loading div.search-btn-wrapper {

69
sites/all/themes/gui/materiobasetheme/scss/styles.scss
View File

@ -573,6 +573,7 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
@media #{$small-only}{ @media #{$small-only}{
margin-top:0; margin-top:0;
} }
max-height: 100px;
} }
/* /*
_ _
@ -1196,12 +1197,12 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
#materio-search-api-advanced-search-form{ #materio-search-api-advanced-search-form{
>div{ >div{
position: relative; position: relative;
#advancedsearch-filters, >.form-wrapper{ #advancedsearch-filters-wrapper, .form-wrapper.right-col{
display: inline-block; display: inline-block;
vertical-align: top; vertical-align: top;
} }
>.form-wrapper{ .form-wrapper.right-col{
position: relative; position: relative;
text-align: center; text-align: center;
>*{display:block;} >*{display:block;}
@ -1218,22 +1219,56 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
} }
} }
.form-wrapper.advancedsearch-filters{
#advancedsearch-filters{
padding-right: 0.5em; padding-right: 0.5em;
margin-right: 0.5em; margin-right: 0.5em;
border-right: 1px solid #ccc; border-right: 1px solid #ccc;
.advanced-search-form-table{
display:table;
border-collapse:separate;
border-spacing: 0 0.2em;
// min-width: 500px;
}
.advanced-search-form-headers{
display:table-header-group;
width:100%;
// grid-template-columns: 30% 30% 30%;
>div{
display:table-cell;
// min-width: 30%;
text-align: left;
text-transform: uppercase;
font-size: 9px;
}
>div:last-child:after{
content:"";
display:table-cell;
}
}
.filter-line{ .filter-line{
margin:0.3em 0; margin:0.3em 0;
padding-top:0.3em; padding-top:0.3em;
display: table-row;
&:not(:first-child){ &:not(:first-child){
border-top: 1px solid #ccc; border-top: 1px solid #ccc;
} }
>*{
display:table-cell;
text-align: left;
&:not(:last-child){
padding:0 1em 0 0;
}
}
.form-item{ .form-item{
display:inline-block; // display:inline-block;
vertical-align: middle; // vertical-align: middle;
@include fs12; line-height:1; @include fs12; line-height:1;
// padding-right:3em; // padding-right:3em;
text-transform: capitalize; text-transform: capitalize;
@ -1244,15 +1279,29 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
select{ select{
width:auto; width:auto;
} }
.filter-markup{
// border-left: 1px solid #ccc;
span{
padding:0.4em 1em;
display: block;
font-size: 11px;
background-color: #eee;
color:#777;
text-align: center;
border-radius: 7px;
}
}
} }
.rm-btn{ // .rm-btn{
float: right; // float: right;
margin:0.4em 0 0.4em 0.4em; // margin:0.4em 0 0.4em 0.4em;
} // }
.add-filter{ .add-filter{
margin:0.5em 0; margin:0.5em 0;
display: table-row;
} }
} }