diff --git a/bin/Controls/BoxContentAdvanced.Settings.html b/bin/Controls/BoxContentAdvanced.Settings.html index e4ed642f4f531bbea75877ceeab2a1bd2e0bfa82..2e8bf15f4440c83711c5822bc3771510f925b211 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 8b75eb8fbc4c075f752d794371abb9de3c64e305..1e9c7ce9757407015d9d1cca8b0c9c6598f88c1c 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 14e04bad1e857cf03a81ebd7203f4c48ce57c602..3860d45c22655c651471965079999d3820ac7431 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 8655fe98325a3ef2a06249344a1dbfabb69746f6..d297e9cc79f4c69f3695384dd010e3298858d680 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 5b0cc920750b9fc21f114089036ca0d49ac89111..592c045c1013072ed44e7e80cdf3893c8262a72f 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 31e656d844fd5d701a837a9a5dd7ab061b8bda63..c62ecc29501c5deb4169dc81881d97f6a066568b 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'}