From 61eeacd34e257e2e08698a6ef9d5faf3f1ccd72f Mon Sep 17 00:00:00 2001 From: Rodrigo Goncalves Date: Wed, 20 Jan 2016 09:14:43 -0200 Subject: [PATCH] Ajustes para OTRS 5.0.x --- Kernel/Config/Files/QueueService.xml | 2 +- Kernel/Output/HTML/Standard/QueueService.tt | 86 -------------------------------------------------------------------------------------- Kernel/Output/HTML/Standard/QueueServiceChange.tt | 103 ------------------------------------------------------------------------------------------------------- Kernel/Output/HTML/Templates/Standard/QueueService.tt | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt | 103 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ QueueService.sopm | 9 +++++---- 6 files changed, 195 insertions(+), 194 deletions(-) delete mode 100644 Kernel/Output/HTML/Standard/QueueService.tt delete mode 100644 Kernel/Output/HTML/Standard/QueueServiceChange.tt create mode 100644 Kernel/Output/HTML/Templates/Standard/QueueService.tt create mode 100644 Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt diff --git a/Kernel/Config/Files/QueueService.xml b/Kernel/Config/Files/QueueService.xml index 81b334f..1f73a28 100644 --- a/Kernel/Config/Files/QueueService.xml +++ b/Kernel/Config/Files/QueueService.xml @@ -13,7 +13,7 @@ Serviços por fila Admin - Kernel::Output::HTML::NavBarModuleAdmin + Kernel::Output::HTML::NavBar::ModuleAdmin Services per queue Serviços por fila Create and manages services per queue diff --git a/Kernel/Output/HTML/Standard/QueueService.tt b/Kernel/Output/HTML/Standard/QueueService.tt deleted file mode 100644 index 17cae1c..0000000 --- a/Kernel/Output/HTML/Standard/QueueService.tt +++ /dev/null @@ -1,86 +0,0 @@ -# -- -# Kernel/Output/HTML/Standard/QueueService.tt - overview -# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/ -# Version 06/01/2015 - Adjusts for OTRS 4 -# -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (AGPL). If you -# did not receive this file, see http://www.gnu.org/licenses/agpl.txt. -# -- -
-

[% Translate("Services per queue") | html %]

- -
- -
-
-

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

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

-
-
- -
-
-[% RenderBlockEnd("serviceFilter") %] -[% RenderBlockStart("queueFilter") %] -
-
-

-
-
- -
-
-[% RenderBlockEnd("queueFilter") %] -
- -
-
- -
-

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

-
-
-
-
    -
  • [% Translate("Services") | html %]
    • - -[% RenderBlockStart("ListService") %] -
  • [% Data.ServiceName | html %]
    • -[% RenderBlockEnd("ListService") %] -
-
-
-
    -
  • [% Translate("Queues") | html %]
    • - -[% RenderBlockStart("ListQueue") %] -
  • [% Data.QueueName | html %]
    • -[% RenderBlockEnd("ListQueue") %] -
-
-
-
- - -[% WRAPPER JSOnDocumentComplete %] - -[% END %] - - \ No newline at end of file diff --git a/Kernel/Output/HTML/Standard/QueueServiceChange.tt b/Kernel/Output/HTML/Standard/QueueServiceChange.tt deleted file mode 100644 index 5bb48de..0000000 --- a/Kernel/Output/HTML/Standard/QueueServiceChange.tt +++ /dev/null @@ -1,103 +0,0 @@ -# -- -# Kernel/Output/HTML/Standard/QueueServiceChange.tt - edit -# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/ -# Version 06/01/2015 - Adjusts for OTRS 4 -# -# This software comes with ABSOLUTELY NO WARRANTY. For details, see -# the enclosed file COPYING for license information (AGPL). If you -# did not receive this file, see http://www.gnu.org/licenses/agpl.txt. -# -- -
-

[% Translate("Services and queues") | html %]

-
-
-
-

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

-
-
- -
-
-
-
-

- -

-
-
- -
-
-
- -
-
-
-

-[% RenderBlockStart("ChangeHeaderService") %] - [% Translate("Select queues for the service") | html %] -[% RenderBlockEnd("ChangeHeaderService") %] -[% RenderBlockStart("ChangeHeaderQueue") %] - [% Translate("Select services for the queue") | html %] -[% RenderBlockEnd("ChangeHeaderQueue") %] - [% Data.Name | html %] -

-
-
-
- - - - - - - -[% RenderBlockStart("ChangeHeader") %] - -[% WRAPPER JSOnDocumentComplete %] - -[% END %] -[% RenderBlockEnd("ChangeHeader") %] - - - -[% RenderBlockStart("ChangeRow") %] - - - - -[% RenderBlockEnd("ChangeRow") %] - -
[% Translate(Data.VisibleNeType) | html %] - - [% Translate("Active") | html %] -
[% Data.Name | html %] - -
-
- - [% Translate("or") | html %] - [% Translate("Cancel") | html %] -
-
-
-
-
-
-
-
- -[% WRAPPER JSOnDocumentComplete %] - -[% END %] diff --git a/Kernel/Output/HTML/Templates/Standard/QueueService.tt b/Kernel/Output/HTML/Templates/Standard/QueueService.tt new file mode 100644 index 0000000..17cae1c --- /dev/null +++ b/Kernel/Output/HTML/Templates/Standard/QueueService.tt @@ -0,0 +1,86 @@ +# -- +# Kernel/Output/HTML/Standard/QueueService.tt - overview +# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/ +# Version 06/01/2015 - Adjusts for OTRS 4 +# +# This software comes with ABSOLUTELY NO WARRANTY. For details, see +# the enclosed file COPYING for license information (AGPL). If you +# did not receive this file, see http://www.gnu.org/licenses/agpl.txt. +# -- +
+

[% Translate("Services per queue") | html %]

+ +
+ +
+
+

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

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

+
+
+ +
+
+[% RenderBlockEnd("serviceFilter") %] +[% RenderBlockStart("queueFilter") %] +
+
+

+
+
+ +
+
+[% RenderBlockEnd("queueFilter") %] +
+ +
+
+ +
+

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

+
+
+
+
    +
  • [% Translate("Services") | html %]
    • + +[% RenderBlockStart("ListService") %] +
  • [% Data.ServiceName | html %]
    • +[% RenderBlockEnd("ListService") %] +
+
+
+
    +
  • [% Translate("Queues") | html %]
    • + +[% RenderBlockStart("ListQueue") %] +
  • [% Data.QueueName | html %]
    • +[% RenderBlockEnd("ListQueue") %] +
+
+
+
+ + +[% WRAPPER JSOnDocumentComplete %] + +[% END %] + + \ No newline at end of file diff --git a/Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt b/Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt new file mode 100644 index 0000000..5bb48de --- /dev/null +++ b/Kernel/Output/HTML/Templates/Standard/QueueServiceChange.tt @@ -0,0 +1,103 @@ +# -- +# Kernel/Output/HTML/Standard/QueueServiceChange.tt - edit +# Copyright (C) (2014) SeTIC - UFSC - http://setic.ufsc.br/ +# Version 06/01/2015 - Adjusts for OTRS 4 +# +# This software comes with ABSOLUTELY NO WARRANTY. For details, see +# the enclosed file COPYING for license information (AGPL). If you +# did not receive this file, see http://www.gnu.org/licenses/agpl.txt. +# -- +
+

[% Translate("Services and queues") | html %]

+
+
+
+

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

+
+
+ +
+
+
+
+

+ +

+
+
+ +
+
+
+ +
+
+
+

+[% RenderBlockStart("ChangeHeaderService") %] + [% Translate("Select queues for the service") | html %] +[% RenderBlockEnd("ChangeHeaderService") %] +[% RenderBlockStart("ChangeHeaderQueue") %] + [% Translate("Select services for the queue") | html %] +[% RenderBlockEnd("ChangeHeaderQueue") %] + [% Data.Name | html %] +

+
+
+
+ + + + + + + +[% RenderBlockStart("ChangeHeader") %] + +[% WRAPPER JSOnDocumentComplete %] + +[% END %] +[% RenderBlockEnd("ChangeHeader") %] + + + +[% RenderBlockStart("ChangeRow") %] + + + + +[% RenderBlockEnd("ChangeRow") %] + +
[% Translate(Data.VisibleNeType) | html %] + + [% Translate("Active") | html %] +
[% Data.Name | html %] + +
+
+ + [% Translate("or") | html %] + [% Translate("Cancel") | html %] +
+
+
+
+
+
+
+
+ +[% WRAPPER JSOnDocumentComplete %] + +[% END %] diff --git a/QueueService.sopm b/QueueService.sopm index ed39bd3..04c46a0 100755 --- a/QueueService.sopm +++ b/QueueService.sopm @@ -1,14 +1,15 @@ QueueService - 1.1.1 - 4.0.x + 1.2.0 + 5.0.x SeTIC http://setic.ufsc.br GPLv2 First Version Support for OTRS 4 + Support for OTRS 5.0.x Services per queue association @@ -23,8 +24,8 @@ - - + + -- libgit2 0.21.2