From 22b1eaec860c7f861b9e62221d51725be18f17f4 Mon Sep 17 00:00:00 2001 From: Quitta Date: Fri, 2 Aug 2013 17:03:26 +0200 Subject: [PATCH] show ticket layout is done,though some unpleasant bugs turned up --- .../ams_lib/ingame_templates/show_ticket.tpl | 340 ++++++++---------- .../ams_lib/ingame_templates/show_user.tpl | 2 +- .../ryzom_ams/ams_lib/translations/en.ini | 4 + 3 files changed, 147 insertions(+), 199 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl index 597d98088..a7d778c28 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl @@ -71,7 +71,7 @@ Support Group: {if $ticket_forwardedGroupName eq "0"} - {$public_sgroup} + {$public_sgroup} {else} {$ticket_forwardedGroupName} {/if} @@ -79,11 +79,10 @@ - Assigned To: {if $ticket_assignedTo neq ""} {$ticket_assignedToText} {else} {$not_assigned} {/if} + Assigned To: {if $ticket_assignedTo neq ""} {$ticket_assignedToText} {else} {$not_assigned} {/if} - @@ -101,7 +100,7 @@ {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else} {$reply.author} {/if} {/if}

- 

 {if $reply.hidden eq 1}{/if}{$reply.replyContent}{if $reply.hidden eq 1}{/if}

+ 

 {if $reply.hidden eq 1}{/if}{$reply.replyContent}{if $reply.hidden eq 1}{/if}

{/foreach} @@ -113,8 +112,147 @@ {/if} + + + +
+

{$t_reply}:

+ + {if $ticket_status neq 3} + + + + {if isset($isMod) and $isMod eq "TRUE"} + + + + {/if} + {/if} + + + + + + +
Hide reply for user.
+ {if isset($isMod) and $isMod eq "TRUE"} + + + + + +
+ Change status to + + + Change priority to + +
+ {/if} +
+ + + +
+
+ + + + {if isset($isMod) and $isMod eq "TRUE"} + + + +
+ + + + + +
+

+ Ticket Assigning: + {if $ticket_assignedTo eq 0} +

+ + + +
+ {else if $ticket_assignedTo eq $user_id} +
+ + + +
+ {/if} +

+ {if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_ASSIGNED"} +

+ {$success_assigned} +

+ {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_UNASSIGNED"} +

+ {$success_unassigned} +

+ {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} +

+ {$ticket_not_existing} +

+ {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "ALREADY_ASSIGNED"} +

+ {$ticket_already_assigned} +

+ {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "NOT_ASSIGNED"} +

+ {$ticket_not_assigned} +

+ {/if} + + + 		+

+ Forward to Group: +

+ + + + + +
+

+ {if isset($ACTION_RESULT) and $ACTION_RESULT eq "INVALID_SGROUP"} +

+ {$invalid_sgroup} +

+ {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} +

+ {$ticket_not_existing} +

+ {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_FORWARDED"} +

+ {$success_forwarded} +

+ {/if} +
+
+ + + {/if} + @@ -128,199 +266,5 @@ - - - - - - - {foreach from=$ticket_replies item=reply} - - - - {/foreach} - - {if $ticket_status eq 3} - - - - {/if} - - - - - -
-

- {$reply.timestamp} - {if $reply.permission eq '1'} - {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else} {$reply.author} {/if} - {else if $reply.permission gt '1'} - {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else} {$reply.author} {/if} - {/if} -

-

{if $reply.hidden eq 1}{/if}{$reply.replyContent}{if $reply.hidden eq 1}{/if}

-
- 

Ticket is closed.

-
-
- {if $ticket_status neq 3} - {$t_reply}: -
- -
-
- -
-
-
- {if isset($isMod) and $isMod eq "TRUE"} -
- -
-
- Hide reply for user. -
-
-
- {/if} - {/if} - {if isset($isMod) and $isMod eq "TRUE"} -
- -
- -
-
-
- -
- -
-
- {/if} - - -
- -
- -
-
-
-
- - - - - - -
-
-

Actions

-
- - -
-
-
-
- - {if isset($isMod) and $isMod eq "TRUE"} - - Ticket Assigning - {if $ticket_assignedTo eq 0} -
- - - -
- {else if $ticket_assignedTo eq $user_id} -
- - - -
- {/if} - - {if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_ASSIGNED"} -
- {$success_assigned} -
- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_UNASSIGNED"} -
- {$success_unassigned} -
- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} -
- {$ticket_not_existing} -
- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "ALREADY_ASSIGNED"} -
- {$ticket_already_assigned} -
- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "NOT_ASSIGNED"} -
- {$ticket_not_assigned} -
- {/if} - - Forward to Group -
- -
-
- -
-
- - -
-
- -
-
-
- {if isset($ACTION_RESULT) and $ACTION_RESULT eq "INVALID_SGROUP"} -
- {$invalid_sgroup} -
- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "TICKET_NOT_EXISTING"} -
- {$ticket_not_existing} -
- {else if isset($ACTION_RESULT) and $ACTION_RESULT eq "SUCCESS_FORWARDED"} -
- {$success_forwarded} -
- {/if} - {/if} - Other actions -
- - -
-
-
-
- {/block} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl index d98d668ea..23282aef6 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl @@ -139,7 +139,7 @@ {$ticket.tId} {$ticket.title} - {$ticket.timestamp} + {$ticket.timestamp} {$ticket.category} {if $ticket.status eq 0} {/if} {$ticket.statusText} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini index ddda98203..7ba5aaf28 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini @@ -31,6 +31,10 @@ ticket_not_existing = "That's an invalid ticket" success_forwarded = "The ticket was forwarded successfully!" public_sgroup = "Public" not_assigned = "None" +success_assigned = "The ticket was successfully assigned!" +success_unassigned = "The ticket was successfully unassigned!" +ticket_not_existing = "That ticket doesn't exist!" +ticket_already_assigned = "That ticket is already assigned to someone!" [show_user]