Skip to content
Code-Schnipsel Gruppen Projekte
Commit a516fd34 erstellt von Henning Leutz's avatar Henning Leutz :martial_arts_uniform:
Dateien durchsuchen

Merge branch 'next' into 'master' 

Next

See merge request !27
Übergeordnete 67eedf58 71d48547
No related branches found
Tags 3.0.1
2 Merge Requests!34Update 'next-4.x' with latest changes from 'main',!27Next
Pipeline #7708 bestanden mit Phase
Phase:
    in 47 Sekunden
    Leerzeichenänderungen ausblenden
    Inline Nebeneinander
    werden angezeigt mit 24 Ergänzungen und 24 Löschungen
    bin/Controls/Independent/Input.js
    + 1
    − 1
    Zeige Datei @ a516fd34
    ......@@ -112,7 +112,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/Input', [
    new Element('button', {
    'class': 'button qui-button--no-icon qui-button qui-utils-noselect',
    html : '<span class="fa fa-remove"></span>',
    title : QUILocale.get('quiqqer/quiqqer', 'remove'),
    title : QUILocale.get('quiqqer/core', 'remove'),
    events : {
    click: (e) => {
    e.stop();
    ......
    bin/Controls/Independent/Items/Anchor.js
    + 2
    − 2
    Zeige Datei @ a516fd34
    ......@@ -37,11 +37,11 @@ define('package/quiqqer/menu/bin/Controls/Independent/Items/Anchor', [
    $onInject: function () {
    this.getElm().set('data-qui', this.getType());
    this.getElm().set('html', Mustache.render(template, {
    status : QUILocale.get('quiqqer/quiqqer', 'status'),
    status : QUILocale.get('quiqqer/core', 'status'),
    statusDescription: QUILocale.get(lg, 'tpl.statusDescription'),
    site : QUILocale.get(lg, 'tpl.Site'),
    title : QUILocale.get('quiqqer/quiqqer', 'title'),
    title : QUILocale.get('quiqqer/core', 'title'),
    linkTitle: QUILocale.get(lg, 'tpl.linkTitle'),
    icon : QUILocale.get(lg, 'tpl.icon'),
    anchor : QUILocale.get(lg, 'tpl.anchor'),
    ......
    bin/Controls/Independent/Items/Custom.js
    + 2
    − 2
    Zeige Datei @ a516fd34
    ......@@ -39,10 +39,10 @@ define('package/quiqqer/menu/bin/Controls/Independent/Items/Custom', [
    $onInject: function () {
    this.getElm().set('data-qui', this.getType());
    this.getElm().set('html', Mustache.render(template, {
    status : QUILocale.get('quiqqer/quiqqer', 'status'),
    status : QUILocale.get('quiqqer/core', 'status'),
    statusDescription: QUILocale.get(lg, 'tpl.statusDescription'),
    title : QUILocale.get('quiqqer/quiqqer', 'title'),
    title : QUILocale.get('quiqqer/core', 'title'),
    linkTitle : QUILocale.get(lg, 'tpl.linkTitle'),
    short: QUILocale.get(lg, 'tpl.short'),
    shortDesc: QUILocale.get(lg, 'tpl.shortDesc'),
    ......
    bin/Controls/Independent/Items/Site.js
    + 1
    − 1
    Zeige Datei @ a516fd34
    ......@@ -37,7 +37,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/Items/Site', [
    $onInject: function () {
    this.getElm().set('data-qui', this.getType());
    this.getElm().set('html', Mustache.render(template, {
    status : QUILocale.get('quiqqer/quiqqer', 'status'),
    status : QUILocale.get('quiqqer/core', 'status'),
    statusDescription: QUILocale.get(lg, 'tpl.statusDescription'),
    site : QUILocale.get(lg, 'tpl.Site'),
    ......
    bin/Controls/Independent/Items/Url.js
    + 2
    − 2
    Zeige Datei @ a516fd34
    ......@@ -37,10 +37,10 @@ define('package/quiqqer/menu/bin/Controls/Independent/Items/Url', [
    $onInject: function () {
    this.getElm().set('data-qui', this.getType());
    this.getElm().set('html', Mustache.render(template, {
    status : QUILocale.get('quiqqer/quiqqer', 'status'),
    status : QUILocale.get('quiqqer/core', 'status'),
    statusDescription: QUILocale.get(lg, 'tpl.statusDescription'),
    title : QUILocale.get('quiqqer/quiqqer', 'title'),
    title : QUILocale.get('quiqqer/core', 'title'),
    linkTitle : QUILocale.get(lg, 'tpl.linkTitle'),
    icon : QUILocale.get(lg, 'tpl.icon'),
    url : QUILocale.get(lg, 'tpl.url'),
    ......
    bin/Controls/Independent/MenuManagement.js
    + 2
    − 2
    Zeige Datei @ a516fd34
    ......@@ -80,7 +80,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/MenuManagement', [
    // buttons
    this.addButton({
    name : 'add',
    text : QUILocale.get('quiqqer/quiqqer', 'add'),
    text : QUILocale.get('quiqqer/core', 'add'),
    textimage: 'fa fa-plus',
    events : {
    onClick: this.openCreationWindow
    ......@@ -90,7 +90,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/MenuManagement', [
    this.addButton({
    disabled : true,
    name : 'delete',
    text : QUILocale.get('quiqqer/quiqqer', 'remove'),
    text : QUILocale.get('quiqqer/core', 'remove'),
    textimage: 'fa fa-trash',
    events : {
    onClick: this.openDeletionWindow
    ......
    bin/Controls/Independent/MenuPanel.js
    + 3
    − 3
    Zeige Datei @ a516fd34
    ......@@ -76,7 +76,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/MenuPanel', [
    // buttons
    this.addButton({
    name : 'save',
    text : QUILocale.get('quiqqer/quiqqer', 'save'),
    text : QUILocale.get('quiqqer/core', 'save'),
    events: {
    click: this.save
    }
    ......@@ -85,7 +85,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/MenuPanel', [
    /*
    this.addButton({
    name : 'add',
    text : QUILocale.get('quiqqer/quiqqer', 'add'),
    text : QUILocale.get('quiqqer/core', 'add'),
    events: {
    click: () => {
    this.addItem();
    ......@@ -126,7 +126,7 @@ define('package/quiqqer/menu/bin/Controls/Independent/MenuPanel', [
    this.addButton({
    name : 'delete',
    disabled: true,
    text : QUILocale.get('quiqqer/quiqqer', 'remove'),
    text : QUILocale.get('quiqqer/core', 'remove'),
    events : {
    click: this.addItem
    }
    ......
    bin/Controls/NavTabsVerticalSettings.js
    + 4
    − 4
    Zeige Datei @ a516fd34
    ......@@ -118,7 +118,7 @@ define('package/quiqqer/menu/bin/Controls/NavTabsVerticalSettings', [
    }, {
    name : 'add',
    textimage: 'fa fa-plus',
    text : QUILocale.get('quiqqer/quiqqer', 'add'),
    text : QUILocale.get('quiqqer/core', 'add'),
    events : {
    onClick: this.$openAddDialog
    }
    ......@@ -127,7 +127,7 @@ define('package/quiqqer/menu/bin/Controls/NavTabsVerticalSettings', [
    }, {
    name : 'edit',
    textimage: 'fa fa-edit',
    text : QUILocale.get('quiqqer/quiqqer', 'edit'),
    text : QUILocale.get('quiqqer/core', 'edit'),
    disabled : true,
    events : {
    onClick: this.$openEditDialog
    ......@@ -135,7 +135,7 @@ define('package/quiqqer/menu/bin/Controls/NavTabsVerticalSettings', [
    }, {
    name : 'delete',
    textimage: 'fa fa-trash',
    text : QUILocale.get('quiqqer/quiqqer', 'delete'),
    text : QUILocale.get('quiqqer/core', 'delete'),
    disabled : true,
    events : {
    onClick: this.$openDeleteDialog
    ......@@ -527,7 +527,7 @@ define('package/quiqqer/menu/bin/Controls/NavTabsVerticalSettings', [
    maxWidth : 600,
    maxHeight : 400,
    ok_button : {
    text : QUILocale.get('quiqqer/quiqqer', 'delete'),
    text : QUILocale.get('quiqqer/core', 'delete'),
    textimage: 'fa fa-trash'
    },
    events : {
    ......
    bin/Controls/Tabs.Settings.js
    + 4
    − 4
    Zeige Datei @ a516fd34
    ......@@ -118,7 +118,7 @@ define('package/quiqqer/menu/bin/Controls/Tabs.Settings', [
    }, {
    name : 'add',
    textimage: 'fa fa-plus',
    text : QUILocale.get('quiqqer/quiqqer', 'add'),
    text : QUILocale.get('quiqqer/core', 'add'),
    events : {
    onClick: this.$openAddDialog
    }
    ......@@ -127,7 +127,7 @@ define('package/quiqqer/menu/bin/Controls/Tabs.Settings', [
    }, {
    name : 'edit',
    textimage: 'fa fa-edit',
    text : QUILocale.get('quiqqer/quiqqer', 'edit'),
    text : QUILocale.get('quiqqer/core', 'edit'),
    disabled : true,
    events : {
    onClick: this.$openEditDialog
    ......@@ -135,7 +135,7 @@ define('package/quiqqer/menu/bin/Controls/Tabs.Settings', [
    }, {
    name : 'delete',
    textimage: 'fa fa-trash',
    text : QUILocale.get('quiqqer/quiqqer', 'delete'),
    text : QUILocale.get('quiqqer/core', 'delete'),
    disabled : true,
    events : {
    onClick: this.$openDeleteDialog
    ......@@ -574,7 +574,7 @@ define('package/quiqqer/menu/bin/Controls/Tabs.Settings', [
    maxWidth : 600,
    maxHeight : 400,
    ok_button : {
    text : QUILocale.get('quiqqer/quiqqer', 'delete'),
    text : QUILocale.get('quiqqer/core', 'delete'),
    textimage: 'fa fa-trash'
    },
    events : {
    ......
    bin/onAdminLoadFooter.js
    + 1
    − 1
    Zeige Datei @ a516fd34
    ......@@ -41,7 +41,7 @@ window.addEvent('domready', function () {
    QUI.getMessageHandler(function (QUI) {
    QUI.addSuccess(
    QUILocale.get('quiqqer/quiqqer', 'message.clear.cache.successful')
    QUILocale.get('quiqqer/core', 'message.clear.cache.successful')
    );
    });
    }, {
    ......
    settings.xml
    + 2
    − 2
    Zeige Datei @ a516fd34
    ......@@ -187,7 +187,7 @@
    <settings>
    <window name="quiqqer-cache" menu-parent="/settings/quiqqer/">
    <title>
    <locale group="quiqqer/quiqqer" var="quiqqer.settings.cache"/>
    <locale group="quiqqer/core" var="quiqqer.settings.cache"/>
    </title>
    <params>
    ......@@ -199,7 +199,7 @@
    <settings title="clearMenuCache" name="clearMenuCache">
    <title>
    <locale group="quiqqer/quiqqer" var="quiqqer.menu.clearMenuCache.title"/>
    <locale group="quiqqer/core" var="quiqqer.menu.clearMenuCache.title"/>
    </title>
    <button>boom</button>
    ......
    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