From 7ee2ce596fa78b14b97e2ddaec804bb4342bf863 Mon Sep 17 00:00:00 2001
From: Quitta <none@none>
Date: Fri, 2 Aug 2013 19:43:43 +0200
Subject: [PATCH] log + reply ingame page

--HG--
branch : quitta-gsoc-2013
---
 .../tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php      | 2 +-
 .../server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl   | 2 +-
 .../tools/server/ryzom_ams/www/html/templates/show_reply.tpl    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php
index 1d1b90a44..d011049d7 100644
--- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php
+++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php
@@ -28,7 +28,7 @@ class Ticket_Log{
      //return all logs that are related to a ticket
     public static function getLogsOfTicket( $ticket_id) {
         $dbl = new DBLayer("lib");
-        $statement = $dbl->execute("SELECT * FROM ticket_log INNER JOIN ticket_user ON ticket_log.Author = ticket_user.TUserId and ticket_log.Ticket=:id ORDER BY ticket_log.TLogId DESC", array('id' => $ticket_id));
+        $statement = $dbl->execute("SELECT * FROM ticket_log INNER JOIN ticket_user ON ticket_log.Author = ticket_user.TUserId and ticket_log.Ticket=:id ORDER BY ticket_log.TLogId ASC", array('id' => $ticket_id));
         $row = $statement->fetchAll();
         $result = Array();
         foreach($row as $log){
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 a7d778c28..253131d90 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
@@ -100,7 +100,7 @@
 									<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="red"> {$reply.author}</font>{else} {$reply.author} {/if}</a></strong></span>
 									{/if}
 								    </p>
-								    <p><pre> {if $reply.hidden eq 1}{/if}{$reply.replyContent}{if $reply.hidden eq 1}{/if}</pre></p>
+								    <p><pre>{$reply.replyContent}</pre></p>
 								</td>
 							    </tr>
 							    {/foreach}
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 886153d5a..65f3f679b 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
@@ -14,7 +14,7 @@
 		<table class="table table-bordered" >
 		    <tr>
 			<td>
-			    <p><span class="label label-info"> {$reply_timestamp} {$author_permission}</span>
+			    <p><span class="label label-info"> {$reply_timestamp}</span>
 			    {if $author_permission eq '1'}
 			    <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 gt '1'}