Skip to content
Snippets Groups Projects
Commit 61abd5dd authored by Tim Wagner's avatar Tim Wagner
Browse files

[TASK] Merge remote-tracking branch 'origin/master' into feature_fixHeaderStylingAndJavaScript

parents b76a24ab f4364a21
No related branches found
No related tags found
1 merge request!21[FEATURE] Rewrite News Slider Similar to Website-Base Sliders
Hide whitespace changes
Inline Side-by-side
Showing
with 90 additions and 28 deletions
Resources/Private/Partials/SingleViewSchema.html
+ 1
− 1
View file @ 61abd5dd
......@@ -7,7 +7,7 @@
"@type": "WebPage",
"@id": "<f:uri.page absolute="TRUE"/>"
{rightBrace},
"author": "{newsMetaData.news.author}",
"author": "{newsMetaData.news.newsAuthor.nameAndRespectFrontendUser}",
"publisher": {leftBrace}
"@type": "Organization",
<f:if condition="{settings.publisher}">
......
Resources/Private/Partials/Teaser.html
+ 1
− 8
View file @ 61abd5dd
......@@ -44,14 +44,7 @@
<div class="tx-sgnews-teaser-meta">
<span class="author">
<f:if condition="{newsMetaData.news.authorFrontendUser}">
<f:then>
{newsMetaData.news.authorFrontendUser.name}
</f:then>
<f:else>
{newsMetaData.news.author}
</f:else>
</f:if>
{newsMetaData.news.newsAuthor.nameAndRespectFrontendUser}
</span>
<f:if condition="{newsMetaData.news.location}">
......
Resources/Private/Partials/TeaserOverview.html
+ 6
− 6
View file @ 61abd5dd
......@@ -37,21 +37,21 @@
<p class="text-center tx-sgnews-teaser-meta">
<span class="author">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#FFF" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"/></svg>
<f:if condition="{newsMetaData.news.authorFrontendUser}">
<f:if condition="{newsMetaData.news.newsAuthor.frontendUser}">
<f:then>
<f:if condition="{newsMetaData.news.authorFrontendUser.www}">
<f:if condition="{newsMetaData.news.newsAuthor.frontendUser.www}">
<f:then>
<f:link.page pageUid="{newsMetaData.news.authorFrontendUser.www}">
{newsMetaData.news.authorFrontendUser.name}
<f:link.page pageUid="{newsMetaData.news.newsAuthor.frontendUser.www}">
{newsMetaData.news.newsAuthor.frontendUser.name}
</f:link.page>
</f:then>
<f:else>
{newsMetaData.news.authorFrontendUser.name}
{newsMetaData.news.newsAuthor.frontendUser.name}
</f:else>
</f:if>
</f:then>
<f:else>
{newsMetaData.news.author}
{newsMetaData.news.newsAuthor.nameAndRespectFrontendUser}
</f:else>
</f:if>
</span>
......
Resources/Private/Templates/NewsByAuthor/List.html 0 → 100644
+ 34
− 0
View file @ 61abd5dd
<f:layout name="Default" />
{namespace sg=SGalinski\SgNews\ViewHelpers}
<f:section name="main">
<f:render partial="ListByCategorySchema" arguments="{_all}" />
<section class="content">
<div class="container">
<f:for each="{authors}" as="author">
<div class="tx-sgnews-category-wrapper">
<h2 class="tx-sgnews-category-title">{author.nameAndRespectFrontendUser}</h2>
<section class="content">
<div class="container tx-sgnews-categories">
<ul class="tx-sgnews-list tx-sgnews-list-0 row" data-record="0">
<f:for each="{newsMetaData}" as="newsMetaDataEntry">
<f:if condition="{newsMetaDataEntry.news.newsAuthor} === {author}">
<li class="col-md-4 col-sm-6 col-xs-12">
<f:render partial="Teaser" arguments="{
newsMetaData: newsMetaDataEntry,
headerTag: '<h2>',
closingHeaderTag: '</h2>',
showCategory: 1
}" />
</li>
</f:if>
</f:for>
</ul>
</div>
</section>
</div>
</f:for>
</div>
</section>
</f:section>
Resources/Private/Templates/SingleView/SingleView.html
+ 8
− 8
View file @ 61abd5dd
......@@ -26,26 +26,26 @@
<div class="tx-sgnews-teaser">
<div class="tx-sgnews-teaser-inner">
<div class="tx-sgnews-teaser-meta">
<f:if condition="{newsMetaData.news.authorFrontendUser}">
<f:if condition="{newsMetaData.news.newsAuthor.frontendUser}">
<f:then>
<span class="author">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#FFF" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z" /></svg>
<f:if condition="{newsMetaData.news.authorFrontendUser.www}">
<f:if condition="{newsMetaData.news.newsAuthor.frontendUser.www}">
<f:then>
<f:link.page pageUid="{newsMetaData.news.authorFrontendUser.www}">
{newsMetaData.news.authorFrontendUser.name}
<f:link.page pageUid="{newsMetaData.news.newsAuthor.frontendUser.www}">
{newsMetaData.news.newsAuthor.frontendUser.name}
</f:link.page>
</f:then>
<f:else>
{newsMetaData.news.authorFrontendUser.name}
{newsMetaData.news.newsAuthor.frontendUser.name}
</f:else>
</f:if>
</span>
</f:then>
<f:else if="{newsMetaData.news.author}">
<f:else if="{newsMetaData.news.newsAuthor.nameAndRespectFrontendUser}">
<span class="author">
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 448 512"><path fill="#FFF" d="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z" /></svg>
{newsMetaData.news.author}
{newsMetaData.news.newsAuthor.nameAndRespectFrontendUser}
</span>
</f:else>
</f:if>
......@@ -88,7 +88,7 @@
<div class="container">
<div class="tx-sgnews-single">
<div class="tx-sgnews-single-container">
<f:alias map="{content: '{f:cObject(typoscriptObjectPath: \'lib.mainContent\')}'}">
<f:alias map="{content: '{f:cObject(typoscriptObjectPath: \'{f:if(condition: \\\'{newsMetaData.news.contentFromAnotherPage}\\\', then: \\\'lib.contentFromAnotherPage\\\', else: \\\'lib.mainContent\\\')}\')}'}">
<div class="tx-sgnews-single-content">
<p>
<a href="#comments">{f:cObject(typoscriptObjectPath: "lib.sgCommentsGetCountWithLabel")}</a>
......
composer.json
+ 1
− 1
View file @ 61abd5dd
......@@ -6,7 +6,7 @@
"license": [
"GPL-2.0-or-later"
],
"version": "7.0.8",
"version": "8.1.0",
"support": {
},
"repositories": [
......
ext_emconf.php
+ 1
− 1
View file @ 61abd5dd
......@@ -19,7 +19,7 @@ $EM_CONF[$_EXTKEY] = [
'modify_tables' => '',
'clearCacheOnLoad' => 0,
'lockType' => '',
'version' => '7.0.8',
'version' => '8.1.0',
'constraints' => [
'depends' => [
'typo3' => '8.7.0-9.5.99',
......
ext_localconf.php
+ 7
− 0
View file @ 61abd5dd
......@@ -81,6 +81,13 @@ call_user_func(
['PageBrowser' => '',]
);
\TYPO3\CMS\Extbase\Utility\ExtensionUtility::configurePlugin(
'SGalinski.' . $extKey,
'NewsByAuthor',
['NewsByAuthor' => 'list',],
['NewsByAuthor' => '',]
);
if (\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::isLoaded('sg_ajax')) {
\SGalinski\SgAjax\Service\AjaxRegistration::configureAjaxFrontendPlugin(
$extKey, [
......
ext_tables.php
+ 4
− 0
View file @ 61abd5dd
......@@ -26,6 +26,10 @@
call_user_func(
function ($extKey) {
\TYPO3\CMS\Core\Utility\ExtensionManagementUtility::allowTableOnStandardPages(
'tx_sgnews_domain_model_author'
);
if (TYPO3_MODE === 'BE') {
$navigationComponentId = 'TYPO3/CMS/Backend/PageTree/PageTreeElement';
if (version_compare(\TYPO3\CMS\Core\Utility\VersionNumberUtility::getCurrentTypo3Version(), '9.0.0', '<')) {
......
ext_tables.sql
+ 27
− 3
View file @ 61abd5dd
CREATE TABLE pages (
tx_sgnews_author int(11) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_news_author int(11) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_related_news varchar(255) DEFAULT '' NOT NULL,
tx_sgnews_highlighted tinyint(4) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_never_highlighted tinyint(4) unsigned DEFAULT '0' NOT NULL,
......@@ -8,9 +8,10 @@ CREATE TABLE pages (
tx_sgnews_tags int(11) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_likes int(11) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_location mediumtext,
tx_sgnews_date_end int(10) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_date_end int(10) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_content_from_another_page int(11) unsigned DEFAULT '0' NOT NULL,
KEY author (tx_sgnews_author)
KEY news_author (tx_sgnews_news_author)
);
CREATE TABLE pages_language_overlay (
......@@ -18,3 +19,26 @@ CREATE TABLE pages_language_overlay (
tx_sgnews_teaser2_image int(11) unsigned DEFAULT '0' NOT NULL,
tx_sgnews_location mediumtext
);
CREATE TABLE tx_sgnews_domain_model_author (
uid int(11) NOT NULL auto_increment,
pid int(11) DEFAULT '0' NOT NULL,
-- Custom fields
name varchar(255) DEFAULT '' NOT NULL,
email varchar(255) DEFAULT '' NOT NULL,
description text,
frontend_user int(11) unsigned DEFAULT '0' NOT NULL,
image int(11) unsigned DEFAULT '0',
-- TYPO3 fields
tstamp int(11) unsigned DEFAULT '0' NOT NULL,
crdate int(11) unsigned DEFAULT '0' NOT NULL,
cruser_id int(11) unsigned DEFAULT '0' NOT NULL,
deleted tinyint(4) unsigned DEFAULT '0' NOT NULL,
hidden tinyint(4) unsigned DEFAULT '0' NOT NULL,
PRIMARY KEY (uid),
KEY parent (pid),
KEY frontend_user (frontend_user)
);
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