Skip to content

TYPO3 9.5 compatibility #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aWuttig wants to merge 3 commits into
base: master
Choose a base branch
from
Open

TYPO3 9.5 compatibility #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef4d6e
[TASK] compat to TYPO3 8.7
May 11, 2020
c74bcf2
[TASK] inc TYPO3 dependency to ^9.5
aWuttig Jul 31, 2020
ecac9a5
[TASK] inc version for TYPO3 9.5 compat
aWuttig Aug 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 0 additions & 48 deletions Classes/Extension/InsertIcon.php
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Configuration/TypoScript/setup.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

# overwrite header partials
lib.fluidContent.partialRootPaths.10 = EXT:iconfont/Resources/Private/Partials/
lib.contentElement.partialRootPaths.10 = EXT:iconfont/Resources/Private/Partials/

# load iconfont css in frontend
page {
Expand Down
36 changes: 0 additions & 36 deletions Configuration/TypoScript/tsconfig.ts
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions Resources/Private/Partials/Header.html
View file
Open in desktop

This file was deleted.

23 changes: 23 additions & 0 deletions Resources/Private/Partials/Header/All.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:if condition="{data.header_layout} != 100">
<f:if condition="{data.header} || {data.subheader} || {data.date}">
<header>
<f:render partial="Header/Header" arguments="{
header: data.header,
layout: data.header_layout,
positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
link: data.header_link,
icon: data.tx_iconfont_icon,
default: settings.defaultHeaderType}" />
<f:render partial="Header/SubHeader" arguments="{
subheader: data.subheader,
layout: data.header_layout,
positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}',
default: settings.defaultHeaderType}" />
<f:render partial="Header/Date" arguments="{
date: data.date,
positionClass: '{f:if(condition: data.header_position, then: \'ce-headline-{data.header_position}\')}'}" />
</header>
</f:if>
</f:if>
</html>
87 changes: 54 additions & 33 deletions Resources/Private/Partials/Header/Header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,34 +1,55 @@
<html xmlns:f="http://typo3.org/ns/TYPO3/CMS/Fluid/ViewHelpers" data-namespace-typo3-fluid="true">
<f:switch expression="{layout}">
<f:case value="1">
<h1><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h1>
</f:case>
<f:case value="2">
<h2><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h2>
</f:case>
<f:case value="3">
<h3><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h3>
</f:case>
<f:case value="4">
<h4><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h4>
</f:case>
<f:case value="5">
<h5><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h5>
</f:case>
<f:case value="6">
<h6><f:if condition="{icon}"><i class="fa fa-{icon}"></i> </f:if><f:link.typolink parameter="{link}">{header}</f:link.typolink></h6>
</f:case>
<f:case value="100">
<f:comment> -- do not show header -- </f:comment>
</f:case>
<f:case default="true">
<f:if condition="{default}">
<f:render partial="Header/Header" arguments="{
header: header,
layout: default,
link: link,
icon: icon}" />
</f:if>
</f:case>
</f:switch>
</html>
<f:if condition="{header}">
<f:switch expression="{layout}">
<f:case value="1">
<h1 class="{positionClass}">
<f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
<f:link.typolink parameter="{link}">{header}</f:link.typolink>
</h1>
</f:case>
<f:case value="2">
<h2 class="{positionClass}">
<f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
<f:link.typolink parameter="{link}">{header}</f:link.typolink>
</h2>
</f:case>
<f:case value="3">
<h3 class="{positionClass}">
<f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
<f:link.typolink parameter="{link}">{header}</f:link.typolink>
</h3>
</f:case>
<f:case value="4">
<h4 class="{positionClass}">
<f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
<f:link.typolink parameter="{link}">{header}</f:link.typolink>
</h4>
</f:case>
<f:case value="5">
<h5 class="{positionClass}">
<f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
<f:link.typolink parameter="{link}">{header}</f:link.typolink>
</h5>
</f:case>
<f:case value="6">
<h6 class="{positionClass}">
<f:if condition="{icon}"><i class="fa fa-{icon}"></i></f:if>
<f:link.typolink parameter="{link}">{header}</f:link.typolink>
</h6>
</f:case>
<f:case value="100">
<f:comment> -- do not show header --</f:comment>
</f:case>
<f:defaultCase>
<f:if condition="{default}">
<f:render partial="Header/Header" arguments="{
header: header,
layout: default,
positionClass: positionClass,
link: link,
icon: icon}"/>
</f:if>
</f:defaultCase>
</f:switch>
</f:if>
</html>
22 changes: 20 additions & 2 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,15 @@
"type": "typo3-cms-extension",
"version": "0.9.0",
"description": "Support for fontawesome or a custom icon font. Allows to show an icon besides headers and to add icons via RTE. RTE feature based on code from ext:fontawesome.",
"keywords": ["typo3", "TYPO3 CMS", "bootstrap", "bsdist", "fontawesome", "font awesome", "iconfont"],
"keywords": [
"typo3",
"TYPO3 CMS",
"bootstrap",
"bsdist",
"fontawesome",
"font awesome",
"iconfont"
],
"homepage": "http://www.bsdist.ch",
"license": "GPL-2.0+",
"authors": [
Expand All @@ -12,5 +20,15 @@
"email": "typo3@bsdist.ch",
"role": "Developer"
}
]
],
"require": {
"typo3/cms-core": "^9.5",
"typo3/cms-backend": "^9.5",
"typo3/cms-frontend": "^9.5"
},
"autoload": {
"psr-4": {
"Laxap\\Iconfont\\": "Classes/"
}
}
}
12 changes: 6 additions & 6 deletions ext_emconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,20 +12,20 @@
'author_email' => 'typo3@bsdist.ch',
'author_company' => '',
'state' => 'beta',
'shy' => '',
'priority' => '',
'module' => '',
'internal' => '',
'uploadfolder' => '0',
'uploadfolder' => false,
'createDirs' => '',
'modify_tables' => 'tt_content,pages',
'clearCacheOnLoad' => 1,
'lockType' => '',
'version' => '0.9.0',
'constraints' => array(
'depends' => array(
'typo3' => '7.6.0-7.6.99',
),
'depends' => [
'typo3' => '9.5.0-9.5.99',
'backend' => '9.5.0-9.5.99',
'frontend' => '9.5.0-9.5.99'
],
'conflicts' => array(
'fontawesome' => '',
),
Expand Down
17 changes: 1 addition & 16 deletions ext_localconf.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,9 @@
break;
}

// --- Add RTE plugin --
//
if ( $pluginClass != '' ) {
$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon'] = array();
$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon']['objectReference'] = $pluginClass;
$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon']['addIconsToSkin'] = 1;
$TYPO3_CONF_VARS['EXTCONF']['rtehtmlarea']['plugins']['InsertIcon']['disableInFE'] = 0;
}


// TypoScript constants
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addTypoScriptConstants('
plugin.tx_iconfont {
# cat=tx_iconfont/base/010; type=string; label=Path to icon font css file
cssFile = ' . $fontCssFile . '
}');


// --- Load default page TSconfig ---
//
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::addPageTSConfig('<INCLUDE_TYPOSCRIPT: source="FILE:EXT:iconfont/Configuration/TypoScript/tsconfig.ts">');
}');