Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

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

Browse source 
--HG--
branch : quitta-gsoc-2013
This commit is contained in:
Quitta 2013-07-19 00:37:47 +02:00
parent e170bff5bc
commit 532732a925
4 changed files with 16 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
code/ryzom/tools/server/ryzom_ams/www/html/inc/show_user.php
View file

@ -20,6 +20,7 @@ function show_user(){
$result['gender'] = $info['Gender']; $result['gender'] = $info['Gender'];
$ticket_user = Ticket_User::constr_ExternId($result['target_id']); $ticket_user = Ticket_User::constr_ExternId($result['target_id']);
$result['userPermission'] = $ticket_user->getPermission();
$ticketlist = Ticket::getTicketsOf($ticket_user->getTUserId()); $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")); $result['ticketlist'] = Gui_Elements::make_table($ticketlist, Array("getTId","getTimestamp","getTitle","getStatus","getStatusText","getStatusText","getCategoryName"), Array("tId","timestamp","title","status","statustext","statusText","category"));

9
code/ryzom/tools/server/ryzom_ams/www/html/templates/show_reply.tpl
View file

@ -16,12 +16,11 @@
<td> <td>
<p><span class="label label-info"> {$reply_timestamp} {$author_permission}</span> <p><span class="label label-info"> {$reply_timestamp} {$author_permission}</span>
{if $author_permission eq '1'} {if $author_permission eq '1'}
<!-- <span class="label label-important"><strong></i>[User]:</strong></span>--> <span class="label label-success"><strong><i class="icon-user icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$author}"><font color="white"> {$authorName}</font>{else} {$authorName} {/if}</a></strong></span></p>
{else if $author_permission eq '2'} {else if $author_permission gt '1'}
<span class="label label-important"><strong><i class="icon-star icon-white"></i>[CSR]</strong></span> <span class="label label-warning"><strong><i class="icon-star icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$author}"><font color="white"> {$authorName}</font>{else} {$authorName} {/if}</a></strong></span></p>
{/if} {/if}
<span class="label label-warning"><strong><i class="icon-user icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$author}"><font color="white">{$authorName}</font>{else}{$authorName} {/if}</a></strong></span></p>
<p><pre{if $author_permission eq '2'} style="background-color:rgb(248, 200, 200);"{/if}>{$reply_content}</pre></p> <p><pre{if $author_permission eq '2'} style="background-color:rgb(248, 200, 200);"{/if}>{$reply_content}</pre></p>
</td> </td>
</tr> </tr>

6
code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket.tpl
View file

@ -35,12 +35,10 @@
<td> <td>
<p><span class="label label-info"> {$reply.timestamp}</span> <p><span class="label label-info"> {$reply.timestamp}</span>
{if $reply.permission eq '1'} {if $reply.permission eq '1'}
<!-- <span class="label label-important"><strong></i>[User]:</strong></span>--> <span class="label label-success"><strong><i class="icon-user icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$reply.authorExtern}"><font color="white"> {$reply.author}</font>{else} {$reply.author} {/if}</a></strong></span></p>
{else if $reply.permission gt '1'} {else if $reply.permission gt '1'}
<span class="label label-important"><strong><i class="icon-star icon-white"></i>[CSR]</strong></span> <span class="label label-warning"><strong><i class="icon-star icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$reply.authorExtern}"><font color="white"> {$reply.author}</font>{else} {$reply.author} {/if}</a></strong></span></p>
{/if} {/if}
<span class="label label-warning"><strong><i class="icon-user icon-white"></i>{if isset($isMod) and $isMod eq "TRUE"} <a href="index.php?page=show_user&id={$reply.authorExtern}"><font color="white">{$reply.author}</font>{else}{$reply.author} {/if}</a></strong></span></p>
<p><pre{if $reply.permission gt '1'} style="background-color:rgb(248, 200, 200);"{/if}>{$reply.replyContent}</pre></p> <p><pre{if $reply.permission gt '1'} style="background-color:rgb(248, 200, 200);"{/if}>{$reply.replyContent}</pre></p>
</td> </td>
</tr> </tr>

9
code/ryzom/tools/server/ryzom_ams/www/html/templates/show_user.tpl
View file

@ -17,6 +17,15 @@
<td><strong>Email:</strong></td> <td><strong>Email:</strong></td>
<td>{$mail}</td> <td>{$mail}</td>
</tr> </tr>
<tr >
<td><strong>Role:</strong></td>
<td>
{if $userPermission eq 1}<span class="label label-success">User</span>{/if}
{if $userPermission eq 2}<span class="label label-warning">Moderator</span>{/if}
{if $userPermission eq 3}<span class="label label-important">Admin</span>{/if}
</td>
</tr>
{if $firstName neq ""} {if $firstName neq ""}
<tr> <tr>
<td><strong>Firstname:</strong></td> <td><strong>Firstname:</strong></td>