From 90d35b4e640a9bf12b6f6459cdf60ff999dab097 Mon Sep 17 00:00:00 2001
From: "michael.danielczok" <michael@pcsg.de>
Date: Mon, 20 Jul 2020 08:21:37 +0200
Subject: [PATCH] feat: box content advanced has new setting per entry: site
url.
---
bin/Controls/BoxContentAdvanced.Settings.html | 4 +++
bin/Controls/BoxContentAdvanced.css | 4 +++
bin/Controls/BoxContentAdvanced.js | 1 +
locale.xml | 4 +++
.../BoxContentAdvanced.boxWithShadow.html | 28 +++++++++++++++++--
.../Controls/BoxContentAdvanced.standard.html | 28 +++++++++++++++++--
6 files changed, 63 insertions(+), 6 deletions(-)
diff --git a/bin/Controls/BoxContentAdvanced.Settings.html b/bin/Controls/BoxContentAdvanced.Settings.html
index e4ed642..2e8bf15 100644
--- a/bin/Controls/BoxContentAdvanced.Settings.html
+++ b/bin/Controls/BoxContentAdvanced.Settings.html
@@ -11,6 +11,10 @@
<span class="entry-title">{{entryImage}}</span>
<input class="media-image" data-qui-options-selectable_types="image" data-qui-options-cssclasses="1" name="entryImage"/>
</label>
+ <label>
+ <span class="entry-title">{{entryUrl}}</span>
+ <input type="text" name="entryUrl" class="project-site" data-external="1" />
+ </label>
<label>
<span class="entry-title">{{entryOrder}}</span>
<input type="number" name="entryOrder"/>
diff --git a/bin/Controls/BoxContentAdvanced.css b/bin/Controls/BoxContentAdvanced.css
index 8b75eb8..1e9c7ce 100644
--- a/bin/Controls/BoxContentAdvanced.css
+++ b/bin/Controls/BoxContentAdvanced.css
@@ -99,3 +99,7 @@
background: #fff;
height: 120px !important;
}
+
+.quiqqer-bricks-boxContentAdvanced-entry .qui-controls-project-site-input {
+ display: flex;
+}
\ No newline at end of file
diff --git a/bin/Controls/BoxContentAdvanced.js b/bin/Controls/BoxContentAdvanced.js
index 14e04ba..3860d45 100644
--- a/bin/Controls/BoxContentAdvanced.js
+++ b/bin/Controls/BoxContentAdvanced.js
@@ -46,6 +46,7 @@ define('package/quiqqer/bricks/bin/Controls/BoxContentAdvanced', [
'entryTitle' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryTitle'),
'entrySubTitle': QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entrySubTitle'),
'entryImage' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryImage'),
+ 'entryUrl' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryUrl'),
'entryOrder' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryOrder'),
'entryContent' : QUILocale.get(lg, 'bricks.BoxContentAdvanced.entries.settings.entryContent')
})
diff --git a/locale.xml b/locale.xml
index 8655fe9..d297e9c 100644
--- a/locale.xml
+++ b/locale.xml
@@ -1469,6 +1469,10 @@ Möchten Sie die Bausteine aus der Bausteinzone entfernen?</p>]]></de>
<de><![CDATA[Bild]]></de>
<en><![CDATA[Image]]></en>
</locale>
+ <locale name="bricks.BoxContentAdvanced.entries.settings.entryUrl">
+ <de><![CDATA[Seiten-Url]]></de>
+ <en><![CDATA[Site url]]></en>
+ </locale>
<locale name="bricks.BoxContentAdvanced.entries.settings.entryOrder">
<de><![CDATA[Priorität]]></de>
<en><![CDATA[Priority]]></en>
diff --git a/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html b/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
index 5b0cc92..592c045 100644
--- a/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
+++ b/src/QUI/Bricks/Controls/BoxContentAdvanced.boxWithShadow.html
@@ -4,19 +4,41 @@
{assign var=centerText value='centerText'}
{/if}
{foreach from=$entries item=entry}
+
+ {if $entry.entryUrl && QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
+ {assign var=TargetSite value=QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
+ {/if}
+
<div class="quiqqer-boxContentAdvanced-entry-container quiqqer-boxContentAdvanced{$entriesPerLine} {$centerText}"
{if $entry.entryOrder}style="order: {$entry.entryOrder}"{/if}>
<div class="quiqqer-boxContentAdvanced-entry">
{if $entry.entryImage}
- <div class="quiqqer-boxContentAdvanced-entry-img control-color">
- {image src=$entry.entryImage width="500"}
- </div>
+ {if $entry.entryUrl}
+ <a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
+ {/if}
+
+ <div class="quiqqer-boxContentAdvanced-entry-img control-color">
+ {image src=$entry.entryImage width="500"}
+ </div>
+
+ {if $entry.entryUrl}
+ </a>
+ {/if}
{/if}
<header>
<h4 class="quiqqer-boxContentAdvanced-entry-title" title="{$entry.entryTitle|escape:'html'}">
+ {if $entry.entryUrl}
+ <a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
+ {/if}
+
{$entry.entryTitle|escape:'html'}
+
+ {if $entry.entryUrl}
+ </a>
+ {/if}
</h4>
+
{if $entry.entrySubTitle}
<span class="quiqqer-boxContentAdvanced-entry-subTitle">
{$entry.entrySubTitle|escape:'html'}
diff --git a/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html b/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
index 31e656d..c62ecc2 100644
--- a/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
+++ b/src/QUI/Bricks/Controls/BoxContentAdvanced.standard.html
@@ -4,19 +4,41 @@
{assign var=centerText value='centerText'}
{/if}
{foreach from=$entries item=entry}
+
+ {if $entry.entryUrl && QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
+ {assign var=TargetSite value=QUI\Projects\Site\Utils::getSiteByLink($entry.entryUrl)}
+ {/if}
+
<div class="quiqqer-boxContentAdvanced-entry-container quiqqer-boxContentAdvanced{$entriesPerLine} {$centerText}"
{if $entry.entryOrder}style="order: {$entry.entryOrder}"{/if}>
<div class="quiqqer-boxContentAdvanced-entry">
{if $entry.entryImage}
- <div class="quiqqer-boxContentAdvanced-entry-img control-color">
- {image src=$entry.entryImage width="500"}
- </div>
+ {if $entry.entryUrl}
+ <a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
+ {/if}
+
+ <div class="quiqqer-boxContentAdvanced-entry-img control-color">
+ {image src=$entry.entryImage width="500"}
+ </div>
+
+ {if $entry.entryUrl}
+ </a>
+ {/if}
{/if}
<header>
<h4 class="quiqqer-boxContentAdvanced-entry-title" title="{$entry.entryTitle|escape:'html'}">
+ {if $entry.entryUrl}
+ <a href="{url site=$TargetSite rewrited=1}" title="{$TargetSite->getAttribute('title')}">
+ {/if}
+
{$entry.entryTitle|escape:'html'}
+
+ {if $entry.entryUrl}
+ </a>
+ {/if}
</h4>
+
{if $entry.entrySubTitle}
<span class="quiqqer-boxContentAdvanced-entry-subTitle">
{$entry.entrySubTitle|escape:'html'}
--
GitLab