From a74de873c325eeee9ab33fe77bc5f824f1b6f869 Mon Sep 17 00:00:00 2001 From: Quitta Date: Fri, 19 Jul 2013 00:37:47 +0200 Subject: [PATCH] fixed some layoutwise stuff, like mods and admins will be shown the same way when replying on a ticket, because users won't be intrested in that anyway --- .../tools/server/ryzom_ams/www/html/inc/show_user.php | 1 + .../server/ryzom_ams/www/html/templates/show_reply.tpl | 9 ++++----- .../server/ryzom_ams/www/html/templates/show_ticket.tpl | 6 ++---- .../server/ryzom_ams/www/html/templates/show_user.tpl | 9 +++++++++ 4 files changed, 16 insertions(+), 9 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php index 342529ead..5ce6ecd96 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php @@ -20,6 +20,7 @@ function show_user(){ $result['gender'] = $info['Gender']; $ticket_user = Ticket_User::constr_ExternId($result['target_id']); + $result['userPermission'] = $ticket_user->getPermission(); $ticketlist = Ticket::getTicketsOf($ticket_user->getTUserId()); $result['ticketlist'] = Gui_Elements::make_table($ticketlist, Array("getTId","getTimestamp","getTitle","getStatus","getStatusText","getStatusText","getCategoryName"), Array("tId","timestamp","title","status","statustext","statusText","category")); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl index 4813f840c..eafad703c 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl @@ -16,12 +16,11 @@

{$reply_timestamp} {$author_permission} {if $author_permission eq '1'} - - {else if $author_permission eq '2'} - [CSR] + {if isset($isMod) and $isMod eq "TRUE"} {$authorName}{else} {$authorName} {/if}

+ {else if $author_permission gt '1'} + {if isset($isMod) and $isMod eq "TRUE"} {$authorName}{else} {$authorName} {/if}

{/if} - {if isset($isMod) and $isMod eq "TRUE"} {$authorName}{else}{$authorName} {/if}

- +

{$reply_content}

diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl index dfda0de8f..0ee7f5548 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl @@ -35,12 +35,10 @@

{$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'} - [CSR] + {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else} {$reply.author} {/if}

{/if} - {if isset($isMod) and $isMod eq "TRUE"} {$reply.author}{else}{$reply.author} {/if}

-

{$reply.replyContent}

diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl index 1ddd97df7..1780724d6 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl @@ -17,6 +17,15 @@ Email: {$mail} + + + Role: + + {if $userPermission eq 1}User{/if} + {if $userPermission eq 2}Moderator{/if} + {if $userPermission eq 3}Admin{/if} + + {if $firstName neq ""} Firstname: