Skip to content
Code-Schnipsel Gruppen Projekte
Commit fe45fae8 erstellt von Michael Danielczok's avatar Michael Danielczok
Dateien durchsuchen

Merge branch 'dev' into 'master' 

Dev

See merge request !13
Übergeordnete a5e363a2 fd1dacb3
No related branches found
No related tags found
3 Merge Requests!19Dev,!18Feat menu manager improvement,!13Dev
Alle erweitern Leerzeichenänderungen ausblenden
Inline Nebeneinander
bin/Controls/NavTabsVerticalSettings.html
+ 58
− 22
Zeige Datei @ fe45fae8
<div class="quiqqer-menu-navTabsVerticalSettings-entry" style="display: none;">
<label class="entry-title">
<span class="entry-title">{{titleIcon}}</span>
<input class="media-image hide-select-image-button" data-qui-options-cssclasses="1"
name="titleIcon" />
</label>
<label>
<span class="entry-title">{{title}}</span>
<input type="text"
name="entryTitle" />
</label>
<label class="entry-title">
<span class="entry-title">{{image}}</span>
<input class="media-image" data-qui-options-selectable_types="image"
name="entryImage"/>
</label>
<label>
<span class="entry-title">{{content}}</span>
<input class="field-container-field field-description" data-qui="controls/editors/Input"
name="entryContent" />
</label>
</div>
\ No newline at end of file
<form name="quiqqer-bricks-customerReviewsSlider-settings-entry"
class="quiqqer-bricks-customerReviewsSlider-settings-entry-form"
>
<table class="data-table data-table-flexbox">
<tbody>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{{fieldIsDisabled}}
</span>
<span id="isDisabledWrapper" class="field-container-field"></span>
</label>
</td>
</tr>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{{fieldTitleIcon}}
</span>
<input name="titleIcon" data-qui-options-cssclasses="1" class="field-container-field media-image"/>
</label>
</td>
</tr>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{{fieldEntryTitle}}
</span>
<input name="entryTitle" class="field-container-field field-customerName"/>
</label>
</td>
</tr>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{{fieldEntryImage}}
</span>
<input name="entryImage" class="field-container-field media-image"/>
</label>
</td>
</tr>
<tr>
<td>
<label class="field-container">
<span class="field-container-item">
{{fieldEntryContent}}
</span>
<input name="entryContent" class="field-container-field field-entryContent" data-qui="controls/editors/Input"/>
</label>
</td>
</tr>
</tbody>
</table>
</form>
bin/Controls/NavTabsVerticalSettings.js
+ 672
− 70
Zeige Datei @ fe45fae8
Dieser Diff ist reduziert.
bricks.xml
+ 3
− 4
Zeige Datei @ fe45fae8
......@@ -135,11 +135,10 @@
var="control.navTabsVertical.navContent"/>
</setting>
<setting name="entries"
data-qui="package/quiqqer/menu/bin/Controls/NavTabsVerticalSettings">
<locale group="quiqqer/menu"
var="control.navTabsVertical.entries"/>
<setting name="entries" type="hidden" data-qui="package/quiqqer/menu/bin/Controls/NavTabsVerticalSettings">
<locale group="quiqqer/menu" var="control.navTabsVertical.entries"/>
</setting>
</settings>
</brick>
......
locale.xml
+ 20
− 0
Zeige Datei @ fe45fae8
......@@ -203,10 +203,30 @@
<de><![CDATA[Tabs]]></de>
<en><![CDATA[Tabs]]></en>
</locale>
<locale name="control.navTabsVertical.entries.add.title">
<de><![CDATA[Eintrag hinzufügen]]></de>
<en><![CDATA[Add Entry]]></en>
</locale>
<locale name="control.navTabsVertical.entries.edit.title">
<de><![CDATA[Eintrag bearbeiten]]></de>
<en><![CDATA[Edit Entry]]></en>
</locale>
<locale name="control.navTabsVertical.entries.delete.title">
<de><![CDATA[Möchten Sie diesen Eintrag wirklich entfernen?]]></de>
<en><![CDATA[Do you really want to remove this entry?]]></en>
</locale>
<locale name="control.navTabsVertical.entries.delete.information">
<de><![CDATA[Der Eintrag kann nicht wiederhergestellt werden]]></de>
<en><![CDATA[The entries can not be restored]]></en>
</locale>
<locale name="control.navTabsVertical.entries.addButton">
<de><![CDATA[Eintrag hinzufügen]]></de>
<en><![CDATA[Add entry]]></en>
</locale>
<locale name="control.navTabsVertical.entries.isDisable">
<de><![CDATA[Deaktiviert]]></de>
<en><![CDATA[Disabled]]></en>
</locale>
<locale name="control.navTabsVertical.entries.entryTitle">
<de><![CDATA[Titel]]></de>
<en><![CDATA[Title]]></en>
......
src/QUI/Menu/NavTabsVertical.html
+ 6
− 2
Zeige Datei @ fe45fae8
......@@ -5,7 +5,7 @@
{/if}
{if $this->getAttribute('content') != ""}
<div class="control-body">
<div class="control-body default-content">
{$this->getAttribute('content')}
</div>
{/if}
......@@ -89,7 +89,11 @@
</div>
{/if}
{$entryContent}
{if $entryContent}
<div class="default-content">
{$entryContent}
</div>
{/if}
{if $entryImage && $imagePos == 'bottom'}
<div class="quiqqer-menu-navTabsVertical-content-image
......
src/QUI/Menu/NavTabsVertical.php
+ 10
− 1
Zeige Datei @ fe45fae8
......@@ -50,14 +50,23 @@ public function getBody()
{
$Engine = QUI::getTemplateManager()->getEngine();
$entries = $this->getAttribute('entries');
$enabledEntries = [];
if (is_string($entries)) {
$entries = json_decode($entries, true);
}
foreach ($entries as $entry) {
if (isset($entry['isDisabled']) && $entry['isDisabled'] === 1) {
continue;
}
array_push($enabledEntries, $entry);
}
$Engine->assign([
'this' => $this,
'entries' => $entries,
'entries' => $enabledEntries,
'navTitle' => $this->getAttribute('navTitle'),
'navContent' => $this->getAttribute('navContent'),
'imagePos' => $this->getAttribute('imagePos')
......
0% oder .
You are about to add 0 people to the discussion. Proceed with caution.
Bearbeitung dieser Nachricht zuerst beenden!
Bitte registrieren oder zum Kommentieren

PCSG & QUIQQER support and DEV System - GitLab