fixed loading indicator for both search forms
This commit is contained in:
parent
12c076c349
commit
81810c5af4
@ -721,6 +721,8 @@ function materio_search_api_search_form($form, &$form_state){
|
|||||||
'#type' => 'image_button',
|
'#type' => 'image_button',
|
||||||
'#src' => drupal_get_path('module', 'materio_search_api') . '/images/search.png',
|
'#src' => drupal_get_path('module', 'materio_search_api') . '/images/search.png',
|
||||||
'#value' => t('Search'),
|
'#value' => t('Search'),
|
||||||
|
'#prefix' => '<div class="search-btn-wrapper">',
|
||||||
|
'#suffix'=> '</div>'
|
||||||
);
|
);
|
||||||
|
|
||||||
// add a back to search/base home bouton if on explore/foo
|
// add a back to search/base home bouton if on explore/foo
|
||||||
@ -1110,6 +1112,8 @@ function materio_search_api_advanced_search_form($form, &$form_state){
|
|||||||
'#title' => t('Search'),
|
'#title' => t('Search'),
|
||||||
'#name' => "search",
|
'#name' => "search",
|
||||||
'#return_value' => "search",
|
'#return_value' => "search",
|
||||||
|
'#prefix' => '<div class="search-btn-wrapper">',
|
||||||
|
'#suffix'=> '</div>'
|
||||||
);
|
);
|
||||||
|
|
||||||
}else{
|
}else{
|
||||||
|
@ -3912,11 +3912,12 @@ body.home-v2 #main {
|
|||||||
background-position: 100% -15px; }
|
background-position: 100% -15px; }
|
||||||
.oldie #tool-bar #materio-search-api-search-form #edit-searchfield-autocomplete-aria-live {
|
.oldie #tool-bar #materio-search-api-search-form #edit-searchfield-autocomplete-aria-live {
|
||||||
background-color: #1a1a1a; }
|
background-color: #1a1a1a; }
|
||||||
#tool-bar #materio-search-api-search-form input#edit-create {
|
#tool-bar #materio-search-api-search-form div.search-btn-wrapper {
|
||||||
|
display: inline-block;
|
||||||
padding: 3px; }
|
padding: 3px; }
|
||||||
#tool-bar #materio-search-api-search-form.loading {
|
#tool-bar #materio-search-api-search-form.loading div.search-btn-wrapper {
|
||||||
background: transparent url("../img/ajax-loader.gif") no-repeat 98% center; }
|
background: transparent url("../img/ajax-loader.gif") no-repeat center center; }
|
||||||
#tool-bar #materio-search-api-search-form.loading input#edit-create {
|
#tool-bar #materio-search-api-search-form.loading div.search-btn-wrapper input {
|
||||||
visibility: hidden; }
|
visibility: hidden; }
|
||||||
@media only screen and (max-width: 40em) {
|
@media only screen and (max-width: 40em) {
|
||||||
#tool-bar #materio-search-api-search-form input#edit-searchfield {
|
#tool-bar #materio-search-api-search-form input#edit-searchfield {
|
||||||
@ -3963,6 +3964,12 @@ body.home-v2 #main {
|
|||||||
margin: 0.4em 0 0.4em 0.4em; }
|
margin: 0.4em 0 0.4em 0.4em; }
|
||||||
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .add-filter {
|
#tool-bar #materio-search-api-advanced-search-form #advancedsearch-filters .add-filter {
|
||||||
margin: 0.5em 0; }
|
margin: 0.5em 0; }
|
||||||
|
#tool-bar #materio-search-api-advanced-search-form div.search-btn-wrapper {
|
||||||
|
display: inline-block; }
|
||||||
|
#tool-bar #materio-search-api-advanced-search-form.loading div.search-btn-wrapper {
|
||||||
|
background: transparent url("../img/ajax-loader.gif") no-repeat center center; }
|
||||||
|
#tool-bar #materio-search-api-advanced-search-form.loading div.search-btn-wrapper input {
|
||||||
|
visibility: hidden; }
|
||||||
|
|
||||||
#center {
|
#center {
|
||||||
border-radius: 10px;
|
border-radius: 10px;
|
||||||
|
@ -522,13 +522,13 @@
|
|||||||
|
|
||||||
function onLoadingContent(event){
|
function onLoadingContent(event){
|
||||||
_$content.addClass('faded');
|
_$content.addClass('faded');
|
||||||
$('#materio-search-api-search-form').addClass('loading');
|
$('#materio-search-api-search-form, #materio-search-api-advanced-search-form').addClass('loading');
|
||||||
};
|
};
|
||||||
|
|
||||||
function onLoadedContent(event){
|
function onLoadedContent(event){
|
||||||
// trace('MaterioBaseTheme :: onLoadedContent',event);
|
// trace('MaterioBaseTheme :: onLoadedContent',event);
|
||||||
_$content.removeClass('faded');
|
_$content.removeClass('faded');
|
||||||
$('#materio-search-api-search-form').removeClass('loading');
|
$('#materio-search-api-search-form, #materio-search-api-advanced-search-form').removeClass('loading');
|
||||||
};
|
};
|
||||||
|
|
||||||
function onResultsChanged(event){
|
function onResultsChanged(event){
|
||||||
|
File diff suppressed because one or more lines are too long
@ -1157,13 +1157,17 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
input#edit-create{
|
// input#edit-create{
|
||||||
|
div.search-btn-wrapper{
|
||||||
|
display: inline-block;
|
||||||
padding: 3px;
|
padding: 3px;
|
||||||
}
|
}
|
||||||
|
|
||||||
&.loading{
|
&.loading{
|
||||||
background: transparent url('../img/ajax-loader.gif') no-repeat 98% center;
|
div.search-btn-wrapper{
|
||||||
input#edit-create{ visibility: hidden; }
|
background: transparent url('../img/ajax-loader.gif') no-repeat center center;
|
||||||
|
input{ visibility: hidden; }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@media #{$small-only}{
|
@media #{$small-only}{
|
||||||
@ -1252,6 +1256,17 @@ $headerouterheight:$headerheight+$headerpaddingtop+$headerpaddingbottom;
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
div.search-btn-wrapper{
|
||||||
|
display: inline-block;
|
||||||
|
// padding: 3px;
|
||||||
|
}
|
||||||
|
|
||||||
|
&.loading{
|
||||||
|
div.search-btn-wrapper{
|
||||||
|
background: transparent url('../img/ajax-loader.gif') no-repeat center center;
|
||||||
|
input{ visibility: hidden; }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user