OXDEV-8462 Fix admin templates and description

OXID-eSales · Jul 25, 2024 · 8b984e5 · 8b984e5
1 parent 13b48da
commit 8b984e5
Show file tree

Hide file tree

Showing 9 changed files with 13 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -211,7 +211,7 @@ Story:
 * extending a shop controller (`OxidEsales\ModuleTemplate\Controller\StartController`)
 * extending a shop database table (`oxuser`)
 * extending a shop template block (`start_newest_articles`)
-* extending a shop admin template block (`admin_user_main_form`)
+* extending a shop admin template block (`admin_user_main_form` - only an extension of a block, without functionality)
 
 **HINT**: only extend the shop core if there is no other way like listen and handle shop events,
 extend/replace some DI service. Your module might be one of many in the class chain and you should 

diff --git a/views/admin_smarty/de/module_options.php b/views/admin_smarty/de/module_options.php
@@ -11,11 +11,11 @@
     'charset' => 'UTF-8',
     'tbcluser_greetings' => 'Greetings',
 
-    'OEMODULETEMPLATE_GREETING_TITLE' => 'Admin controller example',
-    'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Greeting message: ',
-    'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'No greeting message added!',
-    'OEMODULETEMPLATE_ALLOW_GREETING' => 'Allow user to set greeting',
-    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Example of extending admin template',
+    'OEMODULETEMPLATE_GREETING_TITLE' => 'Beispiel Admin Controller',
+    'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Begrüßungsnachricht: ',
+    'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'Es wurde keine Begrüßungsnachricht hinzugefügt!',
+    'OEMODULETEMPLATE_ALLOW_GREETING' => 'Benutzer erlauben die Begrüßungsnachricht zu setzen',
+    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Dies ist ein Beispiel, wie ein Admintemplate erweitert werden kann. Momentan ist keine Funktionalität hinter dieser Checkbox hinterlegt, es wird keine Einstellung in der Datenbank gespeichert.',
 
     # Module settings
     'SHOP_MODULE_GROUP_oemoduletemplate_main' => 'Einstellungen',

diff --git a/views/admin_smarty/en/module_options.php b/views/admin_smarty/en/module_options.php
@@ -15,7 +15,7 @@
     'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Greeting message: ',
     'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'No greeting message added!',
     'OEMODULETEMPLATE_ALLOW_GREETING' => 'Allow user to set greeting',
-    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Example of extending admin template',
+    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'This is an example of extending admin template. There is no functionality implemented behind this checkbox and does not save anything to the database',
 
     # Module settings
     'SHOP_MODULE_GROUP_oemoduletemplate_main' => 'Settings',

diff --git a/views/admin_twig/de/module_options.php b/views/admin_twig/de/module_options.php
@@ -15,7 +15,7 @@
     'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Begrüßungsnachricht: ',
     'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'Es wurde keine Begrüßungsnachricht hinzugefügt!',
     'OEMODULETEMPLATE_ALLOW_GREETING' => 'Benutzer erlauben die Begrüßungsnachricht zu setzen',
-    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Beispiel für die Erweiterung des Admin-Templates',
+    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Dies ist ein Beispiel, wie ein Admintemplate erweitert werden kann. Momentan ist keine Funktionalität hinter dieser Checkbox hinterlegt, es wird keine Einstellung in der Datenbank gespeichert.',
 
     # Module settings
     'SHOP_MODULE_GROUP_oemoduletemplate_main' => 'Einstellungen',

diff --git a/views/admin_twig/en/module_options.php b/views/admin_twig/en/module_options.php
@@ -15,7 +15,7 @@
     'OEMODULETEMPLATE_GREETING_MESSAGE_TEXT' => 'Greeting message: ',
     'OEMODULETEMPLATE_NO_GREETING_TEXT' => 'No greeting message added!',
     'OEMODULETEMPLATE_ALLOW_GREETING' => 'Allow user to set greeting',
-    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'Example of extending admin template',
+    'OEMODULETEMPLATE_HELP_ALLOW_GREETING' => 'This is an example of extending admin template. There is no functionality implemented behind this checkbox and does not save anything to the database',
 
     # Module settings
     'SHOP_MODULE_GROUP_oemoduletemplate_main' => 'Settings',

diff --git a/views/smarty/admin/user_greetings.tpl b/views/smarty/admin/user_greetings.tpl
@@ -1,6 +1,6 @@
 [{include file="headitem.tpl" title="GENERAL_ADMIN_TITLE"|oxmultilangassign box="list"}]
 
-<form action="[{$oViewConf->getSelfLink()}]" method="post">
+<form name="transfer" id="transfer" action="[{$oViewConf->getSelfLink()}]" method="post">
     [{$oViewConf->getHiddenSid()}]
     <input type="hidden" name="oxid" value="[{$oxid}]">
     <input type="hidden" name="cl" value="oemt_admin_greeting">

diff --git a/views/smarty/blocks/admin/admin_user_main_form.tpl b/views/smarty/blocks/admin/admin_user_main_form.tpl
@@ -3,7 +3,7 @@
         [{oxmultilang ident="OEMODULETEMPLATE_ALLOW_GREETING"}]
     </td>
     <td class="edittext">
-        <input type="checkbox" name="editval[oxuser__oxactivegreeting]" class="edittext" value='1'>
+        <input type="checkbox" name="editval[oxuser__oetmactivegreeting]" class="edittext" value='1'>
         [{oxinputhelp ident="OEMODULETEMPLATE_HELP_ALLOW_GREETING"}]
     </td>
 </tr>

diff --git a/views/twig/admin/user_greetings.html.twig b/views/twig/admin/user_greetings.html.twig
@@ -1,6 +1,6 @@
 {% include "headitem.html.twig" with {title: "GENERAL_ADMIN_TITLE"|translate} %}
 
-<form action="{{ oViewConf.getSelfLink() }}" method="post">
+<form name="transfer" id="transfer" action="{{ oViewConf.getSelfLink() }}" method="post">
     {{ oViewConf.getHiddenSid()|raw }}
     <input type="hidden" name="oxid" value="{{ oxid }}">
     <input type="hidden" name="cl" value="oemt_admin_greeting">

diff --git a/views/twig/extensions/themes/admin_twig/user_main.html.twig b/views/twig/extensions/themes/admin_twig/user_main.html.twig
@@ -7,7 +7,7 @@
             {{ translate({ ident: "OEMODULETEMPLATE_ALLOW_GREETING" }) }}
         </td>
         <td class="edittext">
-            <input type="checkbox" name="editval[oxuser__oxactivegreeting]" class="edittext" value='1'>
+            <input type="checkbox" name="editval[oxuser__oetmactivegreeting]" class="edittext" value='1'>
             {% include "inputhelp.html.twig" with {'sHelpId': help_id("OEMODULETEMPLATE_HELP_ALLOW_GREETING"), 'sHelpText': help_text("OEMODULETEMPLATE_HELP_ALLOW_GREETING")} %}
         </td>
     </tr>