From fa227884865e42ad82bec6050073f1f2580b6f6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denny=20Korsuk=C3=A9witz?= Date: Fri, 31 Mar 2023 14:05:46 +0200 Subject: [PATCH] Ported to Znuny 7.0. --- .github/ISSUE_TEMPLATE/bug.md | 2 +- .gitlab-ci.yml | 6 +- GeneralCatalog.sopm | 2 +- .../Templates/Standard/AdminGeneralCatalog.tt | 279 ++++++++++-------- 4 files changed, 154 insertions(+), 135 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md index d109331..16f64d1 100644 --- a/.github/ISSUE_TEMPLATE/bug.md +++ b/.github/ISSUE_TEMPLATE/bug.md @@ -31,7 +31,7 @@ If applicable, add screenshots to help explain your problem. - OS: [e.g. Windows, MacOS, Linux] - Browser: [e. g. Chrome, Firefox, Safari] -- OTRS version [e. g. 6.0.15] +- Znuny version [e. g. 6.0.15] ### Additional information diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3063792..bec9865 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,5 +1,5 @@ -image: registry.znuny.com/znuny/internal/docker-znuny-ci:6.5 +image: registry.znuny.com/znuny/internal/docker-znuny-ci:7.0 include: - - project: 'Znuny/Internal/Znuny' - file: '/templates/gitlab/default/default-db.yml' + - project: $INCLUDE_PROJECT + file: $INCLUDE_FILE \ No newline at end of file diff --git a/GeneralCatalog.sopm b/GeneralCatalog.sopm index f35c5a7..416b97a 100644 --- a/GeneralCatalog.sopm +++ b/GeneralCatalog.sopm @@ -2,7 +2,7 @@ GeneralCatalog 6.5.1 - 6.5.x + 7.0.x Znuny https://www.znuny.org/ GNU GENERAL PUBLIC LICENSE Version 3, 29 June 2007 diff --git a/Kernel/Output/HTML/Templates/Standard/AdminGeneralCatalog.tt b/Kernel/Output/HTML/Templates/Standard/AdminGeneralCatalog.tt index d586f35..aa98005 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminGeneralCatalog.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminGeneralCatalog.tt @@ -8,47 +8,9 @@ # -- [% RenderBlockStart("Overview") %] -
-

[% Translate("General Catalog Management") | html %]

+
- [% USE ItemsTitle = String(Translate("Items in Class")) %] - [% USE EditTitle = String(Translate("Edit Item")) %] - - [% BreadcrumbPath = [ - { - Name => Translate('General Catalog Management'), - Link => 'AdminGeneralCatalog', - }, - ]; - - IF Data.Class && Data.Class == 'NEW'; - - BreadcrumbPath.push({ - Name => Translate('Add Class'), - }); - - ELSIF Data.Class; - - ClassURI = Data.Class; - - BreadcrumbPath.push({ - Name => ItemsTitle.append( ': ', Data.Class ), - Link => 'AdminGeneralCatalog;Subaction=ItemList;Class=' _ ClassURI, - }); - - IF Data.Subaction && Data.Subaction == 'ItemEdit'; - BreadcrumbPath.push({ - Name => Data.ItemEdit ? EditTitle.append( ': ', Data.ItemName ) : Translate('Add Item'), - }); - - END; - - END; - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
+

[% Translate("Actions") | html %]

@@ -62,7 +24,7 @@ - @@ -75,7 +37,7 @@ - @@ -83,7 +45,7 @@ [% RenderBlockEnd("ActionAddClass") %] [% RenderBlockStart("ActionOverview") %]
  • - [% Translate("Go to overview") | html %] + [% Translate("Go to overview") | html %]
    • [% RenderBlockEnd("ActionOverview") %] @@ -92,6 +54,43 @@
    + [% USE ItemsTitle = String(Translate("Items in Class")) %] + [% USE EditTitle = String(Translate("Edit Item")) %] + + [% BreadcrumbPath = [ + { + Name => Translate('General Catalog Management'), + Link => 'AdminGeneralCatalog', + }, + ]; + + IF Data.Class && Data.Class == 'NEW'; + + BreadcrumbPath.push({ + Name => Translate('Add Class'), + }); + + ELSIF Data.Class; + + ClassURI = Data.Class; + + BreadcrumbPath.push({ + Name => ItemsTitle.append( ': ', Data.Class ), + Link => 'AdminGeneralCatalog;Subaction=ItemList;Class=' _ ClassURI, + }); + + IF Data.Subaction && Data.Subaction == 'ItemEdit'; + BreadcrumbPath.push({ + Name => Data.ItemEdit ? EditTitle.append( ': ', Data.ItemName ) : Translate('Add Item'), + }); + + END; + + END; + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
    [% RenderBlockStart("OverviewClass") %]
    @@ -170,130 +169,150 @@ -
    +
    [% RenderBlockStart("ItemEditClassAdd") %] - -
    - -

    [% Translate("This field is required.") | html %]

    -

    [% Translate("This field is required.") | html %]

    +
    + +
    + +

    [% Translate("This field is required.") | html %]

    +

    [% Translate("This field is required.") | html %]

    +
    -
    + [% RenderBlockEnd("ItemEditClassAdd") %] [% RenderBlockStart("ItemEditClassExist") %] - -
    - [% Data.Class | html %] - +
    + +
    + [% Data.Class | html %] + +
    -
    + [% RenderBlockEnd("ItemEditClassExist") %] - -
    - -

    [% Translate("This field is required.") | html %]

    -

    [% Translate("This field is required.") | html %]

    +
    + +
    + +

    [% Translate("This field is required.") | html %]

    +

    [% Translate("This field is required.") | html %]

    +
    -
    + [% RenderBlockStart("InputKey") %] - -
    - +
    + +
    + +
    -
    + [% RenderBlockEnd("InputKey") %] [% RenderBlockStart("Input") %] - -
    - +
    + +
    + +
    -
    + [% RenderBlockEnd("Input") %] [% RenderBlockStart("TextArea") %] - -
    - +
    + +
    + +
    -
    + [% RenderBlockEnd("TextArea") %] [% RenderBlockStart("Option") %] - -
    - [% Data.Option %] +
    + +
    + [% Data.Option %] +
    -
    [% RenderBlockEnd("Option") %] [% RenderBlockStart("Upload") %] - -
    -
    - [% Data.Filename | html %] +
    + +
    +
    + [% Data.Filename | html %] +
    -
    + [% RenderBlockEnd("Upload") %] [% RenderBlockStart("Password") %] - -
    - +
    + +
    + +
    -
    + [% RenderBlockEnd("Password") %] [% RenderBlockStart("ColorPicker") %] - -
    - +
    + +
    + +
    -
    + [% RenderBlockEnd("ColorPicker") %] - -
    - [% Data.ValidOptionStrg %] +
    + +
    + [% Data.ValidOptionStrg %] +
    -
    - -
    - +
    + +
    + +
    -
    - -
    - [% IF (Data.Class && Data.Class == 'NEW') || Data.ItemID == 'NEW' %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] - [% ELSE %] - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] - [% END %] -
    -
    +
    +
    + [% IF (Data.Class && Data.Class == 'NEW') || Data.ItemID == 'NEW' %] + [% Translate("Cancel") | html %] + + + [% ELSE %] + [% Translate("Cancel") | html %] + + + + + [% END %] +
    +
    [% RenderBlockEnd("ItemEdit") %]
    -
    [% RenderBlockEnd("Overview") %]