Skip to content
GitLab
Commit 6b1030e9 authored by Thomas Löffler's avatar Thomas Löffler
Browse files

Merge branch '18-style-solr-integration-into-ter_layout' into 'master' 

Resolve "Style Solr integration into ter_layout"

Closes #18

See merge request !18
parents 37ace7a0 af7797e5
Hide whitespace changes
Inline Side-by-side
data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Page.ts
View file @ 6b1030e9
......@@ -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
data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/Plugins/Solr.ts
View file @ 6b1030e9
......@@ -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
data/typo3/html/typo3conf/ext/ter_layout/Configuration/TypoScript/TempObjects.ts
View file @ 6b1030e9
......@@ -84,4 +84,6 @@ lib {
</div>
)
}
SolrSearch < plugin.tx_solr_PiSearch_Search
}
\ No newline at end of file
data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Ext/Solr/Search.html 0 → 100644
View file @ 6b1030e9
<?xml version="1.0" encoding="UTF-8" ?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<title>Template for the search form view for EXT:solr</title>
</head>
<body>
<!-- ###SOLR_SEARCH### begin -->
<!-- ###SOLR_SEARCH_FORM### begin -->
<div class="tx-solr-searchbox">
###FORM.SUGGEST_URL###
<form id="tx-solr-search-form-pi-search" action="###FORM.ACTION###" method="get" accept-charset="###FORM.ACCEPT-CHARSET###">
<input type="hidden" name="id" value="###FORM.ACTION_ID###" />
<input type="hidden" name="###FORM.ACTION_LANGUAGE_PARAMETER###" value="###FORM.ACTION_LANGUAGE###" />
<input type="text" id="inputText" class="tx-solr-q" name="q" value="" />
<input type="submit" id="submitButton" alt="Search" title="Search" value="Search "/>
</form>
</div>
<!-- ###SOLR_SEARCH_FORM### end -->
<!-- ###SOLR_SEARCH### end -->
<!-- ###SOLR_SEARCH_ERROR### begin -->
###LLL:searchFailed###
<!-- ###SOLR_SEARCH_ERROR### end -->
</body>
</html>
\ No newline at end of file
data/typo3/html/typo3conf/ext/ter_layout/Resources/Private/Templates/Default.html
View file @ 6b1030e9
......@@ -11,7 +11,10 @@
<!-- ### section ### -->
<div class="s d" id="section">
###CONTENT###
<f:cObject typoscriptObjectPath="lib.SolrSearch" />
<!--TYPO3SEARCH_begin-->
{content}
<!--TYPO3SEARCH_end-->
</div>
<!-- ^^^ section ^^^ -->
......
data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/PluginStyles.scss 0 → 100644
View file @ 6b1030e9
@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
data/typo3/html/typo3conf/ext/ter_layout/Resources/Public/Css/_mixins.scss 0 → 100644
View file @ 6b1030e9
@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
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment