EP/website-typo3
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'release/2019.12-10'

Browse Source
This commit is contained in:
Björn Fromme
2019-12-28 17:49:09 +01:00
parent db4f1704a2 4288ffee4f
commit 2b2204741e
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
public/typo3conf/ext/ep_theme/Resources/Private/Assets/js/components/DaterangeSelect.vue
+4
View File
@@ -107,6 +107,10 @@
if (this.from && this.to) { if (this.from && this.to) {
this.picker.setDate([ new Date(this.from), new Date(this.to) ]); this.picker.setDate([ new Date(this.from), new Date(this.to) ]);
} }
if (this.minDate && this.maxDate) {
this.picker.set('minDate', new Date(this.minDate));
this.picker.set('maxDate', new Date(this.maxDate));
}
}); });
EventBus.$on('filterSettingsReset', () => { EventBus.$on('filterSettingsReset', () => {
this.reset(); this.reset();
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbar.html
+4 -5
View File
@@ -1,7 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers">
<f:layout name="Default"/> <f:layout name="Default"/>
@@ -11,9 +10,9 @@
options-uri='<ep:uri.ajax controller="AjaxSearchbar" action="options" pageUid="{settings.defaultAjaxUid}" />' options-uri='<ep:uri.ajax controller="AjaxSearchbar" action="options" pageUid="{settings.defaultAjaxUid}" />'
reset-uri='<ep:uri.ajax controller="AjaxSearchbar" action="reset" pageUid="{settings.defaultAjaxUid}" />' reset-uri='<ep:uri.ajax controller="AjaxSearchbar" action="reset" pageUid="{settings.defaultAjaxUid}" />'
argument-prefix='<ep:argumentPrefix pluginName="ajax" />' argument-prefix='<ep:argumentPrefix pluginName="ajax" />'
:initial-search-params='<v:format.json.encode>{searchParams}</v:format.json.encode>' :initial-search-params='{searchParams -> f:format.json() -> f:format.raw()}'
:initial-filter-options='<v:format.json.encode>{filterOptions}</v:format.json.encode>' :initial-filter-options='{filterOptions -> f:format.json() -> f:format.raw()}'
:date-presets='{settings.datePickerPresets -> v:format.json.encode()}' :date-presets='{settings.datePickerPresets -> f:format.json() -> f:format.raw()}'
inline-template> inline-template>
<div class="container searchbar affix{f:if(condition: fixed, else: '-top')}"{f:if(condition: fixed, else: ' data-spy="affix" data-offset-top="650" data-offset-bottom="200"')}> <div class="container searchbar affix{f:if(condition: fixed, else: '-top')}"{f:if(condition: fixed, else: ' data-spy="affix" data-offset-top="650" data-offset-bottom="200"')}>
<div class="container"> <div class="container">
public/typo3conf/ext/ep_theme/Resources/Private/Templates/Search/Searchbox.html
+4 -5
View File
@@ -1,7 +1,6 @@
<html xmlns="http://www.w3.org/1999/xhtml" lang="en" <html xmlns="http://www.w3.org/1999/xhtml" lang="en"
xmlns:f="http://typo3.org/ns/fluid/ViewHelpers" xmlns:f="http://typo3.org/ns/fluid/ViewHelpers"
xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers" xmlns:ep="http://typo3.org/ns/EP/EpTheme/ViewHelpers">
xmlns:v="http://typo3.org/ns/FluidTYPO3/Vhs/ViewHelpers">
<f:layout name="Default"/> <f:layout name="Default"/>
@@ -11,9 +10,9 @@
options-uri='<ep:uri.ajax controller="AjaxSearchbar" action="options" pageUid="{settings.defaultAjaxUid}" />' options-uri='<ep:uri.ajax controller="AjaxSearchbar" action="options" pageUid="{settings.defaultAjaxUid}" />'
reset-uri='<ep:uri.ajax controller="AjaxSearchbar" action="reset" pageUid="{settings.defaultAjaxUid}" />' reset-uri='<ep:uri.ajax controller="AjaxSearchbar" action="reset" pageUid="{settings.defaultAjaxUid}" />'
argument-prefix='<ep:argumentPrefix pluginName="ajax" />' argument-prefix='<ep:argumentPrefix pluginName="ajax" />'
:initial-search-params='<v:format.json.encode>{searchParams}</v:format.json.encode>' :initial-search-params='{searchParams -> f:format.json() -> f:format.raw()}'
:initial-filter-options='<v:format.json.encode>{filterOptions}</v:format.json.encode>' :initial-filter-options='{filterOptions -> f:format.json() -> f:format.raw()}'
:date-presets='{settings.datePickerPresets -> v:format.json.encode()}' :date-presets='{settings.datePickerPresets -> f:format.json() -> f:format.raw()}'
inline-template> inline-template>
<div class="container"> <div class="container">
<f:form action="processSearch" controller="Search" method="post" name="searchParams" <f:form action="processSearch" controller="Search" method="post" name="searchParams"