diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Page.ts b/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Page.ts index 2154811b523130c6df1e6015b77774e008f76d83..0db5ce6411b3b9ccf06582e1a90089d3f54f0da8 100644 --- a/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Page.ts +++ b/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Page.ts @@ -16,11 +16,17 @@ page { shortcutIcon = EXT:ter_layout/Resources/Public/Icons/favicon.ico - includeCSS.file = EXT:ter_layout/Resources/Public/Css/styles.css - includeCSS.file2 = EXT:ter_layout/Resources/Public/Css/styles2.css + includeCSS { + file = EXT:ter_layout/Resources/Public/Css/styles.css + file2 = EXT:ter_layout/Resources/Public/Css/styles2.css + plugins = EXT:ter_layout/Resources/Public/Css/PluginStyles.css + } 10 = FLUIDTEMPLATE 10 { file = EXT:ter_layout/Resources/Private/Templates/Default.html + variables { + content < styles.content.get + } } } \ No newline at end of file diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Plugins/Solr.ts b/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Plugins/Solr.ts index cac9f704d37f4587170f02e6c9a022eb0e51a617..a9e3b5351bf7d6a21b4ac93668abc38c63e6fe38 100644 --- a/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Plugins/Solr.ts +++ b/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Plugins/Solr.ts @@ -5,5 +5,9 @@ plugin { port = 8983 path = solr/mycore/ } + + templateFiles { + search = EXT:ter_layout/Resources/Private/Ext/Solr/Search.html + } } } \ No newline at end of file diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/TempObjects.ts b/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/TempObjects.ts index 3e593f6ba53f3fa8fcb25cc112e05539be5702c0..48ec69a47b5b1518d38fa5b30fbfe3e9454d3218 100644 --- a/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/TempObjects.ts +++ b/data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/TempObjects.ts @@ -84,4 +84,6 @@ lib { ) } + + SolrSearch < plugin.tx_solr_PiSearch_Search } \ No newline at end of file diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Ext/Solr/Search.html b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Ext/Solr/Search.html new file mode 100644 index 0000000000000000000000000000000000000000..81cfc651741cc5c916ea2316e120c5ecb1cb225a --- /dev/null +++ b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Ext/Solr/Search.html @@ -0,0 +1,31 @@ + + + + + + Template for the search form view for EXT:solr + + + + + + + + + + + + +###LLL:searchFailed### + + + + \ No newline at end of file diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Templates/Default.html b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Templates/Default.html index e54bdbf9fee832abd68f5d2d4e028e8abcb70b7e..600fbc2c4aba3a4022d883674dc65c820a78e568 100644 --- a/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Templates/Default.html +++ b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Templates/Default.html @@ -11,7 +11,10 @@
- ###CONTENT### + + + {content} +
diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.scss b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.scss new file mode 100644 index 0000000000000000000000000000000000000000..7509683a43934a58f09266715e4f57dc164fa8f2 --- /dev/null +++ b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.scss @@ -0,0 +1,31 @@ +@import "mixins"; + +.tx-solr { + /** + * Search form + */ + + form#tx-solr-search-form-pi-search { + @include displayFlex; + } + + #inputText { + background: url(../Images/buttons.png) repeat-x scroll 0 -94px transparent; + border: 1px solid #DBDBDB; + padding: 4px; + width: 415px; + margin-right: 5px; + } + + #submitButton { + color: white; + background: url(../Images/s-buttons.png) left top no-repeat transparent; + padding: 4px 6px; + cursor: pointer; + text-decoration: none; + display: inline-block; + vertical-align: middle; + border: 1px solid #e87c0c; + } + +} \ No newline at end of file diff --git a/data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/_mixins.scss b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/_mixins.scss new file mode 100644 index 0000000000000000000000000000000000000000..579b0a9f6bf0d87d9d163c3fda9ab7851ffb7758 --- /dev/null +++ b/data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/_mixins.scss @@ -0,0 +1,6 @@ +@mixin displayFlex{ + display: -webkit-box; /* OLD - iOS 6-, Safari 3.1-6, BB7 */ + display: -ms-flexbox; /* TWEENER - IE 10 */ + display: -webkit-flex; /* NEW - Safari 6.1+. iOS 7.1+, BB10 */ + display: flex; /* NEW, Spec - Firefox, Chrome, Opera */ +} \ No newline at end of file