From bb7b9c2025272b470f92dd4e790de41efea7d9b9 Mon Sep 17 00:00:00 2001 From: Daniel Seifert Date: Fri, 10 May 2024 12:18:00 +0200 Subject: [PATCH] add Twig templates and translations, move Smarty templates to appropriate folder --- .../views/admin_twig/de/d3DataWizard_lang.php | 25 ++++ .../views/admin_twig/en/d3DataWizard_lang.php | 25 ++++ metadata.php | 10 +- .../smarty/admin/{tpl => }/d3ActionWizard.tpl | 0 .../smarty/admin/{tpl => }/d3ExportWizard.tpl | 0 views/smarty/admin/{tpl => }/inc/Wizards.tpl | 0 .../admin/{tpl => }/inc/actionSubmit.tpl | 0 .../admin/{tpl => }/inc/exportSubmit.tpl | 0 views/twig/admin/d3ActionWizard.html.twig | 4 + views/twig/admin/d3ExportWizard.html.twig | 4 + views/twig/admin/inc/Wizards.html.twig | 136 ++++++++++++++++++ views/twig/admin/inc/actionSubmit.html.twig | 8 ++ views/twig/admin/inc/exportSubmit.html.twig | 24 ++++ 13 files changed, 231 insertions(+), 5 deletions(-) create mode 100644 Application/views/admin_twig/de/d3DataWizard_lang.php create mode 100644 Application/views/admin_twig/en/d3DataWizard_lang.php rename views/smarty/admin/{tpl => }/d3ActionWizard.tpl (100%) rename views/smarty/admin/{tpl => }/d3ExportWizard.tpl (100%) rename views/smarty/admin/{tpl => }/inc/Wizards.tpl (100%) rename views/smarty/admin/{tpl => }/inc/actionSubmit.tpl (100%) rename views/smarty/admin/{tpl => }/inc/exportSubmit.tpl (100%) create mode 100644 views/twig/admin/d3ActionWizard.html.twig create mode 100644 views/twig/admin/d3ExportWizard.html.twig create mode 100644 views/twig/admin/inc/Wizards.html.twig create mode 100644 views/twig/admin/inc/actionSubmit.html.twig create mode 100644 views/twig/admin/inc/exportSubmit.html.twig diff --git a/Application/views/admin_twig/de/d3DataWizard_lang.php b/Application/views/admin_twig/de/d3DataWizard_lang.php new file mode 100644 index 0000000..73c06e3 --- /dev/null +++ b/Application/views/admin_twig/de/d3DataWizard_lang.php @@ -0,0 +1,25 @@ + + * @link https://www.oxidmodule.com + */ + +// @codeCoverageIgnoreStart +declare(strict_types=1); + +$sLangName = 'Deutsch'; + +// ------------------------------- +// RESOURCE IDENTITFIER = STRING +// ------------------------------- + +$aLang = include __DIR__."/../../de/d3DataWizard_translations.php"; + +// @codeCoverageIgnoreEnd diff --git a/Application/views/admin_twig/en/d3DataWizard_lang.php b/Application/views/admin_twig/en/d3DataWizard_lang.php new file mode 100644 index 0000000..5b02564 --- /dev/null +++ b/Application/views/admin_twig/en/d3DataWizard_lang.php @@ -0,0 +1,25 @@ + + * @link https://www.oxidmodule.com + */ + +// @codeCoverageIgnoreStart +declare(strict_types=1); + +$sLangName = 'English'; + +// ------------------------------- +// RESOURCE IDENTITFIER = STRING +// ------------------------------- + +$aLang = include __DIR__."/../../en/d3DataWizard_translations.php"; + +// @codeCoverageIgnoreEnd diff --git a/metadata.php b/metadata.php index 7496ca3..4584ee9 100644 --- a/metadata.php +++ b/metadata.php @@ -42,11 +42,11 @@ $aModule = [ 'extend' => [], 'events' => [], 'templates' => [ - '@' . Constants::OXID_MODULE_ID . '/admin/d3ExportWizard.tpl' => 'views/smarty/admin/tpl/d3ExportWizard.tpl', - '@' . Constants::OXID_MODULE_ID . '/admin/d3ActionWizard.tpl' => 'views/smarty/admin/tpl/d3ActionWizard.tpl', - '@' . Constants::OXID_MODULE_ID . '/admin/inc/d3Wizards.tpl' => 'views/smarty/admin/tpl/inc/Wizards.tpl', - '@' . Constants::OXID_MODULE_ID . '/admin/inc/d3ExportSubmit.tpl' => 'views/smarty/admin/tpl/inc/exportSubmit.tpl', - '@' . Constants::OXID_MODULE_ID . '/admin/inc/d3ActionSubmit.tpl' => 'views/smarty/admin/tpl/inc/actionSubmit.tpl', + '@' . Constants::OXID_MODULE_ID . '/admin/d3ExportWizard.tpl' => 'views/smarty/admin/d3ExportWizard.tpl', + '@' . Constants::OXID_MODULE_ID . '/admin/d3ActionWizard.tpl' => 'views/smarty/admin/d3ActionWizard.tpl', + '@' . Constants::OXID_MODULE_ID . '/admin/inc/d3Wizards.tpl' => 'views/smarty/admin/inc/Wizards.tpl', + '@' . Constants::OXID_MODULE_ID . '/admin/inc/d3ExportSubmit.tpl' => 'views/smarty/admin/inc/exportSubmit.tpl', + '@' . Constants::OXID_MODULE_ID . '/admin/inc/d3ActionSubmit.tpl' => 'views/smarty/admin/inc/actionSubmit.tpl', ], 'settings' => [ [ diff --git a/views/smarty/admin/tpl/d3ActionWizard.tpl b/views/smarty/admin/d3ActionWizard.tpl similarity index 100% rename from views/smarty/admin/tpl/d3ActionWizard.tpl rename to views/smarty/admin/d3ActionWizard.tpl diff --git a/views/smarty/admin/tpl/d3ExportWizard.tpl b/views/smarty/admin/d3ExportWizard.tpl similarity index 100% rename from views/smarty/admin/tpl/d3ExportWizard.tpl rename to views/smarty/admin/d3ExportWizard.tpl diff --git a/views/smarty/admin/tpl/inc/Wizards.tpl b/views/smarty/admin/inc/Wizards.tpl similarity index 100% rename from views/smarty/admin/tpl/inc/Wizards.tpl rename to views/smarty/admin/inc/Wizards.tpl diff --git a/views/smarty/admin/tpl/inc/actionSubmit.tpl b/views/smarty/admin/inc/actionSubmit.tpl similarity index 100% rename from views/smarty/admin/tpl/inc/actionSubmit.tpl rename to views/smarty/admin/inc/actionSubmit.tpl diff --git a/views/smarty/admin/tpl/inc/exportSubmit.tpl b/views/smarty/admin/inc/exportSubmit.tpl similarity index 100% rename from views/smarty/admin/tpl/inc/exportSubmit.tpl rename to views/smarty/admin/inc/exportSubmit.tpl diff --git a/views/twig/admin/d3ActionWizard.html.twig b/views/twig/admin/d3ActionWizard.html.twig new file mode 100644 index 0000000..ec6c526 --- /dev/null +++ b/views/twig/admin/d3ActionWizard.html.twig @@ -0,0 +1,4 @@ +{% set d3dw_backgroundimage %}linear-gradient(22.5deg, rgba(66, 66, 66, 0.02) 0%, rgba(66, 66, 66, 0.02) 11%,rgba(135, 135, 135, 0.02) 11%, rgba(135, 135, 135, 0.02) 24%,rgba(29, 29, 29, 0.02) 24%, rgba(29, 29, 29, 0.02) 38%,rgba(15, 15, 15, 0.02) 38%, rgba(15, 15, 15, 0.02) 50%,rgba(180, 180, 180, 0.02) 50%, rgba(180, 180, 180, 0.02) 77%,rgba(205, 205, 205, 0.02) 77%, rgba(205, 205, 205, 0.02) 100%),linear-gradient(67.5deg, rgba(10, 10, 10, 0.02) 0%, rgba(10, 10, 10, 0.02) 22%,rgba(52, 52, 52, 0.02) 22%, rgba(52, 52, 52, 0.02) 29%,rgba(203, 203, 203, 0.02) 29%, rgba(203, 203, 203, 0.02) 30%,rgba(69, 69, 69, 0.02) 30%, rgba(69, 69, 69, 0.02) 75%,rgba(231, 231, 231, 0.02) 75%, rgba(231, 231, 231, 0.02) 95%,rgba(138, 138, 138, 0.02) 95%, rgba(138, 138, 138, 0.02) 100%),linear-gradient(112.5deg, rgba(221, 221, 221, 0.02) 0%, rgba(221, 221, 221, 0.02) 17%,rgba(190, 190, 190, 0.02) 17%, rgba(190, 190, 190, 0.02) 39%,rgba(186, 186, 186, 0.02) 39%, rgba(186, 186, 186, 0.02) 66%,rgba(191, 191, 191, 0.02) 66%, rgba(191, 191, 191, 0.02) 68%,rgba(16, 16, 16, 0.02) 68%, rgba(16, 16, 16, 0.02) 70%,rgba(94, 94, 94, 0.02) 70%, rgba(94, 94, 94, 0.02) 100%),linear-gradient(90deg, #ffffff,#ffffff){% endset %} +{% set d3dw_noitemmessageid %}D3_DATAWIZARD_ERR_NOACTION_INSTALLED{% endset %} + +{% include "@d3datawizard/admin/inc/Wizards.html.twig" with {submit: "@d3datawizard/admin/inc/actionSubmit.html.twig"} %} diff --git a/views/twig/admin/d3ExportWizard.html.twig b/views/twig/admin/d3ExportWizard.html.twig new file mode 100644 index 0000000..4dbdc13 --- /dev/null +++ b/views/twig/admin/d3ExportWizard.html.twig @@ -0,0 +1,4 @@ +{% set d3dw_backgroundimage %}linear-gradient(339deg, rgba(47, 47, 47,0.02) 0%, rgba(47, 47, 47,0.02) 42%,transparent 42%, transparent 99%,rgba(17, 17, 17,0.02) 99%, rgba(17, 17, 17,0.02) 100%),linear-gradient(257deg, rgba(65, 65, 65,0.02) 0%, rgba(65, 65, 65,0.02) 11%,transparent 11%, transparent 92%,rgba(53, 53, 53,0.02) 92%, rgba(53, 53, 53,0.02) 100%),linear-gradient(191deg, rgba(5, 5, 5,0.02) 0%, rgba(5, 5, 5,0.02) 1%,transparent 1%, transparent 45%,rgba(19, 19, 19,0.02) 45%, rgba(19, 19, 19,0.02) 100%),linear-gradient(29deg, rgba(28, 28, 28,0.02) 0%, rgba(28, 28, 28,0.02) 33%,transparent 33%, transparent 40%,rgba(220, 220, 220,0.02) 40%, rgba(220, 220, 220,0.02) 100%),linear-gradient(90deg, rgb(255,255,255),rgb(255,255,255)){% endset %} +{% set d3dw_noitemmessageid %}D3_DATAWIZARD_ERR_NOEXPORT_INSTALLED{% endset %} + +{% include "@d3datawizard/admin/inc/Wizards.html.twig" with {submit: "@d3datawizard/admin/inc/exportSubmit.html.twig"} %} diff --git a/views/twig/admin/inc/Wizards.html.twig b/views/twig/admin/inc/Wizards.html.twig new file mode 100644 index 0000000..64ae0ec --- /dev/null +++ b/views/twig/admin/inc/Wizards.html.twig @@ -0,0 +1,136 @@ +{% include "headitem.html.twig" with {title: "GENERAL_ADMIN_TITLE"|translate} %} + +{{ style({ include: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/css/bootstrap.min.css" }) }} +{{ script({ include: "https://code.jquery.com/jquery-3.2.1.slim.min.js", dynamic: __oxid_include_dynamic }) }} +{{ script({ include: "https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.12.9/umd/popper.min.js", dynamic: __oxid_include_dynamic }) }} +{{ script({ include: "https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js", dynamic: __oxid_include_dynamic }) }} +{{ style({ include: "https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/solid.min.css" }) }} + + + +{% capture name = "d3script" %}{% apply spaceless %} + function startTask(id, format = '') { + let elements = document.getElementsByClassName('errorbox'); + for (var i = 0; i < elements.length; i++){ + elements[i].style.display = 'none'; + } + setTimeout(function(){ + document.getElementById('mask').className=''; + document.getElementById('popup2').className='d3loader-2'; + }, 3000); + document.getElementById('mask').className='on'; + document.getElementById('popup2').className='d3loader-2 on'; + document.getElementById('taskid').value = id; + document.getElementById('format').value = format; + document.getElementById('myedit').submit(); + } +{% endapply %}{% endcapture %} +{{ script({ add: d3script, dynamic: __oxid_include_dynamic }) }} + +
+ {{ oViewConf.getHiddenSid()|raw }} + + + + + + {% set groups = oView.getGroups() %} + {% if groups|length %} +
+ {% for group in oView.getGroups() %} +
+
+

+ +

+
+ +
+
+
+ {% for id, item in oView.getGroupTasks(group) %} +
+
+
+ {{ item.getTitle() }} +
+
+ {% if item.getDescription() %} + {% set description = item.getDescription() %} + {% set sectionlength = "100" %} + + {% if description|length <= sectionlength %} +

{{ description }}

+ {% else %} + {% set shorttext = description|truncate(sectionlength, '') %} + +

+ ...{{ description|replace(shorttext, '') }} +

+ {% endif %} + {% endif %} + + {% if item.hasFormElements() %} + {% for formElement in item.getFormElements() %} + {{ formElement }} + {% endfor %} + {% endif %} + + {% block exportSubmit %} + {% include submit %} + {% endblock %} +
+
+
+ {% endfor %} +
+ +
+
+
+
+ + {% endfor %} +
+ {% else %} + + {% endif %} +
+ +
+
+
+
+
+
+
+
+ +{% include "@d3modcfg_lib/admin/inc/inc.html.twig" %} \ No newline at end of file diff --git a/views/twig/admin/inc/actionSubmit.html.twig b/views/twig/admin/inc/actionSubmit.html.twig new file mode 100644 index 0000000..a546a22 --- /dev/null +++ b/views/twig/admin/inc/actionSubmit.html.twig @@ -0,0 +1,8 @@ +{% block submitElements %} +
+ +
+{% endblock %} \ No newline at end of file diff --git a/views/twig/admin/inc/exportSubmit.html.twig b/views/twig/admin/inc/exportSubmit.html.twig new file mode 100644 index 0000000..54b702f --- /dev/null +++ b/views/twig/admin/inc/exportSubmit.html.twig @@ -0,0 +1,24 @@ +{% block submitElements %} +
+ + + +
+{% endblock %} \ No newline at end of file