From 8013fe55887683ac03bdd9ee452fb658ebd24d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Denny=20Korsuk=C3=A9witz?= Date: Thu, 23 Mar 2023 13:24:44 +0100 Subject: [PATCH] Updated tt, js, css and html.tmpl files. --- .gitignore | 997 ++++++ .../Standard/AgentDashboardTicketGeneric.tt | 275 -- .../Output/HTML/Templates/Standard/Header.tt | 354 -- .../HTML/Templates/Standard/Pagination.tt | 35 - .../HTML/Templates/Standard/AdminACL.tt | 58 +- .../HTML/Templates/Standard/AdminACLEdit.tt | 164 +- .../HTML/Templates/Standard/AdminACLNew.tt | 116 +- .../AdminAppointmentCalendarManage.tt | 401 ++- .../Standard/AdminAppointmentImport.tt | 99 +- .../AdminAppointmentNotificationEvent.tt | 537 ++- ...NotificationEventTransportEmailSettings.tt | 76 +- .../Templates/Standard/AdminAttachment.tt | 183 +- .../Templates/Standard/AdminAutoResponse.tt | 200 +- .../AdminCloudServiceSupportDataCollector.tt | 127 - .../Templates/Standard/AdminCloudServices.tt | 86 - .../Standard/AdminCommunicationLog.tt | 46 +- .../Standard/AdminCommunicationLogAccounts.tt | 58 +- .../AdminCommunicationLogCommunications.tt | 2 +- .../Standard/AdminCommunicationLogZoom.tt | 52 +- .../Standard/AdminCustomerCompany.tt | 220 +- .../Templates/Standard/AdminCustomerGroup.tt | 197 +- .../Templates/Standard/AdminCustomerUser.tt | 328 +- .../Standard/AdminCustomerUserCustomer.tt | 141 +- .../Standard/AdminCustomerUserGroup.tt | 180 +- .../Standard/AdminCustomerUserService.tt | 163 +- .../Templates/Standard/AdminDynamicField.tt | 85 +- .../Standard/AdminDynamicFieldCheckbox.tt | 207 +- ...inDynamicFieldConfigurationImportExport.tt | 52 +- .../Standard/AdminDynamicFieldDateTime.tt | 311 +- .../Standard/AdminDynamicFieldDropdown.tt | 381 +- .../Standard/AdminDynamicFieldMultiselect.tt | 330 +- .../AdminDynamicFieldScreenConfiguration.tt | 186 +- .../Standard/AdminDynamicFieldText.tt | 402 ++- .../Standard/AdminDynamicFieldWebservice.tt | 312 +- .../AdminDynamicFieldWebservice/Test.tt | 9 +- .../HTML/Templates/Standard/AdminEmail.tt | 151 +- .../Templates/Standard/AdminGenericAgent.tt | 1241 ++++--- .../Standard/AdminGenericInterfaceDebugger.tt | 130 +- ...minGenericInterfaceErrorHandlingDefault.tt | 103 +- ...nericInterfaceErrorHandlingRequestRetry.tt | 114 +- .../AdminGenericInterfaceInvokerEvent.tt | 106 +- .../AdminGenericInterfaceMappingSimple.tt | 385 +- .../AdminGenericInterfaceMappingXSLT.tt | 246 +- .../AdminGenericInterfaceWebservice.tt | 297 +- .../AdminGenericInterfaceWebserviceHistory.tt | 60 +- .../HTML/Templates/Standard/AdminGroup.tt | 133 +- .../HTML/Templates/Standard/AdminLog.tt | 31 +- .../Templates/Standard/AdminMailAccount.tt | 391 +- .../Templates/Standard/AdminNavigationBar.tt | 128 +- .../Standard/AdminNotificationEvent.tt | 675 ++-- .../AdminOAuth2TokenManagement/Edit.tt | 278 +- .../AdminOAuth2TokenManagement/Overview.tt | 60 +- .../Standard/AdminOTRSBusinessInstalled.tt | 179 - .../Standard/AdminOTRSBusinessNotInstalled.tt | 172 - .../Standard/AdminOTRSBusinessUninstall.tt | 104 - .../HTML/Templates/Standard/AdminPGP.tt | 102 +- .../Templates/Standard/AdminPackageManager.tt | 405 ++- .../Templates/Standard/AdminPerformanceLog.tt | 106 +- .../Standard/AdminPostMasterFilter.tt | 225 +- .../HTML/Templates/Standard/AdminPriority.tt | 143 +- .../Standard/AdminProcessManagement.tt | 75 +- .../AdminProcessManagementActivity.tt | 159 +- .../AdminProcessManagementActivityDialog.tt | 348 +- .../Standard/AdminProcessManagementPath.tt | 98 +- .../AdminProcessManagementProcessAccordion.tt | 82 +- .../AdminProcessManagementProcessEdit.tt | 127 +- .../AdminProcessManagementProcessNew.tt | 100 +- .../AdminProcessManagementProcessPrint.tt | 111 +- .../AdminProcessManagementTransition.tt | 239 +- .../AdminProcessManagementTransitionAction.tt | 131 +- .../HTML/Templates/Standard/AdminQueue.tt | 632 ++-- .../Standard/AdminQueueAutoResponse.tt | 98 +- .../Templates/Standard/AdminQueueTemplates.tt | 129 +- .../HTML/Templates/Standard/AdminRole.tt | 127 +- .../HTML/Templates/Standard/AdminRoleGroup.tt | 235 +- .../HTML/Templates/Standard/AdminRoleUser.tt | 158 +- .../HTML/Templates/Standard/AdminSLA.tt | 306 +- .../HTML/Templates/Standard/AdminSMIME.tt | 132 +- .../Templates/Standard/AdminSMIMECertRead.tt | 13 +- .../Templates/Standard/AdminSalutation.tt | 159 +- .../Templates/Standard/AdminSecureMode.tt | 1 - .../HTML/Templates/Standard/AdminSelectBox.tt | 73 +- .../HTML/Templates/Standard/AdminService.tt | 221 +- .../HTML/Templates/Standard/AdminSession.tt | 66 +- .../HTML/Templates/Standard/AdminSignature.tt | 150 +- .../HTML/Templates/Standard/AdminState.tt | 175 +- .../Standard/AdminSupportDataCollector.tt | 96 +- .../Templates/Standard/AdminSystemAddress.tt | 205 +- .../Standard/AdminSystemConfiguration.tt | 61 +- .../Standard/AdminSystemConfigurationGroup.tt | 46 +- .../AdminSystemConfigurationSearch.tt | 50 +- .../AdminSystemConfigurationSearchDialog.tt | 24 +- .../AdminSystemConfigurationSpecialGroup.tt | 50 +- .../Standard/AdminSystemConfigurationView.tt | 47 +- .../Templates/Standard/AdminSystemFiles.tt | 18 +- .../Standard/AdminSystemFiles/Widget.tt | 1 - .../Standard/AdminSystemMaintenance.tt | 42 +- .../Standard/AdminSystemMaintenanceEdit.tt | 198 +- .../Standard/AdminSystemMaintenanceNew.tt | 146 +- .../HTML/Templates/Standard/AdminTemplate.tt | 177 +- .../Standard/AdminTemplateAttachment.tt | 132 +- .../Standard/AdminTicketAttributeRelations.tt | 147 +- .../HTML/Templates/Standard/AdminType.tt | 138 +- .../HTML/Templates/Standard/AdminUser.tt | 42 +- .../HTML/Templates/Standard/AdminUserGroup.tt | 248 +- .../AgentAppointmentAgendaOverview.tt | 189 +- .../AgentAppointmentCalendarOverview.tt | 44 +- .../Standard/AgentAppointmentEdit.tt | 373 +- .../AgentCustomerInformationCenter.tt | 6 +- .../AgentCustomerInformationCenterSearch.tt | 22 +- .../Standard/AgentCustomerUserAddressBook.tt | 111 +- .../AgentCustomerUserAddressBookOverview.tt | 12 +- ...ntCustomerUserAddressBookOverviewNavBar.tt | 9 +- .../AgentCustomerUserInformationCenter.tt | 6 +- ...gentCustomerUserInformationCenterSearch.tt | 11 +- .../HTML/Templates/Standard/AgentDashboard.tt | 6 +- .../AgentDashboardAppointmentCalendar.tt | 23 +- .../Standard/AgentDashboardCommon.tt | 148 +- ...gentDashboardCustomerCompanyInformation.tt | 31 +- .../Standard/AgentDashboardCustomerIDList.tt | 19 +- .../AgentDashboardCustomerIDStatus.tt | 82 +- .../AgentDashboardCustomerUserInformation.tt | 31 +- .../Templates/Standard/AgentDashboardStats.tt | 4 +- .../Standard/AgentDashboardTicketGeneric.tt | 102 +- .../Standard/AgentDashboardUserOnline.tt | 9 +- .../Standard/AgentDashboardUserOutOfOffice.tt | 9 +- .../Templates/Standard/AgentLinkObject.tt | 71 +- .../Templates/Standard/AgentNavigationBar.tt | 43 +- .../Standard/AgentPreferencesOverview.tt | 119 +- .../Templates/Standard/AgentSplitSelection.tt | 2 +- .../Templates/Standard/AgentStatisticsEdit.tt | 92 +- .../Standard/AgentStatisticsImport.tt | 73 +- .../Standard/AgentStatisticsOverview.tt | 122 +- .../Templates/Standard/AgentStatisticsView.tt | 159 +- .../Standard/AgentTicketActionCommon.tt | 604 ++-- .../Templates/Standard/AgentTicketBounce.tt | 141 +- .../Templates/Standard/AgentTicketBulk.tt | 445 +-- .../Templates/Standard/AgentTicketCompose.tt | 556 +-- .../Templates/Standard/AgentTicketCustomer.tt | 45 +- .../Templates/Standard/AgentTicketEmail.tt | 767 ++-- .../Standard/AgentTicketEmailOutbound.tt | 505 +-- .../Standard/AgentTicketEmailResend.tt | 11 +- .../Standard/AgentTicketEscalation.tt | 1 + .../Templates/Standard/AgentTicketForward.tt | 584 +-- .../Templates/Standard/AgentTicketHistory.tt | 34 +- .../Templates/Standard/AgentTicketMerge.tt | 132 +- .../Templates/Standard/AgentTicketMove.tt | 302 +- .../Standard/AgentTicketNoteToLinkedTicket.tt | 186 +- .../Standard/AgentTicketOverviewMedium.tt | 361 +- .../Standard/AgentTicketOverviewNavBar.tt | 106 +- .../Standard/AgentTicketOverviewPreview.tt | 535 ++- .../Standard/AgentTicketOverviewSmall.tt | 210 +- .../Standard/AgentTicketPhoneCommon.tt | 214 +- .../Templates/Standard/AgentTicketPlain.tt | 6 +- .../Templates/Standard/AgentTicketProcess.tt | 37 +- .../Standard/AgentTicketProcessSmall.tt | 22 +- .../Templates/Standard/AgentTicketQueue.tt | 5 +- .../Templates/Standard/AgentTicketSearch.tt | 790 ++-- .../Templates/Standard/AgentTicketService.tt | 5 +- .../Templates/Standard/AgentTicketZoom.tt | 2 +- .../AgentTicketZoom/ArticleRender/Chat.tt | 1 - .../AgentTicketZoom/ArticleRender/MIMEBase.tt | 207 +- .../AgentTicketZoom/CustomerInformation.tt | 2 +- .../Standard/AgentTicketZoom/LinkTable.tt | 25 +- .../Standard/AgentTicketZoom/MentionsTable.tt | 12 +- .../Templates/Standard/ArticleActionMenu.tt | 77 +- .../Templates/Standard/AttachmentBlocker.tt | 8 +- .../HTML/Templates/Standard/Breadcrumb.tt | 17 +- .../Standard/Calendar/Plugin/Ticket/Create.tt | 49 +- .../Standard/Calendar/Plugin/Ticket/Link.tt | 25 +- Kernel/Output/HTML/Templates/Standard/Chat.tt | 94 + .../TicketCustomerIDSelection.tt | 12 +- .../Templates/Standard/CustomerFooterJS.tt | 1 - .../Templates/Standard/CustomerHTMLHead.tt | 10 +- .../HTML/Templates/Standard/CustomerLogin.tt | 190 +- .../Standard/CustomerNavigationBar.tt | 37 +- .../Templates/Standard/CustomerPreferences.tt | 88 +- .../Standard/CustomerTicketOverview.tt | 141 +- .../Standard/CustomerTicketProcess.tt | 47 +- .../Standard/CustomerTicketSearch.tt | 340 +- .../CustomerTicketSearchResultShort.tt | 191 +- .../ArticleRender/MIMEBase.tt | 144 +- .../Standard/DashboardEventsTicketCalendar.tt | 4 - .../Output/HTML/Templates/Standard/Footer.tt | 2 +- .../HTML/Templates/Standard/FooterJS.tt | 1 - .../Standard/FormElements/AttachmentList.tt | 36 +- .../Standard/FormElements/ColorPicker.tt | 18 + .../Standard/FormElements/DraftButtons.tt | 10 +- .../HTML/Templates/Standard/HTMLHead.tt | 10 +- .../Output/HTML/Templates/Standard/Header.tt | 209 +- .../HTML/Templates/Standard/HeaderToolbar.tt | 156 +- .../HTML/Templates/Standard/Installer.tt | 2 - .../Templates/Standard/InstallerDBResult.tt | 1 - .../Templates/Standard/InstallerDBmssql.tt | 3 - .../Templates/Standard/InstallerDBmysql.tt | 2 - .../Templates/Standard/InstallerDBoracle.tt | 1 - .../Standard/InstallerDBpostgresql.tt | 2 - .../Templates/Standard/InstallerFinish.tt | 1 - .../Templates/Standard/InstallerSystem.tt | 1 - .../Standard/LastViews/Agent/Avatar.tt | 14 +- .../Standard/LastViews/Agent/MenuBar.tt | 8 +- .../Standard/LastViews/Agent/ToolBar.tt | 6 +- .../HTML/Templates/Standard/LinkObject.tt | 313 +- .../Output/HTML/Templates/Standard/Login.tt | 36 +- .../HTML/Templates/Standard/NoPermission.tt | 1 - .../Output/HTML/Templates/Standard/Notify.tt | 9 +- .../HTML/Templates/Standard/Pagination.tt | 19 +- .../ProcessManagement/ActivityDialogFooter.tt | 12 +- .../ProcessManagement/ActivityDialogHeader.tt | 58 +- .../Standard/ProcessManagement/Article.tt | 32 +- .../Standard/ProcessManagement/Attachment.tt | 14 +- .../Standard/ProcessManagement/Customer.tt | 15 +- .../CustomerActivityDialogFooter.tt | 10 +- .../CustomerActivityDialogHeader.tt | 10 +- .../ProcessManagement/DynamicField.tt | 22 +- .../Standard/ProcessManagement/Lock.tt | 13 +- .../Standard/ProcessManagement/Owner.tt | 23 +- .../Standard/ProcessManagement/PendingTime.tt | 13 +- .../Standard/ProcessManagement/Priority.tt | 13 +- .../Standard/ProcessManagement/Queue.tt | 13 +- .../Standard/ProcessManagement/Responsible.tt | 22 +- .../Standard/ProcessManagement/SLA.tt | 3 +- .../Standard/ProcessManagement/Service.tt | 13 +- .../Standard/ProcessManagement/State.tt | 37 +- .../Standard/ProcessManagement/Title.tt | 3 +- .../Standard/ProcessManagement/Type.tt | 3 +- .../Templates/Standard/SmartTags/Default.tt | 64 +- .../Statistics/GeneralSpecificationsWidget.tt | 257 +- .../Standard/Statistics/PreviewWidget.tt | 17 +- .../Standard/Statistics/RestrictionsWidget.tt | 109 +- .../Standard/Statistics/StatsParamsWidget.tt | 170 +- .../Standard/Statistics/XAxisWidget.tt | 101 +- .../Standard/Statistics/YAxisWidget.tt | 52 +- .../SettingsListCompare.tt | 2 +- .../SystemConfiguration/Sidebar/Actions.tt | 14 +- .../Sidebar/DynamicActions.tt | 6 +- .../SystemConfiguration/Sidebar/Navigation.tt | 7 +- .../Templates/Standard/Ticket/TimeUnits.tt | 6 +- .../Standard/Activity/Activity.html.tmpl | 4 +- .../Standard/Agent/Admin/Favourite.html.tmpl | 2 +- .../AppointmentTooltip.html.tmpl | 179 +- .../TicketAppointmentRule.html.tmpl | 85 +- .../TicketAppointmentSearchParam.html.tmpl | 23 +- .../Agent/FormDraftAddDialog.html.tmpl | 11 +- .../FormDraftDeleteDialog.html.tmpl | 13 +- .../AjaxDnDUpload/AttachmentItem.html.tmpl | 2 +- .../AttachmentItemUploading.html.tmpl | 2 +- .../AjaxDnDUpload/UploadContainer.html.tmpl | 25 +- .../Standard/SysConfig/AddButton.html.tmpl | 2 +- .../SysConfig/DialogDeployment.html.tmpl | 62 +- .../Standard/SysConfig/RemoveButton.html.tmpl | 2 +- var/httpd/htdocs/js/Core.Activity.js | 63 +- ....Agent.Admin.AppointmentCalendar.Manage.js | 19 - .../Core.Agent.Admin.DynamicFieldDropdown.js | 2 +- ...ore.Agent.Admin.DynamicFieldMultiselect.js | 2 +- .../js/Core.Agent.Admin.GenericAgent.js | 16 +- ...ore.Agent.Admin.GenericInterfaceMapping.js | 2 +- .../Core.Agent.Admin.SystemConfiguration.js | 11 +- .../js/Core.Agent.AppointmentCalendar.js | 6 +- .../htdocs/js/Core.Agent.CustomerSearch.js | 4 +- .../js/Core.Agent.CustomerUserAddressBook.js | 9 +- var/httpd/htdocs/js/Core.Agent.Dashboard.js | 163 +- var/httpd/htdocs/js/Core.Agent.Header.js | 146 +- var/httpd/htdocs/js/Core.Agent.Overview.js | 10 +- var/httpd/htdocs/js/Core.Agent.Responsive.js | 82 +- var/httpd/htdocs/js/Core.Agent.Search.js | 43 +- .../htdocs/js/Core.Agent.TicketAction.js | 2 +- var/httpd/htdocs/js/Core.Agent.TicketEmail.js | 2 +- .../htdocs/js/Core.Agent.TicketHistory.js | 4 +- var/httpd/htdocs/js/Core.Agent.TicketPhone.js | 2 +- .../htdocs/js/Core.Agent.TicketProcess.js | 8 + var/httpd/htdocs/js/Core.Agent.TicketZoom.js | 15 +- var/httpd/htdocs/js/Core.Agent.js | 42 +- var/httpd/htdocs/js/Core.App.Responsive.js | 1 + var/httpd/htdocs/js/Core.Customer.Login.js | 143 +- .../htdocs/js/Core.Customer.Responsive.js | 20 +- .../htdocs/js/Core.Customer.TicketZoom.js | 78 +- .../htdocs/js/Core.SystemConfiguration.js | 4 +- var/httpd/htdocs/js/Core.UI.ActionRow.js | 3 +- var/httpd/htdocs/js/Core.UI.Datepicker.js | 3 +- var/httpd/htdocs/js/Core.UI.Dialog.js | 78 +- var/httpd/htdocs/js/Core.UI.InputFields.js | 84 +- var/httpd/htdocs/js/Core.UI.Table.js | 1 + var/httpd/htdocs/js/Znuny.Form.Input.js | 16 +- .../js/thirdparty/spectrum-1.8.1/spectrum.js | 2341 ------------ .../default/css/Core.Agent.Admin.ACL.css | 128 +- .../css/Core.Agent.Admin.CommunicationLog.css | 23 +- .../css/Core.Agent.Admin.DynamicField.css | 49 +- .../css/Core.Agent.Admin.GenericInterface.css | 11 +- .../Core.Agent.Admin.NotificationEvent.css | 6 +- .../css/Core.Agent.Admin.PerformanceLog.css | 11 +- .../css/Core.Agent.Admin.PostMasterFilter.css | 33 +- .../Core.Agent.Admin.ProcessManagement.css | 368 +- .../Core.Agent.Admin.SupportDataCollector.css | 123 +- .../Core.Agent.Admin.SystemConfiguration.css | 957 ++--- .../Core.Agent.CustomerUserAddressBook.css | 20 +- .../default/css/Core.Agent.Preferences.css | 235 +- .../default/css/Core.Agent.SortedTree.css | 129 +- .../default/css/Core.Agent.Statistics.css | 142 +- .../default/css/Core.Agent.TicketHistory.css | 6 +- .../Core.Agent.TicketMenuModuleCluster.css | 110 +- .../default/css/Core.Agent.TicketProcess.css | 628 +++- .../default/css/Core.AgentTicketQueue.css | 102 +- .../default/css/Core.AgentTicketService.css | 12 +- .../Agent/default/css/Core.AllocationList.css | 32 +- .../css/Core.AppointmentCalendar.Agenda.css | 14 +- .../default/css/Core.AppointmentCalendar.css | 446 ++- .../skins/Agent/default/css/Core.Color.css | 95 + .../Agent/default/css/Core.Components.css | 1994 +++++++++++ .../skins/Agent/default/css/Core.Dialog.css | 315 +- .../Agent/default/css/Core.FlexboxModel.css | 178 + .../skins/Agent/default/css/Core.Footer.css | 44 +- .../skins/Agent/default/css/Core.Form.css | 2526 ++++++++----- .../skins/Agent/default/css/Core.Header.css | 3166 +++++++++-------- .../Agent/default/css/Core.InputFields.css | 601 +++- .../Agent/default/css/Core.LastViews.css | 201 ++ .../skins/Agent/default/css/Core.Login.css | 106 +- .../skins/Agent/default/css/Core.Overview.css | 242 ++ .../default/css/Core.OverviewControl.css | 282 +- .../Agent/default/css/Core.OverviewLarge.css | 276 +- .../Agent/default/css/Core.OverviewMedium.css | 575 +-- .../Agent/default/css/Core.OverviewSmall.css | 64 +- .../Agent/default/css/Core.PageLayout.css | 1883 ++++++++-- .../skins/Agent/default/css/Core.Reset.css | 1200 +------ .../Agent/default/css/Core.Responsive.css | 853 +++-- ...TextEditor.css => Core.RichTextEditor.css} | 22 +- .../skins/Agent/default/css/Core.Table.css | 736 +++- .../Agent/default/css/Core.TicketDetail.css | 78 +- .../skins/Agent/default/css/Core.Tooltip.css | 17 +- .../Agent/default/css/Core.Typography.css | 50 + .../skins/Agent/default/css/Core.Vars.css | 245 ++ .../Agent/default/css/Core.WidgetMenu.css | 770 ++-- .../thirdparty/jstree-theme/default/style.css | 8 +- .../thirdparty/spectrum-1.8.1/spectrum.css | 507 --- .../skins/Agent/forwwward/css/Core.Header.css | 1230 ------- .../skins/Customer/default/css/Core.Color.css | 98 + .../Customer/default/css/Core.Components.css | 1432 ++++++++ .../Customer/default/css/Core.Control.css | 418 ++- .../css/Core.Customer.TicketProcess.css | 168 +- .../Customer/default/css/Core.Dialog.css | 67 + .../default/css/Core.FlexboxModel.css | 58 + .../Customer/default/css/Core.InputFields.css | 343 +- .../Customer/default/css/Core.LastViews.css | 200 ++ .../skins/Customer/default/css/Core.Login.css | 162 +- .../Customer/default/css/Core.PageLayout.css | 288 ++ .../skins/Customer/default/css/Core.Reset.css | 532 +-- .../Customer/default/css/Core.Responsive.css | 178 +- .../skins/Customer/default/css/Core.Table.css | 167 +- .../Customer/default/css/Core.TicketZoom.css | 1171 +++--- .../skins/Customer/default/css/Core.Vars.css | 223 ++ 350 files changed, 35185 insertions(+), 27605 deletions(-) delete mode 100644 Custom/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt delete mode 100644 Custom/Kernel/Output/HTML/Templates/Standard/Header.tt delete mode 100644 Custom/Kernel/Output/HTML/Templates/Standard/Pagination.tt delete mode 100644 Kernel/Output/HTML/Templates/Standard/AdminCloudServiceSupportDataCollector.tt delete mode 100644 Kernel/Output/HTML/Templates/Standard/AdminCloudServices.tt delete mode 100644 Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessInstalled.tt delete mode 100644 Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessNotInstalled.tt delete mode 100644 Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessUninstall.tt create mode 100644 Kernel/Output/HTML/Templates/Standard/Chat.tt create mode 100644 Kernel/Output/HTML/Templates/Standard/FormElements/ColorPicker.tt delete mode 100644 var/httpd/htdocs/js/thirdparty/spectrum-1.8.1/spectrum.js create mode 100644 var/httpd/htdocs/skins/Agent/default/css/Core.Components.css create mode 100644 var/httpd/htdocs/skins/Agent/default/css/Core.FlexboxModel.css create mode 100644 var/httpd/htdocs/skins/Agent/default/css/Core.LastViews.css create mode 100644 var/httpd/htdocs/skins/Agent/default/css/Core.Overview.css rename var/httpd/htdocs/skins/Agent/default/css/{Znuny.RichTextEditor.css => Core.RichTextEditor.css} (65%) create mode 100644 var/httpd/htdocs/skins/Agent/default/css/Core.Typography.css create mode 100644 var/httpd/htdocs/skins/Agent/default/css/Core.Vars.css delete mode 100644 var/httpd/htdocs/skins/Agent/default/css/thirdparty/spectrum-1.8.1/spectrum.css delete mode 100644 var/httpd/htdocs/skins/Agent/forwwward/css/Core.Header.css create mode 100644 var/httpd/htdocs/skins/Customer/default/css/Core.Color.css create mode 100644 var/httpd/htdocs/skins/Customer/default/css/Core.Components.css create mode 100644 var/httpd/htdocs/skins/Customer/default/css/Core.FlexboxModel.css create mode 100644 var/httpd/htdocs/skins/Customer/default/css/Core.LastViews.css create mode 100644 var/httpd/htdocs/skins/Customer/default/css/Core.PageLayout.css create mode 100644 var/httpd/htdocs/skins/Customer/default/css/Core.Vars.css diff --git a/.gitignore b/.gitignore index f214f439cc8..d3370a0659f 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,7 @@ Kernel/Config/Backups/ Kernel/Config/Files/ZZZ*.pm Kernel/Config/Files/User/* +Kernel/Config/Defaults.pm Kernel/Config/GenericAgent.pm Kernel/Config.pm Kernel/Language/*.old @@ -25,6 +26,9 @@ bin/cgi-bin/.htaccess scripts/apache2-perl-startup2.pl var/virtualfs var/run +var/etc +var/etc/* +var/log/* var/log/*.log var/log/Daemon/*.log var/OPM @@ -44,6 +48,13 @@ var/cron/* .viminfo .bash* +# Packages +.mysql_history +doc/en/ +doc/de/ +development/ +development/webservices + # Fred Fred.sopm CHANGES-Fred @@ -70,3 +81,989 @@ cover_db/ # ITSM var/stats/*.xml.installed + + +# FAQ +FAQ.sopm +i18n/FAQ/ +bin/cgi-bin/faq.pl +bin/fcgi-bin/faq.fpl +doc/faq-database.png +Kernel/Config/Files/XML/FAQ.xml +Kernel/Config/Files/ZZZZZFAQItemLinkObjectPermissions.pm +Kernel/cpan-lib/XML/RSS/SimpleGen.pm +Kernel/GenericInterface/Operation/FAQ/PublicCategoryList.pm +Kernel/GenericInterface/Operation/FAQ/LanguageList.pm +Kernel/GenericInterface/Operation/FAQ/PublicFAQSearch.pm +Kernel/GenericInterface/Operation/FAQ/PublicFAQGet.pm +Kernel/Language/da_FAQ.pm +Kernel/Language/de_FAQ.pm +Kernel/Language/en_GB_FAQ.pm +Kernel/Language/es_FAQ.pm +Kernel/Language/es_MX_FAQ.pm +Kernel/Language/fa_FAQ.pm +Kernel/Language/fi_FAQ.pm +Kernel/Language/fr_FAQ.pm +Kernel/Language/hu_FAQ.pm +Kernel/Language/id_FAQ.pm +Kernel/Language/it_FAQ.pm +Kernel/Language/ja_FAQ.pm +Kernel/Language/ms_FAQ.pm +Kernel/Language/nb_NO_FAQ.pm +Kernel/Language/nl_FAQ.pm +Kernel/Language/pl_FAQ.pm +Kernel/Language/pt_FAQ.pm +Kernel/Language/pt_BR_FAQ.pm +Kernel/Language/ru_FAQ.pm +Kernel/Language/sr_Cyrl_FAQ.pm +Kernel/Language/sr_Latn_FAQ.pm +Kernel/Language/sv_FAQ.pm +Kernel/Language/sw_FAQ.pm +Kernel/Language/th_TH_FAQ.pm +Kernel/Language/uk_FAQ.pm +Kernel/Language/zh_CN_FAQ.pm +Kernel/Language/zh_TW_FAQ.pm +Kernel/Modules/AgentFAQAdd.pm +Kernel/Modules/AgentFAQCategory.pm +Kernel/Modules/AgentFAQDelete.pm +Kernel/Modules/AgentFAQEdit.pm +Kernel/Modules/AgentFAQExplorer.pm +Kernel/Modules/AgentFAQHistory.pm +Kernel/Modules/AgentFAQJournal.pm +Kernel/Modules/AgentFAQLanguage.pm +Kernel/Modules/AgentFAQPrint.pm +Kernel/Modules/AgentFAQRelatedArticles.pm +Kernel/Modules/AgentFAQRichText.pm +Kernel/Modules/AgentFAQSearch.pm +Kernel/Modules/AgentFAQSearchSmall.pm +Kernel/Modules/AgentFAQZoom.pm +Kernel/Modules/CustomerFAQExplorer.pm +Kernel/Modules/CustomerFAQPrint.pm +Kernel/Modules/CustomerFAQRelatedArticles.pm +Kernel/Modules/CustomerFAQSearch.pm +Kernel/Modules/CustomerFAQZoom.pm +Kernel/Modules/PublicFAQ.pm +Kernel/Modules/PublicFAQExplorer.pm +Kernel/Modules/PublicFAQPrint.pm +Kernel/Modules/PublicFAQRSS.pm +Kernel/Modules/PublicFAQSearch.pm +Kernel/Modules/PublicFAQZoom.pm +Kernel/Output/HTML/Dashboard/FAQ.pm +Kernel/Output/HTML/FAQJournalOverview/Small.pm +Kernel/Output/HTML/FAQMenu/Generic.pm +Kernel/Output/HTML/FAQMenu/Delete.pm +Kernel/Output/HTML/FAQOverview/Small.pm +Kernel/Output/HTML/HeaderMeta/AgentFAQSearch.pm +Kernel/Output/HTML/HeaderMeta/CustomerFAQSearch.pm +Kernel/Output/HTML/HeaderMeta/PublicFAQSearch.pm +Kernel/Output/HTML/Layout/FAQ.pm +Kernel/Output/HTML/LinkObject/FAQ.pm +Kernel/Output/HTML/FilterElementPost/FAQ.pm +Kernel/Output/HTML/FilterElementPost/FAQAgentRelatedArticles.pm +Kernel/Output/HTML/FilterElementPost/FAQCustomerRelatedArticles.pm +Kernel/Output/HTML/Templates/Standard/AgentFAQAdd.tt +Kernel/Output/HTML/Templates/Standard/AgentDashboardFAQOverview.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQCategory.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQDelete.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQExplorer.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQHistory.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQJournalOverviewSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQLanguage.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQLanguage.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQOverviewNavBar.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQOverviewSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQSearch.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQSearchOpenSearchDescriptionFAQNumber.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQSearchOpenSearchDescriptionFulltext.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQSearchSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQZoom.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQZoomSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentFAQRelatedArticles.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQExplorer.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQRelatedArticles.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQSearch.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQSearchOpenSearchDescriptionFAQNumber.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQSearchOpenSearchDescriptionFullText.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQSearchResultShort.tt +Kernel/Output/HTML/Templates/Standard/CustomerFAQZoom.tt +Kernel/Output/HTML/Templates/Standard/PublicFAQExplorer.tt +Kernel/Output/HTML/Templates/Standard/PublicFAQSearch.tt +Kernel/Output/HTML/Templates/Standard/PublicFAQSearchOpenSearchDescriptionFAQNumber.tt +Kernel/Output/HTML/Templates/Standard/PublicFAQSearchOpenSearchDescriptionFullText.tt +Kernel/Output/HTML/Templates/Standard/PublicFAQSearchResultShort.tt +Kernel/Output/HTML/Templates/Standard/PublicFAQZoom.tt +Kernel/System/Autocompletion/FAQ.pm +Kernel/System/Console/Command/Admin/FAQ/Import.pm +Kernel/System/Console/Command/Maint/FAQ/ContentTypeSet.pm +Kernel/System/DynamicField/ObjectType/FAQ.pm +Kernel/System/FAQ/Category.pm +Kernel/System/FAQ/Language.pm +Kernel/System/FAQ/RelatedArticle.pm +Kernel/System/FAQ/State.pm +Kernel/System/FAQ/Vote.pm +Kernel/System/FAQ.pm +Kernel/System/FAQSearch.pm +Kernel/System/LinkObject/FAQ.pm +Kernel/System/Stats/Static/FAQAccess.pm +scripts/test/Autocompletion/FAQ.t +scripts/test/Console/Command/Admin/FAQ/Import.t +scripts/webservices/GenericFAQConnectorREST.yml +scripts/webservices/GenericFAQConnectorSOAP.yml +scripts/test/Console/Command/Maint/FAQ/ContentTypeSet.t +scripts/test/DynamicField/ObjectType/FAQ/ObjectDataGet.t +scripts/test/FAQSearch/InConditionGet.t +scripts/test/FAQ.t +scripts/test/FAQSearch.t +scripts/test/FAQ/RelatedArticle.t +scripts/test/FAQ/Category/AgentCategorySearch.t +scripts/test/FAQ/Category/CategoryAdd.t +scripts/test/FAQ/Category/CheckCustomerUserCategory.t +scripts/test/FAQ/UpgradeLowerThan5092.t +scripts/test/FAQ/Category/CheckCategoryUserPermission.t +scripts/test/GenericInterface/FAQConnector.t +scripts/test/sample/FAQ-Test1.doc +scripts/test/sample/FAQ-Test1.pdf +scripts/test/sample/FAQ.csv +scripts/test/sample/GenericInterface/FAQ/GI-FAQ-Test-utf8-1.bin +scripts/test/sample/GenericInterface/FAQ/GI-FAQ-Test-utf8-1.txt +scripts/test/Selenium/Agent/AgentFAQAdd.t +scripts/test/Selenium/Agent/AgentFAQCategory.t +scripts/test/Selenium/Agent/AgentFAQDelete.t +scripts/test/Selenium/Agent/AgentFAQEdit.t +scripts/test/Selenium/Agent/AgentFAQExplorer.t +scripts/test/Selenium/Agent/AgentFAQHistory.t +scripts/test/Selenium/Agent/AgentFAQJournal.t +scripts/test/Selenium/Agent/AgentFAQLanguage.t +scripts/test/Selenium/Agent/AgentFAQLinkObject.t +scripts/test/Selenium/Agent/AgentFAQPrint.t +scripts/test/Selenium/Agent/AgentFAQSearch.t +scripts/test/Selenium/Agent/AgentFAQZoom.t +scripts/test/Selenium/Agent/FAQ/RelatedArticles.t +scripts/test/Selenium/Customer/CustomerFAQExplorer.t +scripts/test/Selenium/Customer/CustomerFAQPrint.t +scripts/test/Selenium/Customer/CustomerFAQSearch.t +scripts/test/Selenium/Customer/CustomerFAQZoom.t +scripts/test/Selenium/Customer/FAQ/RelatedArticles.t +scripts/test/Selenium/Public/PublicFAQExplorer.t +scripts/test/Selenium/Public/PublicFAQPrint.t +scripts/test/Selenium/Public/PublicFAQRSS.t +scripts/test/Selenium/Public/PublicFAQSearch.t +scripts/test/Selenium/Public/PublicFAQZoom.t +scripts/test/Selenium/Output/Dashboard/FAQ.t +scripts/test/Selenium/Output/FAQJournalOverview/Small.t +scripts/test/Selenium/Output/FAQMenu/Generic.t +scripts/test/Selenium/Output/FAQOverview/Small.t +scripts/test/Selenium/Output/HeaderMeta/AgentFAQSearch.t +scripts/test/Selenium/Output/HeaderMeta/CustomerFAQSearch.t +scripts/test/Selenium/Output/HeaderMeta/PublicFAQSearch.t +scripts/test/Selenium/Output/LinkObject/FAQ.t +var/httpd/htdocs/js/FAQ.Agent.ConfirmationDialog.js +var/httpd/htdocs/js/FAQ.Agent.FAQ.js +var/httpd/htdocs/js/FAQ.Agent.FAQZoom.js +var/httpd/htdocs/js/FAQ.Agent.RelatedArticles.js +var/httpd/htdocs/js/FAQ.Agent.TicketCompose.js +var/httpd/htdocs/js/FAQ.Customer.FAQZoom.js +var/httpd/htdocs/skins/Agent/default/css/FAQ.Agent.Default.css +var/httpd/htdocs/skins/Agent/default/css/FAQ.Agent.Detail.css +var/httpd/htdocs/skins/Agent/default/img/help-small.png +var/httpd/htdocs/skins/Customer/default/css/FAQ.Customer.Default.css +var/httpd/htdocs/skins/Customer/default/css/FAQ.Customer.Detail.css +var/httpd/htdocs/skins/Customer/default/css/FAQ.RelatedArticles.css +var/httpd/htdocs/skins/Customer/default/css/FAQ.Widget.css +var/httpd/htdocs/skins/Customer/default/css/FAQ.FAQZoom.css +var/packagesetup/FAQ.pm +var/stats/FAQ-FAQAccess.xml + +# GeneralCatalog +GeneralCatalog.sopm +i18n/GeneralCatalog/ +doc/general-catalog-database.dia +doc/general-catalog-database.png +Kernel/Config/Files/XML/GeneralCatalog.xml +Kernel/Language/ar_SA_GeneralCatalog.pm +Kernel/Language/bg_GeneralCatalog.pm +Kernel/Language/ca_GeneralCatalog.pm +Kernel/Language/cs_GeneralCatalog.pm +Kernel/Language/da_GeneralCatalog.pm +Kernel/Language/de_GeneralCatalog.pm +Kernel/Language/el_GeneralCatalog.pm +Kernel/Language/en_CA_GeneralCatalog.pm +Kernel/Language/en_GB_GeneralCatalog.pm +Kernel/Language/es_CO_GeneralCatalog.pm +Kernel/Language/es_GeneralCatalog.pm +Kernel/Language/es_MX_GeneralCatalog.pm +Kernel/Language/et_GeneralCatalog.pm +Kernel/Language/fa_GeneralCatalog.pm +Kernel/Language/fi_GeneralCatalog.pm +Kernel/Language/fr_CA_GeneralCatalog.pm +Kernel/Language/fr_GeneralCatalog.pm +Kernel/Language/gl_GeneralCatalog.pm +Kernel/Language/he_GeneralCatalog.pm +Kernel/Language/hi_GeneralCatalog.pm +Kernel/Language/hr_GeneralCatalog.pm +Kernel/Language/hu_GeneralCatalog.pm +Kernel/Language/id_GeneralCatalog.pm +Kernel/Language/it_GeneralCatalog.pm +Kernel/Language/ja_GeneralCatalog.pm +Kernel/Language/ko_GeneralCatalog.pm +Kernel/Language/lt_GeneralCatalog.pm +Kernel/Language/lv_GeneralCatalog.pm +Kernel/Language/mk_GeneralCatalog.pm +Kernel/Language/ms_GeneralCatalog.pm +Kernel/Language/nb_NO_GeneralCatalog.pm +Kernel/Language/nl_GeneralCatalog.pm +Kernel/Language/pl_GeneralCatalog.pm +Kernel/Language/pt_BR_GeneralCatalog.pm +Kernel/Language/pt_GeneralCatalog.pm +Kernel/Language/ro_GeneralCatalog.pm +Kernel/Language/ru_GeneralCatalog.pm +Kernel/Language/sk_SK_GeneralCatalog.pm +Kernel/Language/sl_GeneralCatalog.pm +Kernel/Language/sr_Cyrl_GeneralCatalog.pm +Kernel/Language/sr_Latn_GeneralCatalog.pm +Kernel/Language/sv_GeneralCatalog.pm +Kernel/Language/sw_GeneralCatalog.pm +Kernel/Language/th_TH_GeneralCatalog.pm +Kernel/Language/tr_GeneralCatalog.pm +Kernel/Language/uk_GeneralCatalog.pm +Kernel/Language/vi_VN_GeneralCatalog.pm +Kernel/Language/zh_CN_GeneralCatalog.pm +Kernel/Language/zh_TW_GeneralCatalog.pm +Kernel/Modules/AdminGeneralCatalog.pm +Kernel/Output/HTML/GeneralCatalogPreferences/Generic.pm +Kernel/Output/HTML/Templates/Standard/AAAGeneralCatalog.tt +Kernel/Output/HTML/Templates/Standard/AdminGeneralCatalog.tt +Kernel/System/GeneralCatalog.pm +Kernel/System/GeneralCatalog/PreferencesDB.pm +scripts/test/GeneralCatalog.t +scripts/test/Selenium/Output/GeneralCatalogPreferencesGeneric.t +scripts/test/Selenium/Agent/Admin/AdminGeneralCatalog.t +var/httpd/htdocs/js/ITSM.GeneralCatalog.js +var/packagesetup/GeneralCatalog.pm + +# ITSMCore +ITSMCore.sopm +i18n/ITSMCore/ +doc/itsm-core-database.dia +doc/itsm-core-database.png +Kernel/Config/Files/XML/FrameworkITSMCore.xml +Kernel/Config/Files/XML/ITSMCore.xml +Kernel/Config/Files/XML/ITSMService.xml +Kernel/Config/Files/XML/TicketITSMService.xml +Kernel/Language/ar_SA_ITSMCore.pm +Kernel/Language/bg_ITSMCore.pm +Kernel/Language/ca_ITSMCore.pm +Kernel/Language/cs_ITSMCore.pm +Kernel/Language/da_ITSMCore.pm +Kernel/Language/de_ITSMCore.pm +Kernel/Language/el_ITSMCore.pm +Kernel/Language/en_CA_ITSMCore.pm +Kernel/Language/en_GB_ITSMCore.pm +Kernel/Language/es_CO_ITSMCore.pm +Kernel/Language/es_ITSMCore.pm +Kernel/Language/es_MX_ITSMCore.pm +Kernel/Language/et_ITSMCore.pm +Kernel/Language/fa_ITSMCore.pm +Kernel/Language/fi_ITSMCore.pm +Kernel/Language/fr_CA_ITSMCore.pm +Kernel/Language/fr_ITSMCore.pm +Kernel/Language/gl_ITSMCore.pm +Kernel/Language/he_ITSMCore.pm +Kernel/Language/hi_ITSMCore.pm +Kernel/Language/hr_ITSMCore.pm +Kernel/Language/hu_ITSMCore.pm +Kernel/Language/id_ITSMCore.pm +Kernel/Language/it_ITSMCore.pm +Kernel/Language/ja_ITSMCore.pm +Kernel/Language/ko_ITSMCore.pm +Kernel/Language/lt_ITSMCore.pm +Kernel/Language/lv_ITSMCore.pm +Kernel/Language/mk_ITSMCore.pm +Kernel/Language/ms_ITSMCore.pm +Kernel/Language/nb_NO_ITSMCore.pm +Kernel/Language/nl_ITSMCore.pm +Kernel/Language/pl_ITSMCore.pm +Kernel/Language/pt_BR_ITSMCore.pm +Kernel/Language/pt_ITSMCore.pm +Kernel/Language/ro_ITSMCore.pm +Kernel/Language/ru_ITSMCore.pm +Kernel/Language/sk_SK_ITSMCore.pm +Kernel/Language/sl_ITSMCore.pm +Kernel/Language/sr_Cyrl_ITSMCore.pm +Kernel/Language/sr_Latn_ITSMCore.pm +Kernel/Language/sv_ITSMCore.pm +Kernel/Language/sw_ITSMCore.pm +Kernel/Language/th_TH_ITSMCore.pm +Kernel/Language/tr_ITSMCore.pm +Kernel/Language/uk_ITSMCore.pm +Kernel/Language/vi_VN_ITSMCore.pm +Kernel/Language/zh_CN_ITSMCore.pm +Kernel/Language/zh_TW_ITSMCore.pm +Kernel/Modules/AdminITSMCIPAllocate.pm +Kernel/Modules/AgentITSMService.pm +Kernel/Modules/AgentITSMServicePrint.pm +Kernel/Modules/AgentITSMServiceZoom.pm +Kernel/Modules/AgentITSMSLA.pm +Kernel/Modules/AgentITSMSLAPrint.pm +Kernel/Modules/AgentITSMSLAZoom.pm +Kernel/Output/HTML/ITSMServiceMenu/Generic.pm +Kernel/Output/HTML/ITSMServiceMenu/Link.pm +Kernel/Output/HTML/ITSMSLAMenu/Generic.pm +Kernel/Output/HTML/LinkObject/Service.pm +Kernel/Output/JavaScript/Templates/Standard/Agent/ITSMCore/LoadingDialog.html.tmpl +Kernel/Output/HTML/Templates/Standard/AdminITSMCIPAllocate.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMService.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMServiceZoom.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMSLA.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMSLAZoom.tt +Kernel/System/LinkObject/Service.pm +Kernel/System/ITSMCIPAllocate.pm +scripts/test/sample/Stats/ITSMCore.Stats.Static.NotExisting.xml +scripts/test/sample/Stats/ITSMCore.Stats.TicketOverview.xml +scripts/test/ITSMCIPAllocate.t +scripts/test/Selenium/Agent/Admin/AdminITSMCIPAllocate.t +scripts/test/Selenium/Agent/AgentITSMService.t +scripts/test/Selenium/Agent/AgentITSMServicePrint.t +scripts/test/Selenium/Agent/AgentITSMServiceZoom.t +scripts/test/Selenium/Agent/AgentITSMSLA.t +scripts/test/Selenium/Agent/AgentITSMSLAPrint.t +scripts/test/Selenium/Agent/AgentITSMSLAZoom.t +var/httpd/htdocs/js/ITSM.Agent.ConfirmDialog.js +var/httpd/htdocs/js/ITSM.Agent.CustomerSearch.js +var/httpd/htdocs/js/ITSM.Agent.Service.js +var/httpd/htdocs/js/ITSM.Agent.ServiceZoom.js +var/httpd/htdocs/js/ITSM.Agent.SLA.js +var/httpd/htdocs/js/ITSM.Agent.SLAZoom.js +var/httpd/htdocs/js/ITSM.Agent.UserSearch.js +var/httpd/htdocs/js/ITSM.Agent.Zoom.js +var/httpd/htdocs/skins/Agent/default/css/ITSM.Agent.Default.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.Agent.Detail.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.Agent.Search.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.Print.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.Table.css +var/packagesetup/ITSMCore.pm + +# ITSMConfigurationManagement +ITSMConfigurationManagement.sopm +i18n/ITSMConfigurationManagement/ +doc/itsm-configuration-management-database.dia +doc/itsm-configuration-management-database.png +Kernel/Config/Files/XML/ITSMConfigItem.xml +Kernel/GenericInterface/Event/ObjectType/ITSMConfigItem.pm +Kernel/GenericInterface/Invoker/ITSMConfigItem/Generic.pm +Kernel/GenericInterface/Operation/ConfigItem/Common.pm +Kernel/GenericInterface/Operation/ConfigItem/ConfigItemCreate.pm +Kernel/GenericInterface/Operation/ConfigItem/ConfigItemDelete.pm +Kernel/GenericInterface/Operation/ConfigItem/ConfigItemGet.pm +Kernel/GenericInterface/Operation/ConfigItem/ConfigItemSearch.pm +Kernel/GenericInterface/Operation/ConfigItem/ConfigItemUpdate.pm +Kernel/Language/ar_SA_ITSMConfigurationManagement.pm +Kernel/Language/bg_ITSMConfigurationManagement.pm +Kernel/Language/ca_ITSMConfigurationManagement.pm +Kernel/Language/cs_ITSMConfigurationManagement.pm +Kernel/Language/da_ITSMConfigurationManagement.pm +Kernel/Language/de_ITSMConfigurationManagement.pm +Kernel/Language/el_ITSMConfigurationManagement.pm +Kernel/Language/en_CA_ITSMConfigurationManagement.pm +Kernel/Language/en_GB_ITSMConfigurationManagement.pm +Kernel/Language/es_CO_ITSMConfigurationManagement.pm +Kernel/Language/es_ITSMConfigurationManagement.pm +Kernel/Language/es_MX_ITSMConfigurationManagement.pm +Kernel/Language/et_ITSMConfigurationManagement.pm +Kernel/Language/fa_ITSMConfigurationManagement.pm +Kernel/Language/fi_ITSMConfigurationManagement.pm +Kernel/Language/fr_CA_ITSMConfigurationManagement.pm +Kernel/Language/fr_ITSMConfigurationManagement.pm +Kernel/Language/gl_ITSMConfigurationManagement.pm +Kernel/Language/he_ITSMConfigurationManagement.pm +Kernel/Language/hi_ITSMConfigurationManagement.pm +Kernel/Language/hr_ITSMConfigurationManagement.pm +Kernel/Language/hu_ITSMConfigurationManagement.pm +Kernel/Language/id_ITSMConfigurationManagement.pm +Kernel/Language/it_ITSMConfigurationManagement.pm +Kernel/Language/ja_ITSMConfigurationManagement.pm +Kernel/Language/ko_ITSMConfigurationManagement.pm +Kernel/Language/lt_ITSMConfigurationManagement.pm +Kernel/Language/lv_ITSMConfigurationManagement.pm +Kernel/Language/mk_ITSMConfigurationManagement.pm +Kernel/Language/ms_ITSMConfigurationManagement.pm +Kernel/Language/nb_NO_ITSMConfigurationManagement.pm +Kernel/Language/nl_ITSMConfigurationManagement.pm +Kernel/Language/pl_ITSMConfigurationManagement.pm +Kernel/Language/pt_BR_ITSMConfigurationManagement.pm +Kernel/Language/pt_ITSMConfigurationManagement.pm +Kernel/Language/ro_ITSMConfigurationManagement.pm +Kernel/Language/ru_ITSMConfigurationManagement.pm +Kernel/Language/sk_SK_ITSMConfigurationManagement.pm +Kernel/Language/sl_ITSMConfigurationManagement.pm +Kernel/Language/sr_Cyrl_ITSMConfigurationManagement.pm +Kernel/Language/sr_Latn_ITSMConfigurationManagement.pm +Kernel/Language/sv_ITSMConfigurationManagement.pm +Kernel/Language/sw_ITSMConfigurationManagement.pm +Kernel/Language/th_TH_ITSMConfigurationManagement.pm +Kernel/Language/tr_ITSMConfigurationManagement.pm +Kernel/Language/uk_ITSMConfigurationManagement.pm +Kernel/Language/vi_VN_ITSMConfigurationManagement.pm +Kernel/Language/zh_CN_ITSMConfigurationManagement.pm +Kernel/Language/zh_TW_ITSMConfigurationManagement.pm +Kernel/Modules/AJAXDynamicFieldConfigItem.pm +Kernel/Modules/AdminDynamicFieldConfigItem.pm +Kernel/Modules/AdminITSMConfigItem.pm +Kernel/Modules/AgentITSMConfigItem.pm +Kernel/Modules/AgentITSMConfigItemAdd.pm +Kernel/Modules/AgentITSMConfigItemAttachment.pm +Kernel/Modules/AgentITSMConfigItemBulk.pm +Kernel/Modules/AgentITSMConfigItemCustomerCIsWidget.pm +Kernel/Modules/AgentITSMConfigItemDelete.pm +Kernel/Modules/AgentITSMConfigItemEdit.pm +Kernel/Modules/AgentITSMConfigItemHistory.pm +Kernel/Modules/AgentITSMConfigItemPrint.pm +Kernel/Modules/AgentITSMConfigItemSearch.pm +Kernel/Modules/AgentITSMConfigItemZoom.pm +Kernel/Output/HTML/Dashboard/ITSMConfigItemGeneric.pm +Kernel/Output/HTML/FilterElementPost/AgentITSMConfigItemCustomerCIs.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutBaseSelectable.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutCI.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutCIAttachment.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutCISimple.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutCustomer.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutCustomerCompany.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutDate.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutDateTime.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutDummy.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutGeneralCatalog.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutInteger.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutPriority.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutQueue.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutSLA.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutService.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutState.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutText.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutTextArea.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutTextLink.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutType.pm +Kernel/Output/HTML/ITSMConfigItem/LayoutUser.pm +Kernel/Output/HTML/ITSMConfigItem/MenuGeneric.pm +Kernel/Output/HTML/ITSMConfigItem/OverviewSmall.pm +Kernel/Output/HTML/Layout/ITSMConfigItem.pm +Kernel/Output/HTML/LinkObject/ITSMConfigItem.pm +Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldConfigItem.tt +Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldConfigItem/Config.tt +Kernel/Output/HTML/Templates/Standard/AdminITSMConfigItem.tt +Kernel/Output/HTML/Templates/Standard/AgentDashboardITSMConfigItemGeneric.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemAdd.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemBulk.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemCustomerCIsWidget.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemDelete.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemHistory.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemOverviewNavBar.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemOverviewSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemSearch.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMConfigItemZoom.tt +Kernel/System/Console/Command/Admin/ITSM/Configitem/Delete.pm +Kernel/System/Console/Command/Admin/ITSM/Configitem/ListDuplicates.pm +Kernel/System/Console/Command/Admin/ITSM/IncidentState/Recalculate.pm +Kernel/System/Console/Command/Maint/ITSM/Configitem/DefinitionPerl2YAML.pm +Kernel/System/DynamicField/ConfigItem.pm +Kernel/System/DynamicField/Driver/ConfigItem.pm +Kernel/System/DynamicField/Driver/ConfigItemDropdown.pm +Kernel/System/DynamicField/Driver/ConfigItemMultiselect.pm +Kernel/System/ITSMConfigItem.pm +Kernel/System/ITSMConfigItem/CIAttachment.pm +Kernel/System/ITSMConfigItem/Definition.pm +Kernel/System/ITSMConfigItem/Event/CIAttachment.pm +Kernel/System/ITSMConfigItem/Event/DoHistory.pm +Kernel/System/ITSMConfigItem/History.pm +Kernel/System/ITSMConfigItem/Number.pm +Kernel/System/ITSMConfigItem/Number/AutoIncrement.pm +Kernel/System/ITSMConfigItem/Permission.pm +Kernel/System/ITSMConfigItem/Permission/ClassGroupCheck.pm +Kernel/System/ITSMConfigItem/Permission/ItemClassGroupCheck.pm +Kernel/System/ITSMConfigItem/Version.pm +Kernel/System/ITSMConfigItem/XML.pm +Kernel/System/ITSMConfigItem/XML/Type/BaseSelectable.pm +Kernel/System/ITSMConfigItem/XML/Type/CI.pm +Kernel/System/ITSMConfigItem/XML/Type/CIAttachment.pm +Kernel/System/ITSMConfigItem/XML/Type/CISimple.pm +Kernel/System/ITSMConfigItem/XML/Type/Customer.pm +Kernel/System/ITSMConfigItem/XML/Type/CustomerCompany.pm +Kernel/System/ITSMConfigItem/XML/Type/Date.pm +Kernel/System/ITSMConfigItem/XML/Type/DateTime.pm +Kernel/System/ITSMConfigItem/XML/Type/Dummy.pm +Kernel/System/ITSMConfigItem/XML/Type/GeneralCatalog.pm +Kernel/System/ITSMConfigItem/XML/Type/Integer.pm +Kernel/System/ITSMConfigItem/XML/Type/Priority.pm +Kernel/System/ITSMConfigItem/XML/Type/Queue.pm +Kernel/System/ITSMConfigItem/XML/Type/SLA.pm +Kernel/System/ITSMConfigItem/XML/Type/Service.pm +Kernel/System/ITSMConfigItem/XML/Type/State.pm +Kernel/System/ITSMConfigItem/XML/Type/Text.pm +Kernel/System/ITSMConfigItem/XML/Type/TextArea.pm +Kernel/System/ITSMConfigItem/XML/Type/TextLink.pm +Kernel/System/ITSMConfigItem/XML/Type/Type.pm +Kernel/System/ITSMConfigItem/XML/Type/User.pm +Kernel/System/ITSMConfigItemCustomerCIs.pm +Kernel/System/ITSMConfigItemInvoker.pm +Kernel/System/ImportExport/ObjectBackend/ITSMConfigItem.pm +Kernel/System/LinkObject/ITSMConfigItem.pm +Kernel/System/LinkObject/ITSMConfigItem.pm +Kernel/System/Stats/Dynamic/ITSMConfigItem.pm +Kernel/System/Ticket/Event/DynamicFieldConfigItemAdditionalDFStorage.pm +Kernel/System/Ticket/Event/DynamicFieldConfigItemTicketLink.pm +Kernel/System/Ticket/Event/ITSMConfigItemCustomerCIs.pm +Kernel/System/Ticket/Event/TicketStatusLink.pm +scripts/test/Console/Command/Admin/ITSM/Configitem/Delete.t +scripts/test/Console/Command/Admin/ITSM/Configitem/ListDuplicates.t +scripts/test/Console/Command/Admin/ITSM/IncidentState/Recalculate.t +scripts/test/Console/Command/Maint/ITSM/Configitem/DefinitionPerl2YAML.t +scripts/test/DynamicField/ConfigItem.t +scripts/test/GenericInterface/Invoker/ITSMConfigItem/Generic.t +scripts/test/GenericInterface/Operation/ConfigItem/ConfigItemUpdate.t +scripts/test/GenericInterface/Operation/ConfigItem/ConfigItemSearch.t +scripts/test/GenericInterface/Operation/ConfigItem/ConfigItemGet.t +scripts/test/GenericInterface/Operation/ConfigItem/ConfigItemDelete.t +scripts/test/GenericInterface/Operation/ConfigItem/ConfigItemCreate.t +scripts/test/ITSMConfigItem.t +scripts/test/ITSMConfigItem/CIAttachment.t +scripts/test/ITSMConfigItem/Definition/DefinitionAdd.t +scripts/test/ITSMConfigItem/Definition/DefinitionGet.t +scripts/test/ITSMConfigItem/Definition/DefinitionList.t +scripts/test/ITSMConfigItem/Event/CIAttachment.t +scripts/test/ITSMConfigItemLinkTest.t +scripts/test/ITSMConfigItemUniqueCIName.t +scripts/test/ImportExportObjectITSMConfigItem.t +scripts/test/Layout/ITSMConfigItem.t +scripts/test/Selenium/Agent/Admin/AdminITSMConfigItem.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItem.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemAdd.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemBulk.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemDuplicate.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemEdit.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemHistory.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemPrint.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemSearch.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentITSMConfigItemZoom.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/AgentLinkObject.t +scripts/test/Selenium/Agent/ITSMConfigurationManagement/DashboardITSMConfigItemGeneric.t +scripts/test/System/ITSMConfigItemCustomerCIs.t +scripts/test/System/ITSMConfigItemInvoker.t +scripts/test/System/ITSMConfigItemInvokerReadableValue.t +scripts/test/System/Ticket/Event/ITSMConfigItemCustomerCIs.t +scripts/test/Ticket/Event/DynamicFieldConfigItemAdditionalDFStorage.t +scripts/test/Ticket/Event/DynamicFieldConfigItemTicketLink.t +scripts/webservices/GenericConfigItemConnectorSOAP.yml +var/httpd/htdocs/js/Core.Agent.Admin.DynamicFieldConfigItem.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Add.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.CustomerCIsWidget.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.CustomerSearch.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.CustomerSearch.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Dashboard.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Edit.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.History.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Overview.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Search.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Search.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.UserSearch.js +var/httpd/htdocs/js/ITSM.Agent.ConfigItem.Zoom.js +var/httpd/htdocs/js/ITSM.UI.ConfigItemActionRow.js +var/httpd/htdocs/js/ITSM.UI.ConfigItemActionRow.js +var/httpd/htdocs/js/Znuny.DynamicField.ConfigItem.js +var/httpd/htdocs/skins/Agent/default/css/ITSM.Agent.ConfigItem.Edit.css +var/packagesetup/ITSMConfigurationManagement.pm + +# ITSMChangeManagement +ITSMChangeManagement.sopm +doc/itsm-change-management-database.dia +doc/itsm-change-management-database.png +Kernel/Config/Files/XML/ITSMChangeManagement.xml +Kernel/GenericInterface/Event/ObjectType/ITSMChange.pm +Kernel/GenericInterface/Event/ObjectType/ITSMWorkOrder.pm +Kernel/Language/ar_SA_ITSMChangeManagement.pm +Kernel/Language/bg_ITSMChangeManagement.pm +Kernel/Language/ca_ITSMChangeManagement.pm +Kernel/Language/cs_ITSMChangeManagement.pm +Kernel/Language/da_ITSMChangeManagement.pm +Kernel/Language/de_ITSMChangeManagement.pm +Kernel/Language/el_ITSMChangeManagement.pm +Kernel/Language/en_ITSMChangeManagement.pm +Kernel/Language/en_CA_ITSMChangeManagement.pm +Kernel/Language/en_GB_ITSMChangeManagement.pm +Kernel/Language/es_CO_ITSMChangeManagement.pm +Kernel/Language/es_ITSMChangeManagement.pm +Kernel/Language/es_MX_ITSMChangeManagement.pm +Kernel/Language/et_ITSMChangeManagement.pm +Kernel/Language/fa_ITSMChangeManagement.pm +Kernel/Language/fi_ITSMChangeManagement.pm +Kernel/Language/fr_CA_ITSMChangeManagement.pm +Kernel/Language/fr_ITSMChangeManagement.pm +Kernel/Language/gl_ITSMChangeManagement.pm +Kernel/Language/he_ITSMChangeManagement.pm +Kernel/Language/hi_ITSMChangeManagement.pm +Kernel/Language/hr_ITSMChangeManagement.pm +Kernel/Language/hu_ITSMChangeManagement.pm +Kernel/Language/id_ITSMChangeManagement.pm +Kernel/Language/it_ITSMChangeManagement.pm +Kernel/Language/ja_ITSMChangeManagement.pm +Kernel/Language/ko_ITSMChangeManagement.pm +Kernel/Language/lt_ITSMChangeManagement.pm +Kernel/Language/lv_ITSMChangeManagement.pm +Kernel/Language/mk_ITSMChangeManagement.pm +Kernel/Language/ms_ITSMChangeManagement.pm +Kernel/Language/nb_NO_ITSMChangeManagement.pm +Kernel/Language/nl_ITSMChangeManagement.pm +Kernel/Language/pl_ITSMChangeManagement.pm +Kernel/Language/pt_BR_ITSMChangeManagement.pm +Kernel/Language/pt_ITSMChangeManagement.pm +Kernel/Language/ro_ITSMChangeManagement.pm +Kernel/Language/ru_ITSMChangeManagement.pm +Kernel/Language/sk_SK_ITSMChangeManagement.pm +Kernel/Language/sl_ITSMChangeManagement.pm +Kernel/Language/sr_Cyrl_ITSMChangeManagement.pm +Kernel/Language/sr_Latn_ITSMChangeManagement.pm +Kernel/Language/sv_ITSMChangeManagement.pm +Kernel/Language/sw_ITSMChangeManagement.pm +Kernel/Language/th_TH_ITSMChangeManagement.pm +Kernel/Language/tr_ITSMChangeManagement.pm +Kernel/Language/uk_ITSMChangeManagement.pm +Kernel/Language/vi_VN_ITSMChangeManagement.pm +Kernel/Language/zh_CN_ITSMChangeManagement.pm +Kernel/Language/zh_TW_ITSMChangeManagement.pm +Kernel/Modules/AdminITSMChangeCIPAllocate.pm +Kernel/Modules/AdminITSMChangeNotification.pm +Kernel/Modules/AdminITSMStateMachine.pm +Kernel/Modules/AgentITSMCABMemberSearch.pm +Kernel/Modules/AgentITSMChange.pm +Kernel/Modules/AgentITSMChangeAdd.pm +Kernel/Modules/AgentITSMChangeAddFromTemplate.pm +Kernel/Modules/AgentITSMChangeCABTemplate.pm +Kernel/Modules/AgentITSMChangeCondition.pm +Kernel/Modules/AgentITSMChangeConditionEdit.pm +Kernel/Modules/AgentITSMChangeDelete.pm +Kernel/Modules/AgentITSMChangeEdit.pm +Kernel/Modules/AgentITSMChangeHistory.pm +Kernel/Modules/AgentITSMChangeHistoryZoom.pm +Kernel/Modules/AgentITSMChangeInvolvedPersons.pm +Kernel/Modules/AgentITSMChangeManager.pm +Kernel/Modules/AgentITSMChangeMyCAB.pm +Kernel/Modules/AgentITSMChangeMyChanges.pm +Kernel/Modules/AgentITSMChangeMyWorkOrders.pm +Kernel/Modules/AgentITSMChangePIR.pm +Kernel/Modules/AgentITSMChangePrint.pm +Kernel/Modules/AgentITSMChangePSA.pm +Kernel/Modules/AgentITSMChangeReset.pm +Kernel/Modules/AgentITSMChangeSchedule.pm +Kernel/Modules/AgentITSMChangeSearch.pm +Kernel/Modules/AgentITSMChangeTemplate.pm +Kernel/Modules/AgentITSMChangeTimeSlot.pm +Kernel/Modules/AgentITSMChangeZoom.pm +Kernel/Modules/AgentITSMTemplateDelete.pm +Kernel/Modules/AgentITSMTemplateEdit.pm +Kernel/Modules/AgentITSMTemplateEditCAB.pm +Kernel/Modules/AgentITSMTemplateEditContent.pm +Kernel/Modules/AgentITSMTemplateOverview.pm +Kernel/Modules/AgentITSMUserSearch.pm +Kernel/Modules/AgentITSMWorkOrderAdd.pm +Kernel/Modules/AgentITSMWorkOrderAddFromTemplate.pm +Kernel/Modules/AgentITSMWorkOrderAgent.pm +Kernel/Modules/AgentITSMWorkOrderDelete.pm +Kernel/Modules/AgentITSMWorkOrderEdit.pm +Kernel/Modules/AgentITSMWorkOrderHistory.pm +Kernel/Modules/AgentITSMWorkOrderHistoryZoom.pm +Kernel/Modules/AgentITSMWorkOrderReport.pm +Kernel/Modules/AgentITSMWorkOrderTake.pm +Kernel/Modules/AgentITSMWorkOrderTemplate.pm +Kernel/Modules/AgentITSMWorkOrderZoom.pm +Kernel/Modules/CustomerITSMChangeSchedule.pm +Kernel/Output/HTML/ITSMChange/MenuChangeDelete.pm +Kernel/Output/HTML/ITSMChange/MenuGeneric.pm +Kernel/Output/HTML/ITSMChange/MenuTimeSlot.pm +Kernel/Output/HTML/ITSMChange/MenuWorkOrdersNeeded.pm +Kernel/Output/HTML/ITSMChange/OverviewSmall.pm +Kernel/Output/HTML/ITSMTemplate/OverviewSmall.pm +Kernel/Output/HTML/ITSMWorkOrder/MenuGeneric.pm +Kernel/Output/HTML/ITSMWorkOrder/MenuWithPermissionFromChange.pm +Kernel/Output/HTML/ITSMWorkOrder/MenuWithTakePermission.pm +Kernel/Output/HTML/Layout/ITSMChange.pm +Kernel/Output/HTML/Layout/ITSMTemplate.pm +Kernel/Output/HTML/LinkObject/ITSMChange.pm +Kernel/Output/HTML/LinkObject/ITSMWorkOrder.pm +Kernel/Output/HTML/TicketMenu/ITSMChange.pm +Kernel/Output/HTML/ToolBar/ChangeManager.pm +Kernel/Output/HTML/ToolBar/MyCAB.pm +Kernel/Output/HTML/ToolBar/MyChanges.pm +Kernel/Output/HTML/ToolBar/MyWorkOrders.pm +Kernel/Output/HTML/Templates/Standard/AdminITSMChangeCIPAllocate.tt +Kernel/Output/HTML/Templates/Standard/AdminITSMChangeNotification.tt +Kernel/Output/HTML/Templates/Standard/AdminITSMStateMachine.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeAdd.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeAddFromTemplate.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeCABTemplate.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeCondition.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeConditionEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeDelete.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeHistory.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeHistoryZoom.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeInvolvedPersons.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeOverviewNavBar.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeOverviewSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeReset.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeSearch.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeTemplate.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeTimeSlot.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMChangeZoom.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMTemplateDelete.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMTemplateEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMTemplateEditCAB.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMTemplateEditContent.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMTemplateOverviewNavBar.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMTemplateOverviewSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderAdd.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderAddFromTemplate.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderAgent.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderDelete.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderHistory.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderHistoryZoom.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderReport.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderTake.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderTemplate.tt +Kernel/Output/HTML/Templates/Standard/AgentITSMWorkOrderZoom.tt +Kernel/Output/HTML/Templates/Standard/CustomerITSMChangeOverview.tt +Kernel/Output/HTML/Templates/Standard/ITSMChange.tt +Kernel/System/ITSMChange.pm +Kernel/System/DynamicField/Event/UpdateITSMChangeConditions.pm +Kernel/System/DynamicField/ObjectType/ITSMChange.pm +Kernel/System/DynamicField/ObjectType/ITSMWorkOrder.pm +Kernel/System/ITSMChange/ITSMChangeCIPAllocate.pm +Kernel/System/ITSMChange/ITSMCondition.pm +Kernel/System/ITSMChange/History.pm +Kernel/System/ITSMChange/ITSMStateMachine.pm +Kernel/System/ITSMChange/ITSMWorkOrder.pm +Kernel/System/ITSMChange/Notification.pm +Kernel/System/ITSMChange/Template.pm +Kernel/System/ITSMChange/Event/Condition.pm +Kernel/System/ITSMChange/Event/ConditionDelete.pm +Kernel/System/ITSMChange/Event/HistoryAdd.pm +Kernel/System/ITSMChange/Event/HistoryDelete.pm +Kernel/System/ITSMChange/Event/Notification.pm +Kernel/System/ITSMChange/Event/ToolBarChangeManagerCacheDelete.pm +Kernel/System/ITSMChange/Event/ToolBarMyCABCacheDelete.pm +Kernel/System/ITSMChange/Event/ToolBarMyChangesCacheDelete.pm +Kernel/System/ITSMChange/ITSMCondition/Action.pm +Kernel/System/ITSMChange/ITSMCondition/Attribute.pm +Kernel/System/ITSMChange/ITSMCondition/Expression.pm +Kernel/System/ITSMChange/ITSMCondition/Object.pm +Kernel/System/ITSMChange/ITSMCondition/Operator.pm +Kernel/System/ITSMChange/ITSMCondition/Object/ITSMChange.pm +Kernel/System/ITSMChange/ITSMCondition/Object/ITSMWorkOrder.pm +Kernel/System/ITSMChange/ITSMCondition/Operator/ITSMChange.pm +Kernel/System/ITSMChange/ITSMCondition/Operator/ITSMWorkOrder.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Event/ToolBarMyWorkOrdersCacheDelete.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Event/WorkOrderActualTimesSet.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Event/WorkOrderNumberCalc.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Permission/CABCheck.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Permission/ChangeBuilderCheck.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Permission/ChangeManagerCheck.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Permission/EmptyAgentCheck.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Permission/ListAgentCheck.pm +Kernel/System/ITSMChange/ITSMWorkOrder/Permission/WorkOrderAgentCheck.pm +Kernel/System/ITSMChange/NumberBase.pm +Kernel/System/ITSMChange/Number/AutoIncrement.pm +Kernel/System/ITSMChange/Number/Date.pm +Kernel/System/ITSMChange/Number/DateChecksum.pm +Kernel/System/ITSMChange/Permission/AddWorkOrderCheck.pm +Kernel/System/ITSMChange/Permission/CABCheck.pm +Kernel/System/ITSMChange/Permission/ChangeAgentCheck.pm +Kernel/System/ITSMChange/Permission/ChangeBuilderCheck.pm +Kernel/System/ITSMChange/Permission/ChangeManagerCheck.pm +Kernel/System/ITSMChange/Template/CAB.pm +Kernel/System/ITSMChange/Template/ITSMChange.pm +Kernel/System/ITSMChange/Template/ITSMCondition.pm +Kernel/System/ITSMChange/Template/ITSMWorkOrder.pm +Kernel/System/LinkObject/ITSMChange.pm +Kernel/System/LinkObject/ITSMWorkOrder.pm +Kernel/System/Stats/Dynamic/ITSMChangeManagement.pm +Kernel/System/Stats/Dynamic/ITSMChangeManagementChangesIncidents.pm +Kernel/System/Stats/Dynamic/ITSMChangeManagementChangesPerCIClasses.pm +Kernel/System/Stats/Dynamic/ITSMChangeManagementHistory.pm +Kernel/System/Stats/Dynamic/ITSMChangeManagementRfcRequester.pm +Kernel/System/Ticket/Acl/RestrictTicketTypes.pm +Kernel/System/Console/Command/Admin/ITSM/Change/Delete.pm +Kernel/System/Console/Command/Admin/ITSM/Change/Check.pm +scripts/test/ITSMChange.t +scripts/test/ITSMCondition.t +scripts/test/ITSMStateMachine.t +scripts/test/ITSMTemplate.t +scripts/test/ITSMWorkOrder.t +scripts/test/Selenium/Agent/AgentITSMChange.t +scripts/test/Selenium/Agent/AgentITSMChangeAdd.t +scripts/test/Selenium/Agent/AgentITSMChangeAddFromTemplate.t +scripts/test/Selenium/Agent/AgentITSMChangeCABTemplate.t +scripts/test/Selenium/Agent/AgentITSMChangeCondition.t +scripts/test/Selenium/Agent/AgentITSMChangeEdit.t +scripts/test/Selenium/Agent/AgentITSMChangeHistory.t +scripts/test/Selenium/Agent/AgentITSMChangeHistoryZoom.t +scripts/test/Selenium/Agent/Admin/AdminITSMChangeCIPAllocate.t +scripts/test/Selenium/Agent/Admin/AdminITSMStateMachine.t +scripts/test/Selenium/Agent/AgentITSMChangeManager.t +scripts/test/Selenium/Agent/AgentITSMChangeMyCAB.t +scripts/test/Selenium/Agent/AgentITSMChangeMyChanges.t +scripts/test/Selenium/Agent/AgentITSMChangeMyWorkOrders.t +scripts/test/Selenium/Agent/AgentITSMChangeInvolvedPersons.t +scripts/test/Selenium/Agent/AgentITSMChangePIR.t +scripts/test/Selenium/Agent/AgentITSMChangePSA.t +scripts/test/Selenium/Agent/AgentITSMChangeSchedule.t +scripts/test/Selenium/Agent/AgentITSMChangeTemplate.t +scripts/test/Selenium/Agent/AgentITSMChangeZoom.t +scripts/test/Selenium/Agent/AgentITSMTemplateDelete.t +scripts/test/Selenium/Agent/AgentITSMTemplateEdit.t +scripts/test/Selenium/Agent/AgentITSMTemplateEditCAB.t +scripts/test/Selenium/Agent/AgentITSMTemplateEditContent.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderAdd.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderAgent.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderDelete.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderEdit.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderHistory.t +scripts/test/Selenium/Agent/AgentITSMChangeDelete.t +scripts/test/Selenium/Agent/AgentITSMChangeReset.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderHistoryZoom.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderReport.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderTemplate.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderZoom.t +scripts/test/Selenium/Agent/AgentITSMCABMemberSearch.t +scripts/test/Selenium/Agent/AgentITSMChangeSearch.t +scripts/test/Selenium/Agent/AgentITSMChangeTimeSlot.t +scripts/test/Selenium/Agent/AgentITSMTemplateOverview.t +scripts/test/Selenium/Agent/AgentITSMUserSearch.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderAddFromTemplate.t +scripts/test/Selenium/Agent/AgentITSMChangeConditionEdit.t +scripts/test/Selenium/Agent/AgentITSMWorkOrderTake.t +scripts/test/Selenium/Output/ITSMChange/MenuGeneric.t +scripts/test/Selenium/Output/ITSMWorkOrder/MenuGeneric.t +scripts/test/Selenium/Output/LinkObject/ITSMChange.t +scripts/test/Selenium/Output/LinkObject/ITSMWorkOrder.t +scripts/test/Selenium/Output/ToolBar/ChangeManager.t +scripts/test/Selenium/Output/ToolBar/MyCAB.t +scripts/test/Selenium/Output/ToolBar/MyChanges.t +scripts/test/Selenium/Output/ToolBar/MyWorkOrder.t +scripts/test/Console/Command/Admin/ITSM/Change/Delete.t +scripts/test/Console/Command/Admin/ITSM/Change/Check.t +var/httpd/htdocs/js/ITSM.Admin.ChangeManagement.ChangeNotification.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.AddEdit.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.CABMemberSearch.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.CABTemplateEdit.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.Condition.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.ConfirmDialog.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.History.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.InvolvedPersons.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.NotificationEvent.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.Overview.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.Search.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.TemplateOverview.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.TimeSlot.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.UserSearch.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.WorkorderGraph.js +var/httpd/htdocs/js/ITSM.Agent.ChangeManagement.Zoom.js +var/httpd/htdocs/skins/Agent/default/css/ITSM.ChangeManagement.Default.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.ChangeManagement.Responsive.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.ChangeManagement.RTEContent.css +var/httpd/htdocs/skins/Agent/default/css/ITSM.ChangeManagement.WorkorderGraph.css +var/httpd/htdocs/skins/Customer/default/css/ITSM.ChangeManagement.Table.css +var/httpd/htdocs/skins/Customer/default/css/ITSM.ChangeManagement.Default.css +var/httpd/htdocs/skins/Customer/default/img/flag_shadow.png +var/packagesetup/ITSMChangeManagement.pm + +# Survey +Survey.sopm +doc/survey-database.png +Kernel/Config/Files/XML/Survey.xml +Kernel/Language/bg_Survey.pm +Kernel/Language/cs_Survey.pm +Kernel/Language/da_Survey.pm +Kernel/Language/de_Survey.pm +Kernel/Language/el_Survey.pm +Kernel/Language/en_GB_Survey.pm +Kernel/Language/es_MX_Survey.pm +Kernel/Language/es_Survey.pm +Kernel/Language/fa_Survey.pm +Kernel/Language/fi_Survey.pm +Kernel/Language/fr_Survey.pm +Kernel/Language/gl_Survey.pm +Kernel/Language/hr_Survey.pm +Kernel/Language/hu_Survey.pm +Kernel/Language/id_Survey.pm +Kernel/Language/it_Survey.pm +Kernel/Language/ja_Survey.pm +Kernel/Language/mk_Survey.pm +Kernel/Language/ms_Survey.pm +Kernel/Language/nb_NO_Survey.pm +Kernel/Language/nl_Survey.pm +Kernel/Language/pl_Survey.pm +Kernel/Language/pt_BR_Survey.pm +Kernel/Language/pt_Survey.pm +Kernel/Language/ro_Survey.pm +Kernel/Language/ru_Survey.pm +Kernel/Language/sl_Survey.pm +Kernel/Language/sr_Cyrl_Survey.pm +Kernel/Language/sr_Latn_Survey.pm +Kernel/Language/sv_Survey.pm +Kernel/Language/sw_Survey.pm +Kernel/Language/th_TH_Survey.pm +Kernel/Language/uk_Survey.pm +Kernel/Language/vi_VN_Survey.pm +Kernel/Language/zh_CN_Survey.pm +Kernel/Language/zh_TW_Survey.pm +Kernel/Modules/AgentSurveyAdd.pm +Kernel/Modules/AgentSurveyEdit.pm +Kernel/Modules/AgentSurveyEditQuestions.pm +Kernel/Modules/AgentSurveyOverview.pm +Kernel/Modules/AgentSurveyStats.pm +Kernel/Modules/AgentSurveyZoom.pm +Kernel/Modules/PublicSurvey.pm +Kernel/Output/HTML/Layout/Survey.pm +Kernel/Output/HTML/SurveyMenu/Generic.pm +Kernel/Output/HTML/SurveyOverview/Small.pm +Kernel/Output/HTML/Templates/Standard/AgentSurveyAdd.tt +Kernel/Output/HTML/Templates/Standard/AgentSurveyEdit.tt +Kernel/Output/HTML/Templates/Standard/AgentSurveyEditQuestions.tt +Kernel/Output/HTML/Templates/Standard/AgentSurveyOverviewNavBar.tt +Kernel/Output/HTML/Templates/Standard/AgentSurveyOverviewSmall.tt +Kernel/Output/HTML/Templates/Standard/AgentSurveyStats.tt +Kernel/Output/HTML/Templates/Standard/AgentSurveyZoom.tt +Kernel/Output/HTML/Templates/Standard/PublicSurvey.tt +Kernel/System/Console/Command/Maint/Survey/RequestsDelete.pm +Kernel/System/Console/Command/Maint/Survey/RequestsSend.pm +Kernel/System/Stats/Dynamic/SurveyList.pm +Kernel/System/Survey.pm +Kernel/System/Survey/Answer.pm +Kernel/System/Survey/Question.pm +Kernel/System/Survey/Request.pm +Kernel/System/Survey/Vote.pm +Kernel/System/Ticket/Event/SurveySendRequest.pm +scripts/test/Console/Command/Maint/Survey/RequestsDelete.t +scripts/test/Console/Command/Maint/Survey/RequestsSend.t +scripts/test/Survey/Vote/VoteGetAll.t +scripts/test/Survey/GetRequestRecipient.t +scripts/test/Survey/PublicAnswerSet.t +scripts/test/Survey.t +scripts/test/Selenium/Agent/AgentSurveyAdd.t +scripts/test/Selenium/Agent/AgentSurveyEdit.t +scripts/test/Selenium/Agent/AgentSurveyOverview.t +scripts/test/Selenium/Agent/AgentSurveyZoom.t +scripts/test/Selenium/Agent/AgentSurveyEditQuestions.t +scripts/test/Selenium/Agent/AgentSurveyStats.t +scripts/test/Selenium/Output/SurveyMenu/Generic.t +scripts/test/Selenium/Output/SurveyOverview/Small.t +scripts/test/Selenium/Public/PublicSurvey.t +scripts/test/Stats/Dynamic/DynamicList.t +var/httpd/htdocs/js/Survey.Agent.CustomerUserConditions.js +var/httpd/htdocs/js/Survey.Agent.SurveyEditQuestions.js +var/httpd/htdocs/js/Survey.Agent.SurveyOverview.js +var/httpd/htdocs/js/Survey.Agent.SurveyStats.js +var/httpd/htdocs/js/Survey.Agent.SurveyZoom.js +var/httpd/htdocs/skins/Agent/default/css/Survey.Agent.Default.css +var/httpd/htdocs/skins/Customer/default/css/Survey.Customer.Default.css +var/packagesetup/Survey.pm diff --git a/Custom/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt b/Custom/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt deleted file mode 100644 index e095b8aa440..00000000000 --- a/Custom/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt +++ /dev/null @@ -1,275 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021-2022 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- -# todo delete nofilter -## nofilter(TidyAll::Plugin::Znuny::CodeStyle::GuardClause) -## nofilter(TidyAll::Plugin::OTRS::Common::Origin) - -[% RenderBlockStart("ContentLargeTicketGenericFilter") %] -
- - - - -
-[% RenderBlockEnd("ContentLargeTicketGenericFilter") %] - -# -
- - - - - - -[% RenderBlockStart("ContentLargeTicketGenericHeader") %] - - -[% RenderBlockStart("GeneralOverviewHeader") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderMeta") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderMeta") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderTicketHeader") %] -[% RenderBlockStart("ContentLargeTicketGenericHeaderTicketNumberColumn") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderTicketNumberColumn") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumn") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumn") %] -[% RenderBlockEnd("ContentLargeTicketGenericHeaderTicketHeader") %] - -[% RenderBlockEnd("GeneralOverviewHeader") %] - - - -[% RenderBlockEnd("ContentLargeTicketGenericHeader") %] - - - -[% RenderBlockStart("ContentLargeTicketGenericRow") %] - - -[% RenderBlockStart("GeneralOverviewRow") %] - -[% RenderBlockStart("ContentLargeTicketGenericRowMeta") %] - -[% RenderBlockEnd("ContentLargeTicketGenericRowMeta") %] - -# -# -# - -[% RenderBlockStart("ContentLargeTicketGenericTicketColumn") %] -[% RenderBlockStart("ContentLargeTicketGenericTicketNumber") %] - -[% RenderBlockEnd("ContentLargeTicketGenericTicketNumber") %] -[% RenderBlockStart("ContentLargeTicketGenericEscalationTime") %] - -[% RenderBlockEnd("ContentLargeTicketGenericEscalationTime") %] -[% RenderBlockStart("ContentLargeTicketGenericColumn") %] - -[% RenderBlockEnd("ContentLargeTicketGenericColumn") %] -[% RenderBlockStart("ContentLargeTicketTitle") %] - -[% RenderBlockEnd("ContentLargeTicketTitle") %] -[% RenderBlockStart("ContentLargeTicketGenericColumnTranslatable") %] - -[% RenderBlockEnd("ContentLargeTicketGenericColumnTranslatable") %] -[% RenderBlockStart("ContentLargeTicketGenericColumnTime") %] - -[% RenderBlockEnd("ContentLargeTicketGenericColumnTime") %] -[% RenderBlockStart("ContentLargeTicketGenericColumnEscalation") %] - -[% RenderBlockEnd("ContentLargeTicketGenericColumnEscalation") %] -[% RenderBlockEnd("ContentLargeTicketGenericTicketColumn") %] - -[% RenderBlockStart("ContentLargeTicketGenericDynamicField") %] - -[% RenderBlockEnd("ContentLargeTicketGenericDynamicField") %] - -[% RenderBlockEnd("GeneralOverviewRow") %] - -[% RenderBlockEnd("ContentLargeTicketGenericRow") %] -[% RenderBlockStart("ContentLargeTicketGenericNone") %] - - - -[% RenderBlockEnd("ContentLargeTicketGenericNone") %] - -
-[% RenderBlockStart("ContentLargeTicketGenericHeaderMetaLink") %] - - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderMetaLink") %] -[% RenderBlockStart("ContentLargeTicketGenericHeaderMetaEmpty") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderMetaEmpty") %] - - [% Config("Ticket::Hook") %] - - -#Forwwward -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLink") %] - [% Data.HeaderNameTranslated | html %] - - - - - -
-
- [% Data.ColumnFilterStrg %] -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerIDSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerIDSearch") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkUserSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkUserSearch") %] - -
-
- -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLink") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnLink") %] - [% Data.HeaderNameTranslated | html %] -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnLink") %] - -#Forwwward -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilter") %] - [% Data.HeaderNameTranslated | html %] - - - -
-
- [% Data.ColumnFilterStrg %] - [% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerUserSearch") %] - - [% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerUserSearch") %] - -
-
-[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilter") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnEmpty") %] - [% Data.HeaderNameTranslated %] -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnEmpty") %] -
-[% RenderBlockStart("ContentLargeTicketGenericRowMetaImage") %] -
- - - - [% Translate(Data.Title) | html %] - -
-[% RenderBlockEnd("ContentLargeTicketGenericRowMetaImage") %] - 		-# [% Data.TicketNumber %] -# -#
[% Data.Title | truncate(70) | html %]
-# 		[% Data.Time | html %] - [% Data.TicketNumber %] - -
[% Data.EscalationTimeHuman | html %]
[% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
- 		-
[% Data.GenericValue | truncate(40) | html %]
- 		-
[% Data.Title | html %]
- 		-
[% Translate(Data.GenericValue) | html %]
- 		-
[% Data.GenericValue | Localize("TimeShort") | html %]
- 		-
[% Data.GenericValue | html %]
- 		-
-[% RenderBlockStart("ContentLargeTicketGenericDynamicFieldLink") %] - [% Data.Value %] -[% RenderBlockEnd("ContentLargeTicketGenericDynamicFieldLink") %] -[% RenderBlockStart("ContentLargeTicketGenericDynamicFieldPlain") %] - [% Data.Value %] -[% RenderBlockEnd("ContentLargeTicketGenericDynamicFieldPlain") %] -
-
- [% Translate("none") | html %] -
-
- - -[% RenderBlockStart("ContentLargeTicketGenericFilterNavBar") %] - - - -[% RenderBlockEnd("ContentLargeTicketGenericFilterNavBar") %] diff --git a/Custom/Kernel/Output/HTML/Templates/Standard/Header.tt b/Custom/Kernel/Output/HTML/Templates/Standard/Header.tt deleted file mode 100644 index 602140b4a42..00000000000 --- a/Custom/Kernel/Output/HTML/Templates/Standard/Header.tt +++ /dev/null @@ -1,354 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021-2022 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- -# TODO delete me -## nofilter(TidyAll::Plugin::OTRS::Common::Origin) - -[%- INCLUDE "HTTPHeaders.tt" -%] - - - -[% InsertTemplate("Copyright.tt") %] -[% InsertTemplate("HTMLHead.tt") %] - - -
- - -
-
-
- Overviews - -
- -
- Actions - -
- -
- Personal views - -
- -
-
- Search tool - - [% RenderBlockStart("ToolBarSearch") %] -
- - -
- -
-
- - -
-
- - -
-
- - -
-
- -
- -
-
-
- [% RenderBlockEnd("ToolBarSearch") %] - -
- -
- - -
- - - -
- - diff --git a/Custom/Kernel/Output/HTML/Templates/Standard/Pagination.tt b/Custom/Kernel/Output/HTML/Templates/Standard/Pagination.tt deleted file mode 100644 index e45037042c5..00000000000 --- a/Custom/Kernel/Output/HTML/Templates/Standard/Pagination.tt +++ /dev/null @@ -1,35 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021-2022 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- -# TODO delete me -## nofilter(TidyAll::Plugin::OTRS::Common::Origin) - -[% RenderBlockStart("PageBack") %] -|< -<< -[% RenderBlockEnd("PageBack") %] -[% RenderBlockStart("PageBackAjax") %] - - -[% RenderBlockEnd("PageBackAjax") %] - -[% RenderBlockStart("Page") %] -[% Data.PageNumber | html %] -[% RenderBlockEnd("Page") %] -[% RenderBlockStart("PageAjax") %] -[% Data.PageNumber | html %] -[% RenderBlockEnd("PageAjax") %] - -[% RenderBlockStart("PageForward") %] ->> ->| -[% RenderBlockEnd("PageForward") %] -[% RenderBlockStart("PageForwardAjax") %] - - -[% RenderBlockEnd("PageForwardAjax") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminACL.tt b/Kernel/Output/HTML/Templates/Standard/AdminACL.tt index 99ecf74ec2d..e3d12ffffc1 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminACL.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminACL.tt @@ -7,20 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
-

[% Translate("ACL Management") | html %]

- - [% BreadcrumbPath = [ - { - Name => Translate('ACL Management'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
+
+

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

@@ -28,13 +16,13 @@
@@ -62,14 +50,14 @@ - +

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

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

- @@ -94,23 +82,37 @@
+

[% Translate("ACL Management") | html %]

+ + [% BreadcrumbPath = [ + { + Name => Translate('ACL Management'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
-
+

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

- - + + Show Valid + Show All
-

[% Translate("Please note: This table represents the execution order of the ACLs. If you need to change the order in which ACLs are executed, please change the names of the affected ACLs.") | html %]

+

+ + [% Translate("Please note: This table represents the execution order of the ACLs. If you need to change the order in which ACLs are executed, please change the names of the affected ACLs.") | html %]

- - + + @@ -119,8 +121,8 @@ - - + + [% RenderBlockEnd("ACLRow") %] [% RenderBlockStart("ACLNoDataRow") %] @@ -130,6 +132,7 @@ [% RenderBlockEnd("ACLNoDataRow") %] + @@ -139,5 +142,4 @@ -
diff --git a/Kernel/Output/HTML/Templates/Standard/AdminACLEdit.tt b/Kernel/Output/HTML/Templates/Standard/AdminACLEdit.tt index d2ed6ec3550..03607a17ca3 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminACLEdit.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminACLEdit.tt @@ -7,23 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
-

[% Translate("Edit ACL %s", Data.Name) | html %]

- - [% BreadcrumbPath = [ - { - Name => Translate('ACL Management'), - Link => Env("Action"), - }, - ] - %] - - [% USE EditTitle = String(Translate("Edit ACL")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
+
+

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

@@ -31,18 +16,18 @@
-
+

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

@@ -59,8 +44,21 @@
-
+

[% Translate("Edit ACL %s", Data.Name) | html %]

+ + [% BreadcrumbPath = [ + { + Name => Translate('ACL Management'), + Link => Env("Action"), + }, + ] + %] + + [% USE EditTitle = String(Translate("Edit ACL")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
@@ -77,47 +75,54 @@
- -
- -
-

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

-
-
-

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

+
+ +
+ +
+

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

+
+
+

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

+
-
- -
- +
+ +
+ +
-
- -
- +
+ +
+ +
-
- -
- +
+
+
+ +
+ +
-
- -
- [% Data.ValidOption %] -
-

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

-
-
-

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

+
+ +
+ [% Data.ValidOption %] +
+

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

+
+
+

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

+
-
@@ -131,14 +136,14 @@
-
+

[% Translate("Match settings") | html %]

    [% Data.ACLKeysLevel1Match %]
    -
    +

    [% Translate("Change settings") | html %]

      [% Data.ACLKeysLevel1Change %] @@ -149,13 +154,12 @@
    • - - +
      • - +
      • @@ -165,13 +169,12 @@
    • - - +
      • - +
      @@ -182,14 +185,13 @@
    • - - +
      • [% Data.ACLKeysLevel4Prefixes %] - +
      • @@ -197,18 +199,18 @@
      - -
      -
      -

      [% Translate("Save ACL") | html %]

      -
      -
      -
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] -
      -
      -
      +
      +
      +
      + + [% Translate("Cancel") | html %] + + + +
      -
      +
      -
      - - + + +
      [% Translate("ACL name") | html %] [% Translate("Comment") | html %] [% Translate("Validity") | html %][% Translate("Export") | html %][% Translate("Copy") | html %][% Translate("Export") | html %][% Translate("Copy") | html %]
      [% Data.Name | html %] [% Data.Comment | html %] [% Translate(Data.ValidID) | html %][% Translate("Export") | html %][% Translate("Copy") | html %][% Translate("Export") | html %][% Translate("Copy") | html %]
      [% Data.ChangeTime | html %] [% Data.CreateTime | html %] - + [% Translate("Export calendar") | html %] @@ -199,13 +211,13 @@ # Use ampersands (&) instead of semicolons (;) for URL parameter delimiter. This has better compatibility with different # calendar implementations and will prevent them from re-encoding the query string and essentially strip the data. # Please see bug#12667 for more information. - + [% Translate("Download calendar") | html %] - @@ -244,57 +256,61 @@
      - [% Translate("Calendar") | html %] - -
      - -

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

      -[% IF Data.CalendarNameExists %] -

      [% Translate("Calendar with same name already exists.") | html %]

      -[% ELSE %] -

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

      -[% END %] + + [% Translate("Calendar") | html %] + + +
      + +
      + +

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

      + [% IF Data.CalendarNameExists %] +

      [% Translate("Calendar with same name already exists.") | html %]

      + [% ELSE %] +

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

      + [% END %] +
      -
      - -
      - -

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

      +
      + [% Data.ColorPicker %]
      -
      - -
      - [% Data.GroupID %] +
      + +
      + [% Data.GroupID %] +
      -
      - -
      - [% Data.ValidID %] +
      + +
      + [% Data.ValidID %] +
      -
      -
      + +
      - + + +

      [% Translate("Ticket Appointments") | html %]

      @@ -302,109 +318,130 @@ [% RenderBlockStart("TicketAppointmentRule") %]
      - +
      [% Translate("Rule") | html %] [% Data.RuleNumber | html %] - + [% Translate("Remove") | html %] - +
      - -
      - [% Data.StartDateStrg %] -
      - -
      - [% Data.EndDateStrg %] + +
      + +
      + [% Data.StartDateStrg %] +
      -
      -

      - [% Translate("Use options below to narrow down for which tickets appointments will be automatically created.") | html %] -

      + +
      + +
      + [% Data.EndDateStrg %] +
      + +
      +

      + [% Translate("Use options below to narrow down for which tickets appointments will be automatically created.") | html %] +

      +
      - -
      - [% Data.QueueIDStrg %] -

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

      -

      [% Translate("Please select a valid queue.") | html %]

      + +
      + +
      + [% Data.QueueIDStrg %] +

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

      +

      [% Translate("Please select a valid queue.") | html %]

      +
      -
      - -
      - [% Data.SearchParamsStrg %] - - - [% Translate("Add") | html %] - + +
      + +
      +
      + [% Data.SearchParamsStrg %] + + + [% Translate("Add") | html %] + +
      [% RenderBlockStart("TicketAppointmentRuleSearchParam") %] -
      - - [% IF Data.ParamStrg %] - [% Data.ParamStrg %] - [% ELSE %] - - [% END %] -

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

      - - - [% Translate("Remove") | html %] - -
      -
      +
      + + [% IF Data.ParamStrg %] + [% Data.ParamStrg %] + [% ELSE %] + + [% END %] +

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

      + + + [% Translate("Remove") | html %] + +
      [% RenderBlockEnd("TicketAppointmentRuleSearchParam") %] +
      -
      [% RenderBlockEnd("TicketAppointmentRule") %] +

      [% Translate("Define rules for creating automatic appointments in this calendar based on ticket data.") | html %]

      - + - [% Translate("Add Rule") | html %] + [% Translate("Add Rule") | html %]
      -
      -
      + +

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

      -
      - [% IF Data.Subaction == 'Update' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - - [% Translate("Cancel") | html %] - +
      +
      + + [% Translate("Cancel") | html %] + + + [% IF Data.Subaction == 'Update' %] + + + + [% ELSE %] + + + [% END %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminAppointmentImport.tt b/Kernel/Output/HTML/Templates/Standard/AdminAppointmentImport.tt index fa7e6fa76ec..e9b1f1f341d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminAppointmentImport.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminAppointmentImport.tt @@ -7,38 +7,22 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      - -

      [% Translate("Appointment Import") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Calendar Management'), - Link => 'AdminAppointmentCalendarManage', - }, - { - Name => Translate('Import Appointments'), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

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

      -[% IF Data.ModulePermissions.AdminAppointmentCalendarManage %] + [% IF Data.ModulePermissions.AdminAppointmentCalendarManage %] -[% END %] + [% END %]
      @@ -57,48 +41,69 @@
      +

      [% Translate("Appointment Import") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Calendar Management'), + Link => 'AdminAppointmentCalendarManage', + }, + { + Name => Translate('Import Appointments'), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      [% Translate("Import Appointments") | html %]

      -
      +
      - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      - -
      - [% Data.Calendar %] -

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

      -

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

      +
      + +
      + [% Data.Calendar %] +

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

      +

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

      +
      - -
      - -

      - [% Translate("All existing appointments in the calendar with same UniqueID will be overwritten.") | html %] -

      +
      +
      + + +
      +

      [% Translate("All existing appointments in the calendar with same UniqueID will be overwritten.") | html %]

      -
      - - [% Translate("or") | html %] - - [% Translate("Cancel") | html %] - + +
      +
      + + [% Translate("Cancel") | html %] + + + +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEvent.tt b/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEvent.tt index deaeb56aeaf..b5eafaf695d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEvent.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEvent.tt @@ -63,8 +63,10 @@

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

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

      - - +
      + + +
      		[% Translate(Data.Valid) | html %] [% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %][% Translate("Export") | html %][% Translate("Copy") | html %][% Translate("Export") | html %][% Translate("Copy") | html %] @@ -172,42 +175,50 @@ [% END %]
      - - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      - -
      - +
      + +
      + +
      - -
      - [% Data.VisibleForAgentStrg %] +
      + +
      + [% Data.VisibleForAgentStrg %] +
      - -
      - -

      [% Translate("This message will be shown on the agent preferences screen as a tooltip for this notification.") | html %]

      +
      + +
      + +

      [% Translate("This message will be shown on the agent preferences screen as a tooltip for this notification.") | html %]

      +
      - -
      - [% Data.ValidOption %] +
      + +
      + [% Data.ValidOption %] +
      -
      @@ -221,22 +232,22 @@
      - - -
      - [% Data.EventsStrg %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.EventsStrg %] +
      +

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

      +
      +
      +

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

      +
      +

      [% Translate("Here you can choose which events will trigger this notification. An additional appointment filter can be applied below to only send for appointments with certain criteria.") | html %]

      -

      [% Translate("Here you can choose which events will trigger this notification. An additional appointment filter can be applied below to only send for appointments with certain criteria.") | html %]

      -
      @@ -251,38 +262,49 @@
      + [% RenderBlockStart("OverviewUpdateType") %] - -
      - [% Data.TypesStrg %] +
      + +
      + [% Data.TypesStrg %] +
      [% RenderBlockEnd("OverviewUpdateType") %] - -
      - [% Data.CalendarStrg %] +
      + +
      + [% Data.CalendarStrg %] +
      - -
      - +
      + +
      + +
      - -
      - +
      + +
      + +
      [% RenderBlockStart("OverviewUpdateTeam") %] - -
      - [% Data.TeamStrg %] +
      + +
      + [% Data.TeamStrg %] +
      [% RenderBlockEnd("OverviewUpdateTeam") %] - - -
      - [% Data.ResourceStrg %] +
      + +
      + [% Data.ResourceStrg %] +
      -
      @@ -297,39 +319,49 @@
      - - -
      - [% Data.RecipientsStrg %] +
      + +
      + [% Data.RecipientsStrg %] +
      - -
      - [% Data.RecipientAgentsStrg %] +
      + +
      + [% Data.RecipientAgentsStrg %] +
      - -
      - [% Data.RecipientGroupsStrg %] +
      + +
      + [% Data.RecipientGroupsStrg %] +
      - -
      - [% Data.RecipientRolesStrg %] +
      + +
      + [% Data.RecipientRolesStrg %] +
      - -
      - - [% Translate("Also send if the user is currently out of office.") | html %] +
      + +
      + + [% Translate("Also send if the user is currently out of office.") | html %] +
      - -
      - - [% Translate("Notify user just once per day about a single appointment using a selected transport.") | html %] +
      + +
      + + [% Translate("Notify user just once per day about a single appointment using a selected transport.") | html %] +
      -
      @@ -350,46 +382,57 @@ [% RenderBlockStart("TransportRow") %]
      - [% Translate(Data.TransportName) | html %] + + [% RenderBlockStart("TransportRowEnabled") %] - -
      - -
      -

      [% Translate("At least one method is needed per notification.") | html %]

      -
      -
      -

      [% Translate("At least one method is needed per notification.") | html %]

      +
      + +
      + +
      +

      [% Translate("At least one method is needed per notification.") | html %]

      +
      +
      +

      [% Translate("At least one method is needed per notification.") | html %]

      +
      - -
      - -

      [% Translate("This is the default value for assigned recipient agents who didn't make a choice for this notification in their preferences yet. If the box is enabled, the notification will be sent to such agents.") | html %]

      +
      + +
      + +

      [% Translate("This is the default value for assigned recipient agents who didn't make a choice for this notification in their preferences yet. If the box is enabled, the notification will be sent to such agents.") | html %]

      +
      - [% Data.SettingsString %] +
      + [% Data.SettingsString %] +
      [% RenderBlockEnd("TransportRowEnabled") %] [% RenderBlockStart("TransportRowDisabled") %] -
      -

      - [% Translate("This feature is currently not available.") | html %] -

      +
      +
      +

      + [% Translate("This feature is currently not available.") | html %] +

      +
      [% RenderBlockEnd("TransportRowDisabled") %]
      [% RenderBlockEnd("TransportRow") %] [% RenderBlockStart("NoDataFoundMsgTransport") %]
      - [% Translate("No data found") | html %] -

      - [% Translate("No notification method found.") | html %] -

      + +
      +

      + [% Translate("No notification method found.") | html %] +

      +
      [% RenderBlockEnd("NoDataFoundMsgTransport") %] @@ -404,114 +447,126 @@
      -
      +
      +
      [% RenderBlockStart("NotificationLanguage") %] -
      -
      + +
      - [% RenderBlockEnd("NotificationLanguage") %] - - - - + [% INCLUDE "SmartTags/Default.tt" %] [% RenderBlockEnd("OverviewUpdate") %] - [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEventTransportEmailSettings.tt b/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEventTransportEmailSettings.tt index ba9f6bfe94c..626a84e54b5 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEventTransportEmailSettings.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminAppointmentNotificationEventTransportEmailSettings.tt @@ -7,46 +7,56 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - -
      - -

      [% Translate("This field must have less then 200 characters.") | html %]

      -

      [% Translate("This field must have less then 200 characters.") | html %]

      +
      + +
      + +

      [% Translate("This field must have less then 200 characters.") | html %]

      +

      [% Translate("This field must have less then 200 characters.") | html %]

      +
      -
      - -
      - -

      [% Translate("An article will be created if the notification is sent to the customer or an additional email address.") | html %]

      +
      + +
      + +

      [% Translate("An article will be created if the notification is sent to the customer or an additional email address.") | html %]

      +
      -
      - -
      - [% Data.TransportEmailTemplateStrg %] -

      [% Translate("Use this template to generate the complete email (only for HTML emails).") | html %]

      +
      + +
      + [% Data.TransportEmailTemplateStrg %] +

      [% Translate("Use this template to generate the complete email (only for HTML emails).") | html %]

      +
      -
      - -
      - -

      [% Data.EmailSecurityInfo %]

      +
      + +
      + +

      [% Data.EmailSecurityInfo %]

      +
      -
      - -
      - [% Data.EmailSigningCrypting %] + +
      + +
      + [% Data.EmailSigningCrypting %] +
      -
      - -
      - [% Data.EmailMissingSigningKeys %] + +
      + +
      + [% Data.EmailMissingSigningKeys %] +
      -
      - -
      - [% Data.EmailMissingCryptingKeys %] + +
      + +
      + [% Data.EmailMissingCryptingKeys %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminAttachment.tt b/Kernel/Output/HTML/Templates/Standard/AdminAttachment.tt index 1c7edd663ef..8d4cb4a1742 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminAttachment.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminAttachment.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Attachment Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Attachment Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add Attachment"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Attachment")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -40,12 +19,12 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Filter") %]
      @@ -72,14 +50,14 @@
      -
      +

      [% Translate("Attachment Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Attachment Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add Attachment"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Attachment")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + +
      [% RenderBlockStart("OverviewResult") %] -
      +

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

      -       - + + Show Valid + Show All
      - @@ -126,7 +124,7 @@ @@ -135,9 +133,8 @@ @@ -162,10 +159,8 @@ [% ELSE %]

      [% Translate("Edit Attachment") | html %]

      [% END %] -
      -
      @@ -175,75 +170,81 @@ [% END %]
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - [% IF Data.Action == 'Add' %] - - [% ELSE %] - - [% END %] -
      - -
      -

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

      -
      -
      -

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

      +
      + [% IF Data.Action == 'Add' %] + + [% ELSE %] + + [% END %] +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      +
      +
      + + [% Translate("Cancel") | html %] + -
      -
      -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] -
      -
      -
      + [% IF Data.Action == 'Change' %] + + + + [% ELSE %] + + [% END %] +
      -
      [% RenderBlockEnd("OverviewUpdate") %] -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminAutoResponse.tt b/Kernel/Output/HTML/Templates/Standard/AdminAutoResponse.tt index 6bdb6a8be2b..3ebb3132b99 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminAutoResponse.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminAutoResponse.tt @@ -8,28 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Auto Response Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Auto Response Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add Auto Response"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Auto Response")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -39,19 +19,18 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Filter") %]
      @@ -67,16 +46,16 @@

      [% Translate('Related Actions') | html %]

      -
      -
      +

      [% Translate("Auto Response Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Auto Response Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add Auto Response"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Auto Response")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]
      -
      +

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

      -       - + + Show Valid + Show All
      @@ -102,7 +100,7 @@
      - + @@ -157,91 +155,96 @@ [% END %]
      - - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - [% Data.TypeOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.TypeOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.SystemAddressOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.SystemAddressOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      @@ -252,6 +255,5 @@ [% RenderBlockEnd("OverviewUpdate") %] -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCloudServiceSupportDataCollector.tt b/Kernel/Output/HTML/Templates/Standard/AdminCloudServiceSupportDataCollector.tt deleted file mode 100644 index 06f838b0165..00000000000 --- a/Kernel/Output/HTML/Templates/Standard/AdminCloudServiceSupportDataCollector.tt +++ /dev/null @@ -1,127 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- - -
      -

      [% Translate("Cloud Service Management") | html %] [% Translate("Support Data Collector") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Cloud Service Management'), - Link => 'AdminCloudServices', - }, - { - Name => Translate('Support data collector'), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      -
      -

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

      -
      -
      - -
      -
      -[% RenderBlockStart("RegisteredNotSending") %] -
      -
      -

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

      -
      -
      -

      - [% Translate("Currently support data is only shown in this system.") | html %] - [% Translate("It is highly recommended to send this data to OTRS Group in order to get better support.") | html %] -

      -
      -
      -
      -[% RenderBlockEnd("RegisteredNotSending") %] - -
      -
      - -[% RenderBlockStart("SendingEdit") %] -
      -
      -

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

      -
      -
      -
      - - - -
      - -
      - -

      - [% Translate("This will allow the system to send additional support data information to OTRS Group.") | html %] -

      -
      -
      - -
      - -
      -
      -
      - -
      -
      -[% RenderBlockEnd("SendingEdit") %] - - -[% RenderBlockStart("NotRegistered") %] -
      -
      -

      [% Translate("System Registration") | html %]

      -
      -
      -

      - [% Translate("Currently support data is only shown in this system.") | html %] - [% Translate("It is highly recommended to send this data to OTRS Group in order to get better support.") | html %] -
      - [% Translate("To enable data sending, please register your system with OTRS Group or update your system registration information (make sure to activate the 'send support data' option.)") | html %] -

      - - [% IF Config("Frontend::Module").AdminRegistration %] -
      - - [% Translate("Register this System") | html %] - -
      - [% ELSE %] -
      -

      - [% Translate("System Registration is disabled for your system. Please check your configuration.") | html %] -

      -
      - [% END %] -
      -
      -
      -[% RenderBlockEnd("NotRegistered") %] - - -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCloudServices.tt b/Kernel/Output/HTML/Templates/Standard/AdminCloudServices.tt deleted file mode 100644 index 62b081d252e..00000000000 --- a/Kernel/Output/HTML/Templates/Standard/AdminCloudServices.tt +++ /dev/null @@ -1,86 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- - -
      -

      [% Translate("Cloud Service Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Cloud Service Management'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      -
      -

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

      -
      -
      - [% IF !Data.SystemIsRegistered %] -

      - [% Translate("System registration is a service of OTRS Group, which provides a lot of advantages!") | html %] -

      -

      - [% Translate('Please note that the use of OTRS cloud services requires the system to be registered.') | html %] -

      - [% END %] -

      - [% Translate("Here you can configure available cloud services that communicate securely with %s.", "cloud.otrs.com") | html %] -

      -
      -
      -
      - -
      -
      -
      -

      [% Translate("Available Cloud Services") | html %]

      -
      -
      -
      [% Data.Name | html %] - + [% Data.Filename | truncate(30) | html %] [% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %] - - [% Translate("Delete this attachment") | html %] - + +
      [% Translate("Name") | html %][% Translate("Name") | html %] [% Translate("Type") | html %] [% Translate("Comment") | html %] [% Translate("Validity") | html %]
      - - - - - - - - - -[% RenderBlockStart("OverviewResultRow") %] - - - - - -[% RenderBlockEnd("OverviewResultRow") %] - - -
      [% Translate("Name") | html %][% Translate("Description") | html %]
      - - - [% IF Data.CloudService.IsOTRSBusiness && !Data.OTRSBusinessIsInstalled %] - [% Data.CloudService.Name | html %] - [% ELSE %] - - [% Data.CloudService.Name | html %] - - [% END %] - - [% Translate(Data.CloudService.Description) | html %] -
      -
      -
      -
      -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLog.tt b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLog.tt index 5d1e49c8573..1b542a3adc4 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLog.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLog.tt @@ -7,23 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Communication Log") | html %] - [% Translate(Data.Action) | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Communication Log'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      - +
      +
      [% RenderBlockStart("TimeRange") %]
      @@ -67,8 +52,19 @@
      +
      +

      [% Translate("Communication Log") | html %] - [% Translate(Data.Action) | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Communication Log'), + Link => Env("Action"), + }, + ] + %] + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("StatusOverview") %]
      @@ -184,11 +180,10 @@

      [% Translate("List of communications (%s)", Data.CommunicationCount) | html %]

      - [% RenderBlockStart("ContextSettings") %]
      - +
      @@ -205,7 +200,6 @@
      [% Data.PageShownString %]
      -
      @@ -216,7 +210,6 @@
      - [% RenderBlockStart("CommunicationNavBarFilter") %]
        [% RenderBlockStart("CommunicationNavBarFilterItem") %] @@ -232,8 +225,12 @@
        [% RenderBlockStart("OverviewNavBarPageNavBar") %] - [% Data.ResultLong %] - [% Data.SiteNavBarLong %] +
          +
        • + [% Data.ResultLong %] +
          • +
        • [% Data.SiteNavBarLong %]
          • +
        [% RenderBlockEnd("OverviewNavBarPageNavBar") %]
        @@ -265,7 +262,7 @@ [% RenderBlockStart("CommunicationRow") %]
      - + [% IF Data.Status == 'Successful' %] [% ELSIF Data.Status == 'Failed' %] @@ -321,6 +318,5 @@
      - diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogAccounts.tt b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogAccounts.tt index 50b6f643f0b..a6718124cca 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogAccounts.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogAccounts.tt @@ -7,32 +7,15 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Communication Log") | html %] - [% Translate("Account Status") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Communication Log'), - Link => Env("Action"), - }, - { - Name => Translate('Account Status'), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      - + [% Translate("Back to overview") | html %] @@ -40,7 +23,6 @@
      - [% RenderBlockStart("TimeRange") %]
      @@ -91,12 +73,25 @@
      -
      +
      +

      [% Translate("Communication Log") | html %] - [% Translate("Account Status") | html %]

      -
      + [% BreadcrumbPath = [ + { + Name => Translate('Communication Log'), + Link => Env("Action"), + }, + { + Name => Translate('Account Status'), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -104,11 +99,9 @@

      [% Translate("Account status for: %s", Data.TimeRange) | html %]

      -
      - @@ -134,7 +127,7 @@ [% ELSIF Data.AccountStatus == 'Warning' %] [% ELSE %] - + [% END %] @@ -152,7 +145,7 @@
      [% IF Data.AccountLink %] - + [% END %] @@ -182,8 +175,12 @@ [% RenderBlockStart("OverviewNavBarPageNavBar") %] - [% Data.ResultLong %] - [% Data.SiteNavBarLong %] +
        +
      • + [% Data.ResultLong %] +
        • +
      • [% Data.SiteNavBarLong %]
        • +
      [% RenderBlockEnd("OverviewNavBarPageNavBar") %]       @@ -208,7 +205,7 @@ [% RenderBlockStart("CommunicationLogRow") %]
      - + [% IF Data.Status == 'Successful' %] [% ELSIF Data.Status == 'Failed' %] @@ -250,6 +247,5 @@ - diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogCommunications.tt b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogCommunications.tt index 3101725e563..4878bebbd6c 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogCommunications.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogCommunications.tt @@ -47,7 +47,7 @@ [% RenderBlockStart("CommunicationLogRow") %]
      - + [% IF Data.Status == 'Successful' %] [% ELSIF Data.Status == 'Failed' %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogZoom.tt b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogZoom.tt index fe77eee203f..5ec351a6de7 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogZoom.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCommunicationLogZoom.tt @@ -7,36 +7,14 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      - [% Translate("Communication Log") | html %] – - [% Data.CommunicationLog.StartTime = Data.CommunicationLog.StartTime | Localize("TimeLong") %] - [% Translate("Detail view for %s communication started at %s", Data.CommunicationLog.Direction.lower, Data.CommunicationLog.StartTime) | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Communication Log'), - Link => Env("Action"), - }, - { - Name => Translate("Detail view for %s communication started at %s", Data.CommunicationLog.Direction.lower, Data.CommunicationLog.StartTime), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      - +
      +

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

      - + [% Translate("Back to overview") | html %] @@ -76,10 +54,27 @@
      -
      -
      +
      +

      + [% Translate("Communication Log") | html %] – + [% Data.CommunicationLog.StartTime = Data.CommunicationLog.StartTime | Localize("TimeLong") %] + [% Translate("Detail view for %s communication started at %s", Data.CommunicationLog.Direction.lower, Data.CommunicationLog.StartTime) | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Communication Log'), + Link => Env("Action"), + }, + { + Name => Translate("Detail view for %s communication started at %s", Data.CommunicationLog.Direction.lower, Data.CommunicationLog.StartTime), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
      @@ -92,7 +87,6 @@
      - @@ -191,9 +185,7 @@
      -

      [% Translate("Please select an entry from the list.") | html %]

      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCustomerCompany.tt b/Kernel/Output/HTML/Templates/Standard/AdminCustomerCompany.tt index 547282f4771..539bd130373 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCustomerCompany.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCustomerCompany.tt @@ -8,66 +8,43 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Customer Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Customer Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate('Add Customer'),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Customer")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.CustomerCompanyName ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %] -
      -
      -

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

      -
      -
      -
        +
        +
        +

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

        +
        +
        +
          [% RenderBlockStart("ActionOverview") %] -
        • - [% Translate("Go to overview") | html %] -
          • +
        • + [% Translate("Go to overview") | html %] +
          • [% RenderBlockEnd("ActionOverview") %] [% RenderBlockStart("ActionSearch") %] -
        • -
          - - - - - - -

          - [% Translate("Wildcards like '*' are allowed.") | html %] -

          -
          • +
        • +
          + + + + + + +

          + [% Translate("Wildcards like '*' are allowed.") | html %] +

          +
          • [% RenderBlockEnd("ActionSearch") %] [% RenderBlockStart("ActionAdd") %] -
        • - -
          + [% Data.SourceOption %] @@ -75,8 +52,8 @@ [% RenderBlockEnd("ActionAdd") %]
        -
        [% RenderBlockEnd("ActionList") %] +

      [% Translate('Related Actions') | html %]

      @@ -84,14 +61,14 @@
      +
      +

      [% Translate("Customer Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Customer Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate('Add Customer'),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Customer")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.CustomerCompanyName ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewHeader") %] -
      +

      [% IF Data.ListAll && Data.Limit && Data.ListAll > Data.Limit %] [% Translate("List (only %s shown - more available)", Data.SearchListSize) | html %] @@ -112,8 +110,9 @@ ([% Data.ListAll | html %] [% Translate("total") | html %]) [% END %]

      -       - + + Show Valid + Show All
      [% RenderBlockEnd("OverviewHeader") %] @@ -123,7 +122,7 @@
      [% RenderBlockEnd("NoSearchTerms") %] [% RenderBlockStart("OverviewResult") %] -
      +
      @@ -162,7 +161,6 @@
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      [% IF Data.Action == 'Add' %] @@ -172,11 +170,11 @@ [% END %]
      - [% IF Config(Data.Source).ReadOnly == 1 %] + [% IF Config(Data.Source).ReadOnly == 1 %]

      [% Translate("Please note") | html %]: [% Translate("This customer backend is read only!") | html %]

      - [% END %] + [% END %]
      @@ -186,73 +184,81 @@ [% IF Data.Action == 'Change' %] [% END %] +
      [% RenderBlockStart("PreferencesGeneric") %] [% RenderBlockStart("PreferencesGenericInputHidden") %] [% RenderBlockEnd("PreferencesGenericInputHidden") %] [% RenderBlockStart("PreferencesGenericInput") %] - -
      - +
      + +
      + [% RenderBlockStart("PreferencesGenericInputRequired") %] -
      -

      [% 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("PreferencesGenericInputRequired") %] +
      -
      [% RenderBlockEnd("PreferencesGenericInput") %] [% RenderBlockStart("PreferencesGenericOption") %] - -
      - [% Data.Option %] +
      + +
      + [% Data.Option %] [% RenderBlockStart("PreferencesGenericOptionRequired") %] -
      -

      [% 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("PreferencesGenericOptionRequired") %] +
      -
      - [% RenderBlockEnd("PreferencesGenericOption") %] - [% RenderBlockStart("DynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] -
      -
      -
      +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      [% RenderBlockEnd("DynamicField") %] - [% RenderBlockEnd("PreferencesGeneric") %] + [% IF Config(Data.Source).ReadOnly != 1 %] -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      + [% Translate("Cancel") | html %] + + [% IF Data.Action == 'Change' %] + + + + [% ELSE %] + + [% END %] +
      -
      [% END %]
      @@ -260,7 +266,5 @@ [% RenderBlockEnd("OverviewUpdate") %]
      -
      -
      - -[% RenderBlockEnd("Overview") %] +
       +[% RenderBlockEnd("Overview") %] \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCustomerGroup.tt b/Kernel/Output/HTML/Templates/Standard/AdminCustomerGroup.tt index cca6bb52699..176bb8fa38e 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCustomerGroup.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCustomerGroup.tt @@ -8,27 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Manage Customer-Group Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Customer-Group Relations'), - Link => Data.OverviewLink, - }, - ] - %] - - [% IF Data.Type %] - [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("Disabled") %]
      @@ -40,25 +21,22 @@ -

      [% Translate("This feature is disabled!") | html %]

      +

      [% Translate("This feature is disabled!") | html %]

      [% Translate("Just use this feature if you want to define group permissions for customers.") | html %]

      -
      -
      -
      -
      [% RenderBlockEnd("Disabled") %] - [% RenderBlockStart("ActionList") %]
      @@ -68,19 +46,19 @@
      @@ -142,16 +119,16 @@

      [% Translate('Related Actions') | html %]

      -
      +

      [% Translate("Manage Customer-Group Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Customer-Group Relations'), + Link => Data.OverviewLink, + }, + ] + %] + + [% IF Data.Type %] + [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("Result") %]

      [% Translate("Search Results") | html %]:

      -
      +
      • [% Translate("Customers") | html %] @@ -199,10 +193,8 @@ [% RenderBlockEnd("Listn1") %]
      -
      [% RenderBlockEnd("Result") %] - [% RenderBlockStart("Change") %]

      @@ -222,73 +214,78 @@ - - - - + + + +
      [% Translate(Data.VisibleNeType) | html %] +
      + + + + + [% RenderBlockStart("ChangeHeaderContextName") %] - + [% RenderBlockEnd("ChangeHeaderContextName") %] - - + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - + + [% RenderBlockStart("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] [% RenderBlockStart("ChangeItemCount") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("ChangeItemCount") %] [% RenderBlockStart("ChangeItemCountLimit") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("ChangeItemCountLimit") %] - [% Translate(Data.Name) | html %][% Translate(Data.Name) | html %]
      - - [% Translate(Data.Type) | html %] - + + [% Translate(Data.Type) | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %]
      [% Data.Name | html %] - - + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +

      +
      +
      + [% Translate("Cancel") | html %] + + + +
      -
      [% RenderBlockEnd("Change") %]
      - [% RenderBlockStart("AlwaysGroups") %] -
      +

      [% Translate("Customer Default Groups:") | html %]

      -
      +
      • [% Translate("Groups") | html %]
        • [% RenderBlockStart("AlwaysGroupsList") %] @@ -302,36 +299,38 @@
      [% RenderBlockEnd("AlwaysGroups") %] - [% RenderBlockStart("Reference") %] -
      +

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

      -
      -[% FOREACH Context IN Data.Contexts %] -
      [% Translate(Data.ContextLookup.$Context.Name) | html %]
      -
      - [% Translate(Data.ContextLookup.$Context.Description) | html %] -
      - -[% END %] -
      [% Translate("ro") | html %]
      -
      - [% Translate("Read only access to the ticket in this group/queue.") | html %] -
      + [% FOREACH Context IN Data.Contexts %] +
      +
      [% Translate(Data.ContextLookup.$Context.Name) | html %]
      +
      + [% Translate(Data.ContextLookup.$Context.Description) | html %] +
      +
      + [% END %] +
      +
      [% Translate("ro") | html %]
      +
      + [% Translate("Read only access to the ticket in this group/queue.") | html %] +
      +
      -
      [% Translate("rw") | html %]
      -
      - [% Translate("Full read and write access to the tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("rw") | html %]
      +
      + [% Translate("Full read and write access to the tickets in this group/queue.") | html %] +
      +
      [% RenderBlockEnd("Reference") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUser.tt b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUser.tt index 7075a5f5e71..78265adb766 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUser.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUser.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Customer User Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Customer User Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate('Add Customer User'),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Customer User")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.ID ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -40,20 +19,20 @@
      +

      [% Translate("Customer User Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Customer User Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate('Add Customer User'),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Customer User")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.ID ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewHeader") %] -
      +

      [% IF Data.ListAll && Data.Limit && Data.ListAll > Data.Limit %] [% Translate("List (only %s shown - more available)", Data.SearchListSize) | html %] @@ -139,8 +137,9 @@ [% Translate("List (%s total)", Data.ListAll) | html %] [% END %]

      -       - + + Show Valid + Show All
      [% RenderBlockEnd("OverviewHeader") %] @@ -150,7 +149,7 @@
      [% RenderBlockEnd("NoSearchTerms") %] [% RenderBlockStart("OverviewResult") %] -
      +
      @@ -173,7 +172,6 @@ [% RenderBlockEnd("NoDataFoundMsg") %] - [% RenderBlockStart("OverviewResultRow") %] [% RenderBlockStart("OverviewResultRowLink") %] @@ -199,7 +197,6 @@
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      [% IF Data.Action == 'Add' %] @@ -209,11 +206,11 @@ [% END %]
      -[% IF Config(Data.Source).ReadOnly == 1 || Config(Data.Source).Module.match('LDAP') %] + [% IF Config(Data.Source).ReadOnly == 1 || Config(Data.Source).Module.match('LDAP') %]

      [% Translate("Please note") | html %]: [% Translate("This customer backend is read only, but the customer user preferences can be changed!") | html %]

      -[% END %] + [% END %]
      @@ -232,128 +229,152 @@
      [% RenderBlockEnd("PreferencesGenericInputHidden") %] [% RenderBlockStart("PreferencesGenericInput") %] - -
      - +
      + +
      + [% RenderBlockStart("PreferencesGenericErrorMsg") %] -

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

      +
      +

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

      +
      [% RenderBlockEnd("PreferencesGenericErrorMsg") %] [% RenderBlockStart("PreferencesUserEmailErrorMsg") %] -

      [% Translate("This field is required and needs to be a valid email address.") | html %]

      +
      +

      [% Translate("This field is required and needs to be a valid email address.") | html %]

      +
      [% RenderBlockEnd("PreferencesUserEmailErrorMsg") %] [% RenderBlockStart("PreferencesGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("PreferencesGenericServerErrorMsg") %] [% RenderBlockStart("PreferencesUserEmailInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("PreferencesUserEmailInvalidConfigServerErrorMsg") %] [% RenderBlockStart("PreferencesUserEmailInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("PreferencesUserEmailInvalidMXServerErrorMsg") %] [% RenderBlockStart("PreferencesUserEmailInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("PreferencesUserEmailInvalidDNSServerErrorMsg") %] [% RenderBlockStart("PreferencesUserEmailInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("PreferencesUserEmailInvalidSyntaxServerErrorMsg") %] +
      -
      [% RenderBlockEnd("PreferencesGenericInput") %] [% RenderBlockStart("PreferencesGenericPassword") %] - -
      - -

      [% 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("PreferencesGenericPassword") %] [% RenderBlockStart("PreferencesGenericOption") %] - -
      - [% Data.Option %] -

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

      -
      - [% IF Data.Name == 'UserCustomerID' %] -

      [% Translate("This CustomerID is invalid.") | html %]

      - [% ELSE %] -

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

      - [% END %] +
      + +
      + [% Data.Option %] +

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

      +
      + [% IF Data.Name == 'UserCustomerID' %] +

      [% Translate("This CustomerID is invalid.") | html %]

      + [% ELSE %] +

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

      + [% END %] +
      -
      [% RenderBlockEnd("PreferencesGenericOption") %] [% RenderBlockEnd("PreferencesGeneric") %] [% RenderBlockStart("Item") %] [% RenderBlockStart("InputKey") %] - -
      - -
      [% Translate(Data.Key) | html %]
      +
      + +
      + +
      [% Translate(Data.Key) | html %]
      +
      -
      [% RenderBlockEnd("InputKey") %] [% RenderBlockStart("Input") %] - -
      - -
      [% Translate(Data.Desc) | html %][% Translate(Data.Key) | html %]
      +
      + +
      + +
      [% Translate(Data.Desc) | html %][% Translate(Data.Key) | html %]
      +
      -
      [% RenderBlockEnd("Input") %] [% RenderBlockStart("Option") %] - -
      - [% Data.Option %] -
      [% Translate(Data.Desc) | html %][% Translate(Data.Key) | html %]
      -
      -
      +
      + +
      + [% Data.Option %] +
      [% Translate(Data.Desc) | html %][% Translate(Data.Key) | html %]
      +
      +
      [% RenderBlockEnd("Option") %] [% RenderBlockStart("Upload") %] - -
      - -
      [% Translate(Data.Desc) | html %][% Translate(Data.Key) | html %]
      -
      -
      +
      + +
      + +
      [% Translate(Data.Desc) | html %][% Translate(Data.Key) | html %]
      +
      +
      [% RenderBlockEnd("Upload") %] [% RenderBlockStart("Password") %] - -
      - -
      [% Translate(Data.Key) | html %]
      -
      -
      +
      + +
      + +
      [% Translate(Data.Key) | html %]
      +
      +
      [% RenderBlockEnd("Password") %] [% RenderBlockStart("DynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] +
      + [% Data.Label %] +
      + [% Data.Field %] +
      -
      -
      [% RenderBlockEnd("DynamicField") %] [% RenderBlockEnd("Item") %] -
      + +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - + + + [% ELSE %] - + [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %]
      -
      +
      +
      [% RenderBlockEnd("OverviewUpdate") %]
      [% RenderBlockStart("EffectivePermissions") %] -
      +

      [% Translate("Effective Permissions for Customer User") | html %]

      @@ -361,76 +382,80 @@
      [% Translate("Group Permissions") | html %]
      - - - - +
      +
      [% Translate("Group") | html %]
      + + + [% RenderBlockStart("HeaderGroupPermissionType") %] - + [% RenderBlockEnd("HeaderGroupPermissionType") %] - - - + + + [% RenderBlockStart("NoGroupPermissionsFoundMsg") %] - - - + + + [% RenderBlockEnd("NoGroupPermissionsFoundMsg") %] [% RenderBlockStart("GroupPermissionTableRow") %] - - + + [% RenderBlockStart("GroupPermissionMark") %] [% RenderBlockStart("GroupPermissionMarkOn") %] - + [% RenderBlockEnd("GroupPermissionMarkOn") %] [% RenderBlockStart("GroupPermissionMarkOff") %] - + [% RenderBlockEnd("GroupPermissionMarkOff") %] [% RenderBlockEnd("GroupPermissionMark") %] - + [% RenderBlockEnd("GroupPermissionTableRow") %] - -
      [% Translate("Group") | html %][% Translate(Data.Type) | html %][% Translate(Data.Type) | html %]
      - [% Translate("This customer user has no group permissions.") | html %] -
      + [% Translate("This customer user has no group permissions.") | html %] +
      [% Data.Name | html %]
      [% Data.Name | html %]
      + +
      +

      [% Translate("Table above shows effective group permissions for the customer user. The matrix takes into account all inherited permissions (e.g. via customer groups). Note: The table does not consider changes made to this form without submitting it.") | html %]

      [% Translate("Customer Access") | html %]
      - - - - +
      +
      [% Translate("Customer") | html %]
      + + + [% RenderBlockStart("HeaderCustomerAccessContext") %] - + [% RenderBlockEnd("HeaderCustomerAccessContext") %] - - - + + + [% RenderBlockStart("NoCustomerAccessFoundMsg") %] - - - + + + [% RenderBlockEnd("NoCustomerAccessFoundMsg") %] [% RenderBlockStart("CustomerAccessTableRow") %] - - + + [% RenderBlockStart("CustomerAccessMark") %] [% RenderBlockStart("CustomerAccessMarkOn") %] - + [% RenderBlockEnd("CustomerAccessMarkOn") %] [% RenderBlockStart("CustomerAccessMarkOff") %] - + [% RenderBlockEnd("CustomerAccessMarkOff") %] [% RenderBlockEnd("CustomerAccessMark") %] - + [% RenderBlockEnd("CustomerAccessTableRow") %] - -
      [% Translate("Customer") | html %][% Translate(Data.Name) | html %][% Translate(Data.Name) | html %]
      - [% Translate("This customer user has no customer access.") | html %] -
      + [% Translate("This customer user has no customer access.") | html %] +
      [% Data.Name | html %]
      [% Data.Name | html %]
      +
      +

      [% Translate("Table above shows granted customer access for the customer user by permission context. The matrix takes into account all inherited access (e.g. via customer groups). Note: The table does not consider changes made to this form without submitting it.") | html %]

      @@ -440,6 +465,5 @@
      [% RenderBlockEnd("EffectivePermissions") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserCustomer.tt b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserCustomer.tt index 9f801bfe9ad..d28e5e0e091 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserCustomer.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserCustomer.tt @@ -8,27 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Manage Customer User-Customer Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Customer User-Customer Relations'), - Link => Data.OverviewLink, - }, - ] - %] - - [% IF Data.Type %] - [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -38,19 +19,19 @@
      +
      +

      [% Translate("Manage Customer User-Customer Relations") | html %]

      + [% BreadcrumbPath = [ + { + Name => Translate('Manage Customer User-Customer Relations'), + Link => Data.OverviewLink, + }, + ] + %] + + [% IF Data.Type %] + [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("Result") %]

      [% Translate("Search Results") | html %]:

      -
      +
      • [% Translate("Customer Users") | html %] @@ -144,10 +142,8 @@ [% RenderBlockEnd("Listn1") %]
      -
      [% RenderBlockEnd("Result") %] - [% RenderBlockStart("Change") %]

      @@ -160,64 +156,75 @@ [% Data.Name | html %]

      -
      - +
      + - - - -
      [% Translate(Data.VisibleNeType) | html %] + +
      +
      + + + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - - - + + + + [% RenderBlockEnd("ChangeRow") %] - -
      [% Translate(Data.VisibleNeType) | html %] [% RenderBlockStart("ChangeItemCount") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("ChangeItemCount") %] [% RenderBlockStart("ChangeItemCountLimit") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("ChangeItemCountLimit") %] - - - [% Translate("Active") | html %] - + + [% Translate("Active") | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %] - - -
      [% Data.Name | html %] + + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] -
      -
      + +
      +
      + +
      +
      + [% Translate("Cancel") | html %] + + + + + +
      +
      +
      [% RenderBlockEnd("Change") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserGroup.tt b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserGroup.tt index cec194e7dce..9c49e1e9a34 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserGroup.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserGroup.tt @@ -8,28 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      - -

      [% Translate("Manage Customer User-Group Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Customer User-Group Relations'), - Link => Data.OverviewLink, - }, - ] - %] - - [% IF Data.Type %] - [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("Disabled") %]
      @@ -41,25 +21,22 @@ -

      [% Translate("This feature is disabled!") | html %]

      +

      [% Translate("This feature is disabled!") | html %]

      [% Translate("Just use this feature if you want to define group permissions for customer users.") | html %]

      -
      -
      -
      -
      [% RenderBlockEnd("Disabled") %] - [% RenderBlockStart("ActionList") %]
      @@ -69,19 +46,19 @@
      @@ -143,16 +119,16 @@

      [% Translate('Related Actions') | html %]

      -
      +

      [% Translate("Manage Customer User-Group Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Customer User-Group Relations'), + Link => Data.OverviewLink, + }, + ] + %] + + [% IF Data.Type %] + [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("Result") %]

      [% Translate("Search Results") | html %]:

      -
      +
      • [% Translate("Customer Users") | html %] @@ -200,10 +193,8 @@ [% RenderBlockEnd("Listn1") %]
      -
      [% RenderBlockEnd("Result") %] - [% RenderBlockStart("Change") %]

      @@ -218,68 +209,77 @@ - - - - + + + +
      [% Translate(Data.VisibleNeType) | html %] +
      + + + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - + + [% RenderBlockStart("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] [% RenderBlockStart("ChangeItemCount") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("ChangeItemCount") %] [% RenderBlockStart("ChangeItemCountLimit") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("ChangeItemCountLimit") %] - - - [% Translate(Data.Type) | html %] - + + [% Translate(Data.Type) | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %]
      [% Data.Name | html %] - - + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +

      + +
      +
      + [% Translate("Cancel") | html %] + + + + + + +
      -
      [% RenderBlockEnd("Change") %]
      - [% RenderBlockStart("AlwaysGroups") %] -
      +

      [% Translate("Customer User Default Groups:") | html %]

      -
      +
      • [% Translate("Groups") | html %]
        • [% RenderBlockStart("AlwaysGroupsList") %] @@ -293,29 +293,31 @@
      [% RenderBlockEnd("AlwaysGroups") %] - [% RenderBlockStart("Reference") %] -
      +

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

      -
      [% Translate("ro") | html %]
      -
      - [% Translate("Read only access to the ticket in this group/queue.") | html %] -
      +
      +
      [% Translate("ro") | html %]
      +
      + [% Translate("Read only access to the ticket in this group/queue.") | html %] +
      +
      -
      [% Translate("rw") | html %]
      -
      - [% Translate("Full read and write access to the tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("rw") | html %]
      +
      + [% Translate("Full read and write access to the tickets in this group/queue.") | html %] +
      +
      [% RenderBlockEnd("Reference") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserService.tt b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserService.tt index 1f8c0a23e35..fb10d4fe5c9 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserService.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminCustomerUserService.tt @@ -8,31 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      - -

      [% Translate("Manage Customer User-Service Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Customer User-Service Relations'), - Link => Data.OverviewLink, - }, - ] - %] - - [% IF Data.Type %] - [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] - [% IF Data.Name %] - [% BreadcrumbPath.push({ Name => EditTitle.append(" '", Data.Name, "'") }) %] - [% ELSE %] - [% BreadcrumbPath.push({ Name => EditTitle.append("") }) %] - [% END %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -42,20 +19,19 @@
      -
      +

      [% Translate("Manage Customer User-Service Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Customer User-Service Relations'), + Link => Data.OverviewLink, + }, + ] + %] + + [% IF Data.Type %] + [% USE EditTitle = String(Translate(Data.BreadcrumbTitle)) %] + [% IF Data.Name %] + [% BreadcrumbPath.push({ Name => EditTitle.append(" '", Data.Name, "'") }) %] + [% ELSE %] + [% BreadcrumbPath.push({ Name => EditTitle.append("") }) %] + [% END %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("Result") %]

      [% Translate("Search Results") | html %]:

      -
      +
        @@ -166,7 +162,6 @@
      [% RenderBlockEnd("Result") %] - [% RenderBlockStart("AllocateItem") %]

      @@ -183,61 +178,73 @@ [% IF Data.Subaction == 'AllocateService' OR Data.Subaction == 'AllocateCustomerUser' %] [% END %] - - - - + + + +
      [% Translate(Data.VisibleNeType) | html %] + +
      + + + + - - - - + + + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("AllocateItemRow") %] - - - - + + + + [% RenderBlockEnd("AllocateItemRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] [% RenderBlockStart("AllocateItemCount") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("AllocateItemCount") %] [% RenderBlockStart("AllocateItemCountLimit") %] - ([% Data.ItemCount | html %]) + ([% Data.ItemCount | html %]) [% RenderBlockEnd("AllocateItemCountLimit") %] - - - [% Translate("Active") | html %] -
      + + [% Translate("Active") | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %] - - -
      [% Data.Name | html %] + + +
      -
      - [% IF Data.Subaction == 'AllocateService' OR Data.Subaction == 'AllocateCustomerUser' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +

      + +
      +
      + [% Translate("Cancel") | html %] + + [% IF Data.Subaction == 'AllocateService' OR Data.Subaction == 'AllocateCustomerUser' %] + + + + + [% ELSE %] + + [% END %] +
      [% RenderBlockEnd("AllocateItem") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicField.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicField.tt index 2b0b10e67bf..2e394a50fd3 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicField.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicField.tt @@ -8,22 +8,8 @@ # -- [% RenderBlockStart("Main") %] -
      -

      [% Translate("Dynamic Fields Management") | html %] - [% Translate(Data.Action) | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -32,10 +18,12 @@
        [% RenderBlockStart("ActionAddDynamicField") %]
      • -

        - [% Data.AddDynamicFieldStrg %] -
        -

        [% Translate("Add new field for object") | html %]: [% Translate(Data.ObjectType) | html %]

        +
        +

        + [% Data.AddDynamicFieldStrg %] +
        +

        [% Translate("Add new field for object") | html %]: [% Translate(Data.ObjectType) | html %]

        +
        • [% RenderBlockEnd("ActionAddDynamicField") %] @@ -50,7 +38,6 @@
      - [% RenderBlockStart("Hint") %]
      @@ -93,13 +80,13 @@ [% Translate('This field is required.') | html %]

      -
      +
      -
      -
      +
      +

      [% Translate("Dynamic Fields Management") | html %] - [% Translate(Data.Action) | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
      -
      +

      [% Translate("Dynamic Fields List") | html %]

      - [% RenderBlockStart("ContextSettings") %]       @@ -168,11 +168,10 @@
      - +
      [% Data.PageShownString %]
      -
      @@ -182,14 +181,14 @@
      [% RenderBlockStart("OverviewNavBarPageNavBar") %] - [% Data.ResultLong %] - [% Data.SiteNavBarLong %] +
        +
      • [% Data.ResultLong %]
        • +
      • [% Data.SiteNavBarLong %]
        • +
      [% RenderBlockEnd("OverviewNavBarPageNavBar") %]
      -
      - -
      +
      @@ -232,7 +231,7 @@ @@ -136,7 +132,6 @@ [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      @@ -155,21 +150,23 @@ [% END %]
      - -
      - -

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

      -

      [% Translate("A postmaster filter with this name already exists!") | html %]

      +
      + +
      + +

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

      +

      [% Translate("A postmaster filter with this name already exists!") | html %]

      +
      -
      - -
      - [% Data.StopAfterMatch %] -

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

      -

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

      +
      + +
      + [% Data.StopAfterMatch %] +

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

      +

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

      +
      -
      @@ -182,26 +179,37 @@

      [% Translate("Filter Condition") | html %] ([% Translate("AND Condition") | html %])

      - [% FOREACH [ 1 .. Config("PostmasterHeaderFieldCount") ] %] -
      - - [% Data.item( "MatchHeader$loop.count") %] -
      -

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

      -
      +
      + [% FOREACH [ 1 .. Config("PostmasterHeaderFieldCount") ] %] +
      +
      + +
      + [% Data.item( "MatchHeader$loop.count") %] +
      +

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

      +
      +
      +
      - - -
      -

      [% Translate("The field needs to be a valid regular expression or a literal word.") | html %]

      -
      +
      + +
      + +
      +

      [% Translate("The field needs to be a valid regular expression or a literal word.") | html %]

      +
      +
      +
      - -
      -
      - [% END %] +
      + +
      +
      + [% END %] +
      @@ -213,24 +221,31 @@

      [% Translate("Set Email Headers") | html %]

      +
      + [% FOREACH [ 1 .. Config("PostmasterHeaderFieldCount") ] %] +
      +
      + +
      + [% Data.item("SetHeader$loop.count") %] +
      +

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

      +
      +
      +
      - [% FOREACH [ 1 .. Config("PostmasterHeaderFieldCount") ] %] -
      - - [% Data.item("SetHeader$loop.count") %] -
      -

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

      -
      - - - -
      -

      [% Translate("The field needs to be a literal word.") | html %]

      +
      + +
      + +
      +

      [% Translate("The field needs to be a literal word.") | html %]

      +
      +
      +
      -
      -
      - [% END %] - + [% END %] +
      @@ -238,19 +253,22 @@

      [% Translate("Save Changes") | html %]

      -
      - [% IF Data.Action == 'Update' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Update' %] + + + [% ELSE %] + + [% END %] +
      +
      +
      -
      -

      [% Translate("Filter Condition") | html %]

      +
      +

      [% Translate("Filter Condition") | html %]

      - -
      - - - + +
      + + + +
      -
      -

      [% Translate("Set Email Headers") | html %]

      +
      +

      [% Translate("Set Email Headers") | html %]

      - -
      - - - + +
      + + + +
      -
      [% RenderBlockEnd("OverviewUpdate") %] -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminPriority.tt b/Kernel/Output/HTML/Templates/Standard/AdminPriority.tt index 80af0f0311e..8805ee6f32a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminPriority.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminPriority.tt @@ -8,31 +8,9 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Priority Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Priority Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate('Add Priority'),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Priority")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      - [% RenderBlockStart("ActionList") %]

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

      @@ -41,13 +19,12 @@
      -
      -
      +

      [% Translate("Priority Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Priority Management'), + Link => Env("Action"), + }, + ] + %] + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate('Add Priority'),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Priority")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewResult") %] -
      +

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

      -       - + + Show Valid + Show All
      @@ -138,7 +134,6 @@
      [% RenderBlockStart("DeleteLink") %] - [% Translate("Delete this field") | html %] + [% Translate("Delete this field") | html %] [% RenderBlockEnd("DeleteLink") %] @@ -249,8 +248,6 @@ [% RenderBlockStart("MaxFieldOrder") %] [% RenderBlockEnd("MaxFieldOrder") %] - -
      [% RenderBlockEnd("Main") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldCheckbox.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldCheckbox.tt index 373b23a63f5..82cac51d787 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldCheckbox.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldCheckbox.tt @@ -7,35 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      - [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: - [% USE Title = String(Data.BreadcrumbText) %] - [% Title | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => 'AdminDynamicField', - }, - ] - %] - - [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] - - [% SWITCH Data.Mode %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] - [% CASE 'Change' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -43,7 +16,7 @@
      @@ -51,6 +24,31 @@
      +

      + [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: + [% USE Title = String(Data.BreadcrumbText) %] + [% Title | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => 'AdminDynamicField', + }, + ] + %] + + [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] + + [% SWITCH Data.Mode %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] + [% CASE 'Change' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -63,82 +61,86 @@

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

      -
      +
      - -
      - -

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      -

      [% Translate(Data.NameServerErrorMessage) | html %]

      -

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      - +
      + +
      + +

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      +

      [% Translate(Data.NameServerErrorMessage) | html %]

      +

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      + +
      -
      - -
      - -

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

      -

      [% Translate(Data.LabelServerErrorMessage) | html %]

      -

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      + +
      + +

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

      +

      [% Translate(Data.LabelServerErrorMessage) | html %]

      +

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      -
      - -
      - [% Data.DynamicFieldOrderStrg %] -

      [% Translate("This field is required and must be numeric.") | html %]

      -

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      -

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      + +
      + [% Data.DynamicFieldOrderStrg %] +

      [% Translate("This field is required and must be numeric.") | html %]

      +

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      +

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      -
      - -
      - [% Data.ValidityStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidityStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      -
      - -
      - -
      +
      + +
      + +
      -
      - -
      - -
      +
      + +
      + +
      +
      - [% RenderBlockStart("InternalField") %] -
      - -
      - -

      - [% Translate("This field is protected and can't be deleted.") | html %] -

      -
      +
      + +
      + +

      + [% Translate("This field is protected and can't be deleted.") | html %] +

      +
      [% RenderBlockEnd("InternalField") %]
      @@ -149,9 +151,9 @@

      [% Translate("This dynamic field is used in the following config settings:") | html %]

        - [% RenderBlockStart("DynamicFieldInSysConfigRow") %] +[% RenderBlockStart("DynamicFieldInSysConfigRow") %]
      • [% Data.SettingName %]
        • - [% RenderBlockEnd("DynamicFieldInSysConfigRow") %] +[% RenderBlockEnd("DynamicFieldInSysConfigRow") %]

      @@ -171,27 +173,28 @@
      - -
      - [% Data.DefaultValueStrg %] -

      [% Translate("This is the default value for this field.") | html %]

      +
      + +
      + [% Data.DefaultValueStrg %] +

      [% Translate("This is the default value for this field.") | html %]

      +
      -
      -
      - [% IF Data.Mode == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Mode == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldConfigurationImportExport.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldConfigurationImportExport.tt index 52f0c9a47c1..a3087d6c043 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldConfigurationImportExport.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldConfigurationImportExport.tt @@ -6,21 +6,8 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
      - [% TranslatedSubaction = Translate(Env("Subaction")); %] - - [% BreadcrumbPath = [ - { - Name => Translate("Dynamic field configurations: %s", TranslatedSubaction), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -29,12 +16,12 @@
      + [% TranslatedSubaction = Translate(Env("Subaction")); %] + + [% BreadcrumbPath = [ + { + Name => Translate("Dynamic field configurations: %s", TranslatedSubaction), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      [% Translate("Dynamic fields") | html %]

      -
      - [% RenderBlockStart("DynamicFieldsInvalidBackend") %]

      [% Translate("For the following dynamic fields a configuration cannot be imported because of an invalid backend.") | html %]

      - +
      @@ -173,14 +169,15 @@ [% RenderBlockEnd("DynamicFieldRow") %]
      -
      - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      + [% Translate("Cancel") | html %] + +
      -
      [% ELSE %]

      @@ -191,6 +188,5 @@ [% END %]

      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDateTime.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDateTime.tt index c00bfaf9d4f..a25abb7563c 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDateTime.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDateTime.tt @@ -7,35 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      - [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: - [% USE Title = String(Data.BreadcrumbText) %] - [% Title | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => 'AdminDynamicField', - }, - ] - %] - - [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] - - [% SWITCH Data.Mode %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] - [% CASE 'Change' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -43,7 +16,7 @@
      @@ -51,6 +24,31 @@
      +

      + [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: + [% USE Title = String(Data.BreadcrumbText) %] + [% Title | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => 'AdminDynamicField', + }, + ] + %] + + [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] + + [% SWITCH Data.Mode %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] + [% CASE 'Change' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -63,82 +61,85 @@

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

      -
      +
      - -
      - -

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      -

      [% Translate(Data.NameServerErrorMessage) | html %]

      -

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      - +
      + +
      + +

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      +

      [% Translate(Data.NameServerErrorMessage) | html %]

      +

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      + +
      -
      - -
      - -

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

      -

      [% Translate(Data.LabelServerErrorMessage) | html %]

      -

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      + +
      + +

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

      +

      [% Translate(Data.LabelServerErrorMessage) | html %]

      +

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      -
      - -
      - [% Data.DynamicFieldOrderStrg %] -

      [% Translate("This field is required and must be numeric.") | html %]

      -

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      -

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      + +
      + [% Data.DynamicFieldOrderStrg %] +

      [% Translate("This field is required and must be numeric.") | html %]

      +

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      +

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      -
      - -
      - [% Data.ValidityStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidityStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      -
      - -
      - -
      +
      + +
      + +
      -
      - -
      - -
      +
      + +
      + +
      - [% RenderBlockStart("InternalField") %] -
      - -
      - -

      - [% Translate("This field is protected and can't be deleted.") | html %] -

      -
      +
      + +
      + +

      + [% Translate("This field is protected and can't be deleted.") | html %] +

      +
      [% RenderBlockEnd("InternalField") %]
      @@ -149,9 +150,9 @@

      [% Translate("This dynamic field is used in the following config settings:") | html %]

        - [% RenderBlockStart("DynamicFieldInSysConfigRow") %] +[% RenderBlockStart("DynamicFieldInSysConfigRow") %]
      • [% Data.SettingName %]
        • - [% RenderBlockEnd("DynamicFieldInSysConfigRow") %] +[% RenderBlockEnd("DynamicFieldInSysConfigRow") %]

      @@ -171,89 +172,97 @@
      - -
      - -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate("The difference from NOW (in seconds) to calculate the field default value (e.g. 3600 or -60).") | html %]

      +
      + +
      + +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate("The difference from NOW (in seconds) to calculate the field default value (e.g. 3600 or -60).") | html %]

      +
      -
      - -
      - [% Data.YearsPeriodStrg %] -

      [% Translate("Activate this feature to define a fixed range of years (in the future and in the past) to be displayed on the year part of the field.") | html %]

      +
      + +
      + [% Data.YearsPeriodStrg %] +

      [% Translate("Activate this feature to define a fixed range of years (in the future and in the past) to be displayed on the year part of the field.") | html %]

      +
      -
      - -
      - -

      [% Translate("Years in the past to display (default: 5 years).") | html %]

      -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate("This field must be numeric.") | html %]

      +
      + +
      + +

      [% Translate("Years in the past to display (default: 5 years).") | html %]

      +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate("This field must be numeric.") | html %]

      +
      -
      - -
      - -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate("Years in the future to display (default: 5 years).") | html %]

      +
      + +
      + +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate("Years in the future to display (default: 5 years).") | html %]

      +
      -
      - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] -
      - [% Translate("If special characters (&, @, :, /, etc.) should not be encoded, use 'url' instead of 'uri' filter.") | html %] -
      - [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] -

      + +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] +
      + [% Translate("If special characters (&, @, :, /, etc.) should not be encoded, use 'url' instead of 'uri' filter.") | html %] +
      + [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] +

      +
      -
      - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] +

      +
      -
      - -
      - [% Data.DateRestrictionStrg %] -

      - [% Translate("Here you can restrict the entering of dates of tickets.") | html %] -

      +
      + +
      + [% Data.DateRestrictionStrg %] +

      + [% Translate("Here you can restrict the entering of dates of tickets.") | html %] +

      +
      -
      -
      -
      - [% IF Data.Mode == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Mode == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDropdown.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDropdown.tt index 9acf0aad6df..fef6c3ec38b 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDropdown.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldDropdown.tt @@ -8,35 +8,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      - [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: - [% USE Title = String(Data.BreadcrumbText) %] - [% Title | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => 'AdminDynamicField', - }, - ] - %] - - [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] - - [% SWITCH Data.Mode %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] - [% CASE 'Change' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -44,7 +17,7 @@
      @@ -52,6 +25,31 @@
      +

      + [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: + [% USE Title = String(Data.BreadcrumbText) %] + [% Title | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => 'AdminDynamicField', + }, + ] + %] + + [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] + + [% SWITCH Data.Mode %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] + [% CASE 'Change' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -64,82 +62,85 @@

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

      -
      +
      - -
      - -

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      -

      [% Translate(Data.NameServerErrorMessage) | html %]

      -

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      - +
      + +
      + +

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      +

      [% Translate(Data.NameServerErrorMessage) | html %]

      +

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      + +
      -
      - -
      - -

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

      -

      [% Translate(Data.LabelServerErrorMessage) | html %]

      -

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      + +
      + +

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

      +

      [% Translate(Data.LabelServerErrorMessage) | html %]

      +

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      -
      - -
      - [% Data.DynamicFieldOrderStrg %] -

      [% Translate("This field is required and must be numeric.") | html %]

      -

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      -

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      + +
      + [% Data.DynamicFieldOrderStrg %] +

      [% Translate("This field is required and must be numeric.") | html %]

      +

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      +

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      -
      - -
      - [% Data.ValidityStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidityStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      -
      - -
      - -
      +
      + +
      + +
      -
      - -
      - -
      +
      + +
      + +
      - [% RenderBlockStart("InternalField") %] -
      - -
      - -

      - [% Translate("This field is protected and can't be deleted.") | html %] -

      -
      +
      + +
      + +

      + [% Translate("This field is protected and can't be deleted.") | html %] +

      +
      [% RenderBlockEnd("InternalField") %]
      @@ -150,9 +151,9 @@

      [% Translate("This dynamic field is used in the following config settings:") | html %]

        - [% RenderBlockStart("DynamicFieldInSysConfigRow") %] +[% RenderBlockStart("DynamicFieldInSysConfigRow") %]
      • [% Data.SettingName %]
        • - [% RenderBlockEnd("DynamicFieldInSysConfigRow") %] +[% RenderBlockEnd("DynamicFieldInSysConfigRow") %]

      @@ -172,122 +173,152 @@
      - -
      - +
      + +
      + [% RenderBlockStart("ValueRow") %] -
      - - -

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

      -

      [% Translate(Data.KeyErrorStrg) | html %]

      +
      +
      + +
      + +

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

      +

      [% Translate(Data.KeyErrorStrg) | html %]

      +
      +
      +
      + +
      + - - -

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

      -

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

      +

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

      +

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

      +
      +
      - [% Translate("Remove value") | html %] -
      -
      + [% Translate("Remove value") | html %] +
      [% RenderBlockEnd("ValueRow") %] [% RenderBlockStart("ValueTemplate") %] - [% RenderBlockEnd("ValueTemplate") %] - + +
      -
      - -
      - [% Translate("Add Value") | html %] +
      + +
      + [% Translate("Add Value") | html %] +
      -
      -
      - -
      - [% Data.DefaultValueStrg %] -

      [% Translate("This is the default value for this field.") | html %]

      +
      + +
      + [% Data.DefaultValueStrg %] +

      [% Translate("This is the default value for this field.") | html %]

      +
      -
      -
      - -
      - [% Data.PossibleNoneStrg %] -

      [% Translate("Activate this option to create an empty selectable value.") | html %]

      +
      + +
      + [% Data.PossibleNoneStrg %] +

      [% Translate("Activate this option to create an empty selectable value.") | html %]

      +
      -
      -
      - -
      - [% Data.TreeViewStrg %] -

      [% Translate("Activate this option to display values as a tree.") | html %]

      +
      + +
      + [% Data.TreeViewStrg %] +

      [% Translate("Activate this option to display values as a tree.") | html %]

      +
      -
      - -
      - [% Data.TranslatableValuesStrg %] -

      [% Translate("If you activate this option the values will be translated to the user defined language.") | html %]

      -

      [% Translate("Note") | html %]: [% Translate("You need to add the translations manually into the language translation files.") | html %]

      +
      + +
      + [% Data.TranslatableValuesStrg %] +

      [% Translate("If you activate this option the values will be translated to the user defined language.") | html %]

      +

      [% Translate("Note") | html %]: [% Translate("You need to add the translations manually into the language translation files.") | html %]

      +
      -
      - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] -
      - [% Translate("If special characters (&, @, :, /, etc.) should not be encoded, use 'url' instead of 'uri' filter.") | html %] -
      - [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] +
      + [% Translate("If special characters (&, @, :, /, etc.) should not be encoded, use 'url' instead of 'uri' filter.") | html %] +
      + [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] +

      +
      -
      - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] +

      +
      -
      -
      -
      - [% IF Data.Mode == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      +
      + [% Translate("Cancel") | html %] + + + [% IF Data.Mode == 'Change' %] + + + + + [% ELSE %] + + + [% END %] + +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldMultiselect.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldMultiselect.tt index 1cb0914773d..39c296cbd3d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldMultiselect.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldMultiselect.tt @@ -7,35 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      - [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: - [% USE Title = String(Data.BreadcrumbText) %] - [% Title | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => 'AdminDynamicField', - }, - ] - %] - - [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] - - [% SWITCH Data.Mode %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] - [% CASE 'Change' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -43,7 +16,7 @@
      @@ -51,6 +24,31 @@
      +

      + [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: + [% USE Title = String(Data.BreadcrumbText) %] + [% Title | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => 'AdminDynamicField', + }, + ] + %] + + [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] + + [% SWITCH Data.Mode %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] + [% CASE 'Change' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -63,82 +61,85 @@

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

      -
      +
      - -
      - -

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      -

      [% Translate(Data.NameServerErrorMessage) | html %]

      -

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      - +
      + +
      + +

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      +

      [% Translate(Data.NameServerErrorMessage) | html %]

      +

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      + +
      -
      - -
      - -

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

      -

      [% Translate(Data.LabelServerErrorMessage) | html %]

      -

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      + +
      + +

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

      +

      [% Translate(Data.LabelServerErrorMessage) | html %]

      +

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      -
      - -
      - [% Data.DynamicFieldOrderStrg %] -

      [% Translate("This field is required and must be numeric.") | html %]

      -

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      -

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      + +
      + [% Data.DynamicFieldOrderStrg %] +

      [% Translate("This field is required and must be numeric.") | html %]

      +

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      +

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      -
      - -
      - [% Data.ValidityStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidityStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      -
      - -
      - -
      +
      + +
      + +
      -
      - -
      - -
      +
      + +
      + +
      - [% RenderBlockStart("InternalField") %] -
      - -
      - -

      - [% Translate("This field is protected and can't be deleted.") | html %] -

      -
      +
      + +
      + +

      + [% Translate("This field is protected and can't be deleted.") | html %] +

      +
      [% RenderBlockEnd("InternalField") %]
      @@ -149,9 +150,9 @@

      [% Translate("This dynamic field is used in the following config settings:") | html %]

        - [% RenderBlockStart("DynamicFieldInSysConfigRow") %] +[% RenderBlockStart("DynamicFieldInSysConfigRow") %]
      • [% Data.SettingName %]
        • - [% RenderBlockEnd("DynamicFieldInSysConfigRow") %] +[% RenderBlockEnd("DynamicFieldInSysConfigRow") %]

      @@ -168,101 +169,118 @@

      [% Translate(Data.FieldTypeName) | html %] [% Translate("Field Settings") | html %]

      +
      - -
      - +
      + +
      + [% RenderBlockStart("ValueRow") %] -
      - - -

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

      -

      [% Translate(Data.KeyErrorStrg) | html %]

      - - - -

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

      -

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

      +
      +
      + +
      + +

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

      +

      [% Translate(Data.KeyErrorStrg) | html %]

      +
      +
      +
      + +
      + +

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

      +

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

      +
      +
      - [% Translate("Remove value") | html %] -
      -
      + [% Translate("Remove value") | html %] +
      [% RenderBlockEnd("ValueRow") %] [% RenderBlockStart("ValueTemplate") %] - [% RenderBlockEnd("ValueTemplate") %] - + +
      -
      - -
      - [% Translate("Add Value") | html %] +
      + +
      + [% Translate("Add Value") | html %] +
      -
      -
      - -
      - [% Data.DefaultValueStrg %] -

      [% Translate("This is the default value for this field.") | html %]

      +
      + +
      + [% Data.DefaultValueStrg %] +

      [% Translate("This is the default value for this field.") | html %]

      +
      -
      -
      - -
      - [% Data.PossibleNoneStrg %] -

      [% Translate("Activate this option to create an empty selectable value.") | html %]

      +
      + +
      + [% Data.PossibleNoneStrg %] +

      [% Translate("Activate this option to create an empty selectable value.") | html %]

      +
      -
      -
      - -
      - [% Data.TreeViewStrg %] -

      [% Translate("Activate this option to display values as a tree.") | html %]

      +
      + +
      + [% Data.TreeViewStrg %] +

      [% Translate("Activate this option to display values as a tree.") | html %]

      +
      -
      - -
      - [% Data.TranslatableValuesStrg %] -

      [% Translate("If you activate this option the values will be translated to the user defined language.") | html %]

      -

      [% Translate("Note") | html %]: [% Translate("You need to add the translations manually into the language translation files.") | html %]

      +
      + +
      + [% Data.TranslatableValuesStrg %] +

      [% Translate("If you activate this option the values will be translated to the user defined language.") | html %]

      +

      [% Translate("Note") | html %]: [% Translate("You need to add the translations manually into the language translation files.") | html %]

      +
      -
      -
      -
      - [% IF Data.Mode == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Mode == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldScreenConfiguration.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldScreenConfiguration.tt index f94ede0731d..1de70eeec6d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldScreenConfiguration.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldScreenConfiguration.tt @@ -6,22 +6,9 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
      -

      [% Translate("Assignment of dynamic fields to screens") | html %]

      - +
      [% RenderBlockStart("Overview") %] - [% BreadcrumbPath = [ - { - Name => Translate('Assignment of dynamic fields to screens'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +

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

      @@ -29,25 +16,36 @@
      +
      +

      [% Translate("Assignment of dynamic fields to screens") | html %]

      + [% BreadcrumbPath = [ + { + Name => Translate('Assignment of dynamic fields to screens'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

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

      -
      - +
      @@ -57,7 +55,7 @@
    • [% Translate("Default columns") | html %]
      • [% RenderBlockStart("DefaultColumnsScreenOverviewRow") %]
    • - [% Data.Name | html %] + [% Data.Name | html %]
      • [% RenderBlockEnd("DefaultColumnsScreenOverviewRow") %] @@ -72,7 +70,7 @@ [% RenderBlockEnd("NoDataFoundMsg") %] [% RenderBlockStart("DynamicFieldOverviewRow") %]
    • - + [% Translate(Data.Name) | html %] ([% Data.DynamicField | html %])
      • [% RenderBlockEnd("DynamicFieldOverviewRow") %] @@ -82,33 +80,8 @@
      [% RenderBlockEnd("Overview") %] - [% RenderBlockStart("Edit") %] - [% USE EditTitle = String(Data.BreadcrumbTitle) %] - [% TypeDescriptions = { - DynamicFieldScreen => 'Screen', - DefaultColumnsScreen => 'Default columns', - DynamicField => 'Dynamic field', - } - %] - [% TypeDescription = TypeDescriptions.item(Data.Type) || Data.Type %] - [% BreadcrumbPath = [ - { - Name => Translate('Assignment of dynamic fields to screens'), - Link => Env("Action"), - }, - { - Name => EditTitle.append(Translate(TypeDescription), ": ", Data.Element), - } - ] - %] - - [% DynamicFieldSelected = ( Data.Type == 'DynamicField' ) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +

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

      @@ -116,7 +89,7 @@
      @@ -127,7 +100,8 @@
      - + +
      @@ -136,7 +110,7 @@ [% RenderBlockStart("ActionOverviewRowEdit") %] - + [% RenderBlockEnd("ActionOverviewRowEdit") %] @@ -144,12 +118,35 @@ +
      + [% USE EditTitle = String(Data.BreadcrumbTitle) %] + [% TypeDescriptions = { + DynamicFieldScreen => 'Screen', + DefaultColumnsScreen => 'Default columns', + DynamicField => 'Dynamic field', + } + %] + [% TypeDescription = TypeDescriptions.item(Data.Type) || Data.Type %] + [% BreadcrumbPath = [ + { + Name => Translate('Assignment of dynamic fields to screens'), + Link => Env("Action"), + }, + { + Name => EditTitle.append(Translate(TypeDescription), ": ", Data.Element), + } + ] + %] + + [% DynamicFieldSelected = ( Data.Type == 'DynamicField' ) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]

      [% Translate(Data.Header, Data.Element) | html %]

      -
      +
      @@ -157,31 +154,31 @@ -
      -
      -

      - [% Translate("You can assign elements by dragging and dropping them to the lists of available, disabled, assigned and required elements.") | html %] -

      -
      +
      + +

      + [% Translate("You can assign elements by dragging and dropping them to the lists of available, disabled, assigned and required elements.") | html %] +

      +
      - [% Translate("Assign selected elements to this list") | html %] + [% Translate("Assign selected elements to this list") | html %] -
      [% RenderBlockEnd("Edit") %] - -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldText.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldText.tt index 1806f561477..6c262ad2a36 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldText.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldText.tt @@ -7,35 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      - [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: - [% USE Title = String(Data.BreadcrumbText) %] - [% Title | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => 'AdminDynamicField', - }, - ] - %] - - [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] - - [% SWITCH Data.Mode %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] - [% CASE 'Change' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -43,7 +16,7 @@
      @@ -51,6 +24,31 @@
      +

      + [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: + [% USE Title = String(Data.BreadcrumbText) %] + [% Title | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => 'AdminDynamicField', + }, + ] + %] + + [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] + + [% SWITCH Data.Mode %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] + [% CASE 'Change' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -62,83 +60,87 @@

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

      +
      -
      +
      - -
      - -

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      -

      [% Translate(Data.NameServerErrorMessage) | html %]

      -

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      - +
      + +
      + +

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      +

      [% Translate(Data.NameServerErrorMessage) | html %]

      +

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      + +
      -
      - -
      - -

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

      -

      [% Translate(Data.LabelServerErrorMessage) | html %]

      -

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      + +
      + +

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

      +

      [% Translate(Data.LabelServerErrorMessage) | html %]

      +

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      -
      - -
      - [% Data.DynamicFieldOrderStrg %] -

      [% Translate("This field is required and must be numeric.") | html %]

      -

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      -

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      + +
      + [% Data.DynamicFieldOrderStrg %] +

      [% Translate("This field is required and must be numeric.") | html %]

      +

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      +

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      -
      - -
      - [% Data.ValidityStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidityStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      -
      - -
      - -
      +
      + +
      + +
      -
      - -
      - -
      +
      + +
      + +
      - [% RenderBlockStart("InternalField") %] -
      - -
      - -

      - [% Translate("This field is protected and can't be deleted.") | html %] -

      -
      +
      + +
      + +

      + [% Translate("This field is protected and can't be deleted.") | html %] +

      +
      [% RenderBlockEnd("InternalField") %]
      @@ -149,9 +151,9 @@

      [% Translate("This dynamic field is used in the following config settings:") | html %]

        - [% RenderBlockStart("DynamicFieldInSysConfigRow") %] +[% RenderBlockStart("DynamicFieldInSysConfigRow") %]
      • [% Data.SettingName %]
        • - [% RenderBlockEnd("DynamicFieldInSysConfigRow") %] +[% RenderBlockEnd("DynamicFieldInSysConfigRow") %]

      @@ -172,141 +174,157 @@
      [% RenderBlockStart("ColsRowsValues") %] - -
      - -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate(Data.RowsServerErrorMessage) | html %]

      -

      [% Translate("Specify the height (in lines) for this field in the edit mode.") | html %]

      +
      + +
      + +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate(Data.RowsServerErrorMessage) | html %]

      +

      [% Translate("Specify the height (in lines) for this field in the edit mode.") | html %]

      +
      -
      - -
      - -

      [% Translate("This field must be numeric.") | html %]

      -

      [% Translate(Data.ColsServerErrorMessage) | html %]

      -

      [% Translate("Specify the width (in characters) for this field in the edit mode.") | html %]

      +
      + +
      + +

      [% Translate("This field must be numeric.") | html %]

      +

      [% Translate(Data.ColsServerErrorMessage) | html %]

      +

      [% Translate("Specify the width (in characters) for this field in the edit mode.") | html %]

      +
      -
      [% RenderBlockEnd("ColsRowsValues") %] - - -
      +
      + +
      [% RenderBlockStart("DefaultValueText") %] - + [% RenderBlockEnd("DefaultValueText") %] [% RenderBlockStart("DefaultValueTextArea") %] - + [% RenderBlockEnd("DefaultValueTextArea") %] -

      [% Translate("This is the default value for this field.") | html %]

      +

      [% Translate("This is the default value for this field.") | html %]

      +
      -
      [% RenderBlockStart("Link") %] - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] -
      - [% Translate("If special characters (&, @, :, /, etc.) should not be encoded, use 'url' instead of 'uri' filter.") | html %] -
      - [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] +
      + [% Translate("If special characters (&, @, :, /, etc.) should not be encoded, use 'url' instead of 'uri' filter.") | html %] +
      + [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] +

      +
      -
      - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] +

      +
      -
      - [% RenderBlockEnd("Link") %] +
      + +
      +

      + [% Translate("Here you can specify a regular expression to check the value. The regex will be executed with the modifiers xms.") | html %] +
      + [% Translate("Example") | html %]: ^[0-9]$ +

      + +[% RenderBlockStart("RegExRow") %] +
      +
      + +
      + +

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

      +

      [% Translate("Invalid RegEx") | html %]: [% Data.RegExServerErrorMessage | html %]

      +
      +
      - -
      -

      - [% Translate("Here you can specify a regular expression to check the value. The regex will be executed with the modifiers xms.") | html %] -
      - [% Translate("Example") | html %]: ^[0-9]$ -

      - -
      +
      + +
      + +

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

      +

      [% Data.CustomerRegExErrorMessageServerErrorMessage | Translate | html %]

      + + + +
      +
      +
      +[% RenderBlockEnd("RegExRow") %] +
      +
      -[% RenderBlockStart("RegExRow") %] -
      - + -[% RenderBlockEnd("RegExRow") %] -
      - - +
      +
      - -

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

      -

      [% Data.CustomerRegExErrorMessageServerErrorMessage | Translate | html %]

      - - + +
      -
      -
      -
      - - -
      - - -
      -
      -
      -
      -
      - [% IF Data.Mode == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      +
      + [% Translate("Cancel") | html %] + + + [% IF Data.Mode == 'Change' %] + + + + + [% ELSE %] + + [% END %] +
      -
      +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice.tt index fabd0354767..4af08d5ef14 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice.tt @@ -6,35 +6,8 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
      -

      - [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: - [% USE Title = String(Data.BreadcrumbText) %] - [% Title | html %] -

      - - [% BreadcrumbPath = [ - { - Name => Translate('Dynamic Fields Management'), - Link => 'AdminDynamicField', - }, - ] - %] - - [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] - - [% SWITCH Data.Mode %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] - [% CASE 'Change' %] - [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - -
      +
      +

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

      @@ -42,7 +15,7 @@
      @@ -50,94 +23,124 @@
      +

      + [% Translate("Dynamic Fields") | html %] - [% Translate(Data.ObjectTypeName) | html %]: + [% USE Title = String(Data.BreadcrumbText) %] + [% Title | html %] +

      + + [% BreadcrumbPath = [ + { + Name => Translate('Dynamic Fields Management'), + Link => 'AdminDynamicField', + }, + ] + %] + + [% USE BreadcrumbName = String(Translate(Data.ObjectTypeName)) %] + + [% SWITCH Data.Mode %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title ) }) %] + [% CASE 'Change' %] + [% BreadcrumbPath.push({ Name => BreadcrumbName.append( ': ', Title, ' - ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
      -

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

      -
      +
      - -
      - -

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      -

      [% Translate(Data.NameServerErrorMessage) | html %]

      -

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      - +
      + +
      + +

      [% Translate("This field is required, and the value should be alphabetic and numeric characters only.") | html %]

      +

      [% Translate(Data.NameServerErrorMessage) | html %]

      +

      [% Translate("Must be unique and only accept alphabetic and numeric characters.") | html %]

      + +
      -
      - -
      - -

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

      -

      [% Translate(Data.LabelServerErrorMessage) | html %]

      -

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      + +
      + +
      + +

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

      +

      [% Translate(Data.LabelServerErrorMessage) | html %]

      +

      [% Translate("This is the name to be shown on the screens where the field is active.") | html %]

      +
      -
      - -
      - [% Data.DynamicFieldOrderStrg %] -

      [% Translate("This field is required and must be numeric.") | html %]

      -

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      -

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      + +
      + [% Data.DynamicFieldOrderStrg %] +

      [% Translate("This field is required and must be numeric.") | html %]

      +

      [% Translate(Data.FieldOrderServerErrorMessage) | html %]

      +

      [% Translate("This is the order in which this field will be shown on the screens where is active.") | html %]

      +
      -
      - -
      - [% Data.ValidityStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidityStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      -
      - -
      - -
      +
      + +
      + + +
      -
      - -
      - -
      +
      + +
      + + +
      [% RenderBlockStart("InternalField") %] -
      - -
      - -

      - [% Translate("This field is protected and can't be deleted.") | html %] -

      -
      +
      + +
      + +

      + [% Translate("This field is protected and can't be deleted.") | html %] +

      +
      [% RenderBlockEnd("InternalField") %]
      @@ -148,9 +151,9 @@

      [% Translate("This dynamic field is used in the following config settings:") | html %]

        - [% RenderBlockStart("DynamicFieldInSysConfigRow") %] +[% RenderBlockStart("DynamicFieldInSysConfigRow") %]
      • [% Data.SettingName %]
        • - [% RenderBlockEnd("DynamicFieldInSysConfigRow") %] +[% RenderBlockEnd("DynamicFieldInSysConfigRow") %]

      @@ -170,99 +173,100 @@
      - [% INCLUDE "AdminDynamicFieldWebservice/Config.tt" %] - -
      + +
      + +
      [% RenderBlockStart("DefaultValue") %] - + [% RenderBlockEnd("DefaultValue") %] -

      [% Translate("This is the default value for this field.") | html %]

      +

      [% Translate("This is the default value for this field.") | html %]

      +
      -
      - -
      +
      + +
      [% RenderBlockStart("DefaultSearchTerm") %] - + [% RenderBlockEnd("DefaultSearchTerm") %] -

      [% Translate("This is the default term for the click search.") | html %]

      +

      [% Translate("This is the default term for the click search.") | html %]

      +
      -
      - [% RenderBlockStart("InitialSearchTerm") %] - -
      - -

      [% Translate("This is the default search term when the mask is loaded.") | html %]

      +
      + +
      + +

      [% Translate("This is the default search term when the mask is loaded.") | html %]

      +
      -
      [% RenderBlockEnd("InitialSearchTerm") %] - [% RenderBlockStart("Link") %] - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] -
      - [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("Here you can specify an optional HTTP link for the field value in Overviews and Zoom screens.") | html %] +
      + [% Translate("Example") | html %]: http://some.example.com/handle?query=[% Data.Field1 | uri %] +

      +
      -
      - -
      - -

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      -

      - [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] -

      +
      + +
      + +

      [% Translate("Reserved keywords. The following placeholders are not allowed:") | html %]
      [% Data.(Link|LinkPreview|Title|Value) %]

      +

      + [% Translate("If filled in, this URL will be used for a preview which is shown when this link is hovered in ticket zoom. Please note that for this to work, the regular URL field above needs to be filled in, too.") | html %] +

      +
      -
      - [% RenderBlockEnd("Link") %] - -
      - [% Data.AdditionalAttributes %] -

      [% Translate("Attributes for invoker execution (initially default values will be used).") | html %]

      +
      + +
      + [% Data.AdditionalAttributes %] +

      [% Translate("Attributes for invoker execution (initially default values will be used).") | html %]

      +
      -
      - [% RenderBlockStart("AttributeKey") %] - -
      - [% RenderBlockStart("SelectableAttributeKeyRow") %] - [% Data.AtributeLabel %]:
      - [% RenderBlockStart("AttributeType") %] - [% Data.AttributeLabel %] - [% RenderBlockEnd("AttributeType") %] -
      - [% RenderBlockEnd("SelectableAttributeKeyRow") %] - -

      [% Translate("Custom attribute form for invoker execution.") | html %]

      +
      + +
      +[% RenderBlockStart("SelectableAttributeKeyRow") %] + [% Data.AtributeLabel %]:
      +[% RenderBlockStart("AttributeType") %] + [% Data.AttributeLabel %] +[% RenderBlockEnd("AttributeType") %] +
      +[% RenderBlockEnd("SelectableAttributeKeyRow") %] +

      [% Translate("Custom attribute form for invoker execution.") | html %]

      +
      -
      [% RenderBlockEnd("AttributeKey") %] -
      [% INCLUDE "AdminDynamicFieldWebservice/Test.tt" %] -
      -
      - [% IF Data.Mode == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Mode == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice/Test.tt b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice/Test.tt index 15915149c4f..ea149974d2d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice/Test.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminDynamicFieldWebservice/Test.tt @@ -5,16 +5,16 @@ # the enclosed file COPYING for license information (AGPL). If you # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- +

      [% Translate("Test settings") | html %]

      -
      - +
      +
      -
      -
      [% RenderBlockEnd("TestField") %]
      @@ -51,7 +49,6 @@
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminEmail.tt b/Kernel/Output/HTML/Templates/Standard/AdminEmail.tt index 91a8ecd9251..39d01371274 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminEmail.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminEmail.tt @@ -7,20 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Admin Message") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Admin Message'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

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

      @@ -33,109 +21,122 @@
      +

      [% Translate("Admin Message") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Admin Message'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]

      [% Translate("Create Administrative Message") | html %]

      - [% RenderBlockStart("Sent") %]

      [% Translate("Your message was sent to") | html %]: [% Data.Bcc | html %]

      [% RenderBlockEnd("Sent") %] - [% RenderBlockStart("Form") %]
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.UserOption %] +
      + +
      + [% Data.UserOption %] +
      -
      - -
      - [% Data.GroupOption %] +
      + +
      + [% Data.GroupOption %] +
      -
      - -
      - - -
      - - +
      + +
      + + +
      + + +
      -
      - [% RenderBlockStart("RoleRecipients") %] - -
      - [% Data.RoleOption %] +
      + +
      + [% Data.RoleOption %] +
      -
      [% RenderBlockEnd("RoleRecipients") %] - [% RenderBlockStart("CustomerUserGroups") %] - -
      - +
      + +
      + +
      -
      [% RenderBlockEnd("CustomerUserGroups") %] - - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      - -
      - -
      -

      [% 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("Form") %] -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminGenericAgent.tt b/Kernel/Output/HTML/Templates/Standard/AdminGenericAgent.tt index 8566e11f446..103e32c8791 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminGenericAgent.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminGenericAgent.tt @@ -6,34 +6,9 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - -
      -

      [% Translate("Generic Agent Job Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Generic Agent Job Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Subaction %] - [% CASE 'Update' %] - [% IF Data.Profile %] - [% USE EditJob = String(Translate("Edit Job")) %] - [% BreadcrumbPath.push({ Name => EditJob.append( ': ', Data.Profile ) }) %] - [% ELSE %] - [% BreadcrumbPath.push({ Name => Translate("Add Job"),}) %] - [% END %] - [% CASE 'Run' %] - [% USE RunJob = String(Translate("Run Job")) %] - [% BreadcrumbPath.push({ Name => RunJob.append( ': ', Data.Profile ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      + +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -43,12 +18,12 @@ @@ -70,9 +45,9 @@

      [% Translate('Related Actions') | html %]

      -
      - +

      [% Translate("Generic Agent Job Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Generic Agent Job Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Subaction %] + [% CASE 'Update' %] + [% IF Data.Profile %] + [% USE EditJob = String(Translate("Edit Job")) %] + [% BreadcrumbPath.push({ Name => EditJob.append( ': ', Data.Profile ) }) %] + [% ELSE %] + [% BreadcrumbPath.push({ Name => Translate("Add Job"),}) %] + [% END %] + [% CASE 'Run' %] + [% USE RunJob = String(Translate("Run Job")) %] + [% BreadcrumbPath.push({ Name => RunJob.append( ': ', Data.Profile ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("Overview") %]
      -
      +

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

      -       - + + Show Valid + Show All
      @@ -100,8 +99,8 @@
      - - + + @@ -122,14 +121,14 @@ - @@ -157,26 +156,28 @@ [% END %]
      - -
      - -
      -

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

      -
      +
      + +
      + +
      +

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

      +
      [% RenderBlockStart("ProfileInvalidMsg") %] -

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

      +

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

      [% RenderBlockEnd("ProfileInvalidMsg") %] [% RenderBlockStart("ProfileInvalidMsgAddError") %] -

      [% Translate("The name you entered already exists.") | html %]

      +

      [% Translate("The name you entered already exists.") | html %]

      [% RenderBlockEnd("ProfileInvalidMsgAddError") %] +
      -
      - -
      - [% Data.ValidOption %] +
      + +
      + [% Data.ValidOption %] +
      -
      @@ -191,7 +192,7 @@
      -
      [% Translate("Name") | html %]
      [% Translate(Data.Element) | html %][% IF DynamicFieldSelected %] ([% Data.ElementKey | html %])[% END %][% Translate(Data.Element) | html %][% IF DynamicFieldSelected %] ([% Data.ElementKey | html %])[% END %]
      [% Translate("Name") | html %] [% Translate("Last run") | html %] [% Translate("Validity") | html %][% Translate("Delete") | html %][% Translate("Run Now!") | html %][% Translate("Delete") | html %][% Translate("Run") | html %]
      [% Data.ScheduleLastRun | Localize("TimeLong") %] [% Translate(Data.ShownValid) | html %] - - [% Translate("Delete") | html %] + + + [% IF Data.Valid == 1 %] - - [% Translate("Run this task") | html %] + + [% END %]
      +
      @@ -215,19 +216,19 @@ [% Translate("Automatic execution values are in the system timezone.") | html %]

      [% RenderBlockStart("JobScheduleWarning") %] -

      +

      [% Translate("Currently this generic agent job will not run automatically.") | html %]
      [% Translate("To enable automatic execution select at least one value from minutes, hours and days!") | html %]

      [% RenderBlockEnd("JobScheduleWarning") %] -
      + -
      + +
      +
      @@ -256,10 +257,10 @@ [% RenderBlockEnd("NoDataFoundMsgEvent") %] - - + + - - + + @@ -146,12 +147,14 @@ - [% RenderBlockEnd("OverviewResultRow") %] @@ -164,11 +167,9 @@ [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewAdd") %]

      [% Translate("Add Mail Account") | html %]

      @@ -178,32 +179,34 @@
      - -
      - [% Data.TypeOptionAdd %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.TypeOptionAdd %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.AuthenticationTypeSelection %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.AuthenticationTypeSelection %] +
      +

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

      +
      +
      +

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

      +
      -
      -
      [% RenderBlockEnd("OverviewAdd") %] - [% RenderBlockStart("OverviewUpdate") %]

      [% Translate("Edit Mail Account") | html %]

      @@ -328,32 +329,34 @@ [% END %]
      - -
      - [% Data.TypeOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.TypeOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.AuthenticationTypeSelection %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.AuthenticationTypeSelection %] +
      +

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

      +
      +
      +

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

      +
      -
      -
      @@ -491,6 +493,5 @@ -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminNavigationBar.tt b/Kernel/Output/HTML/Templates/Standard/AdminNavigationBar.tt index 65f2e00f0a4..e823f52e20c 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminNavigationBar.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminNavigationBar.tt @@ -6,21 +6,11 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -[% RenderBlockStart("AdminNavBar") %] -
      +[% RenderBlockStart("AdminNavBar") %] +

      [% Translate("Administration Overview") | html %]

      - -
      -
      -
      -

      -
      -
      - -
      -
      - +

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

      @@ -32,7 +22,8 @@ [% FOREACH Item IN Data.Favourites %]
      - + + [% END %] [% END %] @@ -51,68 +42,81 @@
      - -
      - -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminOAuth2TokenManagement/Overview.tt b/Kernel/Output/HTML/Templates/Standard/AdminOAuth2TokenManagement/Overview.tt index ce021047df2..d651533a670 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminOAuth2TokenManagement/Overview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminOAuth2TokenManagement/Overview.tt @@ -6,21 +6,9 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
      -

      [% Translate("Manage OAuth2 tokens and their configurations") | html %] - [% Translate(Data.Action) | html %]

      +
      - [% BreadcrumbPath = [ - { - Name => Translate("Manage OAuth2 tokens and their configurations"), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      [% IF Data.TokenConfigTemplateSelection %]
      @@ -49,20 +37,22 @@

      [% Translate("Upload a YAML file to import token configurations. See documentation on OAuth2 token management for further details.") | html %]

      -
        +
        • -
          - - +
          +
          + + +
          -
      +

      [% Translate("Manage OAuth2 tokens and their configurations") | html %] - [% Translate(Data.Action) | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("Manage OAuth2 tokens and their configurations"), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      [% Translate("OAuth2 token configurations") | html %]

      - -
      +
      [% Translate("Type") | html %]
      [% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %] - [% Translate("Delete account") | html %] - + + - [% Translate("Fetch mail") | html %] + + [% Translate("Delete account") | html %] + +
      [% Translate(Item.Name) | html %]
      @@ -97,7 +98,8 @@ - + + @@ -157,12 +159,14 @@ [% Translate(Data.ValidIDs.item(TokenConfig.ValidID)) | html %] + @@ -455,10 +454,10 @@ @@ -503,7 +502,7 @@ @@ -512,15 +511,15 @@ @@ -534,28 +533,11 @@
      - [% RenderBlockEnd("Overview") %] - - [% RenderBlockStart("Package") %] -
      -

      [% Translate("Package Manager") | html %]

      +
      - [% BreadcrumbPath = [ - { - Name => Translate('Package Manager'), - Link => Env("Action"), - }, - ] - %] - - [% USE PackageBreadcrumb = String(Translate("Package Information")) %] - [% BreadcrumbPath.push({ Name => PackageBreadcrumb.append( ': ', Data.Name ) }) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +

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

      @@ -565,32 +547,32 @@
      -
      -
      +

      [% Translate("Package Manager") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Package Manager'), + Link => Env("Action"), + }, + ] + %] + + [% USE PackageBreadcrumb = String(Translate("Package Information")) %] + [% BreadcrumbPath.push({ Name => PackageBreadcrumb.append( ': ', Data.Name ) }) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + +

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

      [% RenderBlockStart("PackageItemDescription") %] - -
      ([% Data.Lang | html %]) [% Data.Content | html %]
      -
      +
      + +
      ([% Data.Lang | html %]) [% Data.Content | html %]
      +
      [% RenderBlockEnd("PackageItemDescription") %] [% RenderBlockStart("PackageItemGeneric") %] - -
      [% Data.Content %]
      -
      +
      + +
      [% Data.Content %]
      +
      [% RenderBlockEnd("PackageItemGeneric") %]
      +
      + +

      [% Translate("Change Log") | html %]

      @@ -648,6 +649,9 @@
      +
      + +

      [% Translate("List of Files") | html %]

      @@ -678,11 +682,12 @@ [% RenderBlockEnd("PackageItemFilelistFileNote") %]
      [% RenderBlockEnd("PackageItemFilelistFile") %] @@ -691,12 +696,15 @@ [% RenderBlockStart("PackageItemDatabase") %] -
      +
      +
      + +

      [% Data.TagName | html %] ([% Data.Type | html %])

      -

      [% Data.Tag | html %]: [% Data.Name | html %] ([% Data.Version | html %])

      +

      [% Data.Tag | html %]: [% Data.Name | html %] ([% Data.Version | html %])

      [% Translate("Token status") | html %] [% Translate("Refresh token status") | html %] [% Translate("Validity of token configuration") | html %][% Translate("Actions") | html %][% Translate("Refresh") | html %][% Translate("Delete") | html %]
      - + [% Translate("Request new token") | html %] -   + [% IF !TokenConfig.Used %] - + + [% Translate("Delete") | html %] [% END %] @@ -181,7 +185,5 @@ -
      - diff --git a/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessInstalled.tt b/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessInstalled.tt deleted file mode 100644 index a5f8940e475..00000000000 --- a/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessInstalled.tt +++ /dev/null @@ -1,179 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- - -[% - SET OTRSBusinessLabel = 'OTRS Business Solution™'; - SET OTRSBusinessLabelPlain = 'OTRS Business Solution™'; -%] - -
      -

      [% Translate("Manage %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("Manage %s", OTRSBusinessLabelPlain), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      -
      -
      -

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

      -
      -
      - -
      -
      -
      -
      -
      -

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

      -
      -
      -

      - [% Translate('%s makes contact regularly with cloud.otrs.com to check on available updates and the validity of the underlying contract.') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      -
      -
      -
      -
      -[% RenderBlockStart("NotEntitled") %] -
      -
      -

      [% Translate("Unauthorized Usage Detected") | html %]

      -
      -
      - -

      - [% Translate('This system uses the %s without a proper license! Please make contact with %s to renew or activate your contract!') | html | ReplacePlaceholders(OTRSBusinessLabel, 'sales@otrs.com') %] -

      -
      -
      -
      -[% RenderBlockEnd("NotEntitled") %] -[% RenderBlockStart("NeedsReinstall") %] -
      -
      -

      [% Translate("%s not Correctly Installed") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      - -

      - [% Translate('Your %s is not correctly installed. Please reinstall it with the button below.') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      - [% Translate('Reinstall %s') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -
      -
      -
      -
      -[% RenderBlockEnd("NeedsReinstall") %] -[% RenderBlockStart("NeedsReinstallAndUpdate") %] -
      -
      -

      [% Translate("%s not Correctly Installed") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      - -

      - [% Translate('Your %s is not correctly installed, and there is also an update available.') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -
      - [% Translate('You can either reinstall your current version or perform an update with the buttons below (update recommended).') | html %] -

      -

      - [% Translate('Update %s') | html | ReplacePlaceholders(OTRSBusinessLabel) %] - [% Translate('or') | html %] - [% Translate('Reinstall %s') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      -
      -
      -[% RenderBlockEnd("NeedsReinstallAndUpdate") %] -[% RenderBlockStart("ReinstallImpossible") %] -
      -
      -

      [% Translate("%s Not Yet Available") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      - -

      - [% Translate('%s will be available soon.') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      -
      -
      -[% RenderBlockEnd("ReinstallImpossible") %] -[% RenderBlockStart("NeedsUpdate") %] -
      -
      -

      [% Translate("%s Update Available") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      - -

      - [% Translate('An update for your %s is available! Please update at your earliest!') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      - [% Translate('Update %s') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -
      -
      -
      -
      -[% RenderBlockEnd("NeedsUpdate") %] -[% RenderBlockStart("EverythingOk") %] -
      -
      -

      [% Translate("%s Correctly Deployed") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      - -

      - [% Translate('Congratulations, your %s is correctly installed and up to date!') | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      -
      -
      -[% RenderBlockEnd("EverythingOk") %] -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessNotInstalled.tt b/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessNotInstalled.tt deleted file mode 100644 index 8ac3e5a5761..00000000000 --- a/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessNotInstalled.tt +++ /dev/null @@ -1,172 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- - -[% - SET OTRSBusinessLabel = 'OTRS Business Solution™'; - SET OTRSBusinessLabelPlain = 'OTRS Business Solution™'; -%] - -
      -

      [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("Upgrade to %s", OTRSBusinessLabelPlain), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      -[% RenderBlockStart("Actions") %] -
      -
      -

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

      -
      -
      - -
      -
      -[% RenderBlockEnd("Actions") %] -
      -
      -

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

      -
      -
      -

      - [% Translate("%s makes contact regularly with cloud.otrs.com to check on available updates and the validity of the underlying contract.") | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
      -
      -
      -
      -
      -[% RenderBlockStart("NotAvailable") %] -
      -
      -

      [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      -

      - [% Translate("%s will be available soon. Please check again in a few days.") | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -

      - [% Translate("Please have a look at %s for more information.") | html | ReplacePlaceholders('otrs-business-solution.com') %] -

      -
      -
      -
      -[% RenderBlockEnd("NotAvailable") %] -[% RenderBlockStart("NotRegistered") %] -
      -
      -

      [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      -

      - [% Translate("Your ((OTRS)) Community Edition is the base for all future actions. Please register first before you continue with the upgrade process of %s!") | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      - [% IF Config("Frontend::Module").AdminRegistration %] -
      - - [% Translate("Register this System") | html %] - -
      - [% ELSE %] -
      -

      - [% Translate("System Registration is disabled for your system. Please check your configuration.") | html %] -

      -
      - [% END %] -
      -
      -
      -[% RenderBlockEnd("NotRegistered") %] -[% RenderBlockStart("NotEntitled") %] -
      -
      -

      [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      -

      - [% Translate("Before you can benefit from %s, please contact %s to get your %s contract.") | html | ReplacePlaceholders(OTRSBusinessLabel, 'sales@otrs.com', OTRSBusinessLabel) %] -

      -
      -
      -
      -[% RenderBlockEnd("NotEntitled") %] -[% RenderBlockStart("EntitlementStatusUnclear") %] -
      -
      -

      [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      -
      -
      -

      - [% Translate("Connection to cloud.otrs.com via HTTPS couldn't be established. Please make sure that your OTRS can connect to cloud.otrs.com via port 443.") | html %] -

      -
      -
      -
      -[% RenderBlockEnd("EntitlementStatusUnclear") %] -[% RenderBlockStart("Install") %] -
      -
      - [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %] -
      -
      - [% IF Data.ShowBlock == "IncompatibleInfo" %] -

      [% Translate("Package installation requires patch level update of OTRS.") | html %]

      -

      [% Translate("Please visit our customer portal and file a request.") | html %]

      -

      [% Translate("Everything else will be done as part of your contract.") | html %]

      -

      [% Translate("Your installed OTRS version is %s.", Config("Version")) | html %]

      - [% IF Data.RequiredMinimumVersion %] -

      [% Translate("To install this package, you need to update to OTRS %s or higher.", Data.RequiredMinimumVersion) | html %]

      - [% END %] - [% IF Data.RequiredMaximumVersion %] -

      [% Translate("To install this package, the Maximum OTRS Version is %s.", Data.RequiredMaximumVersion) | html %]

      - [% END %] - [% IF !Data.RequiredMinimumVersion && Data.RequiredFramework %] -

      [% Translate("To install this package, the required Framework version is %s.", Data.RequiredFramework) | html %]

      - [% END %] -

      [% Translate("Why should I keep OTRS up to date?") | html %]

      -
        -
      • - [% Translate("You will receive updates about relevant security issues.") | html %] -
        • -
      • - [% Translate("You will receive updates for all other relevant OTRS issues") | html %] -
        • -
      - [% ELSE %] -

      - [% Translate("With your existing contract you can only use a small part of the %s.") | html | ReplacePlaceholders(OTRSBusinessLabel ) %] -
      - [% Translate("If you would like to take full advantage of the %s get your contract upgraded now! Contact %s.") | html | ReplacePlaceholders(OTRSBusinessLabel, 'sales@otrs.com') %] -

      -
      - [% Translate("Upgrade to %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %] -
      - [% END %] -
      -
      -
      -[% RenderBlockEnd("Install") %] -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessUninstall.tt b/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessUninstall.tt deleted file mode 100644 index 60183373014..00000000000 --- a/Kernel/Output/HTML/Templates/Standard/AdminOTRSBusinessUninstall.tt +++ /dev/null @@ -1,104 +0,0 @@ -# -- -# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ -# -- -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (GPL). If you -# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. -# -- - -[% - SET OTRSBusinessLabel = 'OTRS Business Solution™'; - SET OTRSBusinessLabelPlain = 'OTRS Business Solution™'; -%] - -
      -

      [% Translate("Manage %s") | html | ReplacePlaceholders(OTRSBusinessLabel) %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("Manage %s", OTRSBusinessLabelPlain), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      -
      -
      -

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

      -
      -
      - -
      -
      -
      -
      -
      -
      -
      -

      [% Translate("Downgrade to ((OTRS)) Community Edition") | html %]

      -
      -
      -[% RenderBlockStart("DowngradeNotPossible") %] -

      - [% Translate("Sorry, but currently you can't downgrade due to the following packages which depend on %s:") | html | ReplacePlaceholders(OTRSBusinessLabel) %] -

      -
        - [% FOR Package IN Data.Packages %] -
      • -

        [% Package.Name | html %]

        - [% FOR Description IN Package.Description %] - [% IF Description.Lang == 'en' %] -

        [% Description.Content | html %]

        - [% END %] - [% END %] -

        [% Translate('Vendor') | html %] [% Package.Vendor | html %], [% Translate('Version') | html %] [% Package.Version | html %]

        -
        • - [% END %] -
      -

      - [% Translate('Please uninstall the packages first using the package manager and try again.') | html %] -

      -[% RenderBlockEnd("DowngradeNotPossible") %] -[% RenderBlockStart("DowngradePossible") %] -

      - [% Translate('You are about to downgrade to ((OTRS)) Community Edition and will lose the following features and all data related to these:') | html %] -

      -
        -
      • [% Translate('Chat') | html %]
        • -
      • [% Translate('Report Generator') | html %]
        • -
      • [% Translate('Timeline view in ticket zoom') | html %]
        • -
      • [% Translate('DynamicField ContactWithData') | html %]
        • -
      • [% Translate('DynamicField Database') | html %]
        • -
      • [% Translate('SLA Selection Dialog') | html %]
        • -
      • [% Translate('Ticket Attachment View') | html %]
        • -
      • [% Translate('The %s skin') | html | ReplacePlaceholders(OTRSBusinessLabel) %]
        • -
      -

      - - - - [% Translate('or') | html %] - [% Translate('Cancel') | html %] -

      -[% RenderBlockEnd("DowngradePossible") %] -
      -
      -
      -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminPGP.tt b/Kernel/Output/HTML/Templates/Standard/AdminPGP.tt index 2766bd7dbc8..bb999a159a2 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminPGP.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminPGP.tt @@ -8,25 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("PGP Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("PGP Management"), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.Subaction == 'Add' %] - [% BreadcrumbPath.push({ Name => Translate('Add PGP Key'), }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("Notice") %]
      @@ -43,7 +26,7 @@ [% Translate("To be able to use PGP in Znuny, you have to enable it first.") | html %]

      -
      @@ -55,12 +38,11 @@ [% Translate("PGP support is enabled, but the relevant configuration contains errors. Please check the configuration using the button below.") | html %]

      -
      [% RenderBlockEnd("NotWorking") %] -
      @@ -73,25 +55,24 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Hint") %]
      @@ -110,7 +90,7 @@ [% Translate("In this way you can directly edit the keyring configured in SysConfig.") | html %]

      - [% Translate("Description") | html %]: + [% Translate("Description") | html %] [% Translate("Introduction to PGP") | html %] @@ -119,9 +99,25 @@

      [% RenderBlockEnd("Hint") %]
      - [% RenderBlockStart("OverviewResult") %] +
      +

      [% Translate("PGP Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("PGP Management"), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.Subaction == 'Add' %] + [% BreadcrumbPath.push({ Name => Translate('Add PGP Key'), }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

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

      @@ -156,15 +152,15 @@
      		[% Data.Identifier | truncate(80) | html %] [% Data.Bit | html %] - [% Data.Key | html %] + [% Data.Key | html %] - [% Data.Fingerprint | truncate(10) | html %] + [% Data.Fingerprint | truncate(10) | html %] [% Data.Created | html %] [% Data.Expires | html %] - + [% Translate("Delete this key") | html %] @@ -177,7 +173,6 @@ [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("AddKey") %]
      @@ -189,22 +184,23 @@
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + +
      @@ -212,7 +208,5 @@
      [% RenderBlockEnd("AddKey") %] - -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminPackageManager.tt b/Kernel/Output/HTML/Templates/Standard/AdminPackageManager.tt index 5c16fbf97aa..c25f4dd111e 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminPackageManager.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminPackageManager.tt @@ -8,24 +8,8 @@ # -- [% RenderBlockStart("Uninstall") %] -
      -

      [% Translate("Package Manager") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Package Manager'), - Link => Env("Action"), - }, - ] - %] - - [% USE UninstallBreadcrumb = String(Translate("Uninstall Package")) %] - [% BreadcrumbPath.push({ Name => UninstallBreadcrumb.append( ': ', Data.Name ) }) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - +
      +

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

      @@ -33,13 +17,28 @@
      +

      [% Translate("Package Manager") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Package Manager'), + Link => Env("Action"), + }, + ] + %] + + [% USE UninstallBreadcrumb = String(Translate("Uninstall Package")) %] + [% BreadcrumbPath.push({ Name => UninstallBreadcrumb.append( ': ', Data.Name ) }) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      @@ -49,33 +48,33 @@
      - -
      - [% Data.Name | html %] +
      + +
      + [% Data.Name | html %] +
      -
      - -
      - [% Data.Version %] -
      -
      -

      - [% Translate("Do you really want to uninstall this package?") | html %] -

      -
      -
      -
      - - - - - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] -
      +
      + +
      + [% Data.Version %] +
      +

      + [% Translate("Do you really want to uninstall this package?") | html %] +

      +
      +
      + + + + + + [% Translate("or") | html %] + [% Translate("Cancel") | html %] +
      +
      -

      @@ -83,23 +82,8 @@
      [% RenderBlockEnd("Uninstall") %] [% RenderBlockStart("Reinstall") %] -
      -

      [% Translate("Package Manager") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Package Manager'), - Link => Env("Action"), - }, - ] - %] - - [% USE ReinstallBreadcrumb = String(Translate("Reinstall package")) %] - [% BreadcrumbPath.push({ Name => ReinstallBreadcrumb.append( ': ', Data.Name ) }) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      @@ -108,13 +92,29 @@
      +
      +

      [% Translate("Package Manager") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Package Manager'), + Link => Env("Action"), + }, + ] + %] + + [% USE ReinstallBreadcrumb = String(Translate("Reinstall package")) %] + [% BreadcrumbPath.push({ Name => ReinstallBreadcrumb.append( ': ', Data.Name ) }) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      @@ -139,7 +139,7 @@ [% Translate("Do you really want to reinstall this package? Any manual changes will be lost.") | html %]

      -
      +
      @@ -147,7 +147,7 @@ [% Translate("or") | html %] - [% Translate("Cancel") | html %] + [% Translate("Cancel") | html %]
      @@ -158,10 +158,9 @@
      [% RenderBlockEnd("Reinstall") %] [% RenderBlockStart("IncompatibleInfo") %] -
      +

      [% Translate("Package Manager") | html %]

      - -
      +

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

      @@ -169,20 +168,20 @@
      -
      +

      [% Data.Name | html %] [% Data.Version | html %] [% Translate("package information") | html %]

      @@ -193,7 +192,7 @@ [% ELSIF Data.Type =='UpgradeIncompatible' %]

      [% Translate("Package update requires a patch level update of Znuny.") | html %]

      [% END %] -

      [% Translate("Please note that your installed Znuny version is %s.", Config("Version")) | html %]

      +

      [% Translate("Please note that your installed Znuny version is %s.", Config("Version")) | html %]

      [% IF Data.RequiredMinimumVersion %]

      [% Translate("To install this package, you need to update Znuny to version %s or newer.", Data.RequiredMinimumVersion) | html %]

      [% END %] @@ -203,7 +202,7 @@ [% IF !Data.RequiredMinimumVersion && !Data.RequiredMaximumVersion && Data.RequiredFramework %]

      [% Translate("This package can only be installed on Znuny version %s.", Data.RequiredFramework) | html %]

      [% END %] -

      [% Translate("Why should I keep Znuny up to date?") | html %]

      +

      [% Translate("Why should I keep Znuny up to date?") | html %]

      • [% Translate("You will receive updates about relevant security issues.") | html %] @@ -212,7 +211,7 @@ [% Translate("You will receive updates for all other relevant Znuny issues.") | html %]
      -

      [% Translate("How can I do a patch level update if I don’t have a contract?") | html %]

      +

      [% Translate("How can I do a patch level update if I don’t have a contract?") | html %]

      [% Translate("Please find all relevant information within the updating instructions at %s.") | html | ReplacePlaceholders('doc.znuny.org') %] @@ -226,35 +225,9 @@

      [% RenderBlockEnd("IncompatibleInfo") %] [% RenderBlockStart("Intro") %] -
      -

      [% Translate("Package Manager") | html %]

      +
      - [% BreadcrumbPath = [ - { - Name => Translate('Package Manager'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Env("Subaction") %] - [% CASE 'InstallRemote' %] - [% USE InstallRemoteTitle = String(Translate("Install Package")) %] - [% BreadcrumbPath.push({ Name => InstallRemoteTitle.append( ': ', Data.Name ) }) %] - [% CASE 'Uninstall' %] - [% USE UninstallTitle = String(Translate("Uninstall Package")) %] - [% BreadcrumbPath.push({ Name => UninstallTitle.append( ': ', Data.Name ) }) %] - [% CASE 'UpgradeRemote' %] - [% USE UpgradeRemoteTitle = String(Translate("Update Package")) %] - [% BreadcrumbPath.push({ Name => UpgradeRemoteTitle.append( ': ', Data.Name ) }) %] - [% CASE 'InstallUpload' %] - [% USE InstallUploadTitle = String(Translate("Install Package")) %] - [% BreadcrumbPath.push({ Name => InstallUploadTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +

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

      @@ -262,13 +235,41 @@
      +
      +

      [% Translate("Package Manager") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Package Manager'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Env("Subaction") %] + [% CASE 'InstallRemote' %] + [% USE InstallRemoteTitle = String(Translate("Install Package")) %] + [% BreadcrumbPath.push({ Name => InstallRemoteTitle.append( ': ', Data.Name ) }) %] + [% CASE 'Uninstall' %] + [% USE UninstallTitle = String(Translate("Uninstall Package")) %] + [% BreadcrumbPath.push({ Name => UninstallTitle.append( ': ', Data.Name ) }) %] + [% CASE 'UpgradeRemote' %] + [% USE UpgradeRemoteTitle = String(Translate("Update Package")) %] + [% BreadcrumbPath.push({ Name => UpgradeRemoteTitle.append( ': ', Data.Name ) }) %] + [% CASE 'InstallUpload' %] + [% USE InstallUploadTitle = String(Translate("Install Package")) %] + [% BreadcrumbPath.push({ Name => InstallUploadTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + [% IF Data.PackageRequired || Data.ModuleRequired %]
      @@ -318,6 +319,7 @@
      [% END %] +

      [% Translate(Data.Title) | html %]

      @@ -340,7 +342,7 @@ [% RenderBlockStart("IntroCancel") %] [% Translate("or") | html %] - [% Translate("Cancel") | html %] + [% Translate("Cancel") | html %] [% RenderBlockEnd("IntroCancel") %] [% RenderBlockEnd("IntroForm") %] @@ -351,23 +353,10 @@
      [% RenderBlockEnd("Intro") %] - - [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Package Manager") | html %]

      +
      - [% BreadcrumbPath = [ - { - Name => Translate('Package Manager'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +

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

      @@ -388,7 +377,7 @@ [% Translate("Please make sure your database accepts packages over %s MB in size (it currently only accepts packages up to %s MB). Please adapt the max_allowed_packet setting of your database in order to avoid errors.", Data.MaxAllowedPacketRecommended, Data.MaxAllowedPacket) | html %]

      [% RenderBlockEnd("DatabasePackageSizeWarning") %] - @@ -399,14 +388,14 @@ [% Data.SourceList %] - [% IF Data.InstalledPackages %]
    • - [% Translate("Update all installed packages") | html %] + [% Translate("Update all installed packages") | html %]
      • [% END %] @@ -415,8 +404,18 @@
      -
      +

      [% Translate("Package Manager") | html %]

      + [% BreadcrumbPath = [ + { + Name => Translate('Package Manager'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      [% Translate("Online Repository") | html %]

      @@ -447,7 +446,7 @@

      		[% RenderBlockStart("ShowRemotePackageDocumentation") %] - + [% RenderBlockEnd("ShowRemotePackageDocumentation") %] [% Data.Version | html %][% Data.Description | truncate(55) | html %] [% RenderBlockStart("ShowRemotePackageInstall") %] - [% Translate("Install") | html %] + [% Translate("Install") | html %] [% RenderBlockEnd("ShowRemotePackageInstall") %] [% RenderBlockStart("ShowRemotePackageUpgrade") %] - [% Translate("Update") | html %] + [% Translate("Update") | html %] [% RenderBlockEnd("ShowRemotePackageUpgrade") %]
      [% RenderBlockStart("ShowLocalPackageDocumentation") %] - + [% RenderBlockEnd("ShowLocalPackageDocumentation") %] [% Data.Version | html %][% Translate(Data.Status) | html %] [% RenderBlockStart("ShowLocalPackageInstall") %] - [% Translate("Install") | html %] + [% Translate("Install") | html %]

      [% RenderBlockEnd("ShowLocalPackageInstall") %] [% RenderBlockStart("ShowLocalPackageUninstall") %] - [% Translate("Uninstall") | html %] + [% Translate("Uninstall") | html %]
      [% RenderBlockEnd("ShowLocalPackageUninstall") %] [% RenderBlockStart("ShowLocalPackageReinstall") %] - [% Translate("Reinstall") | html %] + [% Translate("Reinstall") | html %]
      [% RenderBlockEnd("ShowLocalPackageReinstall") %]       		- +
      [% RenderBlockStart("PackageItemFilelistFileLink") %] - + [% RenderBlockEnd("PackageItemFilelistFileLink") %] - [% Data.Size | html %] + [% Data.Size | html %] +
      @@ -722,59 +730,50 @@
      [% RenderBlockStart("PackageItemDatabaseSQL") %] -

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

      -
      +
      +

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

      [% Data.SQL | html %]
      [% RenderBlockEnd("PackageItemDatabaseSQL") %]
      [% RenderBlockEnd("PackageItemDatabase") %] - - [% RenderBlockStart("PackageItemCode") %] -
      +
      +
      + +

      [% Translate(Data.Tag) | html %] ([% Data.Type | html %])

      - [% Data.Content %] +
      + [% Data.Content %] +
      [% RenderBlockEnd("PackageItemCode") %] [% RenderBlockStart("PackageItemIntro") %] -
      +
      +
      + +

      [% Translate(Data.Tag) | html %] ([% Data.Type | html %]/[% Data.Lang | html %])

      - [% Data.Content %] +
      + [% Data.Content %] +
      [% RenderBlockEnd("PackageItemIntro") %]
      -
      [% RenderBlockEnd("Package") %] [% RenderBlockStart("FileDiff") %] -
      -

      [% Translate("Package Manager") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Package Manager'), - Link => Env("Action"), - }, - ] - %] - - [% USE FileDiffBreadcrumb = String(Translate("File Differences for File %s", Data.Location)) %] - [% BreadcrumbPath.push({ Name => FileDiffBreadcrumb.append( ': ', Data.Name ) }) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - +
      +

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

      @@ -782,7 +781,7 @@
      +
      +

      [% Translate("Package Manager") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Package Manager'), + Link => Env("Action"), + }, + ] + %] + + [% USE FileDiffBreadcrumb = String(Translate("File Differences for File %s", Data.Location)) %] + [% BreadcrumbPath.push({ Name => FileDiffBreadcrumb.append( ': ', Data.Name ) }) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      @@ -798,7 +813,7 @@

      - 
      [% Data.Diff | html %]
      +
      [% Data.Diff | html %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminPerformanceLog.tt b/Kernel/Output/HTML/Templates/Standard/AdminPerformanceLog.tt index e7253505ef0..8d6b7e0da77 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminPerformanceLog.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminPerformanceLog.tt @@ -7,32 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Performance Log") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("Performance Log"), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.Minute %] - [% BreadcrumbPath.push({ Name => Translate("Range") _ ' (' _ Translate("last") _ ' ' _ Data.Age _ ')' }) %] - [% END %] - - [% IF Data.Interface %] - [% BreadcrumbPath.push({ Name => Data.Interface, Link => Env("Action") _ ';Subaction=View;Interface=Agent;Minute=' _ Data.Minute, }) %] - [% END %] - - [% IF Data.Module %] - [% BreadcrumbPath.push({ Name => Data.Module }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -42,7 +18,7 @@ @@ -63,16 +39,14 @@

      [% Translate("Just use this feature if you want to log each request.") | html %]

      -

      +

      [% Translate("Activating this feature might affect your system performance!") | html %]

      -
      -
      -
      -
      [% RenderBlockEnd("Enabled") %] @@ -85,16 +59,14 @@

      [% Translate("Just use this feature if you want to log each request.") | html %]

      -

      +

      [% Translate("Activating this feature might affect your system performance!") | html %]

      -
      -
      -
      -
      [% RenderBlockEnd("Disabled") %] @@ -107,13 +79,11 @@

      [% Translate("The logfile is too large, you need to reset it") | html %] ([% Data.Size | html %]).

      -
      +
      -
      -
      [% RenderBlockEnd("Reset") %] @@ -121,17 +91,39 @@
      -[% RenderBlockStart("Overview") %]
      +

      [% Translate("Performance Log") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("Performance Log"), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.Minute %] + [% BreadcrumbPath.push({ Name => Translate("Range") _ ' (' _ Translate("last") _ ' ' _ Data.Age _ ')' }) %] + [% END %] + + [% IF Data.Interface %] + [% BreadcrumbPath.push({ Name => Data.Interface, Link => Env("Action") _ ';Subaction=View;Interface=Agent;Minute=' _ Data.Minute, }) %] + [% END %] + + [% IF Data.Module %] + [% BreadcrumbPath.push({ Name => Data.Module }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +[% RenderBlockStart("Overview") %]

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

      - [% RenderBlockStart("OverviewTable") %] -

      [% Translate("Range") | html %] ([% Translate("last") | html %] [% Data.Age | html %])

      -
      +

      [% Translate("Range") | html %] ([% Translate("last") | html %] [% Data.Age | html %])

      +
      @@ -176,22 +168,21 @@ [% RenderBlockEnd("OverviewTable") %] - [% RenderBlockEnd("Overview") %] - [% RenderBlockStart("View") %] -

      [% Translate("Range") | html %] ([% Translate("last") | html %] [% Data.Age | html %])

      -

      - [% Translate("Interface") | html %]: [% Data.Interface | html %], - [% Translate("Module") | html %]: [% Data.Module | html %], - [% Translate("Period") | html %]: [% Data.Period | html %] [% Translate("minutes") | html %] -

      -
      +
      +

      + [% Translate("Interface") | html %]: [% Data.Interface | html %],   + [% Translate("Module") | html %]: [% Data.Module | html %],   + [% Translate("Period") | html %]: [% Data.Period | html %] [% Translate("minutes") | html %] +

      +
      +
      @@ -210,14 +201,17 @@ - + [% RenderBlockEnd("ViewRow") %]
      [% Translate("Date") | html %][% Data.Min | html %]s [% Data.Max | html %]s [% Data.Average | html %]s
       
      		 +
      + +
      +
      -
      [% RenderBlockEnd("View") %] -
      +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminPostMasterFilter.tt b/Kernel/Output/HTML/Templates/Standard/AdminPostMasterFilter.tt index 5b196638bd2..2aeee52089d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminPostMasterFilter.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminPostMasterFilter.tt @@ -8,28 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("PostMaster Filter Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('PostMaster Filter Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'AddAction' %] - [% BreadcrumbPath.push({ Name => Translate('Add PostMaster Filter'),}) %] - [% CASE 'Update' %] - [% USE EditTitle = String(Translate('Edit PostMaster Filter')) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -39,19 +19,18 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Filter") %]
      @@ -63,7 +42,7 @@
      [% RenderBlockEnd("Filter") %] -[% IF Env("Subaction") == 'Update' || Env("Subaction") == "AddAction" %] + [% IF Env("Subaction") == 'Update' || Env("Subaction") == "AddAction" %]

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

      @@ -83,12 +62,29 @@

      -[% END %] - + [% END %]
      +

      [% Translate("PostMaster Filter Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('PostMaster Filter Management'), + Link => Env("Action"), + }, + ] + %] + [% SWITCH Data.Action %] + [% CASE 'AddAction' %] + [% BreadcrumbPath.push({ Name => Translate('Add PostMaster Filter'),}) %] + [% CASE 'Update' %] + [% USE EditTitle = String(Translate('Edit PostMaster Filter')) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]
      @@ -116,8 +112,8 @@ [% Translate(Data.Name) | html %]
      		- - + +
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      [% IF Data.Action == 'Add' %] @@ -148,7 +143,6 @@ [% END %]
      -
      @@ -157,58 +151,64 @@ [% END %]
      - -
      - -
      -

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

      -
      -
      -

      +

      + +
      + +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredNameServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredNameServerError") %] [% RenderBlockStart("InSettingNameServerError") %] - [% Translate("This priority is present in a SysConfig setting, confirmation for updating settings to point to the new priority is needed!") | html %] + [% Translate("This priority is present in a SysConfig setting, confirmation for updating settings to point to the new priority is needed!") | html %] [% RenderBlockEnd("InSettingNameServerError") %] -

      +

      +
      -
      - [% Data.ColorPicker %] +
      + [% Data.ColorPicker %] +
      - -
      - [% Data.ValidOptionStrg %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidOptionStrg %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      +
      +
      + + [% Translate("Cancel") | html %] + + [% IF Data.Action == 'Change' %] + + -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + + [% ELSE %] + + [% END %] +
      -
      [% RenderBlockStart("PriorityInSysConfig") %] @@ -233,6 +233,5 @@ [% RenderBlockEnd("OverviewUpdate") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagement.tt b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagement.tt index 58fac4d34d1..8a10473717e 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagement.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagement.tt @@ -7,20 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Process Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Process Management'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

      @@ -36,10 +24,10 @@
      @@ -53,7 +41,7 @@

      [% Translate("Here you can upload a configuration file to import a process to your system. The file needs to be in .yml format as exported by process management module.") | html %]

      -
        +
        • @@ -62,12 +50,12 @@

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

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

          -
          +
          -
          • @@ -83,7 +71,7 @@

          [% Translate("Here you can activate Ready2Adopt processes showcasing our best practices. Please note that some additional configuration may be required.") | html %]

          -
            +
            • @@ -92,12 +80,13 @@ [% Data.ExampleProcessList %]

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

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

              -
              + +
              -
              • @@ -123,30 +112,30 @@

              [% Translate('Related Actions') | html %]

      -
      +

      [% Translate("Process Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Process Management'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      -
      +

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

      -       - + + Show Valid + Show All
      -
      +
      @@ -188,17 +190,17 @@ @@ -219,5 +221,4 @@ -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivity.tt b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivity.tt index e69b0279c19..651e9a31145 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivity.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivity.tt @@ -7,18 +7,18 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +

      [% Translate(Data.Title) | html %]

      [% RenderBlockStart("ClosePopup") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("ClosePopup") %] [% RenderBlockStart("GoBack") %] -

      - [% Translate("Go Back") | html %] -

      + [% RenderBlockEnd("GoBack") %]
      @@ -35,10 +35,12 @@ - [% RenderBlockStart("EditWarning") %]
      -
      [% Translate("Please note, that changing this activity will affect the following processes") | html %]: [% Data.ProcessList | html %]
      +
      + + [% Translate("Please note, that changing this activity will affect the following processes") | html %]: [% Data.ProcessList | html %] +
      [% RenderBlockEnd("EditWarning") %] @@ -51,32 +53,35 @@
      - -
      - -
      -

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

      +
      + +
      + +
      +

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

      +
      -
      - -
      - [% Data.ScopeSelection %] -
      -

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

      +
      + +
      + [% Data.ScopeSelection %] +
      +

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

      +
      -
      - -
      - [% Data.ScopeEntityIDSelection %] -
      -

      [% Translate("This field is required for activities with a scope.") | html %]

      +
      + +
      + [% Data.ScopeEntityIDSelection %] +
      +

      [% Translate("This field is required for activities with a scope.") | html %]

      +
      -
      @@ -95,69 +100,69 @@ [% Translate("Ordering the elements within the list is also possible by drag 'n' drop.") | html %]

      -
      -
        -
      • - [% Translate("Available Activity Dialogs") | html %] -
        • -
      -
      - - - -
      -
        +
        +
        +
          +
        • + [% Translate("Available Activity Dialogs") | html %] +
          • +
        +
        + + + +
        +
          [% RenderBlockStart("AvailableActivityDialogRow") %] -
        • - [% Data.Name | html %] - - [% Translate(Data.AvailableIn) | html %] - - - - -
          • +
        • + [% Data.Name | html %] + + [% Translate(Data.AvailableIn) | html %] + + + + +
          • [% RenderBlockEnd("AvailableActivityDialogRow") %] -
        -
        -# - - [% Translate("Create New Activity Dialog") | html %] +
      - -
      - -
      -
        -
      • - [% Translate("Assigned Activity Dialogs") | html %] -
        • -
      -
      - +
      + [% Translate("Create New Activity Dialog") | html %] +
      -
        +
        +
          +
        • + [% Translate("Assigned Activity Dialogs") | html %] +
          • +
        +
        + +
        +
          [% RenderBlockStart("AssignedActivityDialogRow") %] -
        • - [% Data.Name | html %] - - [% Translate(Data.AvailableIn) | html %] - - - - -
          • +
        • + [% Data.Name | html %] + + [% Translate(Data.AvailableIn) | html %] + + + + +
          • [% RenderBlockEnd("AssignedActivityDialogRow") %] -
        +
      +
      + - +
      - +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivityDialog.tt b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivityDialog.tt index ac46caf6f8e..41adbc4cd04 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivityDialog.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementActivityDialog.tt @@ -7,20 +7,21 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +

      [% Translate(Data.Title) | html %]

      [% RenderBlockStart("ClosePopup") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("ClosePopup") %] [% RenderBlockStart("GoBack") %] -

      - [% Translate("Go Back") | html %] -

      + [% RenderBlockEnd("GoBack") %]
      +
      @@ -36,18 +37,23 @@ - [% RenderBlockStart("EditWarning") %]
      -
      [% Translate("Please note that changing this activity dialog will affect the following activities") | html %]: [% Data.ActivityList | html %]
      +
      + + [% Translate("Please note that changing this activity dialog will affect the following activities") | html %]: [% Data.ActivityList | html %] +
      [% RenderBlockEnd("EditWarning") %]
      - [% Translate("Please note that customer users will not be able to see or use the following fields: Owner, Responsible, Lock, PendingTime and CustomerID.") | html %] - [% Translate("The Queue field can only be used by customers when creating a new ticket.") | html %] + + + [% Translate("Please note that customer users will not be able to see or use the following fields: Owner, Responsible, Lock, PendingTime and CustomerID.") | html %] + [% Translate("The Queue field can only be used by customers when creating a new ticket.") | html %] +
      @@ -60,86 +66,96 @@
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.InterfaceSelection %] +
      + +
      + [% Data.InterfaceSelection %] +
      -
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - [% Data.PermissionSelection %] -
      -
      -

      [% Translate("The selected permission does not exist.") | html %]

      +
      + +
      + [% Data.PermissionSelection %] +
      +
      +

      [% Translate("The selected permission does not exist.") | html %]

      +
      -
      - -
      - [% Data.RequiredLockSelection %] -
      -
      -

      [% Translate("The selected required lock does not exist.") | html %]

      +
      + +
      + [% Data.RequiredLockSelection %] +
      +
      +

      [% Translate("The selected required lock does not exist.") | html %]

      +
      -
      - -
      - [% Data.ScopeSelection %] +
      + +
      + [% Data.ScopeSelection %] +
      -
      - -
      - [% Data.ScopeEntityIDSelection %] -
      -

      [% Translate("This field is required for activitiy dialogs with a scope.") | html %]

      +
      + +
      + [% Data.ScopeEntityIDSelection %] +
      +

      [% Translate("This field is required for activitiy dialogs with a scope.") | html %]

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - +
      + +
      + +
      -
      @@ -152,67 +168,70 @@

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

      -
      +

      [% Translate("You can assign Fields to this Activity Dialog by dragging the elements with the mouse from the left list to the right list.") | html %] [% Translate("Ordering the elements within the list is also possible by drag 'n' drop.") | html %]

      -
      -
        -
      • - [% Translate("Available Fields") | html %] -
        • -
      -
      - -
      -
        + +
        +
        +
          +
        • + [% Translate("Available Fields") | html %] +
          • +
        +
        + +
        +
          [% RenderBlockStart("AvailableFieldRow") %] -
        • - [% Data.FieldnameTranslated | html %] - - - - - -
          • +
        • + [% Data.FieldnameTranslated | html %] + + + + + +
          • [% RenderBlockEnd("AvailableFieldRow") %] -
        -
        -
        -
          -
        • - [% Translate("Assigned Fields") | html %] -
          • -
        -
        - +
      -
        +
        +
          +
        • + [% Translate("Assigned Fields") | html %] +
          • +
        +
        + +
        +
          [% RenderBlockStart("AssignedFieldRow") %] -
        • - [% Translate(Data.Field) | html %] - - - - - -
          • +
        • + [% Translate(Data.Field) | html %] + + + + + +
          • [% RenderBlockEnd("AssignedFieldRow") %] -
        +
      +
      - +
      - +
      @@ -220,74 +239,83 @@
      - -
      - +
      + +
      + +
      -
      - -
      - +
      + +
      + +
      -
      -[% RenderBlockStart("ArticleContainer") %] - -
      - +
      + +
      + +
      -
      - -
      - +[% RenderBlockStart("ArticleContainer") %] +
      + +
      + +
      +
      + +
      + +
      -
      [% RenderBlockEnd("ArticleContainer") %] - -
      - -
      -
      - - -
      - [% Data.CommunicationChannelSelection %] +
      + +
      + [% Data.CommunicationChannelSelection %] +
      -
      - -
      - +
      + +
      + +
      -
      - [% RenderBlockStart("StandardTemplateContainer") %] - -
      - [% Data.StandardTemplateSelection %] +
      + +
      + [% Data.StandardTemplateSelection %] +
      - -
      - + +
      + +
      + +
      -
      [% RenderBlockEnd("StandardTemplateContainer") %] - [% RenderBlockStart("TimeUnitsContainer") %] - -
      - [% Data.TimeUnitsSelection %] +
      + +
      + [% Data.TimeUnitsSelection %] +
      -
      [% RenderBlockEnd("TimeUnitsContainer") %] - -
      - [% Data.DisplaySelection %] +
      + +
      + [% Data.DisplaySelection %] +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementPath.tt b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementPath.tt index 37a11bb0810..00d964612ad 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementPath.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementPath.tt @@ -7,18 +7,18 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +

      [% Translate(Data.Title) | html %]

      [% RenderBlockStart("ClosePopup") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("ClosePopup") %] [% RenderBlockStart("GoBack") %] -

      - [% Translate("Go Back") | html %] -

      + [% RenderBlockEnd("GoBack") %]
      @@ -47,14 +47,18 @@
        -
      • +
      • +
        • +
      • [% Data.Transition %]
        • -
      • +
      • +
        • +
      - +
      @@ -72,51 +76,55 @@ [% Translate("Ordering the elements within the list is also possible by drag 'n' drop.") | html %]

      -
      -
        -
      • - [% Translate("Available Transition Actions") | html %] -
        • -
      -
      - -
      -
        + +
        +
        +
          +
        • + [% Translate("Available Transition Actions") | html %] +
          • +
        +
        + +
        +
          [% RenderBlockStart("AvailableTransitionActionRow") %] -
        • - [% Data.Name | html %] ([% Data.EntityID | html %]) - - - - - -
          • +
        • + [% Data.Name | html %] ([% Data.EntityID | html %]) + + + + + +
          • [% RenderBlockEnd("AvailableTransitionActionRow") %] -
        -
        - [% Translate("Create New Transition Action") | html %] +
      + +
      + [% Translate("Create New Transition Action") | html %] +
      +
      +
      +
        +
      • + [% Translate("Assigned Transition Actions") | html %] +
        • +
      +
      + +
      +
        +
      - -
      -
        -
      • - [% Translate("Assigned Transition Actions") | html %] -
        • -
      -
      - -
      -
        -
      - +
      - +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessAccordion.tt b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessAccordion.tt index e043d993b5a..02db186684e 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessAccordion.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessAccordion.tt @@ -6,19 +6,23 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- + diff --git a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessEdit.tt b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessEdit.tt index f7f3a9a798e..06257bbf586 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessEdit.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminProcessManagementProcessEdit.tt @@ -7,23 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Edit Process") | html %] "[% Data.Name | html %]"

      - - [% BreadcrumbPath = [ - { - Name => Translate('Process Management'), - Link => Env("Action"), - }, - ] - %] - - [% USE EditTitle = String(Translate("Edit Process")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

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

      @@ -31,14 +16,14 @@
      @@ -79,6 +64,21 @@
      +

      [% Translate("Edit Process") | html %] "[% Data.Name | html %]"

      + + [% BreadcrumbPath = [ + { + Name => Translate('Process Management'), + Link => Env("Action"), + }, + ] + %] + + [% USE EditTitle = String(Translate("Edit Process")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -99,43 +99,46 @@
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.StateSelection %] -
      -
      -

      [% Translate("The selected state does not exist.") | html %]

      +
      + +
      + [% Data.StateSelection %] +
      +
      +

      [% Translate("The selected state does not exist.") | html %]

      +
      -
      -
      +
      @@ -147,11 +150,11 @@
      -
      +
      -
      +
      @@ -160,24 +163,30 @@

      [% Translate("Save Activities, Activity Dialogs and Transitions") | html %]

      -
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      +
      + + [% Translate("Cancel") | html %] + + + + + + + +
      -
      - [% InsertTemplate("MobileNotAvailableWidget.tt") %] -
      -
      [% Translate(Data.Description) | truncate(80) | html %] [% Translate(Data.State) | html %] - + [% Translate("Export") | html %] - + [% Translate("Copy") | html %] - + [% Translate("Print") | html %]
      - - - +
      +
      [% Translate(Data.VisibleNeType) | html %]
      + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - - + + - + + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] - - [% Translate("Active") | html %] - + + [% Translate("Active") | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %] - - +
      [% Data.Name | html %] + + -
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + + [% Translate("No matches found.") | html %] + + + +
      +
      +
      + [% Translate("Cancel") | html %] + + + +
      -
      [% RenderBlockEnd("Change") %]
      -
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminRole.tt b/Kernel/Output/HTML/Templates/Standard/AdminRole.tt index e5c671e4794..fe6d07bfb20 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminRole.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminRole.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Role Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Role Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate('Add Role'),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Role")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -40,19 +19,18 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Filter") %]
      @@ -79,16 +57,16 @@

      [% Translate('Related Actions') | html %]

      -
      +
      +

      [% Translate("Role Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Role Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate('Add Role'),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Role")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewHeader") %] -
      +

      [% Translate("List") | html %] ([% Data.AllItemsCount | html %] [% Translate("total") | html %])

      -       - + + Show Valid + Show All
      [% RenderBlockEnd("OverviewHeader") %] @@ -142,7 +142,6 @@
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      [% IF Data.Action == 'Add' %] @@ -160,50 +159,50 @@ [% END %]
      - - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] +
      + +
      + [% Data.ValidOption %] +
      -
      - -
      - +
      + +
      + +
      -
      -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + + [% ELSE %] + + [% END %] +
      -
      [% RenderBlockEnd("OverviewUpdate") %] -
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminRoleGroup.tt b/Kernel/Output/HTML/Templates/Standard/AdminRoleGroup.tt index 36b7ac6eaad..97ef75bb6ec 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminRoleGroup.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminRoleGroup.tt @@ -8,27 +8,9 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Manage Role-Group Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Role-Group Relations'), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.Type %] - [% USE EditTitle = String(Data.BreadcrumbTitle) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      [% RenderBlockStart("OverviewAction") %] -
      +
      @@ -37,10 +19,10 @@
      @@ -69,14 +51,14 @@
      + +

      [% Translate("Manage Role-Group Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Role-Group Relations'), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.Type %] + [% USE EditTitle = String(Data.BreadcrumbTitle) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]

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

      -
      +
      • [% Translate("Roles") | html %]
        • @@ -116,16 +115,12 @@ [% RenderBlockEnd("Listn1") %]
      -
      -
      [% RenderBlockEnd("OverviewAction") %] - [% RenderBlockStart("Change") %] -
      - +
      [% RenderBlockStart("ActionList") %]
      @@ -135,7 +130,7 @@ @@ -165,6 +160,24 @@
      + +

      [% Translate("Manage Role-Group Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Role-Group Relations'), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.Type %] + [% USE EditTitle = String(Data.BreadcrumbTitle) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      @@ -172,106 +185,128 @@ [% Data.Name | html %]

      -
      +
      - - - - +
      +
      [% Translate(Data.NeType) | html %]
      + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - + + [% RenderBlockStart("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.NeType) | html %] - - [% Translate(Data.Type) | html %] - + + [% Translate(Data.Type) | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %]
      [% Data.Name | html %] - - + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + + [% Translate("No matches found.") | html %] + + + +
      + +
      +
      + [% Translate("Cancel") | html %] + + + + + + +
      -
      +
      -
      + +

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

      -
      -
      [% Translate("ro") | html %]
      -
      - [% Translate("Read only access to the ticket in this group/queue.") | html %] -
      +
      +
      [% Translate("ro") | html %]
      +
      + [% Translate("Read only access to the ticket in this group/queue.") | html %] +
      +
      -
      [% Translate("move_into") | html %]
      -
      - [% Translate("Permissions to move tickets into this group/queue.") | html %] -
      +
      +
      [% Translate("move_into") | html %]
      +
      + [% Translate("Permissions to move tickets into this group/queue.") | html %] +
      +
      -
      [% Translate("create") | html %]
      -
      - [% Translate("Permissions to create tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("create") | html %]
      +
      + [% Translate("Permissions to create tickets in this group/queue.") | html %] +
      +
      -
      [% Translate("note") | html %]
      -
      - [% Translate("Permissions to add notes to tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("note") | html %]
      +
      + [% Translate("Permissions to add notes to tickets in this group/queue.") | html %] +
      +
      -
      [% Translate("owner") | html %]
      -
      - [% Translate("Permissions to change the owner of tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("owner") | html %]
      +
      + [% Translate("Permissions to change the owner of tickets in this group/queue.") | html %] +
      +
      -
      [% Translate("priority") | html %]
      -
      - [% Translate("Permissions to change the ticket priority in this group/queue.") | html %] -
      +
      +
      [% Translate("priority") | html %]
      +
      + [% Translate("Permissions to change the ticket priority in this group/queue.") | html %] +
      +
      -
      [% Translate("rw") | html %]
      -
      - [% Translate("Full read and write access to the tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("rw") | html %]
      +
      + [% Translate("Full read and write access to the tickets in this group/queue.") | html %] +
      +
      -
      -
      -
      [% RenderBlockEnd("Change") %]
      -[% RenderBlockEnd("Overview") %] +[% RenderBlockEnd("Overview") %] \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AdminRoleUser.tt b/Kernel/Output/HTML/Templates/Standard/AdminRoleUser.tt index 7db3f17ddf2..f5c2106c1f5 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminRoleUser.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminRoleUser.tt @@ -8,22 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Manage Agent-Role Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Agent-Role Relations'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +

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

      @@ -31,10 +17,10 @@
      @@ -63,14 +49,14 @@
      +

      [% Translate("Manage Agent-Role Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Agent-Role Relations'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

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

      -
      +
      • [% Translate("Agents") | html %]
        • @@ -108,35 +106,14 @@ [% RenderBlockEnd("Listn1") %]
      -
      -
      - [% RenderBlockEnd("Overview") %] [% RenderBlockStart("Change") %] -
      -

      [% Translate("Manage Role-Agent Relations") | html %]

      - - [% USE EditTitle = String(Data.BreadcrumbTitle) %] - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Role-Agent Relations'), - Link => Env("Action"), - }, - { - Name => EditTitle.append( " '", Data.Name, "'" ) - } - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +

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

      @@ -144,7 +121,7 @@
      @@ -162,6 +139,22 @@
      +

      [% Translate("Manage Role-Agent Relations") | html %]

      + + [% USE EditTitle = String(Data.BreadcrumbTitle) %] + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Role-Agent Relations'), + Link => Env("Action"), + }, + { + Name => EditTitle.append( " '", Data.Name, "'" ) + } + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]

      @@ -175,52 +168,55 @@ - - - - +
      +
      [% Translate(Data.VisibleNeType) | html %]
      + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - - - + + + + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] - - [% Translate("Active") | html %] - + + [% Translate("Active") | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %] - -
      [% Data.Name | html %] + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + + [% Translate("No matches found.") | html %] + + + +
      +
      +
      + [% Translate("Cancel") | html %] + + +
      -

      -
      - [% RenderBlockEnd("Change") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSLA.tt b/Kernel/Output/HTML/Templates/Standard/AdminSLA.tt index cd43cc001fd..dc6328143d3 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSLA.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSLA.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("SLA Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('SLA Management'), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.SLAID %] - [% USE EditTitle = String(Translate("Edit SLA")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.SLAName ) }) %] - [% ELSIF Data.Subaction == "SLAEdit" %] - [% BreadcrumbPath.push({ Name => Translate("Add SLA"),}) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -38,16 +17,14 @@
      -
      +

      [% Translate("SLA Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('SLA Management'), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.SLAID %] + [% USE EditTitle = String(Translate("Edit SLA")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.SLAName ) }) %] + [% ELSIF Data.Subaction == "SLAEdit" %] + [% BreadcrumbPath.push({ Name => Translate("Add SLA"),}) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewList") %] -
      +

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

      -       - + + Show Valid + Show All
      - @@ -146,7 +141,6 @@
      [% RenderBlockEnd("OverviewList") %] - [% RenderBlockStart("SLAEdit") %]
      [% IF !Data.SLAID %] @@ -165,161 +159,187 @@ [% END %]
      - - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      -
      [% IF Data.IsITSMInstalled %] - -
      - [% Data.TypeOptionStrg %] +
      + +
      + [% Data.TypeOptionStrg %] +
      -
      [% END %] - -
      - [% Data.ServiceOptionStrg %] +
      + +
      + [% Data.ServiceOptionStrg %] +
      -
      - -
      - [% Data.CalendarOptionStrg %] +
      + +
      + [% Data.CalendarOptionStrg %] +
      -
      - - -
      - -

      [% Translate("Please write only numbers!") | html %]

      - ( [% Data.FirstResponseNotifyOptionStrg %]) -

      - [% Translate("0 = no escalation") | html %] - 24 [% Translate("hours") | html %] = 1440 [% Translate("minutes") | html %] - [% Translate("Only business hours are counted.") | html %] -

      +
      +
      + + +

      [% Translate("Please write only numbers!") | html %]

      +
      +
      + + [% Data.FirstResponseNotifyOptionStrg %] +
      +
      +

      + [% Translate("0 = no escalation") | html %] - 24 [% Translate("hours") | html %] = 1440 [% Translate("minutes") | html %] - [% Translate("Only business hours are counted.") | html %] +

      +
      -
      - -
      - -

      [% Translate("Please write only numbers!") | html %]

      - ( [% Data.UpdateNotifyOptionStrg %]) -

      - [% Translate("0 = no escalation") | html %] - 24 [% Translate("hours") | html %] = 1440 [% Translate("minutes") | html %] - [% Translate("Only business hours are counted.") | html %] -

      +
      +
      + + +

      [% Translate("Please write only numbers!") | html %]

      +
      +
      + + [% Data.UpdateNotifyOptionStrg %] +
      +
      +

      + [% Translate("0 = no escalation") | html %] - 24 [% Translate("hours") | html %] = 1440 [% Translate("minutes") | html %] - [% Translate("Only business hours are counted.") | html %] +

      +
      -
      - -
      - -

      [% Translate("Please write only numbers!") | html %]

      - ( [% Data.SolutionNotifyOptionStrg %]) -

      - [% Translate("0 = no escalation") | html %] - 24 [% Translate("hours") | html %] = 1440 [% Translate("minutes") | html %] - [% Translate("Only business hours are counted.") | html %] -

      +
      +
      + + +

      [% Translate("Please write only numbers!") | html %]

      +
      +
      + [% Data.SolutionNotifyOptionStrg %] +
      +
      +

      + [% Translate("0 = no escalation") | html %] - 24 [% Translate("hours") | html %] = 1440 [% Translate("minutes") | html %] - [% Translate("Only business hours are counted.") | html %] +

      +
      -
      [% IF Data.IsITSMInstalled %] - -
      - -

      [% Translate("Please write only numbers!") | html %]

      +
      + +
      + +

      [% Translate("Please write only numbers!") | html %]

      +
      -
      [% END %] - -
      - [% Data.ValidOptionStrg %] +
      + +
      + [% Data.ValidOptionStrg %] +
      -
      - -
      - +
      + +
      + +
      -
      [% RenderBlockStart("SLAItem") %] [% RenderBlockStart("InputKey") %] - -
      - +
      + +
      + +
      -
      [% RenderBlockEnd("InputKey") %] [% RenderBlockStart("Input") %] - -
      - -

      - [% Translate(Data.Desc) | html %] -

      +
      + +
      + +

      + [% Translate(Data.Desc) | html %] +

      +
      -
      [% RenderBlockEnd("Input") %] [% RenderBlockStart("TextArea") %] - -
      - -

      - [% Translate(Data.Desc) | html %] -

      +
      + +
      + +

      + [% Translate(Data.Desc) | html %] +

      +
      -
      - [% RenderBlockEnd("TextArea") %] [% RenderBlockStart("Option") %] - -
      - [% Data.Option %] -

      - [% Translate(Data.Desc) | html %] -

      +
      + +
      + [% Data.Option %] +

      + [% Translate(Data.Desc) | html %] +

      +
      -
      [% RenderBlockEnd("Option") %] [% RenderBlockStart("Upload") %] - -
      - - [% Data.Filename | html %] +
      + +
      + + [% Data.Filename | html %] +
      -
      [% RenderBlockEnd("Upload") %] [% RenderBlockStart("Password") %] - -
      - +
      + +
      + +
      -
      [% RenderBlockEnd("Password") %] [% RenderBlockEnd("SLAItem") %] -
      - [% IF Data.SLAID %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.SLAID %] + + + [% ELSE %] + + [% END %] +
      -
      [% RenderBlockEnd("SLAEdit") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSMIME.tt b/Kernel/Output/HTML/Templates/Standard/AdminSMIME.tt index 519be9f5762..72cfaff302a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSMIME.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSMIME.tt @@ -8,26 +8,9 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("S/MIME Management") | html %][% IF Data.Subtitle %]:[% END %] [% Translate(Data.Subtitle) | html %]

      +
      - [% BreadcrumbPath = [ - { - Name => Translate('S/MIME Management'), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.Action == "ShowAddCertificate" %] - [% BreadcrumbPath.push({ Name => Translate("Add Certificate"),}) %] - [% ELSIF Data.Action == "ShowAddPrivate" %] - [% BreadcrumbPath.push({ Name => Translate("Add Private Key"),}) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      [% RenderBlockStart("Notice") %]
      @@ -38,30 +21,29 @@ [% RenderBlockStart("Disabled") %] -

      [% Translate("SMIME support is disabled") | html %]

      +

      [% Translate("SMIME support is disabled") | html %]

      [% Translate("To be able to use SMIME in Znuny, you have to enable it first.") | html %]

      -
      [% RenderBlockEnd("Disabled") %] [% RenderBlockStart("NotWorking") %] -

      [% Translate("Faulty SMIME configuration") | html %]

      +

      [% Translate("Faulty SMIME configuration") | html %]

      [% Translate("SMIME support is enabled, but the relevant configuration contains errors. Please check the configuration using the button below.") | html %]

      -
      [% RenderBlockEnd("NotWorking") %] -
      @@ -76,23 +58,21 @@
      - [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("SMIMEFilter") %]
      @@ -111,7 +91,6 @@
      [% RenderBlockEnd("SMIMEFilter") %] - [% RenderBlockStart("OverviewHint") %]
      @@ -160,6 +139,23 @@
      +

      [% Translate("S/MIME Management") | html %][% IF Data.Subtitle %]:[% END %] [% Translate(Data.Subtitle) | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('S/MIME Management'), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.Action == "ShowAddCertificate" %] + [% BreadcrumbPath.push({ Name => Translate("Add Certificate"),}) %] + [% ELSIF Data.Action == "ShowAddPrivate" %] + [% BreadcrumbPath.push({ Name => Translate("Add Private Key"),}) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]
      @@ -191,14 +187,13 @@ [% RenderBlockStart("Row") %] - [% RenderBlockStart("CertificateRelationAdd") %] - + [% Translate("Handle related certificates") | html %] [% RenderBlockEnd("CertificateRelationAdd") %] [% RenderBlockStart("CertificateRead") %] - + [% Translate("Read certificate") | html %] [% RenderBlockEnd("CertificateRead") %] @@ -207,15 +202,15 @@ [% Data.Type | html %] [% Data.Subject | html %] - [% Data.Hash | truncate(12) | html %] + [% Data.Hash | truncate(12) | html %] - [% Data.Fingerprint | truncate(12) | html %] + [% Data.Fingerprint | truncate(12) | html %] [% Data.StartDate | html %] [% Data.EndDate | html %] - + [% Translate("Delete this certificate") | html %] @@ -238,20 +233,20 @@
      - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      -
      - -
      - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + +
      -
      @@ -267,25 +262,28 @@
      - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      -
      - -
      - -

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

      +
      + +
      + +

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

      +
      -
      -
      - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + +
      @@ -322,7 +320,7 @@ [% RenderBlockStart("RelatedCertsRow") %] - + [% Translate("Delete this relation") | html %] @@ -349,7 +347,7 @@
      - +
      @@ -376,7 +374,7 @@ [% RenderBlockStart("AvailableCertsRow") %] @@ -398,5 +396,5 @@ [% RenderBlockEnd("SignerCertificates") %] -
      + [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSMIMECertRead.tt b/Kernel/Output/HTML/Templates/Standard/AdminSMIMECertRead.tt index c5d2a5f3fd7..b79b69d2beb 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSMIMECertRead.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSMIMECertRead.tt @@ -6,12 +6,13 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- +

      [% Translate("S/MIME Certificate") | html %]: [% Data.Filename | html %]

      -

      - [% Translate("Close this dialog") | html %] -

      +
      @@ -23,7 +24,7 @@
      -
      - -
      +#
      +# +#
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSalutation.tt b/Kernel/Output/HTML/Templates/Standard/AdminSalutation.tt index 0c1627cf6d0..c7c9beb8b98 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSalutation.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSalutation.tt @@ -8,28 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Salutation Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Salutation Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add Salutation"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Salutation")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -39,12 +19,12 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Filter") %]
      @@ -69,9 +48,9 @@

      [% Translate('Related Actions') | html %]

      -
      +
      +

      [% Translate("Salutation Management") | html %]

      + [% BreadcrumbPath = [ + { + Name => Translate('Salutation Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add Salutation"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Salutation")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]
      -
      +

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

      -       - + + Show Valid + Show All
      @@ -130,7 +129,6 @@
      [% RenderBlockEnd("OverviewResult") %] [% RenderBlockStart("OverviewUpdate") %] -
      @@ -151,70 +149,75 @@ [% END %]
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + + + + [% ELSE %] + + [% END %] +
      -
      -
      - [% INCLUDE "SmartTags/Default.tt" %] - [% RenderBlockEnd("OverviewUpdate") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSecureMode.tt b/Kernel/Output/HTML/Templates/Standard/AdminSecureMode.tt index 538f93990e6..8094e0e2a93 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSecureMode.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSecureMode.tt @@ -14,7 +14,6 @@

      [% Translate("Secure Mode Needs to be Enabled!") | html %]

      -

      [% Translate("Secure mode will (normally) be set after the initial installation is completed.") | html %]

      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSelectBox.tt b/Kernel/Output/HTML/Templates/Standard/AdminSelectBox.tt index b590c52a4bd..0df91d91314 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSelectBox.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSelectBox.tt @@ -7,20 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("SQL Box") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('SQL Box'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      [% RenderBlockStart("ResultFilter") %]
      @@ -49,8 +37,19 @@
      -
      +

      [% Translate("SQL Box") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('SQL Box'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

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

      @@ -62,12 +61,13 @@
      - -
      - -

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

      -
      -

      +

      + +
      + +

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

      +
      +

      [% RenderBlockStart("FieldRequiredServerError") %] [% Translate("This field is required.") | html %] [% RenderBlockEnd("FieldRequiredServerError") %] @@ -81,31 +81,34 @@ [% Translate("There is at least one parameter missing for the binding. Please check it.") | html %] [% RenderBlockEnd("BindParamServerError") %] -

      +

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - [% Data.ResultFormatStrg %] +
      + +
      + [% Data.ResultFormatStrg %] +
      -
      -
      - +
      +
      + +
      - [% RenderBlockStart("Result") %]
      @@ -143,5 +146,5 @@
      [% RenderBlockEnd("Result") %]
      -
      +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminService.tt b/Kernel/Output/HTML/Templates/Standard/AdminService.tt index 6cb9fcc1047..d805a5cc0d7 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminService.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminService.tt @@ -8,28 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Service Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Service Management'), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.ServiceID == "NEW" %] - [% BreadcrumbPath.push({ Name => Translate("Add Service"),}) %] - [% ELSIF Data.ServiceID %] - [% USE EditTitle = String(Translate("Edit Service")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.ServiceName ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -39,22 +19,21 @@
      [% RenderBlockEnd("ActionList") %]
      - [% RenderBlockStart("Filter") %]
      @@ -70,23 +49,23 @@

      [% Translate('Related Actions') | html %]

      -
      +

      [% Translate("Service Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Service Management'), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.ServiceID == "NEW" %] + [% BreadcrumbPath.push({ Name => Translate("Add Service"),}) %] + [% ELSIF Data.ServiceID %] + [% USE EditTitle = String(Translate("Edit Service")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.ServiceName ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewList") %] -
      +

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

      -       - + + Show Valid + Show All
      @@ -140,10 +139,8 @@
      - + [% Translate("Relate this certificate") | html %]
      -
      [% RenderBlockEnd("OverviewList") %] - [% RenderBlockStart("ServiceEdit") %]
      [% IF Data.ServiceID == 'NEW' %] @@ -153,7 +150,6 @@ [% END %]
      -
      @@ -163,118 +159,125 @@ [% END %]
      - - -
      - -

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

      - [% IF Data.LongName %] -

      [% Translate("Service name maximum length is 200 characters (with Sub-service).") | html %]

      - [% ELSE %] -

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

      - [% END %] +
      + +
      + +

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

      + [% IF Data.LongName %] +

      [% Translate("Service name maximum length is 200 characters (with Sub-service).") | html %]

      + [% ELSE %] +

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

      + [% END %] +
      -
      - -
      - [% Data.ParentOptionStrg %] +
      + +
      + [% Data.ParentOptionStrg %] +
      -
      [% IF Data.IsITSMInstalled %] - -
      - [% Data.TypeOptionStrg %] +
      + +
      + [% Data.TypeOptionStrg %] +
      -
      - -
      - [% Data.CriticalityOptionStrg %] +
      + +
      + [% Data.CriticalityOptionStrg %] +
      -
      [% END %] - -
      - [% Data.ValidOptionStrg %] +
      + +
      + [% Data.ValidOptionStrg %] +
      -
      - -
      - +
      + +
      + +
      -
      - [% RenderBlockStart("Item") %] [% RenderBlockStart("InputKey") %] - -
      - +
      + +
      + +
      -
      [% RenderBlockEnd("InputKey") %] [% RenderBlockStart("Input") %] - -
      - -

      [% Translate(Data.Desc) | html %]

      +
      + +
      + +

      [% Translate(Data.Desc) | html %]

      +
      -
      [% RenderBlockEnd("Input") %] [% RenderBlockStart("TextArea") %] - -
      - -

      [% Translate(Data.Desc) | html %]

      +
      + +
      + +

      [% Translate(Data.Desc) | html %]

      +
      -
      [% RenderBlockEnd("TextArea") %] [% RenderBlockStart("Option") %] - -
      - [% Data.Option %] -

      [% Translate(Data.Desc) | html %]

      +
      + +
      + [% Data.Option %] +

      [% Translate(Data.Desc) | html %]

      +
      -
      [% RenderBlockEnd("Option") %] [% RenderBlockStart("Upload") %] - -
      -
      - [% Data.Filename | html %] +
      + +
      +
      + [% Data.Filename | html %] +
      -
      [% RenderBlockEnd("Upload") %] [% RenderBlockStart("Password") %] - -
      - +
      + +
      + +
      -
      [% RenderBlockEnd("Password") %] [% RenderBlockEnd("Item") %] -
      - [% IF Data.ServiceID != 'NEW' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.ServiceID != 'NEW' %] + + + [% ELSE %] + + [% END %] +
      -
      -
      [% RenderBlockEnd("ServiceEdit") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSession.tt b/Kernel/Output/HTML/Templates/Standard/AdminSession.tt index 349e9e49f2a..3b4feeb63c8 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSession.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSession.tt @@ -7,28 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - -
      -

      [% Translate("Session Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Session Management'), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.Action == 'Detail' %] - [% USE TranslatedUserType = String(Translate(Data.UserType)) %] - [% BreadcrumbPath.push({ Name => Translate( "Detail Session View for %s (%s)", Data.UserFullname, TranslatedUserType ) })%] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -38,45 +18,42 @@
      @@ -94,8 +71,23 @@
      -
      +

      [% Translate("Session Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Session Management'), + Link => Env("Action"), + }, + ] + %] + [% IF Data.Action == 'Detail' %] + [% USE TranslatedUserType = String(Translate(Data.UserType)) %] + [% BreadcrumbPath.push({ Name => Translate( "Detail Session View for %s (%s)", Data.UserFullname, TranslatedUserType ) })%] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("Overview") %]

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

      @@ -119,7 +111,7 @@ [% Data.UserType | html %] [% Data.UserFullname | html %] - [% Translate("Kill this session") | html %] + [% Translate("Kill this session") | html %] [% RenderBlockEnd("Session") %] @@ -130,7 +122,6 @@
      [% RenderBlockEnd("Overview") %] - [% RenderBlockStart("DetailView") %]

      [% Translate("Detail View for SessionID: %s - %s", Data.SessionID, Data.UserFullname) | html %]

      @@ -159,4 +150,3 @@
      - diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSignature.tt b/Kernel/Output/HTML/Templates/Standard/AdminSignature.tt index 08efa51fbcf..891c7af7044 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSignature.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSignature.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Signature Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Signature Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add Signature"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Signature")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -40,12 +19,12 @@
      +
      +

      [% Translate("Signature Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Signature Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add Signature"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Signature")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]
      -
      +

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

      -       - + + Show Valid + Show All
      @@ -147,70 +147,70 @@ [% END %]
      - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [%# Textareas always swallow the first newline from their data, therefore we must prepend one since we want to preserve white space. %] - -
      -

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

      -
      -
      -

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

      +
      + +
      + [%# Textareas always swallow the first newline from their data, therefore we must prepend one since we want to preserve white space. %] + +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      - [% INCLUDE "SmartTags/Default.tt" %] - [% RenderBlockEnd("OverviewUpdate") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminState.tt b/Kernel/Output/HTML/Templates/Standard/AdminState.tt index bc84775f721..a4d122f12b6 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminState.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminState.tt @@ -8,30 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("State Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("State Management"), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add State"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit State")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -41,12 +19,12 @@ @@ -84,14 +62,14 @@
      -
      +

      [% Translate("State Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("State Management"), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add State"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit State")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewResult") %] -
      +

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

      -       - + + Show Valid + Show All
      - @@ -141,7 +137,7 @@ @@ -154,7 +150,6 @@
      [% Data.Comment | truncate(20) | html %] [% Translate(Data.Valid) | html %] -
      [% Data.Color | html %]
      + [% Data.Color | html %]       		[% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %]
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      [% IF Data.Action == 'Add' %] @@ -173,84 +168,83 @@ [% END %]
      - -
      - -
      -

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

      -
      -
      -

      +

      + +
      + +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingNameServerError") %] - [% Translate("This state is present in a SysConfig setting, confirmation for updating settings to point to the new type is needed!") | html %] + [% Translate("This state is present in a SysConfig setting, confirmation for updating settings to point to the new type is needed!") | html %] [% RenderBlockEnd("InSettingNameServerError") %] -

      +

      +
      -
      - -
      - [% Data.StateTypeOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.StateTypeOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] [% RenderBlockStart("MergeErrorValidOptionServerError") %] - [% Translate("It's not possible to invalidate this entry because there is no other merge states in system!") | html %] + [% Translate("It's not possible to invalidate this entry because there is no other merge states in system!") | html %] [% RenderBlockEnd("MergeErrorValidOptionServerError") %] -

      +

      +
      -
      - -
      - +
      + [% Data.ColorPicker %]
      -
      - - -
      - +
      + +
      + +
      -
      - -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      [% RenderBlockStart("StateInSysConfig") %] @@ -276,6 +270,5 @@
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSupportDataCollector.tt b/Kernel/Output/HTML/Templates/Standard/AdminSupportDataCollector.tt index e129932695d..f6c6731c59f 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSupportDataCollector.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSupportDataCollector.tt @@ -6,21 +6,9 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Support Data Collector") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Support Data Collector'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

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

      @@ -30,34 +18,34 @@ [% RenderBlockStart("NoteSupportBundle") %]

    • [% Translate("A support bundle (including: system registration information, support data, a list of installed packages and all locally modified source code files) can be generated by pressing this button:") | html %]

      - + [% Translate("Generate Support Bundle") | html %]
      • [% RenderBlockEnd("NoteSupportBundle") %] -
      [% RenderBlockEnd("SupportDataCollectionFailed") %] - [% RenderBlockStart("SupportData") %]
      +

      [% Translate("Support Data Collector") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Support Data Collector'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("SupportDataGroup") %]
      @@ -94,7 +92,7 @@ [% RenderBlockStart("SupportDataEntryTableDetails") %]
      - +
      [% FOR Label IN Data.Labels %] @@ -123,7 +121,7 @@ ([% Data.Value | html %]) [% RenderBlockEnd("SupportDataEntryValueSingleLine") %] -

      [% Translate(Data.Message) | html %]

      +

      [% Translate(Data.Message) | html %]

      [% RenderBlockStart("SupportDataEntryValueMultiLine") %] [% RenderBlockEnd("SupportDataEntryValueMultiLine") %] @@ -135,33 +133,36 @@ [% Translate(Data.SubGroup) | html %] -
      [% Translate(Label) | html %]
      - +
      +
      + + [% RenderBlockStart("SupportDataSubEntry") %] - - - - - + + + + - + + [% RenderBlockEnd("SupportDataSubEntry") %] - -
      - - [% Data.StatusName | html %] - - [% Translate(Data.Label) | html %][% Data.Value | html %] +
      + + [% Data.StatusName | html %] + + [% Translate(Data.Label) | html %][% Data.Value | html %] [% RenderBlockStart("SupportDataSubEntryMessage") %] - [% Translate("Details") | html %] - + [% Translate("Details") | html %] + [% RenderBlockEnd("SupportDataSubEntryMessage") %] -
      + + +
      [% RenderBlockEnd("SupportDataSubGroup") %] [% RenderBlockEnd("SupportDataRow") %] @@ -171,5 +172,4 @@ [% RenderBlockEnd("SupportDataGroup") %]
      [% RenderBlockEnd("SupportData") %] -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt index 601a34bbde9..29d4ef74527 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemAddress.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("System Email Addresses Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('System Email Addresses Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate('Add System Email Address'),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit System Email Address")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -41,12 +20,12 @@ @@ -78,9 +57,9 @@

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

      -
      -
      -
      +

      [% Translate("System Email Addresses Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('System Email Addresses Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate('Add System Email Address'),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit System Email Address")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewResult") %] -
      +

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

      -       - + + Show Valid + Show All
      @@ -139,7 +137,6 @@
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      [% IF Data.Action == 'Add' %] @@ -157,110 +154,112 @@ [% END %]
      - -
      - -
      -

      [% Translate("This field is required and needs to be a valid email address.") | html %]

      -
      -
      +
      + +
      + +
      +

      [% Translate("This field is required and needs to be a valid email address.") | html %]

      +
      +
      [% RenderBlockStart("RequiredFieldServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("RequiredFieldServerErrorMsg") %] [% RenderBlockStart("EmailInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("EmailInvalidConfigServerErrorMsg") %] [% RenderBlockStart("EmailInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("EmailInvalidMXServerErrorMsg") %] [% RenderBlockStart("EmailInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("EmailInvalidDNSServerErrorMsg") %] [% RenderBlockStart("EmailInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("EmailInvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("EmailAlreadyUsedServerErrorMsg") %]

      [% Translate("This email address is already used as system email address.") | html %]

      [% RenderBlockEnd("EmailAlreadyUsedServerErrorMsg") %] +
      -
      - - -
      - -
      -

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

      -
      -
      -

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      +

      + [% Translate("The display name and email address will be shown on mail you send.") | html %] +

      -

      - [% Translate("The display name and email address will be shown on mail you send.") | html %] -

      -
      - -
      - [% Data.QueueOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.QueueOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      - [% IF Data.Errors.SystemAddressIsUsed %] -
      -

      [% Translate("This system address cannot be set to invalid.") | html %]

      -
      - [% ELSE %] -
      +
      + +
      + [% Data.ValidOption %] +

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

      - [% END %] - [% IF Data.SystemAddressIsUsed %] -

      - [% Translate("This system address cannot be set to invalid, because it is used in one or more queue(s) or auto response(s).") | html %] -

      - [% END %] + [% IF Data.Errors.SystemAddressIsUsed %] +
      +

      [% Translate("This system address cannot be set to invalid.") | html %]

      +
      + [% ELSE %] +
      +

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

      +
      + [% END %] + [% IF Data.SystemAddressIsUsed %] +

      + [% Translate("This system address cannot be set to invalid, because it is used in one or more queue(s) or auto response(s).") | html %] +

      + [% END %] +
      -
      - -
      - +
      + +
      + +
      -
      -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + [% ELSE %] + + [% END %] +
      -
      [% RenderBlockEnd("OverviewUpdate") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfiguration.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfiguration.tt index 25e6e8658ff..a7e1a2448ea 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfiguration.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfiguration.tt @@ -12,28 +12,9 @@ SET DocumentationLink = "" _ DocumentationLinkText.html() _ ""; %] -
      +
      -

      [% Translate("System configuration") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('System Configuration'), - Link => 'AdminSystemConfiguration', - }, - ] - %] - - [% FOREACH Item IN Data.Path %] - [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfigurationGroup;RootNavigation=' _ Item.Value }) %] - [% END %] - - [% FOREACH Item IN Data.Parameters %] - [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfiguration;Subaction=' _ Item.Value }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] -
      +
      [% INCLUDE "SystemConfiguration/Sidebar/Actions.tt" %] [% IF Data.SettingCount %] [% INCLUDE "SystemConfiguration/Sidebar/Navigation.tt" %] @@ -43,24 +24,49 @@
      +

      [% Translate("System configuration") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('System Configuration'), + Link => 'AdminSystemConfiguration', + }, + ] + %] + + [% FOREACH Item IN Data.Path %] + [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfigurationGroup;RootNavigation=' _ Item.Value }) %] + [% END %] + + [% FOREACH Item IN Data.Parameters %] + [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfiguration;Subaction=' _ Item.Value }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
      [% IF Data.SettingCount %]
      • - + + +

        [% Translate("Navigate through the available settings by using the tree in the navigation box on the left side.") | html %]

      • - + + +

        [% Translate("Find certain settings by using the search field below or from search icon from the top navigation.") | html %]

      • - + + +

        [% Translate("Find out how to use the system configuration by reading the %s.") | html | ReplacePlaceholders(DocumentationLink) %]

        @@ -70,11 +76,9 @@ - + + - [% ELSE %] @@ -86,5 +90,4 @@
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationGroup.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationGroup.tt index 102556f76be..1f02338418a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationGroup.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationGroup.tt @@ -7,29 +7,9 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +
      -

      [% Translate("System configuration") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('System Configuration'), - Link => 'AdminSystemConfiguration', - }, - ] - %] - - [% FOREACH Item IN Data.Path %] - [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfigurationGroup;RootNavigation=' _ Item.Value }) %] - [% END %] - - [% FOREACH Item IN Data.Parameters %] - [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfiguration;Subaction=' _ Item.Value }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      [% INCLUDE "SystemConfiguration/Sidebar/Actions.tt" %] [% INCLUDE "SystemConfiguration/Sidebar/Navigation.tt" %] [% INCLUDE "SystemConfiguration/Sidebar/Help.tt" %] @@ -37,6 +17,27 @@
      + +

      [% Translate("System configuration") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('System Configuration'), + Link => 'AdminSystemConfiguration', + }, + ] + %] + + [% FOREACH Item IN Data.Path %] + [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfigurationGroup;RootNavigation=' _ Item.Value }) %] + [% END %] + + [% FOREACH Item IN Data.Parameters %] + [% BreadcrumbPath.push({ Name => Item.Name, Link => 'AdminSystemConfiguration;Subaction=' _ Item.Value }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + [% IF Data.SettingList.size() %] [% INCLUDE "SystemConfiguration/SettingsList.tt" %] [% ELSE %] @@ -47,5 +48,4 @@
      [% END %]
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearch.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearch.tt index d27b92153a9..2284a781af0 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearch.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearch.tt @@ -7,37 +7,38 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +
      -

      [% Translate("System configuration") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('System Configuration'), - Link => 'AdminSystemConfiguration', - }, - ] - %] - -[% IF Env("Subaction") == 'Search' %] - [% IF Data.Search %] - [% BreadcrumbPath.push({ Name => Translate('Search for') _ ' "' _ Data.Search _ '"', Link => 'AdminSystemConfiguration;Subaction=Search;Search=' _ Data.Search }) %] - [% ELSIF Data.Category %] - [% BreadcrumbPath.push({ Name => Translate('Search for category') _ ' "' _ Translate(Data.Category) _ '"', Link => 'AdminSystemConfiguration;Subaction=Search;Category=' _ Data.Category }) %] - [% END %] -[% ELSIF Env("Subaction") == 'SearchLocked' %] - [% BreadcrumbPath.push({ Name => Translate('Settings I\'m currently editing'), Link => 'AdminSystemConfiguration;Subaction=SearchLocked' }) %] -[% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      [% INCLUDE "SystemConfiguration/Sidebar/Actions.tt" %] [% INCLUDE "SystemConfiguration/Sidebar/Help.tt" %] [% INCLUDE "SystemConfiguration/Sidebar/DynamicActions.tt" %]
      + +

      [% Translate("System configuration") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('System Configuration'), + Link => 'AdminSystemConfiguration', + }, + ] + %] + + [% IF Env("Subaction") == 'Search' %] + [% IF Data.Search %] + [% BreadcrumbPath.push({ Name => Translate('Search for') _ ' "' _ Data.Search _ '"', Link => 'AdminSystemConfiguration;Subaction=Search;Search=' _ Data.Search }) %] + [% ELSIF Data.Category %] + [% BreadcrumbPath.push({ Name => Translate('Search for category') _ ' "' _ Translate(Data.Category) _ '"', Link => 'AdminSystemConfiguration;Subaction=Search;Category=' _ Data.Category }) %] + [% END %] + [% ELSIF Env("Subaction") == 'SearchLocked' %] + [% BreadcrumbPath.push({ Name => Translate('Settings I\'m currently editing'), Link => 'AdminSystemConfiguration;Subaction=SearchLocked' }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + [% IF Env("Subaction") == 'Search' %]
      @@ -69,5 +70,4 @@ [% END %] [% INCLUDE "SystemConfiguration/SettingsList.tt" %]
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearchDialog.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearchDialog.tt index 5347fc91e9a..db615f5eca6 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearchDialog.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSearchDialog.tt @@ -12,19 +12,23 @@
      - -
      - +
      + +
      + +
      -
      - -
      - [% Data.CategoriesStrg %] +
      + +
      + [% Data.CategoriesStrg %] +
      -
      -
      - +
      + + +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSpecialGroup.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSpecialGroup.tt index f1dcc22d940..6927d052ee0 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSpecialGroup.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationSpecialGroup.tt @@ -7,25 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      - -

      [% Translate("System configuration") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('System Configuration'), - Link => 'AdminSystemConfiguration', - }, - { - Name => Data.GroupName, - Link => Data.GroupLink, - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

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

      @@ -33,7 +16,7 @@
      @@ -43,11 +26,26 @@
      - [% IF Data.SettingList.size() %] - [% INCLUDE "SystemConfiguration/SettingsList.tt" %] - [% ELSE %] -

      [% Data.GroupEmptyMessage | html %]

      - [% END %] +

      [% Translate("System configuration") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('System Configuration'), + Link => 'AdminSystemConfiguration', + }, + { + Name => Data.GroupName, + Link => Data.GroupLink, + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + + [% IF Data.SettingList.size() %] + [% INCLUDE "SystemConfiguration/SettingsList.tt" %] + [% ELSE %] +

      [% Data.GroupEmptyMessage | html %]

      + [% END %]
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationView.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationView.tt index 60ab571dd66..ac2ef20eeb8 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationView.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemConfigurationView.tt @@ -7,28 +7,9 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +
      -

      [% Translate("System configuration") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('System Configuration'), - Link => 'AdminSystemConfiguration', - }, - ] - %] - -[% IF Data.Type and Data.Type == 'CustomList' %] - [% BreadcrumbPath.push({ Name => Translate('View a custom List of Settings') }) %] -[% ELSE %] - [% View = Data.View | uri %] - [% BreadcrumbPath.push({ Name => Translate('View single Setting: %s', Data.View), Link => 'AdminSystemConfiguration;Subaction=View;Setting=' _ View }) %] -[% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +

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

      @@ -37,9 +18,9 @@ @@ -48,7 +29,25 @@
      +

      [% Translate("System configuration") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('System Configuration'), + Link => 'AdminSystemConfiguration', + }, + ] + %] + + [% IF Data.Type and Data.Type == 'CustomList' %] + [% BreadcrumbPath.push({ Name => Translate('View a custom List of Settings') }) %] + [% ELSE %] + [% View = Data.View | uri %] + [% BreadcrumbPath.push({ Name => Translate('View single Setting: %s', Data.View), Link => 'AdminSystemConfiguration;Subaction=View;Setting=' _ View }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] + [% INCLUDE "SystemConfiguration/SettingsList.tt" %]
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt index 31369a4b31a..6e72f55ff88 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles.tt @@ -6,7 +6,7 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
      +

      [% Translate("System file support") | html %]

      [% BreadcrumbPath = [ @@ -26,24 +26,24 @@ [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]
      + [% RenderBlockStart("Filter") %] -
      +

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

      -
      -
      +
      + -
      -
      - + + + - [% Translate("Delete cache") | html %] - [% Translate("Date") | html %]: [% Data.CacheDate | Localize("TimeLong") %] -
      +
      [% RenderBlockEnd("Filter") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt index 52a3719a7b4..e095558aad2 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemFiles/Widget.tt @@ -5,7 +5,6 @@ # the enclosed file COPYING for license information (AGPL). If you # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- - [% RenderBlockStart("Widget") %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenance.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenance.tt index 462d1716941..9f62d29924e 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenance.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenance.tt @@ -7,23 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - -
      -

      [% Translate("System Maintenance Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("System Maintenance Management"), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +

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

      @@ -31,7 +16,7 @@
      @@ -56,13 +41,23 @@

      [% Translate("Some time before this system maintenance starts the users will receive a notification on each screen announcing about this fact.") | html %]

      -
      -
      +

      [% Translate("System Maintenance Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("System Maintenance Management"), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -92,14 +87,13 @@ [% Translate(Data.ValidID) | html %] - + [% Translate("Delete System Maintenance") | html %] [% RenderBlockEnd("ViewRow") %] - [% RenderBlockStart("NoDataRow") %] @@ -116,8 +110,4 @@
      - -
      - - diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceEdit.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceEdit.tt index 84c03cb5921..73d891b6700 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceEdit.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceEdit.tt @@ -7,24 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Edit System Maintenance") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("System Maintenance Management"), - Link => Env("Action"), - }, - { - Name => Translate("Edit System Maintenance") - } - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +

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

      @@ -32,15 +16,29 @@
      -
      +

      [% Translate("Edit System Maintenance") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("System Maintenance Management"), + Link => Env("Action"), + }, + { + Name => Translate("Edit System Maintenance") + } + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      @@ -55,76 +53,78 @@
      - - - -
      - [% Data.StartDateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      +
      + +
      + [% Data.StartDateString %] +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("Date invalid!") | html %]

      +
      -
      - -
      - [% Data.StopDateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      +
      + +
      + [% Data.StopDateString %] +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("Date invalid!") | html %]

      +
      -
      - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      -
      - -
      - -

      [% Translate("This field must have less then 250 characters.") | html %]

      -

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      + +
      + +

      [% Translate("This field must have less then 250 characters.") | html %]

      +

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - -

      [% Translate("This field must have less then 250 characters.") | html %]

      -

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      + +
      + +

      [% Translate("This field must have less then 250 characters.") | html %]

      +

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      -
      - - -
      - [% Data.ValidOption %] -
      -

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

      +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      -

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

      -
      -
      -
      - -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %]
      -
      +
      +
      + [% Translate("Cancel") | html %] + + +
      +
      @@ -137,23 +137,24 @@

      [% Translate("Manage Sessions") | html %]

      -
      - - -
      [% Data.Counter | html %]
      -
      - - -
      [% Data.UserSessionUniq | html %]
      -
      +
      +
      + +
      [% Data.Counter | html %]
      +
      - -
      [% Data.CustomerSessionUniq | html %]
      -
      +
      + +
      [% Data.UserSessionUniq | html %]
      +
      +
      + +
      [% Data.CustomerSessionUniq | html %]
      +
      -

      [% Translate("Agent Sessions") | html %]

      - +

      [% Translate("Agent Sessions") | html %]

      +
      @@ -169,7 +170,7 @@ [% RenderBlockEnd("AgentSession") %] @@ -182,10 +183,9 @@ [% RenderBlockEnd("AgentNoDataRow") %]
      [% Translate("Session") | html %][% Data.UserType | html %] [% Data.UserFullname | html %] - [% Translate("Kill this session") | html %] + [% Translate("Kill this session") | html %]
      -
      -

      [% Translate("Customer Sessions") | html %]

      - +

      [% Translate("Customer Sessions") | html %]

      +
      @@ -201,7 +201,7 @@ [% RenderBlockEnd("CustomerSession") %] @@ -214,17 +214,15 @@ [% RenderBlockEnd("CustomerNoDataRow") %]
      [% Translate("Session") | html %][% Data.UserType | html %] [% Data.UserFullname | html %] - [% Translate("Kill this session") | html %] + [% Translate("Kill this session") | html %]
      -
      -
      - [% Translate("Kill all Sessions, except for your own") | html %] +
      +
      + [% Translate("Kill all Sessions, except for your own") | html %] +
      -
      -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceNew.tt b/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceNew.tt index c5bbc284851..0277b51df3a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceNew.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminSystemMaintenanceNew.tt @@ -6,25 +6,9 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- +
      -
      -

      [% Translate("Schedule New System Maintenance") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate("System Maintenance Management"), - Link => Env("Action"), - }, - { - Name => Translate("Schedule New System Maintenance") - } - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +

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

      @@ -32,7 +16,7 @@
      @@ -40,6 +24,21 @@
      +

      [% Translate("Schedule New System Maintenance") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate("System Maintenance Management"), + Link => Env("Action"), + }, + { + Name => Translate("Schedule New System Maintenance") + } + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

      [% Translate("Schedule New System Maintenance") | html %]

      @@ -50,78 +49,81 @@
      - - -
      - [% Data.StartDateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      +
      + +
      + [% Data.StartDateString %] +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("Date invalid!") | html %]

      +
      -
      - -
      - [% Data.StopDateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      +
      + +
      + [% Data.StopDateString %] +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("Date invalid!") | html %]

      +
      -
      - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      -
      - -
      - -

      [% Translate("This field must have less then 250 characters.") | html %]

      -

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      + +
      + +

      [% Translate("This field must have less then 250 characters.") | html %]

      +

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      -
      - -
      - +
      + +
      + +
      -
      - -
      - -

      [% Translate("This field must have less then 250 characters.") | html %]

      -

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      + +
      + +

      [% Translate("This field must have less then 250 characters.") | html %]

      +

      [% Translate("This field must have less then 250 characters.") | html %]

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + + +
      -
      -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminTemplate.tt b/Kernel/Output/HTML/Templates/Standard/AdminTemplate.tt index 080ede217e0..fdec87cccd6 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminTemplate.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminTemplate.tt @@ -8,28 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Template Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Template Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add Template"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Template")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +
      [% RenderBlockStart("ActionList") %]

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

      @@ -37,12 +17,12 @@ @@ -82,21 +62,21 @@
      +
      +

      [% Translate("Template Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Template Management'), + Link => Env("Action"), + }, + ] + %] + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add Template"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Template")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]
      -
      +

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

      -       - + + Show Valid + Show All
      @@ -153,8 +153,7 @@ [% Data.ChangeTime | Localize("TimeShort") %] [% Data.CreateTime | Localize("TimeShort") %] - - [% Translate("Delete this entry") | html %] + @@ -190,84 +189,90 @@ [% END %]
      - -
      - [% Data.TemplateTypeString %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.TemplateTypeString %] +
      +

      [% 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("NameServerError") %] -

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

      +

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

      [% RenderBlockEnd("NameServerError") %] [% RenderBlockStart("ExistNameServerError") %] -

      [% Translate("A standard template with this name already exists!") | html %]

      +

      [% Translate("A standard template with this name already exists!") | html %]

      [% RenderBlockEnd("NameServerError") %] +
      -
      - -
      - -
      -
      - -
      - [% Data.AttachmentOption %] +
      + +
      + +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      +
      + +
      + [% Data.AttachmentOption %]
      -
      -

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

      +
      + +
      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      + +
      + +
      -
      -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + + [% ELSE %] + + [% END %] + +
      -
      - [% INCLUDE "SmartTags/Default.tt" %] - [% RenderBlockEnd("OverviewUpdate") %]
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminTemplateAttachment.tt b/Kernel/Output/HTML/Templates/Standard/AdminTemplateAttachment.tt index c72cb122ba7..4fe407d5018 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminTemplateAttachment.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminTemplateAttachment.tt @@ -8,27 +8,9 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Manage Template-Attachment Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Template-Attachment Relations'), - Link => Env("Action"), - }, - ] - %] - - [% IF Data.BreadcrumbTitle %] - [% USE EditTitle = String(Data.BreadcrumbTitle) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -38,7 +20,7 @@ @@ -53,16 +35,15 @@
      [% RenderBlockEnd("NewActions") %] - [% RenderBlockStart("Filter") %]
      @@ -73,7 +54,6 @@
      [% RenderBlockEnd("Filter") %] - [% RenderBlockStart("Filters") %]
      @@ -91,23 +71,22 @@
      - [% RenderBlockEnd("Filters") %]

      [% Translate('Related Actions') | html %]

      -
      +

      [% Translate("Manage Template-Attachment Relations") | html %]

      + [% BreadcrumbPath = [ + { + Name => Translate('Manage Template-Attachment Relations'), + Link => Env("Action"), + }, + ] + %] + + [% IF Data.BreadcrumbTitle %] + [% USE EditTitle = String(Data.BreadcrumbTitle) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( " '", Data.Name, "'" ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] [% RenderBlockStart("OverviewResult") %]

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

      -
      +
      • [% Translate("Templates") | html %]
        • @@ -150,14 +144,9 @@ [% RenderBlockEnd("Listn1") %]
      -
      -
      - - [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("Change") %]
      @@ -172,54 +161,53 @@ - - - - +
      +
      [% Translate(Data.VisibleNeType) | html %]
      + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - - - + + + + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] - - [% Translate("Active") | html %] - + + [% Translate("Active") | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %] - - -
      [% Data.Name | html %] + + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + + [% Translate("No matches found.") | html %] + + + +
      +
      +
      + [% Translate("Cancel") | html %] + + +
      -
      [% RenderBlockEnd("Change") %]
      -
      - [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminTicketAttributeRelations.tt b/Kernel/Output/HTML/Templates/Standard/AdminTicketAttributeRelations.tt index e1c889cd9a3..eded545aa48 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminTicketAttributeRelations.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminTicketAttributeRelations.tt @@ -6,26 +6,8 @@ # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
      - [% BreadcrumbPath = [ - { - Name => Translate('Ticket attribute relations'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add ticket attribute relations"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit ticket attribute relations")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.TicketAttributeRelations.Filename, ' (' , Translate("Priority"), ': ', Data.TicketAttributeRelations.Priority, ')' ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      +
      +

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

      @@ -34,20 +16,38 @@
      - [% RenderBlockStart("Overview") %]
      + + [% BreadcrumbPath = [ + { + Name => Translate('Ticket attribute relations'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add ticket attribute relations"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit ticket attribute relations")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.TicketAttributeRelations.Filename, ' (' , Translate("Priority"), ': ', Data.TicketAttributeRelations.Priority, ')' ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +

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

      @@ -74,8 +74,18 @@ [% TicketAttributeRelations.Attribute2 | html%] [% TicketAttributeRelations.Filename | html %] [% TicketAttributeRelations.ChangeTime | Localize("TimeShort") %] - [% Translate("Edit") | html %] - [% Translate("Delete") | html %] + + + [% Translate("Edit") | html %] + + + + + + [% Translate("Delete") | html %] + + + [% END %] [% ELSE %] @@ -90,9 +100,7 @@
      -
      [% RenderBlockEnd("Overview") %] - [% RenderBlockStart("Edit") %]
      @@ -114,53 +122,57 @@ [% END %]
      - -
      - +
      + +
      + - [% IF Data.Action == 'Change' %] -

      [% Translate("Download previously imported file") | html %] - [% END %] + [% IF Data.Action == 'Change' %] +

      [% Translate("Download previously imported file") | html %] + [% END %] -
      -

      [% Translate("The file needs to be in CSV (UTF-8) or Excel format. Both header columns need to contain the names of valid ticket attributes. The name of the uploaded file must be unique and must not be in use by another ticket attribute relations record.") | html %]

      +
      +

      [% Translate("The file needs to be in CSV (UTF-8) or Excel format. Both header columns need to contain the names of valid ticket attributes. The name of the uploaded file must be unique and must not be in use by another ticket attribute relations record.") | html %]

      +
      -
      - -
      - [% Data.PrioritySelectionHTML %] -
      -

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

      -
      -
      -

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

      +
      + +
      + [% Data.PrioritySelectionHTML %] +
      +

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

      +
      +
      +

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

      +
      -
      - -
      - +
      +
      +
      + +
      + +
      -
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] -
      -
      + [% ELSE %] + + [% END %] +
      +
      @@ -188,13 +200,14 @@ [% END %] -

      - [% Translate("If a value is colored red, it is missing from the possible values list of the dynamic field configuration.") | html %] -

      +
      +

      + [% Translate("If a value is colored red, it is missing from the possible values list of the dynamic field configuration.") | html %] +

      +
      [% END %]
      -
      [% RenderBlockEnd("Edit") %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AdminType.tt b/Kernel/Output/HTML/Templates/Standard/AdminType.tt index 720b6066e99..2e2809809a7 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminType.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminType.tt @@ -8,29 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Type Management") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Type Management'), - Link => Env("Action"), - }, - ] - %] - - [% SWITCH Data.Action %] - [% CASE 'Add' %] - [% BreadcrumbPath.push({ Name => Translate("Add Type"),}) %] - [% CASE 'Change' %] - [% USE EditTitle = String(Translate("Edit Type")) %] - [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] - [% END %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -40,13 +19,12 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("Filter") %]
      @@ -70,9 +47,9 @@

      [% Translate('Related Actions') | html %]

      -
      -
      +

      [% Translate("Type Management") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Type Management'), + Link => Env("Action"), + }, + ] + %] + + [% SWITCH Data.Action %] + [% CASE 'Add' %] + [% BreadcrumbPath.push({ Name => Translate("Add Type"),}) %] + [% CASE 'Change' %] + [% USE EditTitle = String(Translate("Edit Type")) %] + [% BreadcrumbPath.push({ Name => EditTitle.append( ': ', Data.Name ) }) %] + [% END %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewResult") %] -
      +

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

      -       - + + Show Valid + Show All
      @@ -127,7 +124,6 @@
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockStart("OverviewUpdate") %]
      @@ -148,59 +144,61 @@ [% END %]
      - -
      - -
      -

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

      -
      -
      -

      +

      + +
      + +
      +

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

      +
      +
      +

      [% RenderBlockStart("NameServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("NameServerError") %] [% RenderBlockStart("ExistNameServerError") %] - [% Translate("A type with this name already exists!") | html %] + [% Translate("A type with this name already exists!") | html %] [% RenderBlockEnd("ExistNameServerError") %] [% RenderBlockStart("InSettingNameServerError") %] [% Translate("This type is present in a SysConfig setting, confirmation for updating settings to point to the new type is needed!") | html %] [% RenderBlockEnd("InSettingNameServerError") %] -

      +

      +
      -
      - -
      - [% Data.ValidOption %] -
      -

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

      -
      -
      -

      +

      + +
      + [% Data.ValidOption %] +
      +

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

      +
      +
      +

      [% RenderBlockStart("RequiredValidOptionServerError") %] - [% Translate("This field is required.") | html %] + [% Translate("This field is required.") | html %] [% RenderBlockEnd("RequiredValidOptionServerError") %] [% RenderBlockStart("InSettingValidOptionServerError") %] - [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] + [% Translate("Is not possible to invalidate this entry, all config settings have to be changed beforehand.") | html %] [% RenderBlockEnd("InSettingValidOptionServerError") %] -

      +

      +
      -
      +
      +
      + [% Translate("Cancel") | html %] + [% IF Data.Action == 'Change' %] + + + + [% ELSE %] + + [% END %] -
      - [% IF Data.Action == 'Change' %] - - [% Translate("or") | html %] - - [% ELSE %] - - [% END %] - [% Translate("or") | html %] - [% Translate("Cancel") | html %] +
      -
      [% RenderBlockStart("TypeInSysConfig") %] @@ -223,9 +221,7 @@
      [% RenderBlockEnd("OverviewUpdate") %] -
      -
      [% RenderBlockEnd("Overview") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminUser.tt b/Kernel/Output/HTML/Templates/Standard/AdminUser.tt index 9c400d1cb17..59bb50d7c10 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminUser.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminUser.tt @@ -131,9 +131,9 @@
      -
      +
      [% RenderBlockStart("OverviewHeader") %] -
      +

      [% IF Data.ListAll && Data.Limit && Data.ListAll > Data.Limit %] [% Translate("List (only %s shown - more available)", Data.SearchListSize) | html %] @@ -141,8 +141,9 @@ [% Translate("List (%s total)", Data.ListAll) | html %] [% END %]

      - - + + Show Valid + Show All
      [% RenderBlockEnd("OverviewHeader") %] @@ -186,7 +187,7 @@ [% Data.UserLastLoginTimestamp | Localize("TimeShort") %] [% RenderBlockStart("OverviewResultRowSwitchToUser") %] - [% Translate("Switch to agent") | html %] + [% Translate("Switch to agent") | html %] [% RenderBlockEnd("OverviewResultRowSwitchToUser") %] [% Translate(Data.Valid) | html %] @@ -217,15 +218,15 @@ [% END %]
      -
      - +
      +
      -
      - +
      +

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

      @@ -233,8 +234,8 @@
      -
      - +
      +

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

      @@ -242,8 +243,8 @@
      -
      - +
      +

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

      @@ -258,7 +259,7 @@
      -
      +
      @@ -272,8 +273,8 @@
      -
      - +
      +

      [% Translate("This field is required and needs to be a valid email address.") | html %]

      @@ -295,20 +296,19 @@
      -
      - +
      +
      -
      - +
      +
      [% Data.ValidOption %]
      -
      [% Translate("Cancel") | html %] diff --git a/Kernel/Output/HTML/Templates/Standard/AdminUserGroup.tt b/Kernel/Output/HTML/Templates/Standard/AdminUserGroup.tt index 5e4c8fb57ef..430891622c8 100644 --- a/Kernel/Output/HTML/Templates/Standard/AdminUserGroup.tt +++ b/Kernel/Output/HTML/Templates/Standard/AdminUserGroup.tt @@ -8,22 +8,8 @@ # -- [% RenderBlockStart("Overview") %] -
      -

      [% Translate("Manage Agent-Group Relations") | html %]

      - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Agent-Group Relations'), - Link => Env("Action"), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      - +
      +
      [% RenderBlockStart("ActionList") %]
      @@ -33,22 +19,21 @@
      [% RenderBlockEnd("ActionList") %] - [% RenderBlockStart("UserFilter") %]
      @@ -74,16 +59,16 @@

      [% Translate('Related Actions') | html %]

      -
      -
      +

      [% Translate("Manage Agent-Group Relations") | html %]

      + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Agent-Group Relations'), + Link => Env("Action"), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] +
      [% RenderBlockStart("OverviewResult") %]

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

      -
      +
      • [% Translate("Agents") | html %]
        • @@ -123,32 +119,12 @@ [% RenderBlockEnd("Listn1") %]
      -
      [% RenderBlockEnd("OverviewResult") %] - [% RenderBlockEnd("Overview") %] [% RenderBlockStart("Change") %] -
      -

      [% Translate("Manage Agent-Group Relations") | html %]

      - - [% USE EditTitle = String(Data.BreadcrumbTitle) %] - - [% BreadcrumbPath = [ - { - Name => Translate('Manage Agent-Group Relations'), - Link => Env("Action"), - }, - { - Name => EditTitle.append( " '", Data.Name, "'" ) - } - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %] - -
      -
      +
      +

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

      @@ -156,7 +132,7 @@
      @@ -174,6 +150,22 @@
      +

      [% Translate("Manage Agent-Group Relations") | html %]

      + + [% USE EditTitle = String(Data.BreadcrumbTitle) %] + + [% BreadcrumbPath = [ + { + Name => Translate('Manage Agent-Group Relations'), + Link => Env("Action"), + }, + { + Name => EditTitle.append( " '", Data.Name, "'" ) + } + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath %]

      @@ -187,104 +179,124 @@ - - - - + +
      +
      [% Translate(Data.VisibleNeType) | html %]
      + + + [% RenderBlockStart("ChangeHeader") %] - + [% RenderBlockEnd("ChangeHeader") %] - - - + + + [% RenderBlockStart("NoDataFoundMsgList") %] - - - + + + [% RenderBlockEnd("NoDataFoundMsgList") %] [% RenderBlockStart("ChangeRow") %] - - + + [% RenderBlockStart("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRowItem") %] - + [% RenderBlockEnd("ChangeRow") %] - - - - -
      [% Translate(Data.VisibleNeType) | html %] - - [% Translate(Data.Type) | html %] - + + [% Translate(Data.Type) | html %] +
      - [% Translate("No data found.") | html %] -
      + [% Translate("No data found.") | html %] +
      [% Data.Name | html %]
      [% Data.Name | html %] - - + +
      -
      - - [% Translate("or") | html %] - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + + [% Translate("No matches found.") | html %] + + + +
      + +
      +
      + [% Translate("Cancel") | html %] + + + + + + + + +
      -

      [% RenderBlockEnd("Change") %] -
      - [% RenderBlockStart("ChangeReference") %] -
      +

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

      -
      -
      [% Translate("ro") | html %]
      -
      - [% Translate("Read only access to the ticket in this group/queue.") | html %] -
      +
      +
      [% Translate("ro") | html %]
      +
      + [% Translate("Read only access to the ticket in this group/queue.") | html %] +
      +
      -
      [% Translate("move_into") | html %]
      -
      - [% Translate("Permissions to move tickets into this group/queue.") | html %] -
      +
      +
      [% Translate("move_into") | html %]
      +
      + [% Translate("Permissions to move tickets into this group/queue.") | html %] +
      +
      -
      [% Translate("create") | html %]
      -
      - [% Translate("Permissions to create tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("create") | html %]
      +
      + [% Translate("Permissions to create tickets in this group/queue.") | html %] +
      +
      -
      [% Translate("note") | html %]
      -
      - [% Translate("Permissions to add notes to tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("note") | html %]
      +
      + [% Translate("Permissions to add notes to tickets in this group/queue.") | html %] +
      +
      -
      [% Translate("owner") | html %]
      -
      - [% Translate("Permissions to change the owner of tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("owner") | html %]
      +
      + [% Translate("Permissions to change the owner of tickets in this group/queue.") | html %] +
      +
      -
      [% Translate("priority") | html %]
      -
      - [% Translate("Permissions to change the ticket priority in this group/queue.") | html %] -
      +
      +
      [% Translate("priority") | html %]
      +
      + [% Translate("Permissions to change the ticket priority in this group/queue.") | html %] +
      +
      -
      [% Translate("rw") | html %]
      -
      - [% Translate("Full read and write access to the tickets in this group/queue.") | html %] -
      +
      +
      [% Translate("rw") | html %]
      +
      + [% Translate("Full read and write access to the tickets in this group/queue.") | html %] +
      +
      -
      - [% RenderBlockEnd("ChangeReference") %] -
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentAppointmentAgendaOverview.tt b/Kernel/Output/HTML/Templates/Standard/AgentAppointmentAgendaOverview.tt index 408be6c7795..165045dfb69 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentAppointmentAgendaOverview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentAppointmentAgendaOverview.tt @@ -12,22 +12,21 @@

      [% Translate("Agenda Overview") | html %]

      -
      +
      - [% RenderBlockStart("OverviewNavBarFilter") %] @@ -36,30 +35,38 @@
      -[% IF Data.ModulePermissions.AdminAppointmentCalendarManage %] - - [% Translate("Manage Calendars") | html %] - -[% END %] + [% IF Data.ModulePermissions.AdminAppointmentCalendarManage %] + + + [% Translate("Manage Calendars") | html %] + + + [% END %] [% RenderBlockStart("AppointmentCreateButton") %] - - [% Translate("Add Appointment") | html %] - + + + [% Translate("Add Appointment") | html %] + + [% RenderBlockEnd("AppointmentCreateButton") %]
      + +
      +

      [% Data.HeaderTitle | html %] [% Data.HeaderTitleCW | html %]

      +
      +
      - + [% Translate("Today") | html %] - - - - - - -
      -
      -

      [% Data.HeaderTitle | html %] [% Data.HeaderTitleCW | html %]

      +
      + + + + + + +
      @@ -97,77 +104,77 @@ [% RenderBlockStart("AppointmentGroup") %] - - - [% Data.CurrentDay | html %] - - - + + + [% Data.CurrentDay | html %] + + + [% RenderBlockStart("AppointmentActionRow") %] - - -
      - -
      - - -
      - [% Data.CalendarData.${Data.CalendarID}.CalendarName | truncate(21) | html %] -
      - - - - [% Data.Title | truncate(36) | html %] - - - - [% Data.StartDate | html %] - - - [% Data.EndDate | html %] - - - [% IF Data.AllDay == 1 %] - [% Translate("Yes") | html %] - [% ELSE %] - [% Translate("No") | html %] - [% END %] - - - [% IF Data.Recurring == 1 %] - [% Translate("Yes") | html %] - [% ELSE %] - [% Translate("No") | html %] - [% END %] - - - [% IF Data.NotificationDate %] - [% Data.NotificationDate | html %] - [% ELSE %] - [% Translate("No") | html %] - [% END %] - - + + +
      + +
      + + +
      + [% Data.CalendarData.${Data.CalendarID}.CalendarName | truncate(21) | html %] +
      + + + + [% Data.Title | truncate(36) | html %] + + + + [% Data.StartDate | html %] + + + [% Data.EndDate | html %] + + + [% IF Data.AllDay == 1 %] + [% Translate("Yes") | html %] + [% ELSE %] + [% Translate("No") | html %] + [% END %] + + + [% IF Data.Recurring == 1 %] + [% Translate("Yes") | html %] + [% ELSE %] + [% Translate("No") | html %] + [% END %] + + + [% IF Data.NotificationDate %] + [% Data.NotificationDate | html %] + [% ELSE %] + [% Translate("No") | html %] + [% END %] + + [% RenderBlockEnd("AppointmentActionRow") %] - + [% RenderBlockEnd("AppointmentGroup") %] [% RenderBlockStart("AppointmentNoDataRow") %] - - - - [% Translate("No data found.") | html %] - - - + + + + [% Translate("No data found.") | html %] + + + [% RenderBlockEnd("AppointmentNoDataRow") %] [% RenderBlockStart("CalendarsNotFound") %] - - - - [% Translate("No calendars found. Please add a calendar first by using Manage Calendars page.") | html %] - - - + + + + [% Translate("No calendars found. Please add a calendar first by using Manage Calendars page.") | html %] + + + [% RenderBlockEnd("CalendarsNotFound") %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentAppointmentCalendarOverview.tt b/Kernel/Output/HTML/Templates/Standard/AgentAppointmentCalendarOverview.tt index bd81215e253..d3c8a815cf5 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentAppointmentCalendarOverview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentAppointmentCalendarOverview.tt @@ -7,33 +7,37 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Calendar Overview") | html %]

      +
      -
      +

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

      +

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

      @@ -43,7 +47,7 @@
      [% RenderBlockStart("CalendarWidget") %] -
      +

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

      @@ -80,7 +84,7 @@ # Use ampersands (&) instead of semicolons (;) for URL parameter delimiter. This has better compatibility with different # calendar implementations and will prevent them from re-encoding the query string and essentially strip the data. # Please see bug#12667 for more information. - + [% Translate("Copy public calendar URL") | html %] @@ -98,28 +102,26 @@
      +

      [% Translate("Calendar Overview") | html %]

      +

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

      - +
      -
      -

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

      -
      +
      [% RenderBlockStart("NoCalendar") %] -

      [% Translate("No calendars found. Please add a calendar first by using Manage Calendars page.") | html %]

      +

      [% Translate("No calendars found. Please add a calendar first by using Manage Calendars page.") | html %]

      [% RenderBlockEnd("NoCalendar") %] - [% RenderBlockStart("CalendarDiv") %] -
      +
      [% RenderBlockEnd("CalendarDiv") %] -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentAppointmentEdit.tt b/Kernel/Output/HTML/Templates/Standard/AgentAppointmentEdit.tt index bdf6f9e6897..38d221f4adc 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentAppointmentEdit.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentAppointmentEdit.tt @@ -8,8 +8,8 @@ # -- [% RenderBlockStart("EditMask") %] -
      -
      +
      + @@ -18,18 +18,29 @@ +
      - [% Translate("Basic information") | html %] - + + [% Translate("Basic information") | html %] + + + +
      -[% IF Data.TicketAppointmentRuleID %] -

      - [% Data.Title | html %] -

      -[% ELSE %] -[% IF Data.PermissionLevel < 2 %] -

      [% Data.Title | html %]

      -[% ELSE %] + [% IF Data.TicketAppointmentRuleID %] +

      + [% Data.Title | html %] +

      + [% ELSE %] + [% IF Data.PermissionLevel < 2 %] +

      [% Data.Title | html %]

      + [% ELSE %]

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

      @@ -37,135 +48,144 @@

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

      -[% END %] -[% END %] + [% END %] + [% END %]
      -
      +
      -[% IF Data.PermissionLevel < 2 %] + [% IF Data.PermissionLevel < 2 %]

      [% Data.Description || "-" | html %]

      -[% ELSE %] + [% ELSE %] -[% END %] + [% END %]
      -
      - -
      -[% IF Data.PermissionLevel < 2 %] -

      [% Data.Location || "-" | html %]

      -[% ELSE %] - -[% END %] + + +
      + [% IF Data.PermissionLevel < 2 %] +

      [% Data.Location || "-" | html %]

      + [% ELSE %] + + [% END %] +
      -
      +
      -[% IF Data.TicketAppointmentRuleID || Data.PermissionLevel < 3 %] -

      [% Data.CalendarName | html %]

      -[% ELSE %] - [% Data.CalendarIDStrg %] -
      -

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

      -
      -
      -

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

      -
      -[% END %] + [% IF Data.TicketAppointmentRuleID || Data.PermissionLevel < 3 %] +

      [% Data.CalendarName | html %]

      + [% ELSE %] + [% Data.CalendarIDStrg %] +
      +

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

      +
      +
      +

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

      +
      + [% END %]
      -
      - [% Translate("Resource") | html %] -[% IF Data.TeamIDStrg %] - -
      -[% IF Data.PermissionLevel < 2 %] -

      [% Data.TeamNames %]

      -[% ELSE %] - [% Data.TeamIDStrg %] -[% END %] + +
      + + [% Translate("Resource") | html %] + + [% IF Data.TeamIDStrg %] + +
      + [% IF Data.PermissionLevel < 2 %] +

      [% Data.TeamNames %]

      + [% ELSE %] + [% Data.TeamIDStrg %] + [% END %]
      -
      +
      -[% IF Data.PermissionLevel < 2 %] -

      [% Data.ResourceNames %]

      -[% ELSE %] + [% IF Data.PermissionLevel < 2 %] +

      [% Data.ResourceNames %]

      + [% ELSE %] [% Data.ResourceIDStrg %] -[% END %] + [% END %]
      -[% ELSE %] + [% ELSE %]

      [% Translate("This feature is currently not available.") | html %]

      -[% END %] + [% END %]
      -
      - [% Translate("Date/Time") | html %] + +
      + + [% Translate("Date/Time") | html %] +
      -[% IF ( Data.TicketAppointmentRuleID && Data.ReadOnlyStart ) || Data.PermissionLevel < 2 %] -

      [% Data.StartDate | Localize("TimeLong") %]

      -[% ELSE %] + [% IF ( Data.TicketAppointmentRuleID && Data.ReadOnlyStart ) || Data.PermissionLevel < 2 %] +

      [% Data.StartDate | Localize("TimeLong") %]

      + [% ELSE %]

      [% Translate("Invalid date!") | html %]

      [% Translate("Please set this to value before End date.") | html %]

      [% Data.StartDateString %] -[% END %] + [% END %]
      -
      +
      -[% IF ( Data.TicketAppointmentRuleID && Data.ReadOnlyDuration ) || Data.PermissionLevel < 2 %] -

      [% Data.EndDate | Localize("TimeLong") %]

      -[% ELSE %] + [% IF ( Data.TicketAppointmentRuleID && Data.ReadOnlyDuration ) || Data.PermissionLevel < 2 %] +

      [% Data.EndDate | Localize("TimeLong") %]

      + [% ELSE %]

      [% Translate("Invalid date!") | html %]

      [% Translate("Please set this to value after Start date.") | html %]

      [% Data.EndDateString %] -[% END %] + [% END %]
      -
      +
      -[% IF Data.TicketAppointmentRuleID || Data.PermissionLevel < 2 %] -

      [% Translate(Data.AllDayString) | html %]

      -[% ELSE %] + [% IF Data.TicketAppointmentRuleID || Data.PermissionLevel < 2 %] +

      [% Translate(Data.AllDayString) | html %]

      + [% ELSE %] -[% END %] + [% END %]
      -
      + -[% IF Data.TicketAppointmentRuleID || Data.PermissionLevel < 2 %] -
      -[% IF Data.ParentID %] - [% Translate("This an occurrence of a repeating appointment.") | html %]
      - [% Translate("Click here to see the parent appointment.") | html %] -[% ELSE %] -

      [% Data.RecurrenceValue | html %]

      -[% END %] -
      -[% ELSE %] -[% IF Data.ParentID %] -
      - [% Translate("This an occurrence of a repeating appointment.") | html %]
      - [% Translate("Click here to edit the parent appointment.") | html %] -
      -[% ELSE %] + [% IF Data.TicketAppointmentRuleID || Data.PermissionLevel < 2 %] +
      + [% IF Data.ParentID %] + [% Translate("This an occurrence of a repeating appointment.") | html %]
      + [% Translate("Click here to see the parent appointment.") | html %] + [% ELSE %] +

      [% Data.RecurrenceValue | html %]

      + [% END %] +
      + [% ELSE %] + [% IF Data.ParentID %] +
      + [% Translate("This an occurrence of a repeating appointment.") | html %]
      + [% Translate("Click here to edit the parent appointment.") | html %] +
      + [% ELSE %]
      [% Data.RecurrenceTypeString %]
      @@ -196,7 +216,7 @@ [% Translate("On") | html %]: -# Weekly table start +# Weekly table start @@ -251,25 +271,25 @@ # Monthly table start
      -[% Count = 1 %] -[% WHILE Count < 32 %] -[% IF Count % 7 == 1 %] - -[% END %] + [% Count = 1 %] + [% WHILE Count < 32 %] + [% IF Count % 7 == 1 %] + + [% END %] # join strings (Monthly1, Monthly2,...) [% MonthlyCount = "Monthly" _ Count %] - -[% IF Count % 7 == 0 %] - -[% END %] + + [% IF Count % 7 == 0 %] + + [% END %] -[% Count = Count + 1 %] -[% END %] + [% Count = Count + 1 %] + [% END %]
      - -
      + +
      # Monthly table end @@ -371,80 +391,103 @@ -[% END %] -[% END %] + [% END %] + [% END %]
      -
      - - [% Translate("Notification") | html %] +
      + + [% Translate("Notification") | html %] +
      -[% IF Data.PermissionLevel < 2 %] -

      [% Data.NotificationValue | html %]

      -[% ELSE %] - [% Data.NotificationStrg %] -[% END %] + [% IF Data.PermissionLevel < 2 %] +

      [% Data.NotificationValue | html %]

      + [% ELSE %] + [% Data.NotificationStrg %] + [% END %]
      -
      - -
      - - -
      - - -
      -
      - +
      +
      +
      +
      + +
      -
      - [% Data.NotificationCustomUnitsStrg %] -
      -
      - [% Data.NotificationCustomUnitsPointOfTimeStrg %] +
      +
      +
      + +
      +
      + [% Data.NotificationCustomUnitsStrg %] +
      +
      + [% Data.NotificationCustomUnitsPointOfTimeStrg %] +
      +
      -
      - - -
      - - [% Data.NotificationCustomDateTimeStrg %] +
      +
      +
      + + +
      +
      +
      [% Data.NotificationCustomDateTimeStrg %]
      +
      +
      -
      -
      -[% IF Data.PluginGroups %] - [% FOREACH Group IN Data.PluginGroups %] - [% IF Group.HTML %] -
      - [% Translate(Group.Title) | html %] - [% Group.HTML %] -
      + [% IF Data.PluginGroups %] + [% FOREACH Group IN Data.PluginGroups %] + [% IF Group.HTML %] +
      + [% Translate(Group.Title) | html %] + [% Group.HTML %] +
      + [% END %] + [% END %] [% END %] - [% END %] -[% END %] -
      -
      -[% IF !Data.PermissionLevel || Data.PermissionLevel > 1 %] - -[% END %] -[% IF Data.AppointmentID && !Data.TicketAppointmentRuleID && Data.PermissionLevel > 2 %] - -[% END %] -[% IF Data.AppointmentID && !Data.TicketAppointmentRuleID && Data.PermissionLevel > 2 %] - -[% END %] - +
      +
      + [% IF Data.AppointmentID && !Data.TicketAppointmentRuleID && Data.PermissionLevel > 2 %] + + [% END %] + + [% IF Data.AppointmentID && !Data.TicketAppointmentRuleID && Data.PermissionLevel > 2 %] + + [% END %] +
      + +
      + + + [% IF !Data.PermissionLevel || Data.PermissionLevel > 1 %] + + [% END %] +
      [% RenderBlockEnd("EditMask") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenter.tt b/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenter.tt index 5f52e7976e7..b87b2ad258d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenter.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenter.tt @@ -8,10 +8,8 @@ # -- [% RenderBlockStart("Content") %] -
      +

      [% Translate("Customer Information Center") | html %] — [% Data.CustomerIDTitle | html %]

      - -[% InsertTemplate("AgentDashboardCommon.tt") %] - + [% InsertTemplate("AgentDashboardCommon.tt") %]
      [% RenderBlockEnd("Content") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenterSearch.tt b/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenterSearch.tt index 7e017d80540..9b704a0e4cd 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenterSearch.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentCustomerInformationCenterSearch.tt @@ -7,21 +7,25 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +
      - -
      - +
      + +
      + +
      -
      - -
      - + +
      + +
      + +
      -
      +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBook.tt b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBook.tt index f1c3f1e7e0c..20df65ab382 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBook.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBook.tt @@ -9,9 +9,13 @@ [% IF Data.ShowSearchDialog %]
      -

      [% Translate("Customer User Address Book") | html %]

      -
      [% Translate("Search for recipients and add the results as '%s'.", Data.RecipientFieldLabel) | html %]
      -
      +

      [% Translate("Customer User Address Book") | html %]

      +
      +

      + [% Translate("Search for recipients and add the results as '%s'.", Data.RecipientFieldLabel) | html %] +

      +
      +
      @@ -21,72 +25,79 @@ -
      - [% Translate("Templates") | html %] - -
      - [% Data.ProfilesStrg %] -
      - - +
      +

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

      +
      + +
      + [% Data.ProfilesStrg %] +
      + + +
      +
      +
      + +
      -
      - - -
      -
      - -
      - + +
      + +
      + +
      -
      - [% Translate("Filters in use") | html %] +
      +

      [% Translate("Filters in use") | html %]

      +
      -
      - [% Translate("Additional filters") | html %] - -
      - [% Data.AttributesStrg %] -
      [% Translate("The attributes with the identifier '(Customer)' are from the customer company.") | html %]
      +
      +

      [% Translate("Additional filters") | html %]

      +
      + +
      + [% Data.AttributesStrg %] +
      [% Translate("The attributes with the identifier '(Customer)' are from the customer company.") | html %]
      +
      -
      [% END %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBookOverview.tt b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBookOverview.tt index 1f1f7db7c31..0fedd371b37 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBookOverview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserAddressBookOverview.tt @@ -53,7 +53,13 @@
      -
      - [% RenderBlockEnd("OverviewNavBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenter.tt b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenter.tt index 4bf32b7b4a7..f74b61ea9ba 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenter.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenter.tt @@ -8,10 +8,8 @@ # -- [% RenderBlockStart("Content") %] -
      +

      [% Translate("Customer User Information Center") | html %] — [% Data.CustomerUserIDTitle | html %]

      - -[% InsertTemplate("AgentDashboardCommon.tt") %] - + [% InsertTemplate("AgentDashboardCommon.tt") %]
      [% RenderBlockEnd("Content") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenterSearch.tt b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenterSearch.tt index 51526b61594..74e5a1bd1bf 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenterSearch.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentCustomerUserInformationCenterSearch.tt @@ -7,16 +7,17 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +
      - -
      - +
      + +
      + +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboard.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboard.tt index 9a105965306..fb1ac858ae9 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboard.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboard.tt @@ -8,10 +8,8 @@ # -- [% RenderBlockStart("Content") %] -
      +

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

      - -[% InsertTemplate("AgentDashboardCommon.tt") %] - + [% InsertTemplate("AgentDashboardCommon.tt") %]
      [% RenderBlockEnd("Content") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardAppointmentCalendar.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardAppointmentCalendar.tt index d637c4cfc2c..5beaef8c6ea 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardAppointmentCalendar.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardAppointmentCalendar.tt @@ -7,13 +7,14 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - - - - [% Translate("New Appointment") | html %] + + + + + [% Translate("New Appointment") | html %] + - [% RenderBlockStart("ContentSmallAppointmentFilter") %]
      -[% RenderBlockStart("ContentSmallAppointmentFilterNavBar") %] - - [% Data.SiteNavBar %] - -[% RenderBlockEnd("ContentSmallAppointmentFilterNavBar") %] - [% RenderBlockEnd("ContentSmallAppointmentFilter") %] - [% RenderBlockStart("ContentSmallTable") %] @@ -61,3 +55,8 @@
      [% RenderBlockEnd("ContentSmallTable") %] +[% RenderBlockStart("ContentSmallAppointmentFilterNavBar") %] + + [% Data.SiteNavBar %] + +[% RenderBlockEnd("ContentSmallAppointmentFilterNavBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCommon.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCommon.tt index f58ebda2a4c..4e299af8444 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCommon.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCommon.tt @@ -1,18 +1,16 @@ # -- # Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021-2022 Znuny GmbH, https://znuny.org/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -# TODO delete me -## nofilter(TidyAll::Plugin::OTRS::Common::Origin) [% RenderBlockStart("DashboardWidgetExpand") %]
        - [% RenderBlockStart("DashboardWidgetExpandContent") %] +[% RenderBlockStart("DashboardWidgetExpandContent") %] [% IF Data.ActiveContentLargeWidgets %]
      • All @@ -22,15 +20,14 @@ [% Translate('No Data Available.') | html %]
        • [% END %] - [% RenderBlockEnd("DashboardWidgetExpandContent") %] - - [% RenderBlockStart("DashboardWidgetExpandListItem") %] +[% RenderBlockEnd("DashboardWidgetExpandContent") %] +[% RenderBlockStart("DashboardWidgetExpandListItem") %]
      • [% Translate(Data.Title) | html %]
        • - [% RenderBlockEnd("DashboardWidgetExpandListItem") %] +[% RenderBlockEnd("DashboardWidgetExpandListItem") %]
      [% RenderBlockEnd("DashboardWidgetExpand") %] @@ -39,17 +36,11 @@
      - - [% RenderBlockStart("ContentSmall") %] +[% RenderBlockStart("ContentSmall") %]

      [% Translate(Data.Title) | html %]

      @@ -101,7 +91,7 @@ - +
      @@ -157,18 +147,16 @@
      - [% RenderBlockStart("ContentSmallPreferencesItem") %] - - [% RenderBlockStart("ContentSmallPreferencesItemOption") %] +[% RenderBlockStart("ContentSmallPreferencesItem") %] +[% RenderBlockStart("ContentSmallPreferencesItemOption") %]
      [% Data.Option %]
      - [% RenderBlockEnd("ContentSmallPreferencesItemOption") %] - - [% RenderBlockStart("ContentSmallPreferencesItemInput") %] +[% RenderBlockEnd("ContentSmallPreferencesItemOption") %] +[% RenderBlockStart("ContentSmallPreferencesItemInput") %]
      @@ -178,9 +166,8 @@ value="[% Data.Data | html %]" />
      - [% RenderBlockEnd("ContentSmallPreferencesItemInput") %] - - [% RenderBlockStart("ContentSmallPreferencesItemTextArea") %] +[% RenderBlockEnd("ContentSmallPreferencesItemInput") %] +[% RenderBlockStart("ContentSmallPreferencesItemTextArea") %]
      @@ -189,9 +176,8 @@ name="[% Data.NamePref | html %]">[% Data.Data | html %]
      - [% RenderBlockEnd("ContentSmallPreferencesItemTextArea") %] - - [% RenderBlockEnd("ContentSmallPreferencesItem") %] +[% RenderBlockEnd("ContentSmallPreferencesItemTextArea") %] +[% RenderBlockEnd("ContentSmallPreferencesItem") %]
      [% Data.Content %]
      - [% RenderBlockStart("ContentSmallMore") %] +[% RenderBlockStart("ContentSmallMore") %] [% Translate("more") | html %] » - [% RenderBlockEnd("ContentSmallMore") %] +[% RenderBlockEnd("ContentSmallMore") %]
      - [% RenderBlockEnd("ContentSmall") %] +[% RenderBlockEnd("ContentSmall") %]
      - - [% RenderBlockStart("MainMenu") %] +[% RenderBlockStart("MainMenu") %]
        - [% RenderBlockStart("MainMenuItem") %] +[% RenderBlockStart("MainMenuItem") %]
      • [% Translate(Data.Name) | html %]
        • - [% RenderBlockEnd("MainMenuItem") %] +[% RenderBlockEnd("MainMenuItem") %]
      - [% RenderBlockEnd("MainMenu") %] - - [% RenderBlockStart("ContentLarge") %] +[% RenderBlockEnd("MainMenu") %] +[% RenderBlockStart("ContentLarge") %]

      [% Translate(Data.Title) | html %]

      @@ -250,7 +234,7 @@
      • - [% RenderBlockStart("ContentLargePreferences") %] +[% RenderBlockStart("ContentLargePreferences") %]
        @@ -259,10 +243,10 @@ [% Translate('Settings') | html %]
        - [% RenderBlockEnd("ContentLargePreferences") %] +[% RenderBlockEnd("ContentLargePreferences") %]
        • -
      • - [% RenderBlockStart("ContentLargeRemove") %] +
      • +[% RenderBlockStart("ContentLargeRemove") %]
        [% Translate('Hide') | html %]
        - [% RenderBlockEnd("ContentLargeRemove") %] +[% RenderBlockEnd("ContentLargeRemove") %]
      @@ -291,9 +275,8 @@
      - [% RenderBlockStart("ContentLargePreferencesItem") %] - - [% RenderBlockStart("ContentLargePreferencesItemOption") %] +[% RenderBlockStart("ContentLargePreferencesItem") %] +[% RenderBlockStart("ContentLargePreferencesItemOption") %]
      @@ -302,27 +285,22 @@
      - [% RenderBlockEnd("ContentLargePreferencesItemOption") %] - - [% RenderBlockStart("ContentLargePreferencesItemInput") %] +[% RenderBlockEnd("ContentLargePreferencesItemOption") %] +[% RenderBlockStart("ContentLargePreferencesItemInput") %]
      - - [% RenderBlockEnd("ContentLargePreferencesItemInput") %] - - [% RenderBlockStart("ContentLargePreferencesItemTextArea") %] +[% RenderBlockEnd("ContentLargePreferencesItemInput") %] +[% RenderBlockStart("ContentLargePreferencesItemTextArea") %]
      - - [% RenderBlockEnd("ContentLargePreferencesItemTextArea") %] - - [% RenderBlockStart("ContentLargePreferencesItemAllocationList") %] +[% RenderBlockEnd("ContentLargePreferencesItemTextArea") %] +[% RenderBlockStart("ContentLargePreferencesItemAllocationList") %]
      @@ -359,23 +337,15 @@
      - [% RenderBlockEnd("ContentLargePreferencesItemAllocationList") %] - - [% RenderBlockStart("ContentLargePreferencesItemRawHTML") %] +[% RenderBlockEnd("ContentLargePreferencesItemAllocationList") %] +[% RenderBlockStart("ContentLargePreferencesItemRawHTML") %] [% Data.HTML %] - [% RenderBlockEnd("ContentLargePreferencesItemRawHTML") %] - - [% RenderBlockEnd("ContentLargePreferencesItem") %] -
      +[% RenderBlockEnd("ContentLargePreferencesItemRawHTML") %] +[% RenderBlockEnd("ContentLargePreferencesItem") %] +
      -# --- -# Forwwward -# --- -# - removed button divider "or" - -# --- @@ -387,11 +357,11 @@
      [% Data.Content %]
      - [% RenderBlockStart("ContentLargeMore") %] +[% RenderBlockStart("ContentLargeMore") %] [% Translate("more") | html %] » - [% RenderBlockEnd("ContentLargeMore") %] +[% RenderBlockEnd("ContentLargeMore") %]
      - [% RenderBlockEnd("ContentLarge") %] +[% RenderBlockEnd("ContentLarge") %]
      \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerCompanyInformation.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerCompanyInformation.tt index 62d6ca259d2..c75e5972cdb 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerCompanyInformation.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerCompanyInformation.tt @@ -7,31 +7,28 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      - [% RenderBlockStart("ContentSmallCustomerCompanyInformationRow") %] - [% RenderBlockStart("ContentSmallCustomerCompanyInformationRowText") %] - -

      [% Data.Value | html %] + + +

      [% Data.Value | html %] [% RenderBlockStart("ContentSmallCustomerCompanyInvalid") %] - [% Translate("Note: Customer is invalid!") | html %] + [% Translate("Note: Customer is invalid!") | html %] [% RenderBlockEnd("ContentSmallCustomerCompanyInvalid") %] -

      -
      +

      + [% RenderBlockEnd("ContentSmallCustomerCompanyInformationRowText") %] - [% RenderBlockStart("ContentSmallCustomerCompanyInformationRowLink") %] - -
      - - [% Data.Value | html %] - -
      -
      + + +
      + + [% Data.Value | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerCompanyInformationRowLink") %] - [% RenderBlockEnd("ContentSmallCustomerCompanyInformationRow") %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDList.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDList.tt index 266f28d0fe5..1b4fc26126d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDList.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDList.tt @@ -6,20 +6,20 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- + [% RenderBlockStart("HeaderCustomerIDList") %] - [% RenderBlockStart("ContentLargeCustomerIDAdd") %] +
      +[% RenderBlockStart("ContentLargeCustomerIDAdd") %] - [% Translate("Change Customer Relations") | html %] + + [% Translate("Change Customer Relations") | html %] - [% RenderBlockEnd("ContentLargeCustomerIDAdd") %] +[% RenderBlockEnd("ContentLargeCustomerIDAdd") %] +
      [% RenderBlockEnd("HeaderCustomerIDList") %] - [% RenderBlockStart("ContentCustomerIDList") %] - [% RenderBlockStart("ContentLargeCustomerIDListNavBar") %] - - [% Data.SiteNavBar %] - +[% Data.SiteNavBar %] [% RenderBlockEnd("ContentLargeCustomerIDListNavBar") %] @@ -61,7 +61,7 @@ [% RenderBlockEnd("ContentLargeCustomerIDListRowCustomerIDTicketsClosed") %]
      [% IF Data.EditCustomerIDPermission %] - + [% END %] @@ -77,5 +77,4 @@ [% RenderBlockEnd("ContentLargeCustomerIDListNone") %]
      - [% RenderBlockEnd("ContentCustomerIDList") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDStatus.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDStatus.tt index 1ac16d13ad0..a1f0709048a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDStatus.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerIDStatus.tt @@ -7,57 +7,55 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      - [% RenderBlockStart("ContentSmallCustomerIDStatusEscalatedTickets") %] - -
      - - [% Data.Count | html %] - -
      -
      + + +
      + + [% Data.Count | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerIDStatusEscalatedTickets") %] - [% RenderBlockStart("ContentSmallCustomerIDStatusOpenTickets") %] - -
      - - [% Data.Count | html %] - -
      -
      + + +
      + + [% Data.Count | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerIDStatusOpenTickets") %] - [% RenderBlockStart("ContentSmallCustomerIDStatusClosedTickets") %] - -
      - - [% Data.Count | html %] - -
      -
      + + +
      + + [% Data.Count | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerIDStatusClosedTickets") %] - [% RenderBlockStart("ContentSmallCustomerIDStatusAllTickets") %] - -
      - - [% Data.Count | html %] - -
      -
      + + +
      + + [% Data.Count | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerIDStatusAllTickets") %] - [% RenderBlockStart("ContentSmallCustomerIDStatusArchivedTickets") %] - -
      - - [% Data.Count | html %] - -
      -
      + + +
      + + [% Data.Count | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerIDStatusArchivedTickets") %] -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerUserInformation.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerUserInformation.tt index d76093baa59..4ef9d94a702 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerUserInformation.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardCustomerUserInformation.tt @@ -8,29 +8,26 @@ # --
      - [% RenderBlockStart("ContentSmallCustomerUserInformationRow") %] - [% RenderBlockStart("ContentSmallCustomerUserInformationRowText") %] - -

      [% Data.Value | html %] + + +

      [% Data.Value | html %] [% RenderBlockStart("ContentSmallCustomerUserInvalid") %] - [% Translate("Note: Customer User is invalid!") | html %] + [% Translate("Note: Customer User is invalid!") | html %] [% RenderBlockEnd("ContentSmallCustomerUserInvalid") %] -

      -
      +

      + [% RenderBlockEnd("ContentSmallCustomerUserInformationRowText") %] - [% RenderBlockStart("ContentSmallCustomerUserInformationRowLink") %] - -
      - - [% Data.Value | html %] - -
      -
      + + +
      + + [% Data.Value | html %] + +
      +       [% RenderBlockEnd("ContentSmallCustomerUserInformationRowLink") %] - [% RenderBlockEnd("ContentSmallCustomerUserInformationRow") %] -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardStats.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardStats.tt index db8eed334c8..4385b2c57f2 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardStats.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardStats.tt @@ -7,8 +7,6 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - - [% IF Data.StatConfigurationValid %] [% IF !Data.StatParametersValid %] @@ -27,7 +25,7 @@ [% SET AvailableFormats = Data.Stat.Format %] -
      +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt index d78b9680b59..d0803c0282b 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardTicketGeneric.tt @@ -8,46 +8,65 @@ # -- [% RenderBlockStart("ContentLargeTicketGenericFilter") %] -
      - - +
      [% RenderBlockEnd("ContentLargeTicketGenericFilter") %] # -
      + @@ -56,93 +75,71 @@ [% RenderBlockStart("ContentLargeTicketGenericHeader") %] - [% RenderBlockStart("GeneralOverviewHeader") %] - [% RenderBlockStart("ContentLargeTicketGenericHeaderMeta") %] [% RenderBlockStart("ContentLargeTicketGenericHeaderMetaLink") %] - [% RenderBlockEnd("ContentLargeTicketGenericHeaderMetaLink") %] [% RenderBlockStart("ContentLargeTicketGenericHeaderMetaEmpty") %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderMetaEmpty") %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderMeta") %] - [% RenderBlockStart("ContentLargeTicketGenericHeaderTicketHeader") %] [% RenderBlockStart("ContentLargeTicketGenericHeaderTicketNumberColumn") %] [% Config("Ticket::Hook") %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderTicketNumberColumn") %] - [% RenderBlockStart("ContentLargeTicketGenericHeaderColumn") %] [% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLink") %] + [% Data.HeaderNameTranslated | html %] + +
      [% Data.ColumnFilterStrg %] -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerIDSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerIDSearch") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkUserSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkUserSearch") %]
      - - [% Data.HeaderNameTranslated | html %] - [% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLink") %] - [% RenderBlockStart("ContentLargeTicketGenericHeaderColumnLink") %] [% Data.HeaderNameTranslated | html %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnLink") %] [% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilter") %] + [% Data.HeaderNameTranslated | html %]
      [% Data.ColumnFilterStrg %] -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerUserSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerUserSearch") %]
      - [% Data.HeaderNameTranslated | html %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilter") %] - [% RenderBlockStart("ContentLargeTicketGenericHeaderColumnEmpty") %] [% Data.HeaderNameTranslated %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnEmpty") %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderColumn") %] [% RenderBlockEnd("ContentLargeTicketGenericHeaderTicketHeader") %] - [% RenderBlockEnd("GeneralOverviewHeader") %] - - [% RenderBlockEnd("ContentLargeTicketGenericHeader") %] [% RenderBlockStart("ContentLargeTicketGenericRow") %] - [% RenderBlockStart("GeneralOverviewRow") %] - [% RenderBlockStart("ContentLargeTicketGenericRowMeta") %] [% RenderBlockStart("ContentLargeTicketGenericRowMetaImage") %] @@ -164,7 +161,6 @@ #
      [% Data.Title | truncate(70) | html %]
      # # [% Data.Time | html %] - [% RenderBlockStart("ContentLargeTicketGenericTicketColumn") %] [% RenderBlockStart("ContentLargeTicketGenericTicketNumber") %] @@ -202,7 +198,6 @@ [% RenderBlockEnd("ContentLargeTicketGenericColumnEscalation") %] [% RenderBlockEnd("ContentLargeTicketGenericTicketColumn") %] - [% RenderBlockStart("ContentLargeTicketGenericDynamicField") %]
      @@ -215,7 +210,6 @@
      [% RenderBlockEnd("ContentLargeTicketGenericDynamicField") %] - [% RenderBlockEnd("GeneralOverviewRow") %] [% RenderBlockEnd("ContentLargeTicketGenericRow") %] @@ -229,3 +223,13 @@
      +[% RenderBlockStart("ContentLargeTicketGenericFilterNavBar") %] + +
        +
      • + [% Data.ResultLong %] +
        • +
      • [% Data.SiteNavBar %]
        • +
      +       +[% RenderBlockEnd("ContentLargeTicketGenericFilterNavBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOnline.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOnline.tt index 8eaa8a51c97..f54df3f062c 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOnline.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOnline.tt @@ -14,12 +14,6 @@
    • [% Translate("Customers") | html %] ([% Data.Customer | html %])
      • -[% RenderBlockStart("ContentSmallTicketGenericFilterNavBar") %] - - [% Data.SiteNavBar %] - -[% RenderBlockEnd("ContentSmallTicketGenericFilterNavBar") %] - [% RenderBlockEnd("ContentSmallUserOnlineFilter") %] @@ -60,3 +54,6 @@ [% RenderBlockEnd("ContentSmallUserOnlineNone") %]
      +[% RenderBlockStart("ContentSmallTicketGenericFilterNavBar") %] +[% Data.SiteNavBar %] +[% RenderBlockEnd("ContentSmallTicketGenericFilterNavBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOutOfOffice.tt b/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOutOfOffice.tt index 46979e36d82..b5f7324bd2d 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOutOfOffice.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentDashboardUserOutOfOffice.tt @@ -7,12 +7,6 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -[% RenderBlockStart("ContentSmallTicketGenericNavBar") %] - - [% Data.SiteNavBar %] - -[% RenderBlockEnd("ContentSmallTicketGenericNavBar") %] - [% RenderBlockStart("ContentSmallUserOutOfOfficeRow") %] @@ -26,3 +20,6 @@ [% RenderBlockEnd("ContentSmallUserOutOfOfficeRow") %]
      +[% RenderBlockStart("ContentSmallTicketGenericNavBar") %] +[% Data.SiteNavBar %] +[% RenderBlockEnd("ContentSmallTicketGenericNavBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentLinkObject.tt b/Kernel/Output/HTML/Templates/Standard/AgentLinkObject.tt index 5d2da5b2a17..13587539531 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentLinkObject.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentLinkObject.tt @@ -7,18 +7,18 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      - +

      [% Translate("Manage links for %s", Data.SourceObjectLong) | html %]

      -

      - [% Translate("Close this dialog") | html %] -

      +
      -
      [% Translate("Create new links") | html %] @@ -27,7 +27,7 @@
      - [% RenderBlockStart("Link") %] +[% RenderBlockStart("Link") %]
      @@ -35,34 +35,39 @@ -
      - -
      - [% Data.TargetObjectStrg %] -
      - [% RenderBlockStart("LinkSearchRow") %] - -
      - [% Data.InputStrg %] -
      - [% RenderBlockEnd("LinkSearchRow") %] -
      - +
      +
      +
      + +
      + [% Data.TargetObjectStrg %] +
      +
      +[% RenderBlockStart("LinkSearchRow") %] +
      + +
      + [% Data.InputStrg %] +
      +
      +[% RenderBlockEnd("LinkSearchRow") %]
      - [% RenderBlockStart("LinkTableComplex") %] +
      + +
      +[% RenderBlockStart("LinkTableComplex") %] [% Data.LinkTableStrg %] - [% RenderBlockEnd("LinkTableComplex") %] +[% RenderBlockEnd("LinkTableComplex") %] - [% RenderBlockEnd("Link") %] +[% RenderBlockEnd("Link") %]
      - -
      - [% RenderBlockStart("Delete") %] +
      +[% RenderBlockStart("Delete") %]
      @@ -70,15 +75,15 @@ - [% RenderBlockStart("DeleteTableComplex") %] +[% RenderBlockStart("DeleteTableComplex") %] [% IF !Data.LinkTableStrg %]

      [% Translate("There are currently no links. Please click 'Create new Links' on the top to link this item to other objects.") | html %]

      [% ELSE %] [% Data.LinkTableStrg %] [% END %] - [% RenderBlockEnd("DeleteTableComplex") %] +[% RenderBlockEnd("DeleteTableComplex") %]
      - [% RenderBlockEnd("Delete") %] +[% RenderBlockEnd("Delete") %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentNavigationBar.tt b/Kernel/Output/HTML/Templates/Standard/AgentNavigationBar.tt index 181bd5f4e4e..b09dc410cc8 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentNavigationBar.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentNavigationBar.tt @@ -10,33 +10,38 @@ [% RenderBlockStart("LastViewsMenuBar") %] -
      - [% Data.MenuBarLastViewsHTML %] -
      +
      +
      + [% Data.MenuBarLastViewsHTML %] +
      +
      [% RenderBlockEnd("LastViewsMenuBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentPreferencesOverview.tt b/Kernel/Output/HTML/Templates/Standard/AgentPreferencesOverview.tt index 1c7092f8aab..5b41ce58e31 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentPreferencesOverview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentPreferencesOverview.tt @@ -7,7 +7,7 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      +

      [% Translate("Edit your preferences") | html %]

      @@ -20,77 +20,68 @@ %] [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = 'Agent' %] -
      -
      -
      -

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

      -
      -
      - [% IF Data.EditingAnotherAgent %] -
      -

      [% Translate("Please note: you're currently editing the preferences of %s.", Data.CurrentUserFullname) | html %]

      +
      +
      +
      +
      +

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

      +
      +
      + [% IF Data.EditingAnotherAgent %] +
      +

      [% Translate("Please note: you're currently editing the preferences of %s.", Data.CurrentUserFullname) | html %]

      +
      + + [% ELSE %] +

      [% Translate("Choose from the groups on the left to find the settings you'd wish to change.") | html %]

      + [% END %] + [% IF !Data.EditingAnotherAgent && Config("Frontend::AvatarEngine") == 'Gravatar' %] +

      + [% SET GravatarLink = ' gravatar.com'; %] +

      + [% Translate("Did you know?") | html %] [% Translate("You can change your avatar by registering with your email address %s on %s") | html | ReplacePlaceholders(Env("UserEmail"), GravatarLink) %] +

      +

      + [% END %]
      - - [% ELSE %] -

      - [% Translate("Choose from the groups on the right to find the settings you'd wish to change.") | html %] -

      - [% END %] -
      -
      - - [% IF !Data.EditingAnotherAgent && Config("Frontend::AvatarEngine") == 'Gravatar' %] -
      -
      -

      - [% SET GravatarLink = ' gravatar.com'; %] -

      - [% Translate("Did you know?") | html %] [% Translate("You can change your avatar by registering with your email address %s on %s") | html | ReplacePlaceholders(Env("UserEmail"), GravatarLink) %] -

      -

      - [% END %] -
      - - -
      +
      -
      -
      -

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

      -
      -
      +
      +
      +

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

      +
      +
      -
      - +
      + +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentSplitSelection.tt b/Kernel/Output/HTML/Templates/Standard/AgentSplitSelection.tt index d89de8b0ec7..bae15ef9ce7 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentSplitSelection.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentSplitSelection.tt @@ -31,5 +31,5 @@
      - +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsEdit.tt b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsEdit.tt index 56317dce27f..ebf6c86dfeb 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsEdit.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsEdit.tt @@ -7,26 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - -
      -

      [% Translate("Statistics Management") | html %]

      - - [% USE ActionLink = String( 'AgentStatistics' ) %] - - [% BreadcrumbPath = [ - { - Name => Translate('Statistics Management'), - Link => ActionLink.append( ';Subaction=Overview' ), - }, - { - Name => Translate('Edit Statistics'), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] - -
      +
      +

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

      @@ -34,11 +16,20 @@
      @@ -47,6 +38,23 @@
      +

      [% Translate("Statistics Management") | html %]

      + + [% USE ActionLink = String( 'AgentStatistics' ) %] + + [% BreadcrumbPath = [ + { + Name => Translate('Statistics Management'), + Link => ActionLink.append( ';Subaction=Overview' ), + }, + { + Name => Translate('Edit Statistics'), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] +
      @@ -55,7 +63,10 @@
      -# [% Data.XAxisWidget %] [% Data.YAxisWidget %] [% Data.RestrictionsWidget %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsImport.tt b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsImport.tt index 5dda6b8cb92..361d1baef0f 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsImport.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsImport.tt @@ -7,26 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - -
      -

      [% Translate("Statistics Management") | html %]

      - - [% USE ActionLink = String( 'AgentStatistics' ) %] - - [% BreadcrumbPath = [ - { - Name => Translate('Statistics Management'), - Link => ActionLink.append( ';Subaction=Overview' ), - }, - { - Name => Translate('Import Statistics'), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] - -
      +
      +

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

      @@ -34,7 +16,12 @@
      @@ -42,29 +29,51 @@
      +

      [% Translate("Statistics Management") | html %]

      + + [% USE ActionLink = String( 'AgentStatistics' ) %] + + [% BreadcrumbPath = [ + { + Name => Translate('Statistics Management'), + Link => ActionLink.append( ';Subaction=Overview' ), + }, + { + Name => Translate('Import Statistics'), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] +

      [% Translate("Import Statistics Configuration") | html %]

      - -
      +
      - -
      - - +
      + +
      + + +
      -
      - - [% Translate("or") | html %] - [% Translate("Cancel") | html %] + +
      +
      + [% Translate("Cancel") | html %] + + +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsOverview.tt b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsOverview.tt index 482d67e95cf..a36abe92df4 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsOverview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsOverview.tt @@ -7,22 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
      -

      [% Translate("Statistics Management") | html %]

      - - [% USE ActionLink = String( 'AgentStatistics' ) %] - - [% BreadcrumbPath = [ - { - Name => Translate('Statistics Management'), - Link => ActionLink.append( ';Subaction=Overview' ), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] - -
      +
      +

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

      @@ -31,15 +17,28 @@ @@ -48,16 +47,25 @@
      +

      [% Translate("Statistics Management") | html %]

      + + [% USE ActionLink = String( 'AgentStatistics' ) %] + + [% BreadcrumbPath = [ + { + Name => Translate('Statistics Management'), + Link => ActionLink.append( ';Subaction=Overview' ), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] +

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

      - - [% Data.ResultLong %] - [% Data.SiteNavBarLong %] - - @@ -92,42 +100,52 @@ [% RenderBlockStart("Result") %] - - - + + + [% IF Data.AccessRw %] - - + + [% END %] - - + + [% RenderBlockEnd("Result") %] - -
      + [% IF Data.AccessRw %] - - [% Data.StatNumber | html %] + + [% Data.StatNumber | html %] - + [% ELSE %] [% Data.StatNumber | html %] [% END %] - [% Data.Title | html %][% Translate(Data.ObjectName) | html %][% Data.Title | html %][% Translate(Data.ObjectName) | html %] - - - [% Translate('Export statistic %s', Data.Title) | html %] - - - - - [% Translate('Delete statistic %s', Data.Title) | html %] - - + + + [% Translate('Export statistic %s', Data.Title) | html %] + + + + + [% Translate('Delete statistic %s', Data.Title) | html %] + + - [% IF Data.Valid %] - - [% END %] -
      + [% IF Data.Valid %] + + + + [% END %] +
      + + + +
        +
      • + [% Data.ResultLong %] +
        • +
      • [% Data.SiteNavBar %]
        • +
      +       +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsView.tt b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsView.tt index 342d5a0816a..3a46f1948e0 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentStatisticsView.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentStatisticsView.tt @@ -7,29 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - - -
      -

      [% Translate("Statistics Overview") | html %]

      - -

      [% Translate("Statistics Management") | html %]

      - - [% USE ActionLink = String( 'AgentStatistics' ) %] - - [% BreadcrumbPath = [ - { - Name => Translate('Statistics Management'), - Link => ActionLink.append( ';Subaction=Overview' ), - }, - { - Name => Translate('View Statistics'), - }, - ] - %] - - [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] - -
      +
      +

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

      @@ -37,64 +16,102 @@
      -
      +
      +

      [% Translate("Statistics Information") | html %]

      - -

      [% Data.Created | Localize("TimeLong") %]

      -
      - - -

      [% Data.CreatedBy | html %]

      -
      - - -

      [% Data.Changed | Localize("TimeLong") %]

      -
      - - -

      [% Data.ChangedBy | html %]

      -
      - - -

      [% Translate(Data.SumRowValue) | html %]

      -
      +
      + +

      [% Data.Created | Localize("TimeLong") %]

      +
      +
      + +

      [% Data.CreatedBy | html %]

      +
      + +
      + +

      [% Data.Changed | Localize("TimeLong") %]

      +
      + +
      + +

      [% Data.ChangedBy | html %]

      +
      + +
      + +

      [% Translate(Data.SumRowValue) | html %]

      +
      + +
      + +

      [% Translate(Data.SumColValue) | html %]

      +
      + +
      + +

      [% Translate(Data.ShowAsDashboardWidgetValue) | html %]

      +
      + +
      + +

      [% Translate(Data.CacheValue) | html %]

      +
      + +
      + +

      [% Translate(Data.ValidValue) | html %]

      +
      - -

      [% Translate(Data.SumColValue) | html %]

      -
      - - -

      [% Translate(Data.ShowAsDashboardWidgetValue) | html %]

      -
      - - -

      [% Translate(Data.CacheValue) | html %]

      -
      - - -

      [% Translate(Data.ValidValue) | html %]

      -
      +

      [% Translate("Statistics Overview") | html %]

      + +

      [% Translate("Statistics Management") | html %]

      + + [% USE ActionLink = String( 'AgentStatistics' ) %] + + [% BreadcrumbPath = [ + { + Name => Translate('Statistics Management'), + Link => ActionLink.append( ';Subaction=Overview' ), + }, + { + Name => Translate('View Statistics'), + }, + ] + %] + + [% INCLUDE "Breadcrumb.tt" Path = BreadcrumbPath Type = "Agent" %] +
      @@ -114,25 +131,23 @@ [% Data.StatsParamsWidget %]
      -
      - - [% Translate('or') | html %] - - [% Translate('Cancel') | html %] - +
      +
      + [% Translate('Cancel') | html %] + + +
      - [% ELSE %] -

      [% Translate('This statistic contains configuration errors and can currently not be used.') | html %]

      - [% END %] -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt index 05384ae9823..4b52624ed9b 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketActionCommon.tt @@ -8,8 +8,9 @@ # -- [% RenderBlockStart("Properties") %] +[% TicketFrontendConfig = Config("Ticket::Frontend::" _ Env("Action") ) %] -
      + @@ -22,46 +23,51 @@
      -

      +
      +

      [% RenderBlockStart("HeaderAgentTicketFreeText") %] -[% Translate("Change Free Text of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Change Free Text of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketFreeText") %] [% RenderBlockStart("HeaderAgentTicketOwner") %] -[% Translate("Change Owner of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Change Owner of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketOwner") %] [% RenderBlockStart("HeaderAgentTicketClose") %] -[% Translate("Close %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Close %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketClose") %] [% RenderBlockStart("HeaderAgentTicketNote") %] -[% Translate("Add Note to %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Add Note to %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketNote") %] [% RenderBlockStart("HeaderAgentTicketPending") %] -[% Translate("Set Pending Time for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Set Pending Time for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketPending") %] [% RenderBlockStart("HeaderAgentTicketPriority") %] -[% Translate("Change Priority of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Change Priority of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketPriority") %] [% RenderBlockStart("HeaderAgentTicketResponsible") %] -[% Translate("Change Responsible of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] + [% Translate("Change Responsible of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] [% RenderBlockEnd("HeaderAgentTicketResponsible") %] - — [% Data.Title | html %] -

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      + — [% Data.Title | html %] +

      +#

      +
      [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %] -

      - [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] +

      [% RenderBlockEnd("PropertiesLock") %] -
      [% INCLUDE "FormElements/DraftNotifications.tt" %] @@ -74,193 +80,215 @@

      [% Translate("Ticket Settings") | html %]

      -
      -[% RenderBlockStart("Title") %] - -
      - -

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

      -

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

      -
      -
      -[% RenderBlockEnd("Title") %] - -[% RenderBlockStart("Type") %] - -
      - [% Data.TypeStrg %] -

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

      -

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

      -
      -
      -[% RenderBlockEnd("Type") %] - -[% RenderBlockStart("Queue") %] - [% IF Data.QueueMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.QueuesStrg %] - [% IF Data.QueueMandatory %] -

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

      - [% END %] -

      [% Translate("Queue invalid.") | html %]

      -
      -
      -[% RenderBlockEnd("Queue") %] - +
      + [% IF Config('Ticket::Service') && TicketFrontendConfig.Service %] +
      +

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

      [% RenderBlockStart("Service") %] - [% IF Data.ServiceMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.ServiceStrg %] - [% IF Data.ServiceMandatory %] -

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

      - [% END %] -

      [% Translate("Service invalid.") | html %]

      -
      -
      +
      + [% IF Data.ServiceMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.ServiceStrg %] + [% IF Data.ServiceMandatory %] +

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

      + [% END %] +

      [% Translate("Service invalid.") | html %]

      +
      +
      [% RenderBlockEnd("Service") %] - [% RenderBlockStart("ServiceMandatory") %] - -
      - [% Data.ServiceStrg %] -

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

      -

      [% Translate("Service invalid.") | html %]

      -
      -
      +
      + +
      + [% Data.ServiceStrg %] +

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

      +

      [% Translate("Service invalid.") | html %]

      +
      +
      [% RenderBlockEnd("ServiceMandatory") %] - [% RenderBlockStart("SLA") %] - [% IF Data.SLAMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.SLAStrg %] - [% IF Data.SLAMandatory %] -

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

      -

      [% Translate("SLA invalid.") | html %]

      - [% END %] -
      -
      +
      + [% IF Data.SLAMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.SLAStrg %] + [% IF Data.SLAMandatory %] +

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

      +

      [% Translate("SLA invalid.") | html %]

      + [% END %] +
      +
      [% RenderBlockEnd("SLA") %] - [% RenderBlockStart("SLAMandatory") %] - -
      - [% Data.SLAStrg %] -

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

      -

      [% Translate("SLA invalid.") | html %]

      -
      -
      +
      + +
      + [% Data.SLAStrg %] +

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

      +

      [% Translate("SLA invalid.") | html %]

      +
      +
      [% RenderBlockEnd("SLAMandatory") %] +
      + [% END %] + [% IF TicketFrontendConfig.Queue || TicketFrontendConfig.Owner || TicketFrontendConfig.Responsible %] +
      +

      [% Translate("Team Data") | html %]

      +[% RenderBlockStart("Queue") %] +
      + [% IF Data.QueueMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.QueuesStrg %] + [% IF Data.QueueMandatory %] +

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

      + [% END %] +

      [% Translate("Queue invalid.") | html %]

      +
      +
      +[% RenderBlockEnd("Queue") %] [% RenderBlockStart("Owner") %] - [% IF Data.OwnerMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.OwnerStrg %] - [% IF Data.OwnerMandatory %] -

      [% Translate("Please set a new owner!") | html %]

      - [% END %] -

      [% Translate("Owner invalid.") | html %]

      -
      -
      +
      + [% IF Data.OwnerMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.OwnerStrg %] + [% IF Data.OwnerMandatory %] +

      [% Translate("Please set a new owner!") | html %]

      + [% END %] +

      [% Translate("Owner invalid.") | html %]

      +
      +
      [% RenderBlockEnd("Owner") %] - [% RenderBlockStart("OwnerMandatory") %] - -
      - [% Data.OwnerStrg %] -

      [% Translate("Please set a new owner!") | html %]

      -

      [% Translate("Owner invalid.") | html %]

      -
      -
      +
      + +
      + [% Data.OwnerStrg %] +

      [% Translate("Please set a new owner!") | html %]

      +

      [% Translate("Owner invalid.") | html %]

      +
      +
      [% RenderBlockEnd("OwnerMandatory") %] - [% RenderBlockStart("Responsible") %] - [% IF Data.ResponsibleMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.ResponsibleStrg %] - [% IF Data.ResponsibleMandatory %] -

      [% Translate("Please set a new responsible!") | html %]

      -

      [% Translate("Responsible invalid.") | html %]

      - [% END %] -
      -
      +
      + [% IF Data.ResponsibleMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.ResponsibleStrg %] + [% IF Data.ResponsibleMandatory %] +

      [% Translate("Please set a new responsible!") | html %]

      +

      [% Translate("Responsible invalid.") | html %]

      + [% END %] +
      +
      [% RenderBlockEnd("Responsible") %] - [% RenderBlockStart("ResponsibleMandatory") %] - -
      - [% Data.ResponsibleStrg %] -

      [% Translate("Please set a new responsible!") | html %]

      -

      [% Translate("Responsible invalid.") | html %]

      -
      -
      +
      + +
      + [% Data.ResponsibleStrg %] +

      [% Translate("Please set a new responsible!") | html %]

      +

      [% Translate("Responsible invalid.") | html %]

      +
      +
      [% RenderBlockEnd("ResponsibleMandatory") %] +
      + [% END %] + [% IF TicketFrontendConfig.Title || TicketFrontendConfig.TicketType || TicketFrontendConfig.State || TicketFrontendConfig.Priority %] +
      +

      [% Translate("Ticket Data") | html %]

      +[% RenderBlockStart("Title") %] +
      + +
      + +

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

      +

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

      +
      +
      +[% RenderBlockEnd("Title") %] +[% RenderBlockStart("Type") %] +
      + +
      + [% Data.TypeStrg %] +

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

      +

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

      +
      +
      +[% RenderBlockEnd("Type") %] [% RenderBlockStart("State") %] - [% IF Data.StateMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.StateStrg %] - [% IF Data.StateMandatory %] -

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

      -

      [% Translate("State invalid.") | html %]

      - [% END %] -
      -
      +
      + [% IF Data.StateMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.StateStrg %] + [% IF Data.StateMandatory %] +

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

      +

      [% Translate("State invalid.") | html %]

      + [% END %] +
      +
      [% RenderBlockEnd("State") %] - [% RenderBlockStart("StatePending") %] - -
      - [% Data.DateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("For all pending* states.") | html %]

      +
      + +
      +
      [% Data.DateString %]
      +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("For all pending* states.") | html %]

      +
      -
      [% RenderBlockEnd("StatePending") %] - [% RenderBlockStart("Priority") %] - -
      - [% Data.PriorityStrg %] +
      + +
      + [% Data.PriorityStrg %] +
      -
      [% RenderBlockEnd("Priority") %] +
      + [% END %] + [% IF !TicketFrontendConfig.DynamicField.empty %] +
      +

      [% Translate("Dynamic Info") | html %]

      [% RenderBlockStart("TicketTypeDynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] -
      -
      -
      +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      [% RenderBlockEnd("TicketTypeDynamicField") %] +
      + [% END %] # Example of how to use fixed dynamic field blocks for customizations. Block below is for fields of type 'Ticket'. # NOTE: Field1 and Field2 are the names of the dynamic fields and have to be replaced with the actual field names. @@ -286,144 +314,171 @@
      [% RenderBlockEnd("WidgetTicketActions") %] - [% RenderBlockStart("WidgetArticle") %]
      - + + + +

      [% Translate("Add Article") | html %]

      +
      +
      + [% IF TicketFrontendConfig.InformAgent || TicketFrontendConfig.InvolvedAgent %] -
      -[% IF Data.WidgetStatus == 'Expanded' %] - -[% ELSE %] - -
      - -
      -
      -[% END %] -
      +

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

      [% RenderBlockStart("InformAdditionalAgents") %] -
      [% RenderBlockStart("InformAgent") %] - -
      - [% Data.OptionStrg %] -
      -
      +
      + +
      + [% Data.OptionStrg %] +
      +
      [% RenderBlockEnd("InformAgent") %] [% RenderBlockStart("InvolvedAgent") %] - -
      - [% Data.InvolvedAgentStrg %] -
      -
      +
      + +
      + [% Data.InvolvedAgentStrg %] +
      +

      + [% Translate("Here you can select additional agents which should receive a notification regarding the new article.") | html %] +

      +
      [% RenderBlockEnd("InvolvedAgent") %] -
      -

      - [% Translate("Here you can select additional agents which should receive a notification regarding the new article.") | html %] -

      -
      -
      [% RenderBlockEnd("InformAdditionalAgents") %] [% RenderBlockStart("InformAgentsWithoutSelection") %] -
      - -
      - +
      + +
      + [% RenderBlockStart("InformAgentsWithoutSelectionSingleUser") %] - [% Data.UserFullname | html %][% RenderBlockStart("InformAgentsWithoutSelectionSingleUserSeparator") %],[% RenderBlockEnd("InformAgentsWithoutSelectionSingleUserSeparator") %] + [% Data.UserFullname | html %] +[% RenderBlockStart("InformAgentsWithoutSelectionSingleUserSeparator") %],[% RenderBlockEnd("InformAgentsWithoutSelectionSingleUserSeparator") %] [% RenderBlockEnd("InformAgentsWithoutSelectionSingleUser") %] -
      -
      -
      +
      +
      [% RenderBlockEnd("InformAgentsWithoutSelection") %] -
      + [% END %] + +

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

      + [% IF Data.WidgetStatus == 'Expanded' %] + + [% ELSE %] +
      +
      + + +
      +
      + [% END %] +
      [% RenderBlockStart("SubjectLabel") %] - + [% RenderBlockEnd("SubjectLabel") %] [% RenderBlockStart("SubjectLabelMandatory") %] - + [% RenderBlockEnd("SubjectLabelMandatory") %] -
      - -

      [% 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("TicketOptions") %] - -
      +
      + +
      - - + + -
      -
      +
      +
      [% RenderBlockEnd("TicketOptions") %] - - +
      + +
      [% RenderBlockStart("StandardTemplate") %] - -
      - [% Data.StandardTemplateStrg %] -

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      -
      -
      +
      + +
      + [% Data.StandardTemplateStrg %] +

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      +
      +
      [% RenderBlockEnd("StandardTemplate") %] +
      [% RenderBlockStart("RichTextLabel") %] - + [% RenderBlockEnd("RichTextLabel") %] [% RenderBlockStart("RichTextLabelMandatory") %] - + [% RenderBlockEnd("RichTextLabelMandatory") %] -
      - -

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

      -

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

      -
      -
      - - -
      -[% INCLUDE "FormElements/AttachmentList.tt" %] -
      -
      +
      + +
      +

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

      +
      +
      +

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

      +
      +
      +
      - -
      - -
      -
      +
      +
      + [% INCLUDE "FormElements/AttachmentList.tt" %] +
      +
      +
      +
      + + +
      +
      [% RenderBlockStart("TimeUnits") %] - [% Data.TimeUnitsBlock %] +
      + [% Data.TimeUnitsBlock %] +
      [% RenderBlockEnd("TimeUnits") %] - [% RenderBlockStart("ArticleTypeDynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] +
      + [% Data.Label %] +
      + [% Data.Field %] [% RenderBlockStart("ArticleTypeDynamicFieldError") %] -
      -

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

      -
      +
      +

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

      +
      [% RenderBlockEnd("ArticleTypeDynamicFieldError") %] +
      -
      -
      [% RenderBlockEnd("ArticleTypeDynamicField") %] +
      # Example of how to use fixed dynamic field blocks for customizations. Block below is for fields of type 'Article'. # NOTE: Field1 and Field2 are the names of the dynamic fields and have to be replaced with the actual field names. @@ -459,13 +514,12 @@
      [% RenderBlockEnd("WidgetArticle") %] -
      - [% INCLUDE "FormElements/DraftButtons.tt" %] +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketBounce.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketBounce.tt index eeb8d09dd58..57b09a11c89 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketBounce.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketBounce.tt @@ -15,118 +15,127 @@ -
      -

      [% Translate("Bounce %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      - [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% Translate("Cancel") | html %] [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %]

      [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] + + [% Translate("cancel") | html %]

      [% RenderBlockEnd("PropertiesLock") %] -
      -
      - -
      - -
      - -

      [% Translate("You need a email address.") | html %]

      -
      +
      +
      +
      +
      + +
      + +

      [% Translate("You need a email address.") | html %]

      +
      [% RenderBlockStart("BounceToCustomerGenericServerErrorMsg") %] -

      [% Translate("Need a valid email address or don't use a local email address.") | html %]

      +

      [% Translate("Need a valid email address or don't use a local email address.") | html %]

      [% RenderBlockEnd("BounceToCustomerGenericServerErrorMsg") %] [% RenderBlockStart("BounceToInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("BounceToInvalidConfigServerErrorMsg") %] [% RenderBlockStart("BounceToInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("BounceToInvalidMXServerErrorMsg") %] [% RenderBlockStart("BounceToInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("BounceToInvalidDNSServerErrorMsg") %] [% RenderBlockStart("BounceToInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("BounceToInvalidSyntaxServerErrorMsg") %] +
      +
      -
      - -
      - [% Data.NextStatesStrg %] -
      -
      - - -
      - +
      +

      [% Translate("Ticket Data") | html %]

      +
      + +
      + [% Data.NextStatesStrg %] +
      +
      -
      - -
      - [% Data.From | html %] -
      -
      +
      +

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

      +
      + +
      + [% Data.From | html %] +
      +
      - -
      - -

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

      -
      +
      + +
      + +

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

      +
      [% RenderBlockStart("ToCustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("ToCustomerGenericServerErrorMsg") %] [% RenderBlockStart("ToInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("ToInvalidConfigServerErrorMsg") %] [% RenderBlockStart("ToInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("ToInvalidMXServerErrorMsg") %] [% RenderBlockStart("ToInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("ToInvalidDNSServerErrorMsg") %] [% RenderBlockStart("ToInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("ToInvalidSyntaxServerErrorMsg") %] +
      +
      -
      -
      - -
      - -

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

      -

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

      -
      -
      +
      + +
      + +

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

      +

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

      +
      +
      - -
      - -

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

      -

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

      -
      -
      +
      + +
      + +

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

      +

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

      +
      +
      +
      + +
      + +
      +
      +
      - +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketBulk.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketBulk.tt index fad413fd6e4..3d04ce6cdc4 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketBulk.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketBulk.tt @@ -8,249 +8,296 @@ # -- [% RenderBlockStart("BulkAction") %] -
      - - - -
      -
      -

      [% Translate("Ticket Bulk Action") | html %]

      + + + +
      +
      +

      [% Translate("Ticket Bulk Action") | html %]

      [% RenderBlockStart("CancelClosePopup") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("CancelClosePopup") %] [% RenderBlockStart("UndoClosePopup") %] -

      - [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] - -

      +
      + [% Translate("The ticket has been locked") | html %]. + + [% Translate("Cancel") | html %] + +
      [% RenderBlockEnd("UndoClosePopup") %] -
      -
      +
      +
      [% RenderBlockStart("UsedTicketID") %] - + [% RenderBlockEnd("UsedTicketID") %] - -
      - -
      - -
      - +
      +
      -
      -
      +
      [% RenderBlockStart("State") %] - -
      - [% Data.NextStatesStrg %] -
      -
      +
      + +
      + [% Data.NextStatesStrg %] +
      +
      [% RenderBlockStart("StatePending") %] - -
      - [% Data.DateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("For all pending* states.") | html %]

      -
      -
      +
      + +
      + [% Data.DateString %] +
      +

      [% Translate("Date invalid!") | html %]

      +
      +
      +

      [% Translate("Date invalid!") | html %]

      +
      +

      [% Translate("For all pending* states.") | html %]

      +
      +
      [% RenderBlockEnd("StatePending") %] [% RenderBlockEnd("State") %] - [% RenderBlockStart("Type") %] - -
      - [% Data.TypeStrg %] -
      -
      +
      + +
      + [% Data.TypeStrg %] +
      +
      [% RenderBlockEnd("Type") %] - -
      - [% Data.MoveQueuesStrg %] -
      -
      - +
      + +
      + [% Data.MoveQueuesStrg %] +
      +
      [% RenderBlockStart("Service") %] - [% IF Data.ServiceMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.ServiceStrg %] - [% IF Data.ServiceMandatory %] -

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

      - [% END %] -

      [% Translate("Service invalid.") | html %]

      -
      -
      +
      + [% IF Data.ServiceMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.ServiceStrg %] + [% IF Data.ServiceMandatory %] +
      +

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

      +
      + [% END %] +
      +

      [% Translate("Service invalid.") | html %]

      +
      +
      +
      [% RenderBlockEnd("Service") %] - [% RenderBlockStart("ServiceMandatory") %] - -
      - [% Data.ServiceStrg %] -

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

      -

      [% Translate("Service invalid.") | html %]

      -
      -
      +
      + +
      + [% Data.ServiceStrg %] +
      +

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

      +
      +
      +

      [% Translate("Service invalid.") | html %]

      +
      +
      +
      [% RenderBlockEnd("ServiceMandatory") %] - [% RenderBlockStart("Owner") %] - -
      - [% Data.OwnerStrg %] -
      -
      +
      + +
      + [% Data.OwnerStrg %] +
      +
      [% RenderBlockEnd("Owner") %] - [% RenderBlockStart("Responsible") %] - -
      - [% Data.ResponsibleStrg %] -
      -
      +
      + +
      + [% Data.ResponsibleStrg %] +
      +
      [% RenderBlockEnd("Responsible") %] - [% RenderBlockStart("Priority") %] - -
      - [% Data.PriorityStrg %] -
      -
      +
      + +
      + [% Data.PriorityStrg %] +
      +
      [% RenderBlockEnd("Priority") %] - - -
      -
      - - - -

      [% Translate("Invalid ticket identifier!") | html %]

      +
      + +
      +
      +
      + + +
      + +
      +

      [% Translate("Invalid ticket identifier!") | html %]

      +
      +
      +
      +
      + + +
      +
      +
      -
      - - +
      + +
      + [% Data.LinkTogetherYesNoOption %] +
      +
      +
      + +
      + +
      +

      [% Translate("Invalid ticket identifier!") | html %]

      +
      +
      +
      +
      + +
      + [% Data.UnlockYesNoOption %] +
      -
      -
      - - -
      - [% Data.LinkTogetherYesNoOption %] -
      -
      - - -
      - -

      [% Translate("Invalid ticket identifier!") | html %]

      -
      -
      - - -
      - [% Data.UnlockYesNoOption %] -
      -
      -[% FOREACH CONTENT IN Data.BulkModuleContent %] - [% CONTENT %] -[% END %] + [% FOREACH CONTENT IN Data.BulkModuleContent %] +
      + [% CONTENT %] +
      + [% END %] [% RenderBlockStart("DynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] -
      -
      -
      +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      [% RenderBlockEnd("DynamicField") %] -
      +
      +
      +
      +
      +
      -
      - -
      -
      - - + [% RenderBlockEnd("BulkAction") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt index 6d40ddb03be..67ad94c6d2a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketCompose.tt @@ -6,396 +6,398 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - +[% TicketFrontendConfig = Config("Ticket::Frontend::" _ Env("Action") ) %]
      - - - - - - - - - - - - + + + + + + + + + + + + -
      +
      -

      [% Translate("Compose Answer for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      +

      [% Translate("Compose Answer for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %] +

      [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      + + [% Translate("Cancel") | html %] + [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("TicketBackUndo") %]

      [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] + + [% Translate("Cancel") | html %]

      [% RenderBlockEnd("TicketBackUndo") %]
      -
      +
      [% INCLUDE "FormElements/DraftNotifications.tt" %] -
      -
      - - -
      - [% Data.From | html %] +
      +
      +

      [% Translate("Ticket Data") | html %]

      +
      + +
      + [% Data.NextStatesStrg %] +
      -
      - - +
      +
      +
      - - -
      +
      [% Data.PendingDateString %]
      +
      +

      [% Translate("Date Invalid!") | html %]

      +
      +
      +

      [% Translate("Date Invalid!") | html %]

      +
      +

      [% Translate("For all pending* states.") | html %]

      +
      +
      + [% IF !TicketFrontendConfig.DynamicField.empty %] +
      +

      [% Translate("Dynamic Info") | html %]

      +[% RenderBlockStart("DynamicField") %] +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      +[% RenderBlockEnd("DynamicField") %] +
      + [% END %] +
      +

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

      +
      + +
      + [% Data.From | html %] +
      +
      +
      + +
      + +
      [% RenderBlockStart("ToIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      [% RenderBlockEnd("ToIsLocalAddressServerErrorMsg") %] - [% RenderBlockStart("ToServerErrorMsg") %] -

      [% Translate("Please include at least one recipient") | html %]

      +

      [% Translate("Please include at least one recipient") | html %]

      [% RenderBlockEnd("ToServerErrorMsg") %] +
      - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      -
      - -
      - - -
      - [% Translate("To") | html %] -[% RenderBlockStart("MultipleCustomer") %] -
      - - - - - +
      + +
      + [% Translate('To') | html %] +[% RenderBlockStart("MultipleCustomer") %] +
      + + + + + + [% Translate("Remove Ticket Customer") | html %] + [% RenderBlockStart("CustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("CustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("CustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("CustomerGenericServerErrorMsg") %] [% RenderBlockStart("InvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("InvalidConfigServerErrorMsg") %] [% RenderBlockStart("InvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("InvalidMXServerErrorMsg") %] [% RenderBlockStart("InvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("InvalidDNSServerErrorMsg") %] [% RenderBlockStart("InvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("InvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("IsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("IsDuplicatedServerErrorMsg") %] +
      -
      [% RenderBlockEnd("MultipleCustomer") %] -
      +
      [% RenderBlockStart("MultipleCustomerCounter") %] - + [% RenderBlockEnd("MultipleCustomerCounter") %] -
      -
      - - -
      - - -
      -[% RenderBlockStart("CcIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Cc) | html %]

      -[% RenderBlockEnd("CcIsLocalAddressServerErrorMsg") %] -
      - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %]
      -
      - -
      -
      -
      -
      - +
      - [% INCLUDE "FormElements/DraftButtons.tt" %] +
      - + \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketCustomer.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketCustomer.tt index c6c9d62c3c5..0adf67406c7 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketCustomer.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketCustomer.tt @@ -8,13 +8,14 @@ # -- [% RenderBlockStart("Customer") %] -
      +

      [% Translate("Change Customer of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      -

      - [% Translate("Cancel & close") | html %] -

      +
      @@ -30,33 +31,39 @@
      -
      +
      -
      - -
      - -

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

      -

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

      -
      -
      +
      + +
      +

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

      - [% INCLUDE "CustomerCompany/TicketCustomerIDSelection.tt" Required = 0 Readonly = Config("Ticket::Frontend::AgentTicketCustomer::CustomerIDReadOnly") %] +
      + +
      + +

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

      +

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

      +
      +
      + +
      + [% INCLUDE "CustomerCompany/TicketCustomerIDSelection.tt" Required = 0 Readonly = Config("Ticket::Frontend::AgentTicketCustomer::CustomerIDReadOnly") %] +
      +
      -
      - - +
      +
      -
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt index 9330e1b0aac..9bb7208fde1 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmail.tt @@ -8,14 +8,9 @@ # --
      -

      [% Translate("Create New Email Ticket") | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      -
      -
      -# show customer info table [% RenderBlockStart("CustomerTable") %]
      @@ -27,472 +22,504 @@
      [% RenderBlockEnd("CustomerTable") %]
      - -
      +
      - - - - - - - - - - -
      - + + + + + + + + + + +
      # example template for customizations, see hidden form at the end of the file -# -#
      -# -#
      -#
      - -[% RenderBlockStart("TicketType") %] - -
      - [% Data.TypeStrg %] -

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

      -

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

      -
      -
      -[% RenderBlockEnd("TicketType") %] - - -
      - [% Data.FromStrg %] -

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

      -

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

      -
      -
      - - -
      - -
      +# +#
      +# +#
      +#
      +
      +

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

      +
      + +
      + +
      [% RenderBlockStart("ToServerErrorMsg") %] -

      [% Translate("Please include at least one customer user for the ticket.") | html %]

      +

      [% Translate("Please include at least one customer user for the ticket.") | html %]

      [% RenderBlockEnd("ToServerErrorMsg") %] - [% RenderBlockStart("ToIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      [% RenderBlockEnd("ToIsLocalAddressServerErrorMsg") %] +
      +
      - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      -
      - -
      - - -
      - [% Translate("To") | html %] -[% RenderBlockStart("MultipleCustomer") %] -
      - - - - - +
      + +
      + [% Translate("To") | html %] +[% RenderBlockStart("MultipleCustomer") %] +
      + + + + + + [% Translate("Remove Ticket Customer User") | html %] + [% RenderBlockStart("CustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("CustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("CustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("CustomerGenericServerErrorMsg") %] [% RenderBlockStart("InvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("InvalidConfigServerErrorMsg") %] [% RenderBlockStart("InvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("InvalidMXServerErrorMsg") %] [% RenderBlockStart("InvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("InvalidDNSServerErrorMsg") %] [% RenderBlockStart("InvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("InvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("IsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("IsDuplicatedServerErrorMsg") %] +
      -
      [% RenderBlockEnd("MultipleCustomer") %] -
      +
      [% RenderBlockStart("MultipleCustomerCounter") %] - + [% RenderBlockEnd("MultipleCustomerCounter") %] -
      -
      - - -
      - - -
      +
      +
      + +
      + +
      [% RenderBlockStart("CcIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Cc) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Cc) | html %]

      [% RenderBlockEnd("CcIsLocalAddressServerErrorMsg") %] +
      +
      - - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      -
      - -
      - - -
      - [% Translate("Cc") | html %] +
      +
      + +
      + [% Translate("Cc") | html %] [% RenderBlockStart("CcMultipleCustomer") %] -
      - - - - - [% Translate("Remove Cc") | html %] - - +
      + + + + + [% Translate("Remove Cc") | html %] + [% RenderBlockStart("CcCustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("CcCustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("CcCustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("CcCustomerGenericServerErrorMsg") %] [% RenderBlockStart("CcInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("CcInvalidConfigServerErrorMsg") %] [% RenderBlockStart("CcInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("CcInvalidMXServerErrorMsg") %] [% RenderBlockStart("CcInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("CcInvalidDNSServerErrorMsg") %] [% RenderBlockStart("CcInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("CcInvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("CcIsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("CcIsDuplicatedServerErrorMsg") %] -
      -
      +
      +
      [% RenderBlockEnd("CcMultipleCustomer") %] - -
      +
      [% RenderBlockStart("CcMultipleCustomerCounter") %] - + [% RenderBlockEnd("CcMultipleCustomerCounter") %] -
      -
      - - -
      - - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      - -
      +
      +
      +
      + +
      + +
      +
      [% RenderBlockStart("BccIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Bcc) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Bcc) | html %]

      [% RenderBlockEnd("BccIsLocalAddressServerErrorMsg") %] +
      -
      - -
      - - -
      - [% Translate("Bcc") | html %] +
      +
      + +
      + [% Translate("Bcc") | html %] [% RenderBlockStart("BccMultipleCustomer") %] -
      - - - - - [% Translate("Remove Bcc") | html %] - - +
      + + + + + [% Translate("Remove Bcc") | html %] + [% RenderBlockStart("BccCustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("BccCustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("BccCustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("BccCustomerGenericServerErrorMsg") %] [% RenderBlockStart("BccInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("BccInvalidConfigServerErrorMsg") %] [% RenderBlockStart("BccInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("BccInvalidMXServerErrorMsg") %] [% RenderBlockStart("BccInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("BccInvalidDNSServerErrorMsg") %] [% RenderBlockStart("BccInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("BccInvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("BccIsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("BccIsDuplicatedServerErrorMsg") %] -
      -
      +
      +
      [% RenderBlockEnd("BccMultipleCustomer") %] - -
      +
      [% RenderBlockStart("BccMultipleCustomerCounter") %] - + [% RenderBlockEnd("BccMultipleCustomerCounter") %] +
      +
      +
      + [% INCLUDE "CustomerCompany/TicketCustomerIDSelection.tt" Required = 0 Readonly = Config("Ticket::Frontend::AgentTicketEmail::CustomerIDReadOnly") %] +
      -
      - - [% INCLUDE "CustomerCompany/TicketCustomerIDSelection.tt" Required = 0 Readonly = Config("Ticket::Frontend::AgentTicketEmail::CustomerIDReadOnly") %] - -
      - + [% IF Config('Ticket::Service') %] +
      +

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

      [% RenderBlockStart("TicketService") %] - [% IF Data.ServiceMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.ServiceStrg %] - [% IF Data.ServiceMandatory %] -

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

      - [% END %] -

      [% Translate("Service invalid.") | html %]

      -
      -
      +
      + [% IF Data.ServiceMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.ServiceStrg %] + [% IF Data.ServiceMandatory %] +
      +

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

      +
      + [% END %] +
      +

      [% Translate("Service invalid.") | html %]

      +
      +
      +
      [% RenderBlockEnd("TicketService") %] - [% RenderBlockStart("TicketSLA") %] - [% IF Data.SLAMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.SLAStrg %] - [% IF Data.SLAMandatory %] -

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

      - [% END %] -
      -
      +
      + [% IF Data.SLAMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.SLAStrg %] + [% IF Data.SLAMandatory %] +
      +

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

      +
      + [% END %] +
      +
      [% RenderBlockEnd("TicketSLA") %] - -[% RenderBlockStart("OwnerSelection") %] - -
      - [% Data.OptionStrg %] - - [% Translate("Get all") | html %] - -
      -
      + [% END %] +
      +

      [% Translate("Team Data") | html %]

      +
      + +
      + [% Data.FromStrg %] +
      +

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

      +
      +
      +

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

      +
      +
      +
      +[% RenderBlockStart("OwnerSelection") %] +
      + +
      + [% Data.OptionStrg %] +
      +
      [% RenderBlockEnd("OwnerSelection") %] - [% RenderBlockStart("ResponsibleSelection") %] - -
      - [% Data.ResponsibleOptionStrg %] - - [% Translate("Get all") | html %] - - -
      -
      +
      + +
      + [% Data.ResponsibleOptionStrg %] +
      +
      [% RenderBlockEnd("ResponsibleSelection") %] - -[% RenderBlockStart("Option") %] - -
      - [% Data.Value %] -

      [% Data.Invalid | html %]

      - [% IF Data.FieldExplanation.length %] -

      [% Translate(Data.FieldExplanation) | html %]

      - [% END %]
      -
      -[% RenderBlockEnd("Option") %] - - -
      - -

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

      -

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

      +
      +

      [% Translate("Ticket Data") | html %]

      +[% RenderBlockStart("TicketType") %] +
      + +
      + [% Data.TypeStrg %] +
      +

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

      +
      +
      +

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

      +
      +
      +
      +[% RenderBlockEnd("TicketType") %] +
      + +
      + [% Data.NextStatesStrg %] +
      +
      +
      + +
      +
      [% Data.PendingDateString %]
      +
      +

      [% Translate("Date invalid!") | html %]

      +
      +
      +

      [% Translate("Date invalid!") | html %]

      +
      +

      [% Translate("For all pending* states.") | html %]

      +
      +
      +
      + +
      + [% Data.PriorityStrg %] +
      +
      -
      - + [% IF !Data.DynamicFieldHTML.empty %] +
      +

      [% Translate("Dynamic Info") | html %]

      +[% RenderBlockStart("DynamicField") %] +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      +[% RenderBlockEnd("DynamicField") %] +
      + [% END %] +
      +

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

      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      +
      +
      +[% RenderBlockStart("Option") %] +
      + +
      + [% Data.Value %] +
      +

      [% Data.Invalid | html %]

      +
      + [% IF Data.FieldExplanation.length %] +

      [% Translate(Data.FieldExplanation) | html %]

      + [% END %] +
      +
      +[% RenderBlockEnd("Option") %] [% RenderBlockStart("TicketOptions") %] - -
      - - +
      + +
      + [% RenderBlockStart("OptionCustomer") %] - [ [% Translate("Customer user") | html %] ] + [% Translate("Customer user") | html %] [% RenderBlockEnd("OptionCustomer") %] - - - -
      -
      + +
      +
      [% RenderBlockEnd("TicketOptions") %] - - - + [% RenderBlockStart("StandardTemplate") %] - -
      - [% Data.StandardTemplateStrg %] -

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      -
      -
      +
      + +
      + [% Data.StandardTemplateStrg %] +

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      +
      +
      [% RenderBlockEnd("StandardTemplate") %] - - -
      - -

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

      -

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

      -
      -
      - - -
      - - -
      -
      - - -
      -[% INCLUDE "FormElements/AttachmentList.tt" %] -
      -
      - - -
      - [% Data.NextStatesStrg %] -
      -
      - - -
      - [% Data.PendingDateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("For all pending* states.") | html %]

      -
      -
      - - -
      - [% Data.PriorityStrg %] -
      -
      - -[% RenderBlockStart("DynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      +
      +
      +
      + +
      + + +
      -
      +
      + +
      + [% INCLUDE "FormElements/AttachmentList.tt" %] +
      +
      +[% RenderBlockStart("TimeUnits") %] +
      + [% Data.TimeUnitsBlock %] +
      +[% RenderBlockEnd("TimeUnits") %]
      -[% RenderBlockEnd("DynamicField") %] - # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual # field names #[% RenderBlockStart("DynamicField_Field1") %] -#
      -# [% Data.Label %] -#
      -# [% Data.Field %] -#
      -#
      -#
      +#
      +# [% Data.Label %] +#
      +# [% Data.Field %] +#
      +#
      +#
      #[% RenderBlockEnd("DynamicField_Field1") %] #[% RenderBlockStart("DynamicField_Field2") %] -#
      -# [% Data.Label %] -#
      -# [% Data.Field %] -#
      -#
      -#
      +#
      +# [% Data.Label %] +#
      +# [% Data.Field %] +#
      +#
      +#
      #[% RenderBlockEnd("DynamicField_Field2") %] - -[% RenderBlockStart("TimeUnits") %] - [% Data.TimeUnitsBlock %] -[% RenderBlockEnd("TimeUnits") %] - -
      - +
      +
      -
      - # example template form for customizations #
      -# -# -# -# -# -# -#
      +# +# +# +# +# +# +# \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt index 1a743b5c456..c22972803df 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailOutbound.tt @@ -7,6 +7,7 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- +[% TicketFrontendConfig = Config("Ticket::Frontend::" _ Env("Action") ) %]
      @@ -20,350 +21,387 @@

      [% Translate("Outbound Email for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      - [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %] -

      +

      [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] + + [% Translate("Cancel") | html %] -

      +
      [% RenderBlockEnd("PropertiesLock") %]
      -
      +
      [% INCLUDE "FormElements/DraftNotifications.tt" %] -
      - -
      - [% Data.From | html %] -
      -
      +
      + +
      +

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

      +
      + +
      + [% Data.From | html %] +
      +
      + +
      +
      -
      - [% INCLUDE "FormElements/DraftButtons.tt" %] +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailResend.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailResend.tt index 4fa327fc537..a2a09a8a49f 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailResend.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketEmailResend.tt @@ -54,7 +54,6 @@ [% RenderBlockStart("ToIsLocalAddressServerErrorMsg") %]

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      [% RenderBlockEnd("ToIsLocalAddressServerErrorMsg") %] - [% RenderBlockStart("ToServerErrorMsg") %]

      [% Translate("Please include at least one recipient") | html %]

      [% RenderBlockEnd("ToServerErrorMsg") %] @@ -166,7 +165,6 @@ [% Translate("Remove Cc") | html %] - [% RenderBlockStart("CcCustomerErrorExplantion") %]

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("CcCustomerErrorExplantion") %] @@ -242,7 +240,6 @@ [% Translate("Remove Bcc") | html %] - [% RenderBlockStart("BccCustomerErrorExplantion") %]

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("BccCustomerErrorExplantion") %] @@ -284,7 +281,6 @@

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

      - [% RenderBlockStart("Option") %]
      @@ -296,7 +292,6 @@
      [% RenderBlockEnd("Option") %] - [% RenderBlockStart("TicketOptions") %]
      @@ -319,11 +314,10 @@
      -
      - [% INCLUDE "FormElements/AttachmentList.tt" %] +
      + [% INCLUDE "FormElements/AttachmentList.tt" %]
      - [% RenderBlockStart("IsVisibleForCustomer") %]
      @@ -331,7 +325,6 @@
      [% RenderBlockEnd("IsVisibleForCustomer") %] - [% RenderBlockStart("TimeUnits") %] [% Data.TimeUnitsBlock %] [% RenderBlockEnd("TimeUnits") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketEscalation.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketEscalation.tt index 1713e1b7b85..212af6978d5 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketEscalation.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketEscalation.tt @@ -6,6 +6,7 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- + [% RenderBlockStart("TicketEscalationFirstResponseTimeOver") %] [% Translate("Ticket %s: first response time is over (%s/%s)!", Data.TicketNumber, Data.FirstResponseTimeHuman, Localize(Data.FirstResponseTimeDestinationDate, "TimeShort")) | html %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt index 78ba094a9e6..9364a064f2a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketForward.tt @@ -7,392 +7,394 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- +[% TicketFrontendConfig = Config("Ticket::Frontend::" _ Env("Action") ) %]
      - - - - - - - - - - + + + + + + + + + + - -
      +

      [% Translate("Forward %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      - [% RenderBlockStart("TicketBack") %]

      - [% Translate("Cancel & close") | html %] + [% Translate("Cancel") | html %]

      [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %]

      [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] + + [% Translate("Cancel") | html %]

      [% RenderBlockEnd("PropertiesLock") %] -
      - -
      +
      [% INCLUDE "FormElements/DraftNotifications.tt" %] -
      - -
      - [% Data.From | html %] +
      +
      +

      [% Translate("Ticket Data") | html %]

      +
      + +
      + [% Data.NextStatesStrg %] +
      +
      +
      + +
      +
      [% Data.PendingDateString %]
      +
      +

      [% Translate("Date Invalid!") | html %]

      +
      +
      +

      [% Translate("Date Invalid!") | html %]

      +
      +

      [% Translate("For all pending* states.") | html %]

      +
      +
      -
      - - -
      - - -
      + [% IF !TicketFrontendConfig.DynamicField.empty %] +
      +

      [% Translate("Dynamic Info") | html %]

      +[% RenderBlockStart("DynamicField") %] +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      +[% RenderBlockEnd("DynamicField") %] +
      + [% END %] +
      +

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

      +
      + +
      + [% Data.From | html %] +
      +
      +
      + +
      + +
      [% RenderBlockStart("ToServerErrorMsg") %] -

      [% Translate("Please include at least one recipient") | html %]

      +

      [% Translate("Please include at least one recipient") | html %]

      [% RenderBlockEnd("ToServerErrorMsg") %] - [% RenderBlockStart("ToIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.To) | html %]

      [% RenderBlockEnd("ToIsLocalAddressServerErrorMsg") %] -
      - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      -
      - -
      - - -
      - [% Translate("To") | html %] +
      +
      +
      + +
      + [% Translate("To") | html %] [% RenderBlockStart("MultipleCustomer") %] -
      - - - - - - [% Translate("Remove Ticket Customer") | html %] - - +
      + + + + + + [% Translate("Remove Ticket Customer") | html %] + [% RenderBlockStart("CustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("CustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("CustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("CustomerGenericServerErrorMsg") %] [% RenderBlockStart("InvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("InvalidConfigServerErrorMsg") %] [% RenderBlockStart("InvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("InvalidMXServerErrorMsg") %] [% RenderBlockStart("InvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("InvalidDNSServerErrorMsg") %] [% RenderBlockStart("InvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("InvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("IsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("IsDuplicatedServerErrorMsg") %] -
      -
      +
      +
      [% RenderBlockEnd("MultipleCustomer") %] -
      +
      [% RenderBlockStart("MultipleCustomerCounter") %] - + [% RenderBlockEnd("MultipleCustomerCounter") %] -
      -
      - - -
      - - -
      +
      +
      +
      + +
      + +
      [% RenderBlockStart("CcIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Cc) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Cc) | html %]

      [% RenderBlockEnd("CcIsLocalAddressServerErrorMsg") %] -
      - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      -
      - -
      - - -
      - [% Translate("Cc") | html %] +
      +
      +
      + +
      + [% Translate("Cc") | html %] [% RenderBlockStart("CcMultipleCustomer") %] -
      - - - - - - [% Translate("Remove Cc") | html %] - - +
      + + + + + + [% Translate("Remove Cc") | html %] + [% RenderBlockStart("CcCustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("CcCustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("CcCustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("CcCustomerGenericServerErrorMsg") %] [% RenderBlockStart("CcInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("CcInvalidConfigServerErrorMsg") %] [% RenderBlockStart("CcInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("CcInvalidMXServerErrorMsg") %] [% RenderBlockStart("CcInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("CcInvalidDNSServerErrorMsg") %] [% RenderBlockStart("CcInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("CcInvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("CcIsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("CcIsDuplicatedServerErrorMsg") %] -
      -
      +
      +
      [% RenderBlockEnd("CcMultipleCustomer") %] - -
      +
      [% RenderBlockStart("CcMultipleCustomerCounter") %] - + [% RenderBlockEnd("CcMultipleCustomerCounter") %] -
      -
      - - -
      - - -
      +
      +
      +
      + +
      + +
      [% RenderBlockStart("BccIsLocalAddressServerErrorMsg") %] -

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Bcc) | html %]

      +

      [% Translate("This address is registered as system address and cannot be used: %s", Data.Bcc) | html %]

      [% RenderBlockEnd("BccIsLocalAddressServerErrorMsg") %] -
      - [% IF Data.OptionCustomerUserAddressBook %] - - [% Translate("Customer user address book") | html %] - - - [% END %] -
      -
      - -
      - - -
      - [% Translate("Bcc") | html %] +
      +
      +
      + +
      + [% Translate("Bcc") | html %] [% RenderBlockStart("BccMultipleCustomer") %] -
      - - - - - - [% Translate("Remove Bcc") | html %] - - +
      + + + + + + [% Translate("Remove Bcc") | html %] + [% RenderBlockStart("BccCustomerErrorExplantion") %] -

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      +

      [% Translate("Please remove this entry and enter a new one with the correct value.") | html %]

      [% RenderBlockEnd("BccCustomerErrorExplantion") %] - -
      +
      [% RenderBlockStart("BccCustomerGenericServerErrorMsg") %] -

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

      +

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

      [% RenderBlockEnd("BccCustomerGenericServerErrorMsg") %] [% RenderBlockStart("BccInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("BccInvalidConfigServerErrorMsg") %] [% RenderBlockStart("BccInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("BccInvalidMXServerErrorMsg") %] [% RenderBlockStart("BccInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("BccInvalidDNSServerErrorMsg") %] [% RenderBlockStart("BccInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("BccInvalidSyntaxServerErrorMsg") %] [% RenderBlockStart("BccIsDuplicatedServerErrorMsg") %] -

      [% Translate("This address already exists on the address list.") | html %]

      +

      [% Translate("This address already exists on the address list.") | html %]

      [% RenderBlockEnd("BccIsDuplicatedServerErrorMsg") %] -
      -
      +
      +
      [% RenderBlockEnd("BccMultipleCustomer") %] - -
      +
      [% RenderBlockStart("BccMultipleCustomerCounter") %] - + [% RenderBlockEnd("BccMultipleCustomerCounter") %] -
      -
      - - -
      - -

      [% 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("Option") %] - -
      - [% Data.Value %] -

      [% Data.Invalid | html %]

      - [% IF Data.FieldExplanation.length %] -

      [% Translate(Data.FieldExplanation) | html %]

      - [% END %] -
      -
      +
      + +
      + [% Data.Value %] +
      +

      [% Data.Invalid | html %]

      +
      + [% IF Data.FieldExplanation.length %] +

      [% Translate(Data.FieldExplanation) | html %]

      + [% END %] +
      +
      [% RenderBlockEnd("Option") %] - [% RenderBlockStart("TicketOptions") %] - -
      - - - - -
      -
      +
      + +
      + + +
      +
      [% RenderBlockEnd("TicketOptions") %] - - - - -
      - -

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

      -

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

      -
      -
      - - -
      -[% INCLUDE "FormElements/AttachmentList.tt" %] -
      -
      - - -
      - [% Data.NextStatesStrg %] -
      -
      - - -
      - [% Data.PendingDateString %] -

      [% Translate("Date Invalid!") | html %]

      -

      [% Translate("Date Invalid!") | html %]

      -

      [% Translate("For all pending* states.") | html %]

      -
      -
      - - -
      - -
      -
      - -[% RenderBlockStart("DynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] +
      +
      -
      +
      + +
      + +
      +

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

      +
      +
      +

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

      +
      +
      +
      +
      +
      + [% INCLUDE "FormElements/AttachmentList.tt" %] +
      +
      +
      + +
      + +
      +
      +[% RenderBlockStart("TimeUnits") %] +
      + [% Data.TimeUnitsBlock %] +
      +[% RenderBlockEnd("TimeUnits") %]
      -[% RenderBlockEnd("DynamicField") %] - # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual # field names #[% RenderBlockStart("DynamicField_Field1") %] -#
      -# [% Data.Label %] -#
      -# [% Data.Field %] -#
      -#
      -#
      +#
      +# [% Data.Label %] +#
      +# [% Data.Field %] +#
      +#
      +#
      #[% RenderBlockEnd("DynamicField_Field1") %] #[% RenderBlockStart("DynamicField_Field2") %] -#
      -# [% Data.Label %] -#
      -# [% Data.Field %] -#
      -#
      -#
      +#
      +# [% Data.Label %] +#
      +# [% Data.Field %] +#
      +#
      +#
      #[% RenderBlockEnd("DynamicField_Field2") %] - -[% RenderBlockStart("TimeUnits") %] - [% Data.TimeUnitsBlock %] -[% RenderBlockEnd("TimeUnits") %] -
      -
      - [% INCLUDE "FormElements/DraftButtons.tt" %] +
      - + \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketHistory.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketHistory.tt index e694b475af6..949f22a8407 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketHistory.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketHistory.tt @@ -13,24 +13,23 @@

      [% Translate("History of %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      - [% Translate("Close this dialog") | html %] -

      +
      - -
      - -
      +
      +
      - + - - [% Translate("Expand/collapse all") | html %] + + [% Translate("Expand/Collapse all") | html %]
      - - - [% RenderBlockStart("HistoryWidget") %] -
      +[% RenderBlockStart("HistoryWidget") %] +

      @@ -59,7 +57,7 @@ - [% RenderBlockStart("Row") %] +[% RenderBlockStart("Row") %] [% IF Data.UserID == Config('CustomerPanelUserID') || Data.UserID == Config('PostmasterUserID') %] @@ -76,15 +74,15 @@ [% IF Data.ArticleID != '0' %] - + [% END %] - [% RenderBlockEnd("Row") %] +[% RenderBlockEnd("Row") %]

      - [% RenderBlockEnd("HistoryWidget") %] +[% RenderBlockEnd("HistoryWidget") %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketMerge.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketMerge.tt index 7a9c14a57e5..a05eb457726 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketMerge.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketMerge.tt @@ -12,26 +12,24 @@ -
      +

      [% Translate("Merge %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      - [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      + [% RenderBlockEnd("TicketBack") %] - [% RenderBlockStart("PropertiesLock") %] -

      +

      [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] + + [% Translate("Cancel") | html %] -

      +
      [% RenderBlockEnd("PropertiesLock") %] -
      @@ -43,20 +41,25 @@
      - -
      - -

      [% Translate("You need to use a ticket number!") | html %]

      -

      [% Translate("A valid ticket number is required.") | html %]

      -
      - [% Translate("Try typing part of the ticket number or title in order to search by it.") | html %] +
      +
      + +
      + +

      [% Translate("You need to use a ticket number!") | html %]

      +

      [% Translate("A valid ticket number is required.") | html %]

      +
      + [% Translate("Try typing part of the ticket number or title in order to search by it.") | html %] +
      + [% IF Data.CustomerID %] +
      + + +
      + [% END %] +
      - [% IF Data.CustomerID %] - - - [% END %]
      -
      @@ -70,64 +73,71 @@
      - -
      - -
      -
      +
      +
      +
      + +
      + +
      - -
      - [% Data.From | html %] - -
      -
      +
      + +
      + [% Data.From | html %] + +
      +
      - -
      - -

      [% Translate("Need a valid email address.") | html %]

      -
      +
      + +
      + +

      [% Translate("Need a valid email address.") | html %]

      +
      [% RenderBlockStart("ToCustomerGenericServerErrorMsg") %] -

      [% Translate("Need a valid email address or don't use a local email address.") | html %]

      +

      [% Translate("Need a valid email address or don't use a local email address.") | html %]

      [% RenderBlockEnd("ToCustomerGenericServerErrorMsg") %] [% RenderBlockStart("ToInvalidConfigServerErrorMsg") %] -

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      +

      [% Translate("This email address is not allowed due to the system configuration.") | html %]

      [% RenderBlockEnd("ToInvalidConfigServerErrorMsg") %] [% RenderBlockStart("ToInvalidMXServerErrorMsg") %] -

      [% Translate("This email address failed MX check.") | html %]

      +

      [% Translate("This email address failed MX check.") | html %]

      [% RenderBlockEnd("ToInvalidMXServerErrorMsg") %] [% RenderBlockStart("ToInvalidDNSServerErrorMsg") %] -

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      +

      [% Translate("DNS problem, please check your configuration and the error log.") | html %]

      [% RenderBlockEnd("ToInvalidDNSServerErrorMsg") %] [% RenderBlockStart("ToInvalidSyntaxServerErrorMsg") %] -

      [% Translate("The syntax of this email address is incorrect.") | html %]

      +

      [% Translate("The syntax of this email address is incorrect.") | html %]

      [% RenderBlockEnd("ToInvalidSyntaxServerErrorMsg") %] +
      +
      -
      -
      - -
      - -

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

      -

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

      -
      -
      +
      + +
      + +

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

      +

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

      +
      +
      - -
      - -

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

      -

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

      +
      + +
      + +

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

      +

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

      +
      +
      -
      - +
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketMove.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketMove.tt index 687c975e4f1..858c9a1bbd9 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketMove.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketMove.tt @@ -19,119 +19,127 @@ -
      +

      [% Translate("Move %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

      -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      - [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      +
      + Cancel +
      [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %] -

      - [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] - -

      +
      + [% Translate("The ticket has been locked") | html %]. + Cancel +
      [% RenderBlockEnd("PropertiesLock") %] - -
      +
      [% INCLUDE "FormElements/DraftNotifications.tt" %]
      - + + + +

      [% Translate("Ticket Settings") | html %]

      -
      - +
      +
      +

      [% Translate("Team Data") | html %]

      [% RenderBlockStart("Queue") %] - -
      - [% Data.MoveQueuesStrg %] -

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

      -

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

      -
      -
      +
      + +
      + [% Data.MoveQueuesStrg %] +

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

      +

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

      +
      +
      [% RenderBlockEnd("Queue") %] - [% RenderBlockStart("Owner") %] - -
      - [% Data.OwnerStrg %] - - [% Translate("Get all") | html %] - - -
      -
      +
      + +
      + [% Data.OwnerStrg %] +
      +
      [% RenderBlockEnd("Owner") %] +
      +
      +

      [% Translate("Ticket Data") | html %]

      [% RenderBlockStart("State") %] - [% IF Data.StateMandatory %] - - [% ELSE %] - - [% END %] -
      - [% Data.NextStatesStrg %] - [% IF Data.StateMandatory %] -

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

      -

      [% Translate("State invalid.") | html %]

      - [% END %] - -
      -
      +
      + [% IF Data.StateMandatory %] + + [% ELSE %] + + [% END %] +
      + [% Data.NextStatesStrg %] + [% IF Data.StateMandatory %] +

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

      +

      [% Translate("State invalid.") | html %]

      + [% END %] +
      +
      [% RenderBlockEnd("State") %] - [% RenderBlockStart("StatePending") %] - -
      - [% Data.DateString %] -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("Date invalid!") | html %]

      -

      [% Translate("For all pending* states.") | html %]

      -
      -
      +
      + +
      + [% Data.DateString %] +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("Date invalid!") | html %]

      +

      [% Translate("For all pending* states.") | html %]

      +
      +
      [% RenderBlockEnd("StatePending") %] - [% RenderBlockStart("Priority") %] - -
      - [% Data.NextPrioritiesStrg %] -
      -
      +
      + +
      + [% Data.NextPrioritiesStrg %] +
      +
      [% RenderBlockEnd("Priority") %] +
      [% RenderBlockStart("WidgetDynamicFields") %] -
      -
      -
      - +
      +
      +
      + +
      +

      [% Translate("Dynamic Fields") | html %]

      -

      [% Translate("Dynamic Fields") | html %]

      -
      -
      -
      +
      +
      +
      +

      [% Translate("Dynamic Info") | html %]

      [% RenderBlockStart("DynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] -
      -
      -
      +
      + [% Data.Label %] +
      + [% Data.Field %] +
      +
      [% RenderBlockEnd("DynamicField") %] +
      # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual @@ -155,99 +163,109 @@ #
      #[% RenderBlockEnd("DynamicField_Field2") %] -
      +
      +
      -
      [% RenderBlockEnd("WidgetDynamicFields") %] - [% RenderBlockStart("WidgetArticle") %] -
      -
      -
      - -
      -

      [% Translate("Add Article") | html %]

      -
      -
      -
      -[% IF Data.WidgetStatus == 'Expanded' %] - -[% ELSE %] - -
      - +
      +
      +
      +
      -
      -[% END %] +

      [% Translate("Add Article") | html %]

      +
      +
      +
      + +
      +

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

      + +
      + [% IF Data.WidgetStatus == 'Expanded' %] + + [% ELSE %] + +
      + +
      + [% END %] +
      [% RenderBlockStart("Note") %] +
      [% RenderBlockStart("SubjectLabel") %] - + [% RenderBlockEnd("SubjectLabel") %] [% RenderBlockStart("SubjectLabelMandatory") %] - + [% RenderBlockEnd("SubjectLabelMandatory") %] -
      - -

      [% 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("TicketOptions") %] - -
      - - - -
      -
      +
      + +
      + + +
      +
      [% RenderBlockEnd("TicketOptions") %] - - +
      + +
      [% RenderBlockStart("StandardTemplate") %] - -
      - [% Data.StandardTemplateStrg %] -

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      -
      -
      +
      + +
      + [% Data.StandardTemplateStrg %] +

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      +
      +
      [% RenderBlockEnd("StandardTemplate") %] +
      [% RenderBlockStart("RichTextLabel") %] - + [% RenderBlockEnd("RichTextLabel") %] [% RenderBlockStart("RichTextLabelMandatory") %] - + [% RenderBlockEnd("RichTextLabelMandatory") %] -
      - -

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

      -

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

      -
      -
      - - -
      -[% INCLUDE "FormElements/AttachmentList.tt" %] -
      -
      +
      + +

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

      +

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

      +
      +
      +
      + +
      + [% INCLUDE "FormElements/AttachmentList.tt" %] +
      +
      [% RenderBlockEnd("Note") %] [% RenderBlockStart("TimeUnits") %] - [% Data.TimeUnitsBlock %] +
      + [% Data.TimeUnitsBlock %] +
      [% RenderBlockEnd("TimeUnits") %] -
      +
      +
      +
      -
      [% RenderBlockEnd("WidgetArticle") %]
      +
      - - [% INCLUDE "FormElements/DraftButtons.tt" %]
      - -#Layers diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt index fb8fe7696d5..9ef5f6e212b 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketNoteToLinkedTicket.tt @@ -47,18 +47,18 @@ [% Translate("Add note to linked %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %] -

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      +#

      [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

      [% RenderBlockStart("TicketBack") %] -

      - [% Translate("Cancel & close") | html %] -

      + + [% Translate("Cancel") | html %] + [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %]

      [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] + + [% Translate("Cancel") | html %]

      [% RenderBlockEnd("PropertiesLock") %] @@ -83,7 +83,7 @@

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

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

      -
      + [% RenderBlockEnd("Title") %] [% RenderBlockStart("Type") %] @@ -93,7 +93,7 @@

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

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

      -
      + [% RenderBlockEnd("Type") %] [% RenderBlockStart("Queue") %] @@ -109,7 +109,7 @@ [% END %]

      [% Translate("Queue invalid.") | html %]

      -
      + [% RenderBlockEnd("Queue") %] [% RenderBlockStart("Service") %] @@ -125,7 +125,7 @@ [% END %]

      [% Translate("Service invalid.") | html %]

      -
      + [% RenderBlockEnd("Service") %] [% RenderBlockStart("ServiceMandatory") %] @@ -135,7 +135,7 @@

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

      [% Translate("Service invalid.") | html %]

      -
      + [% RenderBlockEnd("ServiceMandatory") %] [% RenderBlockStart("SLA") %] @@ -151,7 +151,7 @@

      [% Translate("SLA invalid.") | html %]

      [% END %]
      -
      + [% RenderBlockEnd("SLA") %] [% RenderBlockStart("SLAMandatory") %] @@ -161,7 +161,7 @@

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

      [% Translate("SLA invalid.") | html %]

      -
      + [% RenderBlockEnd("SLAMandatory") %] [% RenderBlockStart("Owner") %] @@ -177,7 +177,7 @@ [% END %]

      [% Translate("Owner invalid.") | html %]

      -
      + [% RenderBlockEnd("Owner") %] [% RenderBlockStart("OwnerMandatory") %] @@ -187,7 +187,7 @@

      [% Translate("Please set a new owner!") | html %]

      [% Translate("Owner invalid.") | html %]

      -
      + [% RenderBlockEnd("OwnerMandatory") %] [% RenderBlockStart("Responsible") %] @@ -205,7 +205,7 @@

      [% Translate("Responsible invalid.") | html %]

      [% END %]
      -
      + [% RenderBlockEnd("Responsible") %] [% RenderBlockStart("ResponsibleMandatory") %] @@ -215,7 +215,7 @@

      [% Translate("Please set a new responsible!") | html %]

      [% Translate("Responsible invalid.") | html %]

      -
      + [% RenderBlockEnd("ResponsibleMandatory") %] [% RenderBlockStart("State") %] @@ -231,7 +231,7 @@

      [% Translate("State invalid.") | html %]

      [% END %]
      -
      + [% RenderBlockEnd("State") %] [% RenderBlockStart("StatePending") %] @@ -242,7 +242,7 @@

      [% Translate("Date invalid!") | html %]

      [% Translate("For all pending* states.") | html %]

      -
      + [% RenderBlockEnd("StatePending") %] [% RenderBlockStart("Priority") %] @@ -250,7 +250,7 @@
      [% Data.PriorityStrg %]
      -
      + [% RenderBlockEnd("Priority") %] [% RenderBlockStart("TicketTypeDynamicField") %] @@ -259,7 +259,7 @@
      [% Data.Field %]
      -
      +
      [% RenderBlockEnd("TicketTypeDynamicField") %] @@ -271,7 +271,7 @@ #
      # [% Data.Field %] #
      -#
      +# #
      #[% RenderBlockEnd("TicketTypeDynamicField_Field2") %] #[% RenderBlockStart("TicketTypeDynamicField_Field2") %] @@ -280,7 +280,7 @@ #
      # [% Data.Field %] #
      -#
      +# #
      #[% RenderBlockEnd("TicketTypeDynamicField_Field2") %]
      @@ -306,7 +306,7 @@
      -
      + [% END %]
      [% RenderBlockStart("InformAdditionalAgents") %] @@ -316,14 +316,14 @@
      [% Data.OptionStrg %]
      -
      + [% RenderBlockEnd("InformAgent") %] [% RenderBlockStart("InvolvedAgent") %]
      [% Data.InvolvedAgentStrg %]
      -
      + [% RenderBlockEnd("InvolvedAgent") %]

      @@ -341,107 +341,110 @@ [% Data.UserFullname | html %][% RenderBlockStart("InformAgentsWithoutSelectionSingleUserSeparator") %],[% RenderBlockEnd("InformAgentsWithoutSelectionSingleUserSeparator") %] [% RenderBlockEnd("InformAgentsWithoutSelectionSingleUser") %]

      -
      + [% RenderBlockEnd("InformAgentsWithoutSelection") %] -
      +
      +
      +

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

      [% RenderBlockStart("LinkList") %] - -
      - [% Data.LinkListStrg %] -

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

      -

      [% Translate("LinkList invalid.") | html %]

      -
      -
      + +
      + [% Data.LinkListStrg %] +

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

      +

      [% Translate("LinkList invalid.") | html %]

      +
      [% RenderBlockEnd("LinkList") %] + [% RenderBlockStart("NoteToTicket") %] - -
      - [% Data.NoteToTicketStrg %] -

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

      -

      [% Translate("NoteToTicket invalid.") | html %]

      -
      -
      + +
      + [% Data.NoteToTicketStrg %] +

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

      +

      [% Translate("NoteToTicket invalid.") | html %]

      +
      [% RenderBlockEnd("NoteToTicket") %] +
      + +
      +

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

      [% RenderBlockStart("SubjectLabel") %] - + [% RenderBlockEnd("SubjectLabel") %] [% RenderBlockStart("SubjectLabelMandatory") %] - + [% RenderBlockEnd("SubjectLabelMandatory") %] -
      - -

      [% 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("TicketOptions") %] - -
      + +
      -
      -
      +
      [% RenderBlockEnd("TicketOptions") %] [% RenderBlockStart("StandardTemplate") %] - -
      - [% Data.StandardTemplateStrg %] -

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      -
      -
      + +
      + [% Data.StandardTemplateStrg %] +

      [% Translate("Setting a template will overwrite any text or attachment.") | html %]

      +
      [% RenderBlockEnd("StandardTemplate") %] [% RenderBlockStart("RichTextLabel") %] - + [% RenderBlockEnd("RichTextLabel") %] [% RenderBlockStart("RichTextLabelMandatory") %] - + [% RenderBlockEnd("RichTextLabelMandatory") %] -
      - -

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

      -

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

      -
      -
      +
      + +

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

      +

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

      +
      - -
      + + +
      [% INCLUDE "FormElements/AttachmentList.tt" %] -
      -
      +
      + + + +
      + +
      - -
      - -
      -
      [% RenderBlockStart("TimeUnits") %] [% Data.TimeUnitsBlock %] [% RenderBlockEnd("TimeUnits") %] [% RenderBlockStart("ArticleTypeDynamicField") %] -
      - [% Data.Label %] -
      - [% Data.Field %] +
      + [% Data.Label %] +
      + [% Data.Field %] [% RenderBlockStart("ArticleTypeDynamicFieldError") %] -
      -

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

      -
      +
      +

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

      +
      [% RenderBlockEnd("ArticleTypeDynamicFieldError") %] +
      +
      -
      -
      [% RenderBlockEnd("ArticleTypeDynamicField") %] # Example of how to use fixed dynamic field blocks for customizations. Block below is for fields of type 'Article'. @@ -457,7 +460,7 @@ #
      # [% END %] #
      -#
      +# #
      #[% RenderBlockEnd("ArticleTypeDynamicField_Field1") %] #[% RenderBlockStart("ArticleTypeDynamicField_Field2") %] @@ -471,9 +474,10 @@ #
      # [% END %] #
      -#
      +# #
      #[% RenderBlockEnd("ArticleTypeDynamicField_Field2") %] +
      @@ -481,8 +485,8 @@
      - [% INCLUDE "FormElements/DraftButtons.tt" %]
      diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt index 9a1a42cf05c..d2355c95474 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewMedium.tt @@ -6,12 +6,13 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- + [% RenderBlockStart("DocumentActionRow") %]
        [% RenderBlockStart("DocumentActionRowBulk") %]
      • - +
        • @@ -27,23 +28,20 @@ [% RenderBlockEnd("DocumentActionRowHTML") %]
      [% RenderBlockEnd("DocumentActionRow") %] - [% RenderBlockStart("DocumentHeader") %]
        [% RenderBlockEnd("DocumentHeader") %] - [% RenderBlockStart("NoTicketFound") %] -
      • +
      • [% Translate("No ticket data found.") | html %]
        • [% RenderBlockEnd("NoTicketFound") %] - [% RenderBlockStart("DocumentContent") %] -
      • +
      • [% RenderBlockStart("InlineActionRow") %]
          -
          • +
          • [% RenderBlockStart("InlineActionRowItem") %]
        • [% Translate(Data.Name) | html %]
          • [% RenderBlockEnd("InlineActionRowItem") %] @@ -52,248 +50,265 @@ [% RenderBlockEnd("InlineActionRowItemHTML") %]
        [% RenderBlockEnd("InlineActionRow") %] + [% RenderBlockStart("Bulk") %] -
        - -
        +
        + +
        [% RenderBlockEnd("Bulk") %] +

        + [% Config("Ticket::Hook") %][% Config("Ticket::HookDivider") %][% Data.TicketNumber %] – [% Data.Title | html %] +

        +         + + [% RenderBlockStart("Meta") %] [% RenderBlockStart("MetaIcon") %] -
        - - - - [% Translate(Data.Title) | html %] - -
        +
        + + + + [% Translate(Data.Title) | html %] + +
        [% RenderBlockEnd("MetaIcon") %] [% RenderBlockEnd("Meta") %] -

        - [% Config("Ticket::Hook") %][% Config("Ticket::HookDivider") %][% Data.TicketNumber %] – [% Data.Title | html %] -

        [% RenderBlockStart("MenuItem") %] - [% Translate(Data.Name) | html %] + [% Translate(Data.Name) | html %] [% RenderBlockEnd("MenuItem") %] - - - - - - -[% IF !Data.IsITSMIncidentProblemManagementInstalled %] - -[% END %] + +
        -
        [% Data.ArticleFields.Sender.Realname | truncate(36) | html %]
        -         		- [% Data.Age | html %] - -
        [% Data.Queue | html %]
        -         		-[% RenderBlockStart("CustomerIDRW") %] - [% IF Data.CustomerID %][% Data.CustomerID | html %][% END %] -[% RenderBlockEnd("CustomerIDRW") %] -[% RenderBlockStart("CustomerIDRO") %] - [% Data.CustomerID | html %] -[% RenderBlockEnd("CustomerIDRO") %] -
        [% Data.CustomerName | html %]
        -
        + + + + + # example of how to use fixed dynamic field blocks for customizations # Note: Field1 is the name of the field and had to be replaced with the actual # field name #[% RenderBlockStart("DynamicField_Field1") %] -# +# #[% RenderBlockEnd("DynamicField_Field1") %] - -[% IF Data.IsITSMIncidentProblemManagementInstalled %] - - -[% END %] - - - - - -[% IF Data.IsITSMIncidentProblemManagementInstalled %] - - - -[% END %] + + + + +[% RenderBlockStart("OwnerResponsible") %] + [% IF Config('Ticket::Responsible') %] + + [% ELSE %] + + [% END %] +[% RenderBlockEnd("OwnerResponsible") %] + # example of how to use fixed dynamic field blocks for customizations # Note: Field2 is the name of the field and had to be replaced with the actual # field name #[% RenderBlockStart("DynamicField_Field2") %] -# +# #[% RenderBlockEnd("DynamicField_Field2") %] + + [% IF !Data.IsITSMIncidentProblemManagementInstalled %] [% END %] - - - -[% RenderBlockStart("OwnerResponsible") %] -[% IF Config('Ticket::Responsible') %] - -[% ELSE %] - + +[% IF Data.IsITSMIncidentProblemManagementInstalled %] + + + [% END %] -[% RenderBlockEnd("OwnerResponsible") %] - - + + + [% IF Data.IsITSMIncidentProblemManagementInstalled %] - +
        [% Data.CustomerName | html %]
        + [% END %] +[% IF !Data.IsITSMIncidentProblemManagementInstalled %] + +[% END %] + + # example of how to use fixed dynamic field blocks for customizations # Note: Field3 is the name of the field and had to be replaced with the actual # field name #[% RenderBlockStart("DynamicField_Field3") %] -# +# #[% RenderBlockEnd("DynamicField_Field3") %] + [% IF !Data.IsITSMIncidentProblemManagementInstalled %] - + [% END %] - - -
        + +
        [% Data.ArticleFields.Sender.Realname | truncate(36) | html %]
        +         		+ [% Data.Created | Localize("TimeLong") %] + + +
        [% Data.ArticleFields.Subject.Value | truncate(36) | html %]
        +         		-# +# +# #[% RenderBlockStart("DynamicField_Field1Link") %] -# +# #[% RenderBlockEnd("DynamicField_Field1Link") %] #[% RenderBlockStart("DynamicField_Field1Plain") %] -#
        [% Data.Value %]
        +#
        [% Data.Value %]
        #[% RenderBlockEnd("DynamicField_Field1Plain") %] -#         		- -[% RenderBlockStart("FirstResponseTime") %] -
        [% Data.FirstResponseTimeHuman | html %] / [% Data.FirstResponseTimeDestinationDate | Localize("TimeShort") %]
        -[% RenderBlockEnd("FirstResponseTime") %] -         		- -[% RenderBlockStart("UpdateTime") %] -
        [% Data.UpdateTimeHuman | html %] / [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
        -[% RenderBlockEnd("UpdateTime") %] -         		- -[% RenderBlockStart("SolutionTime") %] -
        [% Data.SolutionTimeHuman | html %] / [% Data.SolutionTimeDestinationDate | Localize("TimeShort") %]
        -[% RenderBlockEnd("SolutionTime") %] -
        - [% Data.Created | Localize("TimeLong") %] - -
        [% Translate(Data.State) | html %]
        -         		-[% RenderBlockStart("Type") %] -
        [% Data.Type | html %]
        -[% RenderBlockEnd("Type") %] -         		- -
        [% Translate(Data.Criticality) | html %]
        -         		- -
        [% Translate(Data.Impact) | html %]
        -         		-
        [% Translate(Data.Priority) | html %]
        -
        + [% Data.Age | html %] + + [% Translate(Data.State) | html %] + + +
        [% Data.OwnerFullname | html %] / [% Data.ResponsibleFullname | html %]
        +         		+ +
        [% Data.OwnerFullname | html %]
        +
        -# +# +# #[% RenderBlockStart("DynamicField_Field2Link") %] -# +# #[% RenderBlockEnd("DynamicField_Field2Link") %] #[% RenderBlockStart("DynamicField_Field2Plain") %] -#
        [% Data.Value %]
        +#
        [% Data.Value %]
        #[% RenderBlockEnd("DynamicField_Field2Plain") %] -#
        + +
        [% Data.Queue | html %]
        +         		- -[% RenderBlockStart("UpdateTime") %] -
        [% Data.UpdateTimeHuman | html %] / [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
        -[% RenderBlockEnd("UpdateTime") %] +[% RenderBlockStart("CustomerIDRW") %] + [% IF Data.CustomerID %][% Data.CustomerID | html %][% END %] +[% RenderBlockEnd("CustomerIDRW") %] +[% RenderBlockStart("CustomerIDRO") %] + [% Data.CustomerID | html %] +[% RenderBlockEnd("CustomerIDRO") %] +
        [% Data.CustomerName | html %]
        -
        [% Data.ArticleFields.Subject.Value | truncate(36) | html %]
        -         		-
        [% Data.OwnerFullname | html %] / [% Data.ResponsibleFullname | html %]
        -         		-
        [% Data.OwnerFullname | html %]
        -         		+[% RenderBlockStart("Type") %] + +
        [% Data.Type | html %]
        +[% RenderBlockEnd("Type") %] +         		+ +
        [% Translate(Data.Criticality) | html %]
        +         		+ +
        [% Translate(Data.Impact) | html %]
        +         		+
        [% Translate(Data.Priority) | html %]
        +         		-
        [% Translate(Data.Lock) | html %]
        -         		-[% RenderBlockStart("Service") %] -
        [% Data.Service | html %]
        -[% RenderBlockEnd("Service") %] -[% RenderBlockStart("SLA") %] -
        [% Data.SLA | html %]
        -[% RenderBlockEnd("SLA") %] -         		+ +
        [% Translate(Data.Lock) | html %]
        +
        + [% RenderBlockStart("CustomerIDRW") %] - [% Data.CustomerID | html %] + [% Data.CustomerID | html %] [% RenderBlockEnd("CustomerIDRW") %] [% RenderBlockStart("CustomerIDRO") %] - [% Data.CustomerID | html %] + [% Data.CustomerID | html %] [% RenderBlockEnd("CustomerIDRO") %] -
        [% Data.CustomerName | html %]
        -         		+ +[% RenderBlockStart("UpdateTime") %] +
        [% Data.UpdateTimeHuman | html %] / [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
        +[% RenderBlockEnd("UpdateTime") %] +         		+[% RenderBlockStart("Service") %] + +
        [% Data.Service | html %]
        +[% RenderBlockEnd("Service") %] +[% RenderBlockStart("SLA") %] + +
        [% Data.SLA | html %]
        +[% RenderBlockEnd("SLA") %] +
        -# +# +# #[% RenderBlockStart("DynamicField_Field3Link") %] -# +# #[% RenderBlockEnd("DynamicField_Field3Link") %] #[% RenderBlockStart("DynamicField_Field3Plain") %] -#
        [% Data.Value %]
        +#
        [% Data.Value %]
        #[% RenderBlockEnd("DynamicField_Field3Plain") %] -#
        - + + [% RenderBlockStart("SolutionTime") %] -
        [% Data.SolutionTimeHuman | html %] / [% Data.SolutionTimeDestinationDate | Localize("TimeShort") %]
        +
        [% Data.SolutionTimeHuman | html %] / [% Data.SolutionTimeDestinationDate | Localize("TimeShort") %]
        [% RenderBlockEnd("SolutionTime") %] -
        - + + + +[% RenderBlockStart("FirstResponseTime") %] +
        [% Data.FirstResponseTimeHuman | html %] / [% Data.FirstResponseTimeDestinationDate | Localize("TimeShort") %]
        +[% RenderBlockEnd("FirstResponseTime") %] + +[% IF Data.IsITSMIncidentProblemManagementInstalled %] + + +[% RenderBlockStart("UpdateTime") %] +
        [% Data.UpdateTimeHuman | html %] / [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
        +[% RenderBlockEnd("UpdateTime") %] + + + +[% RenderBlockStart("SolutionTime") %] +
        [% Data.SolutionTimeHuman | html %] / [% Data.SolutionTimeDestinationDate | Localize("TimeShort") %]
        +[% RenderBlockEnd("SolutionTime") %] + +[% END %] + + + +         [% RenderBlockStart("DynamicFieldTable") %]
        - - + + +
        + [% RenderBlockStart("DynamicFieldTableRow") %] - + [% RenderBlockStart("DynamicFieldTableRowRecord") %] - + [% RenderBlockEnd("DynamicFieldTableRowRecord") %] - + [% RenderBlockEnd("DynamicFieldTableRow") %] - -
        - + + [% RenderBlockStart("DynamicFieldTableRowRecordLink") %] - + [% RenderBlockEnd("DynamicFieldTableRowRecordLink") %] [% RenderBlockStart("DynamicFieldTableRowRecordPlain") %] -
        [% Data.Value %]
        +
        [% Data.Value %]
        [% RenderBlockEnd("DynamicFieldTableRowRecordPlain") %] -
        + + +         [% RenderBlockEnd("DynamicFieldTable") %]
        • - [% RenderBlockEnd("DocumentContent") %] - [% RenderBlockStart("DocumentFooter") %]
      -
      - +
      -
      - + [% RenderBlockStart("DocumentFooterBulkItem") %] - + [% RenderBlockEnd("DocumentFooterBulkItem") %] - +
      [% RenderBlockEnd("DocumentFooter") %] - [% RenderBlockStart("DocumentMenuItemMoveForm") %]
    • -
      - - - + + + + [% Data.MoveQueuesStrg %]
      • -[% RenderBlockEnd("DocumentMenuItemMoveForm") %] +[% RenderBlockEnd("DocumentMenuItemMoveForm") %] \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewNavBar.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewNavBar.tt index 17a7948ec92..57bdfc928da 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewNavBar.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewNavBar.tt @@ -1,69 +1,73 @@ # -- # Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021-2022 Znuny GmbH, https://znuny.org/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -# TODO delete me -## nofilter(TidyAll::Plugin::OTRS::Common::Origin) [% RenderBlockStart("OverviewNavBar") %]
      -

      [% Translate(Data.TitleName) | html %]: [% IF Env("Action") == 'AgentTicketQueue' %][% Data.TitleValue | html %][% ELSE %][% Translate(Data.TitleValue) | html %][% END %]

      +

      [% Translate(Data.TitleName) | html %]: +
      + [% IF Env("Action") == 'AgentTicketQueue' %] + [% Data.TitleValue %] + [% ELSE %] + [% Translate(Data.TitleValue) | html %] + [% END %] +
      +

      [% Data.DataInTheMiddle %]
      - [% RenderBlockStart("OverviewNavBarFilter") %] +[% RenderBlockStart("OverviewNavBarFilter") %]
        - [% RenderBlockStart("OverviewNavBarFilterItem") %] - [% RenderBlockStart("OverviewNavBarFilterItemSelected") %] +[% RenderBlockStart("OverviewNavBarFilterItem") %] +[% RenderBlockStart("OverviewNavBarFilterItemSelected") %]
      • [% Translate(Data.Name) | html %][% Data.Count | html %]
        • - [% RenderBlockEnd("OverviewNavBarFilterItemSelected") %] - - [% RenderBlockStart("OverviewNavBarFilterItemSelectedNot") %] +[% RenderBlockEnd("OverviewNavBarFilterItemSelected") %] +[% RenderBlockStart("OverviewNavBarFilterItemSelectedNot") %]
      • [% Translate(Data.Name) | html %][% Data.Count | html %]
        • - [% RenderBlockEnd("OverviewNavBarFilterItemSelectedNot") %] - - [% RenderBlockStart("OverviewNavBarFilterItemSplit") %] +[% RenderBlockEnd("OverviewNavBarFilterItemSelectedNot") %] +[% RenderBlockStart("OverviewNavBarFilterItemSplit") %] - - [% RenderBlockEnd("OverviewNavBarFilterItemSplit") %] - [% RenderBlockEnd("OverviewNavBarFilterItem") %] +[% RenderBlockEnd("OverviewNavBarFilterItemSplit") %] +[% RenderBlockEnd("OverviewNavBarFilterItem") %]
      - [% RenderBlockEnd("OverviewNavBarFilter") %] - - [% RenderBlockStart("OverviewNavBarPageBack") %] +[% RenderBlockEnd("OverviewNavBarFilter") %] +[% RenderBlockStart("OverviewNavBarPageBack") %] - [% RenderBlockEnd("OverviewNavBarPageBack") %] - - - [% RenderBlockStart("ContextSettings") %] +[% RenderBlockEnd("OverviewNavBarPageBack") %] +[% RenderBlockStart("ContextSettings") %]
      - + - [% RenderBlockStart("FilterColumnSettings") %] +[% RenderBlockStart("FilterColumnSettings") %] @@ -115,68 +119,54 @@
        - - [% RenderBlockEnd("FilterColumnSettings") %] +[% RenderBlockEnd("FilterColumnSettings") %]
        - - [% RenderBlockEnd("ContextSettings") %] +[% RenderBlockEnd("ContextSettings") %]
        -
        [% Data.ActionRow %] -
        - [% RenderBlockStart("OverviewNavBarPageNavBar") %] +[% RenderBlockStart("OverviewNavBarPageNavBar") %]
        • [% Data.ResultLong %]
          • - -
        • - [% Data.SiteNavBarLong %] -
          • +
        • [% Data.SiteNavBarLong %]
         - [% RenderBlockEnd("OverviewNavBarPageNavBar") %] +[% RenderBlockEnd("OverviewNavBarPageNavBar") %]
        - -
        -# sort order bar if needed [% Data.SortOrderBar %]
        - [% RenderBlockEnd("OverviewNavBar") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewPreview.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewPreview.tt index 5a63f8280ac..4c7b8b0ce60 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewPreview.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewPreview.tt @@ -1,307 +1,302 @@ # -- # Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ -# Copyright (C) 2021-2022 Znuny GmbH, https://znuny.org/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ # -- # This software comes with ABSOLUTELY NO WARRANTY. For details, see # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -# TODO delete me -## nofilter(TidyAll::Plugin::OTRS::Common::Origin) - [% RenderBlockStart("DocumentActionRow") %]
          - [% RenderBlockStart("DocumentActionRowBulk") %] -
        • - - - - -
          • -
        • - [% Translate(Data.Name) | html %] -
          • - [% RenderBlockEnd("DocumentActionRowBulk") %] - - [% RenderBlockStart("DocumentActionRowItem") %] -
        • [% Data.Name | html %]
          • - [% RenderBlockEnd("DocumentActionRowItem") %] - - [% RenderBlockStart("DocumentActionRowHTML") %] - [% Data.HTML %] - [% RenderBlockEnd("DocumentActionRowHTML") %] +[% RenderBlockStart("DocumentActionRowBulk") %] +
        • + + + + +
          • +
        • + [% Translate(Data.Name) | html %] +
          • +[% RenderBlockEnd("DocumentActionRowBulk") %] +[% RenderBlockStart("DocumentActionRowItem") %] +
        • [% Data.Name | html %]
          • +[% RenderBlockEnd("DocumentActionRowItem") %] +[% RenderBlockStart("DocumentActionRowHTML") %] + [% Data.HTML %] +[% RenderBlockEnd("DocumentActionRowHTML") %]
        [% RenderBlockEnd("DocumentActionRow") %] - - [% RenderBlockStart("DocumentHeader") %] -
          - [% RenderBlockEnd("DocumentHeader") %] - - [% RenderBlockStart("NoTicketFound") %] -
        • - [% Translate("No ticket data found.") | html %] -
          • - [% RenderBlockEnd("NoTicketFound") %] - - [% RenderBlockStart("DocumentContent") %] -
        • -
          - [% RenderBlockStart("InlineActionRow") %] -
            -
            • - - [% RenderBlockStart("InlineActionRowItem") %] -
          • [% Translate(Data.Name) | html %]
            • - [% RenderBlockEnd("InlineActionRowItem") %] - - [% RenderBlockStart("InlineActionRowItemHTML") %] - [% Data.HTML %] - [% RenderBlockEnd("InlineActionRowItemHTML") %] -
          - [% RenderBlockEnd("InlineActionRow") %] - - - [% RenderBlockStart("Bulk") %] -
          - -
          - [% RenderBlockEnd("Bulk") %] -

          - [% Config("Ticket::Hook") %][% Config("Ticket::HookDivider") %][% Data.TicketNumber %] – [% Data.Title | html %] -

          +[% RenderBlockStart("DocumentHeader") %] +
            +[% RenderBlockEnd("DocumentHeader") %] +[% RenderBlockStart("NoTicketFound") %] +
          • + [% Translate("No ticket data found.") | html %] +
            • +[% RenderBlockEnd("NoTicketFound") %] +[% RenderBlockStart("DocumentContent") %] +
          • +
            +[% RenderBlockStart("InlineActionRow") %] +
              +
              • +[% RenderBlockStart("InlineActionRowItem") %] +
            • [% Translate(Data.Name) | html %]
              • +[% RenderBlockEnd("InlineActionRowItem") %] +[% RenderBlockStart("InlineActionRowItemHTML") %] + [% Data.HTML %] +[% RenderBlockEnd("InlineActionRowItemHTML") %] +
            +[% RenderBlockEnd("InlineActionRow") %] + +[% RenderBlockStart("Bulk") %] +
            + +
            +[% RenderBlockEnd("Bulk") %] +

            + [% Config("Ticket::Hook") %][% Config("Ticket::HookDivider") %][% Data.TicketNumber %] – [% Data.Title | html %] +

            +             + + +[% RenderBlockStart("Meta") %] +[% RenderBlockStart("MetaIcon") %] +
            + + + + [% Translate(Data.Title) | html %] + +
            +[% RenderBlockEnd("MetaIcon") %] +[% RenderBlockEnd("Meta") %]             - - - - [% RenderBlockStart("Meta") %] - [% RenderBlockStart("MetaIcon") %] -
            - - - - [% Translate(Data.Title) | html %] - -
            - [% RenderBlockEnd("MetaIcon") %] - [% RenderBlockEnd("Meta") %] -             - - -
            - [% RenderBlockStart("MenuItem") %] - [% Translate(Data.Name) | html %] - [% RenderBlockEnd("MenuItem") %] - - - - - - - - - - - - - [% RenderBlockStart("Service") %] - - - - - [% RenderBlockEnd("Service") %] - - - [% RenderBlockStart("OwnerResponsible") %] - [% IF Config('Ticket::Responsible') %] - - [% ELSE %] - - [% END %] - [% RenderBlockEnd("OwnerResponsible") %] - - - - - - - - - - - - - - - - [% RenderBlockStart("DynamicFieldTableRow") %] - - [% RenderBlockStart("DynamicFieldTableRowRecord") %] - - [% RenderBlockEnd("DynamicFieldTableRowRecord") %] - - [% RenderBlockEnd("DynamicFieldTableRow") %] - + +
            +[% RenderBlockStart("MenuItem") %] + [% Translate(Data.Name) | html %] +[% RenderBlockEnd("MenuItem") %] +
            - [% Data.Age | html %] - -
            [% Data.Queue | truncate(26) | html %]
            -
            - [% Data.Created | Localize("TimeLong") %] - -
            [% Translate(Data.State) | html %]
            -
            -
            [% Data.Service | truncate(26) | html %]
            -             		- [% RenderBlockStart("SLA") %] -
            [% Data.SLA | truncate(26) | html %]
            - [% RenderBlockEnd("SLA") %] -
            -
            [% Data.OwnerFullname | truncate(30) | html %] / [% Data.ResponsibleFullname | truncate(30) | html %]
            -             		-
            [% Data.OwnerFullname | truncate(30) | html %]
            -             		-
            [% Translate(Data.Lock) | html %]
            -
            - [% RenderBlockStart("CustomerID") %] - - [% RenderBlockStart("CustomerIDRW") %] - - [% RenderBlockEnd("CustomerIDRW") %] - - [% RenderBlockStart("CustomerIDRO") %] -
            [% Data.CustomerID | html %]
            - [% RenderBlockEnd("CustomerIDRO") %] - - [% RenderBlockStart("CustomerName") %] -
            [% Data.CustomerName | html %]
            - [% RenderBlockEnd("CustomerName") %] - [% RenderBlockEnd("CustomerID") %] -             		- [% RenderBlockStart("FirstResponseTime") %] - -
            [% Data.FirstResponseTimeHuman | html %] / [% Data.FirstResponseTimeDestinationDate | Localize("TimeShort") %]
            - [% RenderBlockEnd("FirstResponseTime") %] -
            - [% RenderBlockStart("Type") %] -
            [% Data.Type | html %]
            - [% RenderBlockEnd("Type") %] -             		- [% RenderBlockStart("UpdateTime") %] - -
            [% Data.UpdateTimeHuman | html %] / [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
            - [% RenderBlockEnd("UpdateTime") %] -
            - [% RenderBlockStart("SolutionTime") %] - -
            [% Data.SolutionTimeHuman | html %] / [% Data.SolutionTimeDestinationDate | Localize("TimeShort") %]
            - [% RenderBlockEnd("SolutionTime") %] -
            - - [% RenderBlockStart("DynamicFieldTableRowRecordLink") %] - - [% RenderBlockEnd("DynamicFieldTableRowRecordLink") %] - - [% RenderBlockStart("DynamicFieldTableRowRecordPlain") %] -
            [% Data.Value %]
            - [% RenderBlockEnd("DynamicFieldTableRowRecordPlain") %] -
            + + + + + + + + + +[% RenderBlockStart("Service") %] + + + + +[% RenderBlockEnd("Service") %] + +[% RenderBlockStart("OwnerResponsible") %] + [% IF Config('Ticket::Responsible') %] + + [% ELSE %] + + [% END %] +[% RenderBlockEnd("OwnerResponsible") %] + + + + + + + + + + + + + + +[% IF Data.IsITSMIncidentProblemManagementInstalled %] + + + + + + + +[% END %] +[% RenderBlockStart("DynamicFieldTableRow") %] + +[% RenderBlockStart("DynamicFieldTableRowRecord") %] + +[% RenderBlockEnd("DynamicFieldTableRowRecord") %] + +[% RenderBlockEnd("DynamicFieldTableRow") %] # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual # field names -# +# #[% RenderBlockStart("DynamicField_Field1_TableRowRecord") %] -# +# #[% RenderBlockEnd("DynamicField_Field1_TableRowRecord") %] -# -# +# +# #[% RenderBlockStart("DynamicField_Field2_TableRowRecord") %] -# +# #[% RenderBlockEnd("DynamicField_Field2_TableRowRecord") %] -# - - -
            + [% Data.Age | html %] + + +
            [% Data.Queue | truncate(26) | html %]
            +
            + [% Data.Created | Localize("TimeLong") %] + + [% Translate(Data.State) | html %] +
            + +
            [% Data.Service | truncate(26) | html %]
            +             		+[% RenderBlockStart("SLA") %] + +
            [% Data.SLA | truncate(26) | html %]
            +[% RenderBlockEnd("SLA") %] +
            + +
            [% Data.OwnerFullname | truncate(30) | html %] / [% Data.ResponsibleFullname | truncate(30) | html %]
            +             		+ +
            [% Data.OwnerFullname | truncate(30) | html %]
            +             		+ +
            [% Translate(Data.Lock) | html %]
            +
            +[% RenderBlockStart("CustomerID") %] + +[% RenderBlockStart("CustomerIDRW") %] + +[% RenderBlockEnd("CustomerIDRW") %] +[% RenderBlockStart("CustomerIDRO") %] +
            [% Data.CustomerID | html %]
            +[% RenderBlockEnd("CustomerIDRO") %] +[% RenderBlockStart("CustomerName") %] +
            [% Data.CustomerName | html %]
            +[% RenderBlockEnd("CustomerName") %] +[% RenderBlockEnd("CustomerID") %] +             		+[% RenderBlockStart("FirstResponseTime") %] + +
            [% Data.FirstResponseTimeHuman | html %] / [% Data.FirstResponseTimeDestinationDate | Localize("TimeShort") %]
            +[% RenderBlockEnd("FirstResponseTime") %] +
            +[% RenderBlockStart("Type") %] + +
            [% Data.Type | html %]
            +[% RenderBlockEnd("Type") %] +             		+[% RenderBlockStart("UpdateTime") %] + +
            [% Data.UpdateTimeHuman | html %] / [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
            +[% RenderBlockEnd("UpdateTime") %] +
            +[% RenderBlockStart("SolutionTime") %] + +
            [% Data.SolutionTimeHuman | html %] / [% Data.SolutionTimeDestinationDate | Localize("TimeShort") %]
            +[% RenderBlockEnd("SolutionTime") %] +
            + +
            [% Translate(Data.Criticality) | html %]
            +             		+ +
            [% Translate(Data.Impact) | html %]
            +
            +
            [% Translate(Data.Priority) | html %]
            +
            + +[% RenderBlockStart("DynamicFieldTableRowRecordLink") %] + +[% RenderBlockEnd("DynamicFieldTableRowRecordLink") %] +[% RenderBlockStart("DynamicFieldTableRowRecordPlain") %] +
            [% Data.Value %]
            +[% RenderBlockEnd("DynamicFieldTableRowRecordPlain") %] +
            -# +# +# #[% RenderBlockStart("DynamicField_Field1_TableRowRecordLink") %] -# +# #[% RenderBlockEnd("DynamicField_Field1_TableRowRecordLink") %] #[% RenderBlockStart("DynamicField_Field1_TableRowRecordPlain") %] -#
            [% Data.Value %]
            +#
            [% Data.Value %]
            #[% RenderBlockEnd("DynamicField_Field1_TableRowRecordPlain") %] -#
            -# +# +# #[% RenderBlockStart("DynamicField_Field2_TableRowRecordLink") %] -# +# #[% RenderBlockEnd("DynamicField_Field2_TableRowRecordLink") %] #[% RenderBlockStart("DynamicField_Field2_TableRowRecordPlain") %] -#
            [% Data.Value %]
            +#
            [% Data.Value %]
            #[% RenderBlockEnd("DynamicField_Field2_TableRowRecordPlain") %] -#
            -
            - - [% RenderBlockStart("ArticlesPreviewArea") %] -
            - -
            - [% RenderBlockEnd("ArticlesPreviewArea") %] -             +# + + +
            +[% RenderBlockStart("ArticlesPreviewArea") %] +
            + +
            +[% RenderBlockEnd("ArticlesPreviewArea") %] - -
          -
          • - [% RenderBlockEnd("DocumentContent") %] - + +
        + +[% RenderBlockEnd("DocumentContent") %] [% RenderBlockStart("DocumentFooter") %] - - -
        - -
        - -
        - - [% RenderBlockStart("DocumentFooterBulkItem") %] - - [% RenderBlockEnd("DocumentFooterBulkItem") %] - -
        +
        + +
        +
        + +[% RenderBlockStart("DocumentFooterBulkItem") %] + +[% RenderBlockEnd("DocumentFooterBulkItem") %] + +
        [% RenderBlockEnd("DocumentFooter") %] - [% RenderBlockStart("DocumentMenuItemMoveForm") %]
      • -
        - - - + + + + [% Data.MoveQueuesStrg %]
        • -[% RenderBlockEnd("DocumentMenuItemMoveForm") %] +[% RenderBlockEnd("DocumentMenuItemMoveForm") %] \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewSmall.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewSmall.tt index f738b7a7828..267fb794af7 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewSmall.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketOverviewSmall.tt @@ -11,39 +11,34 @@ [% RenderBlockStart("DocumentActionRowBulk") %]
      • [% Translate(Data.Name) | html %]
        • [% RenderBlockEnd("DocumentActionRowBulk") %] - [% RenderBlockStart("DocumentActionRowLastColumnFilter") %]
      • [% Translate("Reset overview") | html %]
        • [% RenderBlockEnd("DocumentActionRowLastColumnFilter") %] - [% RenderBlockStart("DocumentActionRowItem") %]
      • [% Translate(Data.Name) | html %]
        • [% RenderBlockEnd("DocumentActionRowItem") %] [% RenderBlockEnd("DocumentActionRow") %] - [% RenderBlockStart("DocumentContent") %] -
        +
          [% RenderBlockStart("NoTicketFound") %] -
          +
        • [% Translate("No ticket data found.") | html %] -
          • + [% RenderBlockEnd("NoTicketFound") %] -
          - - - + + + + [% RenderBlockStart("OverviewTable") %] [% RenderBlockStart("TableHeader") %] - [% RenderBlockStart("GeneralOverviewHeader") %] - [% RenderBlockStart("BulkNavBar") %] [% RenderBlockEnd("BulkNavBar") %] [% RenderBlockStart("OverviewNavBarPageFlag") %] @@ -60,7 +55,6 @@ [% RenderBlockEnd("OverviewNavBarPageFlagEmpty") %] [% RenderBlockEnd("OverviewNavBarPageFlag") %] - [% RenderBlockStart("OverviewNavBarPageTicketHeader") %] [% RenderBlockStart("OverviewNavBarPageTicketNumber") %] [% RenderBlockEnd("OverviewNavBarPageColumn") %] [% RenderBlockEnd("OverviewNavBarPageTicketHeader") %] - [% RenderBlockStart("OverviewNavBarPageDynamicField") %] [% RenderBlockEnd("OverviewNavBarPageDynamicField") %] - [% RenderBlockEnd("GeneralOverviewHeader") %] - # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual # field names #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field1") %] -# +# #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field1") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field2") %] -# - +# [% RenderBlockEnd("TableHeader") %] @@ -232,12 +201,10 @@ [% RenderBlockStart("Record") %] - [% RenderBlockStart("GeneralOverviewRow") %] - [% RenderBlockStart("Bulk") %] [% RenderBlockEnd("Bulk") %] [% RenderBlockStart("ContentLargeTicketGenericRowMeta") %] @@ -253,7 +220,6 @@ [% RenderBlockEnd("ContentLargeTicketGenericRowMetaImage") %] [% RenderBlockEnd("ContentLargeTicketGenericRowMeta") %] - [% RenderBlockStart("RecordTicketData") %] [% RenderBlockStart("RecordTicketNumber") %] [% RenderBlockEnd("RecordEscalationTime") %] [% RenderBlockStart("RecordOwner") %] @@ -299,7 +265,7 @@ [% RenderBlockEnd("RecordTicketColumnTranslatable") %] [% RenderBlockStart("RecordTicketColumnTime") %] [% RenderBlockEnd("RecordTicketColumnTime") %] [% RenderBlockStart("RecordTicketColumnEscalation") %] @@ -308,7 +274,6 @@ [% RenderBlockEnd("RecordTicketColumnEscalation") %] [% RenderBlockEnd("RecordTicketData") %] - [% RenderBlockStart("RecordDynamicField") %] [% RenderBlockEnd("RecordDynamicField") %] - [% RenderBlockEnd("GeneralOverviewRow") %] - # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual # field names #[% RenderBlockStart("RecordDynamicField_Field1") %] -# +# +# #[% RenderBlockEnd("RecordDynamicField_Field1") %] #[% RenderBlockStart("RecordDynamicField_Field2") %] -# +# +# #[% RenderBlockEnd("RecordDynamicField_Field2") %] - - [% RenderBlockEnd("Record") %] [% RenderBlockEnd("TableBody") %]
          - + @@ -69,56 +63,37 @@ [% RenderBlockEnd("OverviewNavBarPageTicketNumber") %] [% RenderBlockStart("OverviewNavBarPageColumn") %] - [% RenderBlockStart("OverviewNavBarPageColumnFilter") %] + [% Data.ColumnNameTranslated | html %]
          [% Data.ColumnFilterStrg %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerUserSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerUserSearch") %] -
          - [% Data.ColumnNameTranslated | html %] [% RenderBlockEnd("OverviewNavBarPageColumnFilter") %] - [% RenderBlockStart("OverviewNavBarPageColumnFilterLink") %] + [% Data.ColumnNameTranslated | html %]
          [% Data.ColumnFilterStrg %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerIDSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkCustomerIDSearch") %] - -[% RenderBlockStart("ContentLargeTicketGenericHeaderColumnFilterLinkUserSearch") %] - -[% RenderBlockEnd("ContentLargeTicketGenericHeaderColumnFilterLinkUserSearch") %]
          - [% Data.ColumnNameTranslated | html %] [% RenderBlockEnd("OverviewNavBarPageColumnFilterLink") %] - [% RenderBlockStart("OverviewNavBarPageColumnLink") %] [% Data.ColumnNameTranslated | html %] [% RenderBlockEnd("OverviewNavBarPageColumnLink") %] - [% RenderBlockStart("OverviewNavBarPageColumnEmpty") %] [% Data.ColumnNameTranslated | html %] [% RenderBlockEnd("OverviewNavBarPageColumnEmpty") %] -           		[% RenderBlockStart("OverviewNavBarPageDynamicFieldSortable") %] @@ -127,8 +102,8 @@ [% RenderBlockStart("OverviewNavBarPageDynamicFieldNotSortable") %] [% Translate(Data.Label) | html %] [% RenderBlockEnd("OverviewNavBarPageDynamicFieldNotSortable") %] - [% RenderBlockStart("OverviewNavBarPageDynamicFieldFiltrableSortable") %] + [% Translate(Data.Label) | html %] @@ -137,10 +112,9 @@ [% Data.ColumnFilterStrg %] - [% Translate(Data.Label) | html %] [% RenderBlockEnd("OverviewNavBarPageDynamicFieldFiltrableSortable") %] - [% RenderBlockStart("OverviewNavBarPageDynamicFieldFiltrableNotSortable") %] + [% Data.Label | html %] @@ -149,82 +123,77 @@ [% Data.ColumnFilterStrg %] - [% Data.Label | html %] [% RenderBlockEnd("OverviewNavBarPageDynamicFieldFiltrableNotSortable") %] - +# #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field1_Sortable") %] -# [% Translate(Data.Label) | html %] +# [% Translate(Data.Label) | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field1_Sortable") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field1_NotSortable") %] -# [% Translate(Data.Label) | html %] +# [% Translate(Data.Label) | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field1_NotSortable") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field1_FiltrableSortable") %] -# -# -# -#
          -#
          -# [% Data.ColumnFilterStrg %] -#
          -#
          -# [% Data.Label | html %] +# +# +# +#
          +#
          +# [% Data.ColumnFilterStrg %] +#
          +#
          +# [% Data.Label | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field1_FiltrableSortable") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field1_FiltrableNotSortable") %] -# -# -# -#
          -#
          -# [% Data.ColumnFilterStrg %] -#
          -#
          -# [% Data.Label | html %] +# +# +# +#
          +#
          +# [% Data.ColumnFilterStrg %] +#
          +#
          +# [% Data.Label | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field1_FiltrableNotSortable") %] -#           		+# #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field2_Sortable") %] -# [% Translate(Data.Label) | html %] +# [% Translate(Data.Label) | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field2_Sortable") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field2_NotSortable") %] -# [% Translate(Data.Label) | html %] +# [% Translate(Data.Label) | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field2_NotSortable") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field2_FiltrableSortable") %] -# -# -# -#
          -#
          -# [% Data.ColumnFilterStrg %] -#
          -#
          -# [% Data.Label | html %] +# +# +# +#
          +#
          +# [% Data.ColumnFilterStrg %] +#
          +#
          +# [% Data.Label | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field2_FiltrableSortable") %] #[% RenderBlockStart("OverviewNavBarPageDynamicField_Field2_FiltrableNotSortable") %] -# -# -# -#
          -#
          -# [% Data.ColumnFilterStrg %] -#
          -#
          -# [% Data.Label | html %] +# +# +# +#
          +#
          +# [% Data.ColumnFilterStrg %] +#
          +#
          +# [% Data.Label | html %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field2_FiltrableNotSortable") %] #[% RenderBlockEnd("OverviewNavBarPageDynamicField_Field2") %] -#
          - + @@ -262,7 +228,7 @@ [% RenderBlockEnd("RecordTicketNumber") %] [% RenderBlockStart("RecordEscalationTime") %] -
          [% Data.EscalationTimeHuman | html %]
          [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
          +
          [% Data.EscalationTimeHuman | html %]
          [% Data.UpdateTimeDestinationDate | Localize("TimeShort") %]
          		 -
          [% Data.GenericValue | Localize("TimeShort") | html %]
          +
          [% Data.GenericValue | Localize("TimeShort") | html %]
          @@ -321,64 +286,59 @@
          		-#
          +#
          		+#
          #[% RenderBlockStart("RecordDynamicField_Field1_Link") %] -# [% Data.Value %] +# [% Data.Value %] #[% RenderBlockEnd("RecordDynamicField_Field1_Link") %] #[% RenderBlockStart("RecordDynamicField_Field1_Plain") %] -# [% Data.Value %] +# [% Data.Value %] #[% RenderBlockEnd("RecordDynamicField_Field1_Plain") %] -#
          -#           		-#
          +#
          		+#
          #[% RenderBlockStart("RecordDynamicField_Field2_Link") %] -# [% Data.Value %] +# [% Data.Value %] #[% RenderBlockEnd("RecordDynamicField_Field2_Link") %] #[% RenderBlockStart("RecordDynamicField_Field2_Plain") %] -# [% Data.Value %] +# [% Data.Value %] #[% RenderBlockEnd("RecordDynamicField_Field2_Plain") %] -#
          -#
          [% RenderBlockEnd("OverviewTable") %]
          -
        +
        [% RenderBlockEnd("DocumentContent") %] - [% RenderBlockStart("DocumentMenuItemMoveForm") %] -
      • -
        - - - - - [% Data.MoveQueuesStrg %] -
        -
        • +
      • +
        + + + + + [% Data.MoveQueuesStrg %] +
        +
        • [% RenderBlockEnd("DocumentMenuItemMoveForm") %] - [% RenderBlockStart("DocumentColumnFilterForm") %] -
        + [% RenderBlockStart("DocumentColumnFilterFormElement") %] - + [% RenderBlockEnd("DocumentColumnFilterFormElement") %] -
        + [% RenderBlockEnd("DocumentColumnFilterForm") %] + \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt index 7a37caf910a..3948dd785e0 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketPhoneCommon.tt @@ -7,6 +7,8 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- +[% TicketFrontendConfig = Config("Ticket::Frontend::" _ Env("Action") ) %] +
        @@ -19,108 +21,136 @@

        [% Translate("Phone Call for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

        -

        [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

        - [% RenderBlockStart("TicketBack") %] -

        - [% Translate("Cancel & close") | html %] -

        + [% RenderBlockEnd("TicketBack") %] [% RenderBlockStart("PropertiesLock") %] -

        - [% Translate("The ticket has been locked") | html %]. - - [% Translate("Undo & close") | html %] - -

        +
        + [% Translate("The ticket has been locked") | html %]. + + [% Translate("Undo & close") | html %] + +
        [% RenderBlockEnd("PropertiesLock") %]
        - -
        - [% INCLUDE "FormElements/DraftNotifications.tt" %] -
        +
        +
        + [% INCLUDE "FormElements/DraftNotifications.tt" %] +
        [% RenderBlockStart("CustomerTable") %] -
        -
        -

        [% Translate("Customer Information") | html %]

        -
        -
        - [% Data.CustomerTable %] -
        -
        +
        +
        +

        [% Translate("Customer Information") | html %]

        +
        +
        + [% Data.CustomerTable %] +
        +
        [% RenderBlockEnd("CustomerTable") %] -
        +
        + +
        +
        + + [% IF TicketFrontendConfig.State %] +
        +

        [% Translate("Ticket Data") | html %]

        + +
        + +
        + [% Data.NextStatesStrg %] +
        +
        +
        + +
        +
        [% Data.PendingDateString %]
        +

        [% Translate("Date invalid!") | html %]

        +

        [% Translate("Date invalid!") | html %]

        +

        [% Translate("For all pending* states.") | html %]

        +
        +
        +
        + [% END %] + + [% IF !TicketFrontendConfig.DynamicField.empty %] +
        +

        [% Translate("Dynamic Info") | html %]

        +[% RenderBlockStart("DynamicField") %] +
        + [% Data.Label %] +
        + [% Data.Field %] +
        +
        +[% RenderBlockEnd("DynamicField") %] +
        + [% END %] + -
        -
        - -
        - -

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

        -

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

        -
        -
        +
        +

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

        +
        + +
        + +

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

        +

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

        +
        +
        [% RenderBlockStart("TicketOptions") %] - -
        +
        + +
        - - + + -
        -
        +
        +
        [% RenderBlockEnd("TicketOptions") %] - - +
        + +
        [% RenderBlockStart("StandardTemplate") %] - -
        - [% Data.StandardTemplateStrg %] -

        [% Translate("Setting a template will overwrite any text or attachment.") | html %]

        -
        -
        +
        + +
        + [% Data.StandardTemplateStrg %] +

        [% Translate("Setting a template will overwrite any text or attachment.") | html %]

        +
        +
        [% RenderBlockEnd("StandardTemplate") %] - -
        - -

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

        -

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

        -
        -
        - - -
        -[% INCLUDE "FormElements/AttachmentList.tt" %] -
        -
        - - -
        - [% Data.NextStatesStrg %] -
        -
        - - -
        - [% Data.PendingDateString %] -

        [% Translate("Date invalid!") | html %]

        -

        [% Translate("Date invalid!") | html %]

        -

        [% Translate("For all pending* states.") | html %]

        -
        -
        -[% RenderBlockStart("DynamicField") %] -
        - [% Data.Label %] -
        - [% Data.Field %] +
        + +
        + +

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

        +

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

        +
        +
        + +
        +# +
        + [% INCLUDE "FormElements/AttachmentList.tt" %] +
        +
        +[% RenderBlockStart("TimeUnits") %] +
        + [% Data.TimeUnitsBlock %] +
        +[% RenderBlockEnd("TimeUnits") %]
        -
        -
        -[% RenderBlockEnd("DynamicField") %] # example of how to use fixed dynamic field blocks for customizations # Note: Field1 and Field2 are the names of the fields and had to be replaced with the actual @@ -143,22 +173,16 @@ #
        #
        #[% RenderBlockEnd("DynamicField_Field2") %] - -[% RenderBlockStart("TimeUnits") %] - [% Data.TimeUnitsBlock %] -[% RenderBlockEnd("TimeUnits") %] - -
        +
        +
        -
        +
        - [% INCLUDE "FormElements/DraftButtons.tt" %] +
        - -#Layers diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketPlain.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketPlain.tt index e509e9a12a9..22d3bf6be77 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketPlain.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketPlain.tt @@ -11,9 +11,7 @@

        [% Translate("View Email Plain Text for %s%s%s", Config('Ticket::Hook'), Config('Ticket::HookDivider'), Data.TicketNumber) | html %] — [% Data.Title | html %]

        -

        - [% Translate("Close this dialog") | html %] -

        + [% Translate("Cancel") | html %]
        @@ -23,7 +21,7 @@

        [% Translate("Plain") | html %] [% Config("Ticket::Hook") | html %][% Config("Ticket::HookDivider") | html %][% Data.TicketNumber | html %] / TicketID: [% Data.TicketID | html %] / ArticleID: [% Data.ArticleID | html %] - - + [% Translate("Download this email") | html %]

        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketProcess.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketProcess.tt index aab70f37214..d4b5609aaef 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketProcess.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketProcess.tt @@ -6,32 +6,35 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -

        [% Translate("Create New Process Ticket") | html %]

        -

        [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

        - - - - - -
        + + + + + +
        [% RenderBlockStart("ProcessList") %] - -
        - [% Data.ProcessList %] -

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

        -

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

        +
        + +
        + [% Data.ProcessList %] +
        +

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

        +
        +
        +

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

        +
        +
        -
        [% RenderBlockEnd("ProcessList") %]
        - -
        +
        \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketProcessSmall.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketProcessSmall.tt index 446269a4ca3..667951af30a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketProcessSmall.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketProcessSmall.tt @@ -10,33 +10,37 @@

        [% Translate("Enroll Ticket into a Process") | html %]

        -

        [% Translate("All fields marked with an asterisk (*) are mandatory.") | html %]

        -

        - [% Translate("Cancel & close") | html %] -

        +
        -
        -
        + +
        + -
        +
        [% RenderBlockStart("ProcessList") %] +
        [% Data.ProcessList %]

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

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

        -
        +
        [% RenderBlockEnd("ProcessList") %]
        -
        +
        +
        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketQueue.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketQueue.tt index 9db351da249..88895dacdd3 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketQueue.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketQueue.tt @@ -6,10 +6,9 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
        + +
        [% Data.MainContent %]
        -
        -
        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketSearch.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketSearch.tt index 17a0e1858a4..6e4b9a1df67 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketSearch.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketSearch.tt @@ -8,352 +8,506 @@ # -- [% RenderBlockStart("SearchAJAX") %] -
        -
        +
        + -
        - [% Translate("Templates") | html %] - -
        - [% Data.ProfilesStrg %] -
        - - +
        +
        + [% Translate("Templates") | html %] + +
        + [% Data.ProfilesStrg %] +
        + +
        + +
        +
        +
        + + + +
        + + +
        + +
        +
        +
        + +
        +
        + [% Translate("Filters in use") | html %] +
        + +
        + [% Translate("Additional filters") | html %] +
        + +
        + [% Data.AttributesStrg %] +
        +
        +
        + +
        + [% Data.ResultFormStrg %] +
        +
        +
        +
        + + + + -
        - [% Translate("Filters in use") | html %] -
        -
        - [% Translate("Additional filters") | html %] -
        - [% Data.AttributesStrg %] + + [% Translate("Remove") | html %] +
        +
        +
        +
        +
        -
        -
        - [% Data.ResultFormStrg %] + + [% Translate("Remove") | html %]
        -
        - - - -
        +
        +
        + +
        +
        + + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.TypesStrg %] + [% Translate("Remove") | html %] +
        +
        [% RenderBlockStart("SearchableArticleField") %] - -
        - - [% Translate("Remove") | html %] +
        +
        + +
        +
        + + [% Translate("Remove") | html %] +
        -
        [% RenderBlockEnd("SearchableArticleField") %] - [% RenderBlockStart("DynamicField") %] - [% Data.Label %] -
        - [% Data.Field %] - [% Translate("Remove") | html %] +
        + [% Data.Label %] +
        + [% Data.Field %] + [% Translate("Remove") | html %] +
        -
        [% RenderBlockEnd("DynamicField") %] - - -
        - [% Data.ServicesStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.SLAsStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.PrioritiesStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.StatesStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.QueuesStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.UserStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.ResponsibleStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.CreatedQueuesStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.CreatedUserStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.LocksStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - [% Data.WatchUserStrg %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.ArticleCreateTimePointStart %] [% Data.ArticleCreateTimePoint %] [% Data.ArticleCreateTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.ArticleCreateTimeStart %] [% Translate("and") | html %] [% Data.ArticleCreateTimeStop %] - [% Translate("Remove") | html %] -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value before end date.") | html %]

        -
        -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value after start date.") | html %]

        -
        -
        -
        - -
        - - [% Data.TicketCreateTimePointStart %] [% Data.TicketCreateTimePoint %] [% Data.TicketCreateTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketCreateTimeStart %] [% Translate("and") | html %] [% Data.TicketCreateTimeStop %] - [% Translate("Remove") | html %] -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value before end date.") | html %]

        -
        -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value after start date.") | html %]

        -
        -
        -
        - -
        - - [% Data.TicketChangeTimePointStart %] [% Data.TicketChangeTimePoint %] [% Data.TicketChangeTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketChangeTimeStart %] [% Translate("and") | html %] [% Data.TicketChangeTimeStop %] - [% Translate("Remove") | html %] -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value before end date.") | html %]

        -
        -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value after start date.") | html %]

        -
        -
        -
        - -
        - - [% Data.TicketLastChangeTimePointStart %] [% Data.TicketLastChangeTimePoint %] [% Data.TicketLastChangeTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketLastChangeTimeStart %] [% Translate("and") | html %] [% Data.TicketLastChangeTimeStop %] - [% Translate("Remove") | html %] -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value before end date.") | html %]

        -
        -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value after start date.") | html %]

        -
        -
        -
        - -
        - - [% Data.TicketPendingTimePointStart %] [% Data.TicketPendingTimePoint %] [% Data.TicketPendingTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketPendingTimeStart %] [% Translate("and") | html %] [% Data.TicketPendingTimeStop %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketCloseTimePointStart %] [% Data.TicketCloseTimePoint %] [% Data.TicketCloseTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketCloseTimeStart %] [% Translate("and") | html %] [% Data.TicketCloseTimeStop %] - [% Translate("Remove") | html %] -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value before end date.") | html %]

        -
        -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        + +
        +
        + [% Data.ServicesStrg %] + [% Translate("Remove") | html %]
        - -
        - -
        - - [% Data.TicketEscalationTimePointStart %] [% Data.TicketEscalationTimePoint %] [% Data.TicketEscalationTimePointFormat %] - [% Translate("Remove") | html %] -
        -
        - -
        - - [% Data.TicketEscalationTimeStart %] [% Translate("and") | html %] [% Data.TicketEscalationTimeStop %] - [% Translate("Remove") | html %] -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value before end date.") | html %]

        -
        -
        -

        [% Translate("Invalid date!") | html %]

        -

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        + +
        +
        + [% Data.SLAsStrg %] + [% Translate("Remove") | html %]
        - -
        - -
        - [% Data.SearchInArchiveStrg %] - [% Translate("Remove") | html %] +
        +
        + +
        +
        + [% Data.PrioritiesStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.StatesStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.QueuesStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.UserStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.ResponsibleStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.CreatedQueuesStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.CreatedUserStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.LocksStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + [% Data.WatchUserStrg %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + + [% Data.ArticleCreateTimePointStart %] [% Data.ArticleCreateTimePoint %] [% Data.ArticleCreateTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.ArticleCreateTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.ArticleCreateTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value before end date.") | html %]

        +
        +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        +
        +
        +
        + +
        +
        + + [% Data.TicketCreateTimePointStart %] [% Data.TicketCreateTimePoint %] [% Data.TicketCreateTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.TicketCreateTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.TicketCreateTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value before end date.") | html %]

        +
        +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        +
        +
        +
        + +
        +
        + + [% Data.TicketChangeTimePointStart %] [% Data.TicketChangeTimePoint %] [% Data.TicketChangeTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.TicketChangeTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.TicketChangeTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value before end date.") | html %]

        +
        +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        +
        +
        +
        + +
        +
        + + [% Data.TicketLastChangeTimePointStart %] [% Data.TicketLastChangeTimePoint %] [% Data.TicketLastChangeTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.TicketLastChangeTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.TicketLastChangeTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value before end date.") | html %]

        +
        +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        +
        +
        +
        + +
        +
        + + [% Data.TicketPendingTimePointStart %] [% Data.TicketPendingTimePoint %] [% Data.TicketPendingTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.TicketPendingTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.TicketPendingTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + + [% Data.TicketCloseTimePointStart %] [% Data.TicketCloseTimePoint %] [% Data.TicketCloseTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.TicketCloseTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.TicketCloseTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value before end date.") | html %]

        +
        +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        +
        +
        +
        + +
        +
        + + [% Data.TicketEscalationTimePointStart %] [% Data.TicketEscalationTimePoint %] [% Data.TicketEscalationTimePointFormat %] + [% Translate("Remove") | html %] +
        +
        +
        +
        + +
        +
        + +
        +
        [% Data.TicketEscalationTimeStart %]
        +
        [% Translate("and") | html %]
        +
        [% Data.TicketEscalationTimeStop %]
        +
        + [% Translate("Remove") | html %] +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value before end date.") | html %]

        +
        +
        +

        [% Translate("Invalid date!") | html %]

        +

        [% Translate("Please set this to value after start date.") | html %]

        +
        +
        +
        +
        +
        + +
        +
        + [% Data.SearchInArchiveStrg %] + [% Translate("Remove") | html %] +
        -
        [% Data.AttributesOrigStrg %]
        -
        - -
        +
        + + +
        [% RenderBlockEnd("SearchAJAX") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketService.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketService.tt index 4569483d8f6..158728442ab 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketService.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketService.tt @@ -6,10 +6,9 @@ # the enclosed file COPYING for license information (GPL). If you # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- -
        + +
        [% Data.MainContent %]
        -
        -
        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom.tt index 2f6b8b53d86..0f0c95e292b 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom.tt @@ -300,7 +300,7 @@ [% Data.ArticleTree %]
        [% RenderBlockStart("HintNoArticles") %] -
        +

        [% Translate("This item has no articles yet.") | html %]

        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/Chat.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/Chat.tt index 665dcb35801..bffdafac44c 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/Chat.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/Chat.tt @@ -69,7 +69,6 @@
        - [% PROCESS ArticleActionMenu.tt %]
        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/MIMEBase.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/MIMEBase.tt index 5ccc8b99ce0..625f7d4872a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/MIMEBase.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/ArticleRender/MIMEBase.tt @@ -19,13 +19,13 @@ [% Translate("#%s", Data.ArticleNumber) | html %] – [% Data.ArticleFields.Subject.Value | truncate(100) | html %] – [% Data.ArticleFields.Sender.Value | html %] [% Data.ArticleFields.Sender.Realname | html %] – [% Data.CreateTime | Localize("TimeShort") %] [% Translate("via %s", Translate(Data.CommunicationChannel)) | html %] -[% IF Data.CreateByUser %] - [% Translate("by %s", Data.CreateByUser) | html %] -[% END %] + [% IF Data.CreateByUser %] + [% Translate("by %s", Data.CreateByUser) | html %] + [% END %]
        - +
        @@ -35,30 +35,33 @@
        -[% FOREACH ArticleField IN Data.ArticleFields.values.nsort("Prio") %] - [% IF ArticleField.Label == "From" || ArticleField.Label == "To" || ArticleField.Label == "Cc" || ArticleField.Label == "Bcc" %] - -

        - [% ArticleField.Value | html %] - [% ArticleField.Realname | html %] -

        -
        - [% ELSIF ArticleField.Type == "ArticleOption" %] + [% FOREACH ArticleField IN Data.ArticleFields.values.nsort("Prio") %] + [% IF ArticleField.Label == "From" || ArticleField.Label == "To" || ArticleField.Label == "Cc" || ArticleField.Label == "Bcc" %] +
        + +

        + [% ArticleField.Value | html %] + [% ArticleField.Realname | html %] +

        +
        + [% ELSIF ArticleField.Type == "ArticleOption" %] - -

        - [% Translate(ArticleField.Value) | html %] -

        -
        - [% ELSIF ArticleField.Label == "Subject" %] +
        + +

        + [% Translate(ArticleField.Value) | html %] +

        +
        + [% ELSIF ArticleField.Label == "Subject" %] - -

        [% ArticleField.Value | html %]

        -
        - [% END %] -[% END %] +
        + +

        [% ArticleField.Value | html %]

        +
        + [% END %] + [% END %] -[% FOREACH ArticleField IN Data.ArticleMetaFields %] + [% FOREACH ArticleField IN Data.ArticleMetaFields %] [% IF ArticleField.value.Link %] @@ -73,7 +76,7 @@

        [% ArticleField.value.Value %]

        [% END %]
        -[% END %] + [% END %]
        @@ -154,31 +157,32 @@ # Show info, that links within the iframe must be clicked with strg/cmd/shift (depending on the used browser and os) # to open the links in a new window without the security permissions given to the iframe
        -

        + + [% Translate("To open links in the following article, you might need to press Ctrl or Cmd or Shift key while clicking the link (depending on your browser and OS).") | html %] -

        - + +
        [% RenderBlockEnd("BrowserLinkMessage") %]
        -[% IF Config("Frontend::AvatarEngine") == 'Gravatar' && Data.SenderImage %] -
        - -
        -[% ELSE %] -
        - [% Data.SenderInitials | html %] -
        -[% END %] + [% IF Config("Frontend::AvatarEngine") == 'Gravatar' && Data.SenderImage %] +
        + +
        + [% ELSE %] +
        + [% Data.SenderInitials | html %] +
        + [% END %]
        +
        + [% PROCESS ArticleActionMenu.tt %] - [% PROCESS ArticleActionMenu.tt %] - -[% IF Data.HTML %] -
        + [% IF Data.HTML %] +
        # execute IFrame JS asynchronously. Otherwise it could happen before our API was loaded # the following JS code must be within the template, otherwise it could happen, that also this code itself is not loaded yet -
        -[% ELSE %] -[% Data.BodyNote %] -
        -[% Data.Body %] -
        -[% END %] + + +
        + [% ELSE %] - [% IF Data.ArticleModuleMeta && Data.ArticleModuleMeta.size() %] -
        - [% FOREACH Entry IN Data.ArticleModuleMeta %] -
        -

        [% Entry.Name | html %]

        - + [% Data.BodyNote %] + +
        + [% Data.Body %]
        [% END %] -
        - [% END %] -[% IF Data.Attachments && Data.Attachments.size() %] -
          - [% FOREACH Attachment IN Data.Attachments %] -
        • -
          [% Attachment.Filename | truncate( Config("Ticket::Frontend::AgentTicketZoom::DisplayedAttachmentFilenameMaxLength") ) | html %]
          - [% IF Attachment.ContentType.match('image') %] - [% Translate("Image") | html %] - [% ELSIF Attachment.ContentType == "application/pdf" %] - [% Translate("PDF") | html %] - [% ELSE %] - [% Translate("Unknown") | html %] - [% END %] - – - [% Attachment.FilesizeRaw | Localize("Filesize") %] -
          - [% FOREACH Item IN Attachment.Links %] - [% IF Item.Action == "Download" %] - - - - [% ELSIF Item.Link %] - - - + [% IF Data.ArticleModuleMeta && Data.ArticleModuleMeta.size() %] +
          + [% FOREACH Entry IN Data.ArticleModuleMeta %] +
          +

          [% Entry.Name | html %]

          + +
          [% END %] - [% END %]
          -
          • - [% END %] -
        -[% END %] + [% END %] + + [% IF Data.Attachments && Data.Attachments.size() %] + +
          + [% FOREACH Attachment IN Data.Attachments %] +
        • +
          +
          + + [% Attachment.Filename | truncate( Config("Ticket::Frontend::AgentTicketZoom::DisplayedAttachmentFilenameMaxLength") ) | html %] + + + [% IF Attachment.ContentType.match('image') %] + [% Translate("Image") | html %] + [% ELSIF Attachment.ContentType == "application/pdf" %] + [% Translate("PDF") | html %] + [% ELSE %] + [% Translate("Unknown") | html %] + [% END %] + + [% Attachment.FilesizeRaw | Localize("Filesize") %] + +
          + [% FOREACH Item IN Attachment.Links %] + [% IF Item.Action == "Download" %] + + + + [% ELSIF Item.Link %] + + + + [% END %] + [% END %] +
          +
          • + [% END %] +
        + [% END %] +
        +
        diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/CustomerInformation.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/CustomerInformation.tt index bf29fd9e78e..a4189c3aa33 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/CustomerInformation.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/CustomerInformation.tt @@ -17,4 +17,4 @@
        [% Data.CustomerTable %]
        -
        +
        \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/LinkTable.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/LinkTable.tt index 0e57689150f..54280034c42 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/LinkTable.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/LinkTable.tt @@ -8,18 +8,21 @@ # -- [% RenderBlockStart("LinkTableSimple") %] -
        -
        -
        - -
        -

        [% Translate("Linked Objects") | html %]

        -
        -
        - [% Data.LinkTableStrg %] -
        +
        +
        +
        + +# + +
        +

        [% Translate("Linked Objects") | html %]

        +
        +
        + [% Data.LinkTableStrg %] +
        +
        [% RenderBlockEnd("LinkTableSimple") %] [% RenderBlockStart("LinkTableComplex") %] - [% Data.LinkTableStrg %] + [% Data.LinkTableStrg %] [% RenderBlockEnd("LinkTableComplex") %] diff --git a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/MentionsTable.tt b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/MentionsTable.tt index 7299c22de0c..56619b6b32a 100644 --- a/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/MentionsTable.tt +++ b/Kernel/Output/HTML/Templates/Standard/AgentTicketZoom/MentionsTable.tt @@ -5,7 +5,7 @@ # the enclosed file COPYING for license information (AGPL). If you # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- -
        +
        @@ -15,9 +15,15 @@
          [% RenderBlockStart("User") %] -
        • -[% Data.UserFullname | html %] +
        • + [% IF Data.Removable %] - + + + [% END %]
          • [% RenderBlockEnd("User") %] diff --git a/Kernel/Output/HTML/Templates/Standard/ArticleActionMenu.tt b/Kernel/Output/HTML/Templates/Standard/ArticleActionMenu.tt index fb63c62100a..4ccbee211f4 100644 --- a/Kernel/Output/HTML/Templates/Standard/ArticleActionMenu.tt +++ b/Kernel/Output/HTML/Templates/Standard/ArticleActionMenu.tt @@ -8,42 +8,59 @@ # --
          -
            +
              +
            • Mark
              • +
            • Options
              • +
            + +
            +
            +
            Options
            +
              [% FOREACH Item IN Data.MenuItems.reverse %] - [% IF Item.ItemType == 'Dropdown' %] - [% IF Item.DropdownType == 'Forward' %] -
            • -
              - - - - - - [% Item.StandardForwardsStrg %] -
              -
              • - [% ELSIF Item.DropdownType == 'Reply' %] + [% IF Item.ItemType == 'Dropdown' %] + [% IF Item.DropdownType == 'Forward' %] +
            • +
              + + + + + + [% Item.StandardForwardsStrg %] +
              +
              • + [% ELSIF Item.DropdownType == 'Reply' %] +
            • +
              + + + + + + [% Item.StandardResponsesStrg %] +
              +
              • + [% END %] + + [% ELSIF Item.ItemType == 'Link' %]
            • -
              - - - - - - [% Item.StandardResponsesStrg %] -
              + [% Translate(Item.Name) | html %]
              • [% END %] - [% ELSIF Item.ItemType == 'Link' %] -
            • - [% Translate(Item.Name) | html %] -
              • - [% END %] - [% END %] -
            -
            +
          +
          + + + Collapse + +
          +
          +
          +
        +
        diff --git a/Kernel/Output/HTML/Templates/Standard/AttachmentBlocker.tt b/Kernel/Output/HTML/Templates/Standard/AttachmentBlocker.tt index ed046fde05f..9562572ff2e 100644 --- a/Kernel/Output/HTML/Templates/Standard/AttachmentBlocker.tt +++ b/Kernel/Output/HTML/Templates/Standard/AttachmentBlocker.tt @@ -12,9 +12,7 @@ # article iframe, and the standard CSS of OTRS is not available there. # -
        -
        - [% Translate("To protect your privacy, remote content was blocked.") | html %] - [% Translate("Load blocked content.") | html %] -
        +
        + [% Translate("To protect your privacy, remote content was blocked.") | html %] + [% Translate("Load blocked content.") | html %]
        diff --git a/Kernel/Output/HTML/Templates/Standard/Breadcrumb.tt b/Kernel/Output/HTML/Templates/Standard/Breadcrumb.tt index 2ff2222974f..bd72f71ca51 100644 --- a/Kernel/Output/HTML/Templates/Standard/Breadcrumb.tt +++ b/Kernel/Output/HTML/Templates/Standard/Breadcrumb.tt @@ -9,11 +9,23 @@ -
        diff --git a/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Create.tt b/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Create.tt index ca799e01cef..ad6dfe85190 100644 --- a/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Create.tt +++ b/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Create.tt @@ -9,7 +9,6 @@
        [% Translate(Data.Plugin.Name) | html %]
        -
        @@ -19,12 +18,12 @@
        - +
        -
        +
        [% Data.TicketCreateOffsetUnitStrg %]
        -
        +
        [% Data.TicketCreateOffsetPointStrg %]
        @@ -39,21 +38,21 @@ [% Data.OwnerStrg %]
        [% RenderBlockStart("Responsible") %] - -
        - [% Data.ResponsibleUserStrg %] -
        + +
        + [% Data.ResponsibleUserStrg %] +
        [% RenderBlockEnd("Responsible") %]
        - +
        - +
        @@ -63,9 +62,9 @@
        - +
        - +
        [% Data.TicketPendingTimeOffsetUnitStrg %] @@ -80,24 +79,22 @@
        [% Data.LockStrg %]
        - [% RenderBlockStart("Type") %] - -
        - [% Data.TypeStrg %] -
        + +
        + [% Data.TypeStrg %] +
        [% RenderBlockEnd("Type") %] - [% RenderBlockStart("ServiceSLA") %] - -
        - [% Data.ServiceStrg %] -
        + +
        + [% Data.ServiceStrg %] +
        - -
        - [% Data.SLAStrg %] -
        + +
        + [% Data.SLAStrg %] +
        [% RenderBlockEnd("ServiceSLA") %] diff --git a/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Link.tt b/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Link.tt index e6897bda267..e5255eb748c 100644 --- a/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Link.tt +++ b/Kernel/Output/HTML/Templates/Standard/Calendar/Plugin/Ticket/Link.tt @@ -5,23 +5,28 @@ # the enclosed file COPYING for license information (AGPL). If you # did not receive this file, see http://www.gnu.org/licenses/agpl.txt. # -- + - -
        -[% IF Data.PermissionLevel >= 2 %] +
        + [% IF Data.PermissionLevel >= 2 %] -[% ELSE %] + [% ELSE %] [% IF Data.Plugin.Links.size == 0 %]

        -

        [% END %] -[% END %] -
        = 2 %] class="PluginContainer"[% END %]>[% FOREACH Link IN Data.Plugin.Links %] + [% END %] +
        = 2 %] class="PluginContainer"[% END %]> + [% FOREACH Link IN Data.Plugin.Links %]
        [% Link.LinkName | html %] [% IF Data.PermissionLevel >= 2 %] - [% Translate("Remove") | html %] - [% END %]
        -[% END %]
        + + + [% Translate("Remove") | html %] + + [% END %] +
        + [% END %]
        -
        +
        diff --git a/Kernel/Output/HTML/Templates/Standard/Chat.tt b/Kernel/Output/HTML/Templates/Standard/Chat.tt new file mode 100644 index 00000000000..5cffc51056f --- /dev/null +++ b/Kernel/Output/HTML/Templates/Standard/Chat.tt @@ -0,0 +1,94 @@ +# -- +# Copyright (C) 2001-2021 OTRS AG, https://otrs.com/ +# Copyright (C) 2021 Znuny GmbH, https://znuny.org/ +# -- +# This software comes with ABSOLUTELY NO WARRANTY. For details, see +# the enclosed file COPYING for license information (GPL). If you +# did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. +# -- + +
        + +
        +
        +
        + +
        +

        + [% Translate("#%s", Data.ArticleNumber) | html %] – [% Data.ArticleFields.Subject.Value | truncate(100) | html %] + – [% Data.ArticleFields.Sender.Value | html %] [% Data.ArticleFields.Sender.Realname | html %] + – [% Data.CreateTime | Localize("TimeShort") %] [% Translate("via %s", Translate(Data.CommunicationChannel)) | html %] +[% IF Data.CreateByUser %] + [% Translate("by %s", Data.CreateByUser) | html %] +[% END %] +

        +
        +
        + +
        +
        +
        + + + +
        +
        + + [% PROCESS ArticleActionMenu.tt %] +
        + [% Data.Body %] +
        + + [% IF Data.ArticleModuleMeta && Data.ArticleModuleMeta.size() %] +
        + [% FOREACH Entry IN Data.ArticleModuleMeta %] +
        +

        [% Entry.Name | html %]

        + +
        + [% END %] +
        + [% END %] +
        +
        +
        +
        diff --git a/Kernel/Output/HTML/Templates/Standard/CustomerCompany/TicketCustomerIDSelection.tt b/Kernel/Output/HTML/Templates/Standard/CustomerCompany/TicketCustomerIDSelection.tt index 193b394b7be..ca21f2ad72b 100644 --- a/Kernel/Output/HTML/Templates/Standard/CustomerCompany/TicketCustomerIDSelection.tt +++ b/Kernel/Output/HTML/Templates/Standard/CustomerCompany/TicketCustomerIDSelection.tt @@ -7,19 +7,23 @@ # did not receive this file, see https://www.gnu.org/licenses/gpl-3.0.txt. # -- - +
        [% IF Required %]

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

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

        [% END %] - + [% IF Data.DescriptionShort %]
        [% Data.DescriptionShort %]
        [% END %] + [% IF !Readonly %]