Fancified outgame show info page and made ingame info page

--HG--
branch : quitta-gsoc-2013

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl

@@ -1,14 +1,5 @@
 {extends file="layout.tpl"}
 {block name=menu}
-    <li class="nav-header hidden-tablet">Main</li>
-    <li style="margin-left: -2px;" class="active"><a class="ajax-link" href="index.php"><i class="icon-home"></i><span class="hidden-tablet"> Dashboard</span></a></li>
-    <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=show_user"><i class="icon-user"></i><span class="hidden-tablet"> Profile</span></a></li>
-    <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=settings"><i class="icon-cog"></i><span class="hidden-tablet"> Settings</span></a></li>
-    <li class="nav-header hidden-tablet">Actions</li>
-    <li style="margin-left: -2px;"><a class="ajax-link" href="index.php?page=createticket"><i class="icon-pencil"></i><span class="hidden-tablet">Create New Ticket</span></a></li>
-    <li style="margin-left: -2px;"><a href="?page=logout"><i class="icon-off"></i><span class="hidden-tablet"> Logout </span></a></li>
-    
-
     <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php"><h5> Dashboard</h5></a></td>
     <td width="3"></td>
     <td height="25" valign="middle" nowrap><a class="ajax-link" href="index.php?page=show_user"><h5> Profile</h5></a></td>

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket.tpl

@@ -10,7 +10,7 @@
 		  <tr>		    
 			{if isset($isMod) and $isMod eq "TRUE"}<td valign="middle" nowrap><a href="index.php?page=show_ticket_log&id={$ticket_tId}">Show Ticket Log</a></td>{/if}
 			<td valign="middle" nowrap><a href="index.php?page=createticket&user_id={$ticket_author}">Send Other Ticket</a></td>
-			<td valign="middle" nowrap><a href="index.php?page=show_ticket_info&id={$ticket_tId}">Show Additional Info</a></td>
+			{if $hasInfo}<td valign="middle" nowrap><a href="index.php?page=show_ticket_info&id={$ticket_tId}">Show Additional Info</a></td>{/if}
 		  </tr>
 		</table>
 	      </td>

code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl

@@ -1,96 +1,149 @@
 {block name=content}
-<div class="row-fluid sortable ui-sortable">
+<tr><td>
-    <div class="box span9">
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
-        <div class="box-header well" data-original-title="">
+	<tr bgcolor="{$second_menu_bg_color}" valign="middle">
-            <h2><i class="icon-tag"></i> <a href="index.php?page=show_ticket&id={$ticket_id}">[#{$ticket_id}] {$ticket_title}</a> </h2>
+	  <td>
-            <div class="box-icon">
+	  <table>
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
+	    <tr>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
+	      <td>
-            </div>
+		<table cellspacing="0" cellpadding="4">
-        </div>
+		  <tr>		    
-        <div class="box-content">
+			{if isset($isMod) and $isMod eq "TRUE"}<td valign="middle" nowrap><a href="index.php?page=show_ticket_log&id={$ticket_id}">Show Ticket Log</a></td>{/if}
-            <div class="row-fluid">
+			<td valign="middle" nowrap><a href="index.php?page=createticket&user_id={$ticket_author}">Send Other Ticket</a></td>
-                <legend>Additional Info </legend>
+			<td valign="middle" nowrap><a href="index.php?page=show_ticket&id={$ticket_id}">Show Ticket</a></td>
+		  </tr>
+		</table>
+	      </td>
+	    </tr>
+	  </table>
+	  </td>
+	</tr>
+	<tr>
+		<td height="3" bgcolor="#000000"></td>
+	</tr>
+      </table>
+  </td></tr>
 
-		
+  <tr><td>
-		<form id="changeTicket" class="form-vertical" method="post" action="index.php">
+	<table width="100%" bgcolor="{$title_bg_color}" cellspacing="2">
-		<table class="table table-bordered table-condensed " >
+	<tr><td height="7"></td><td></td></tr>
 	<tr>
-			    <td><strong>Shard ID: </strong>{$shard_id}</td>
+		<td width="3%"></td>
+		<td width="100%" height="12" valign="middle"><h1>Additional Info For Ticket <a href="index.php?page=show_ticket&id={$ticket_id}">[#{$ticket_id}]</a></h1></td>
 	</tr>
 	<tr>
-			    <td><strong>User Position: </strong>{$user_position}</td> 
+	  <td height="5"></td><td></td>
+	</tr>
+	</table>
+  </td></tr>
+  <tr><td>
+      <table width="100%" cellspacing="0" cellpadding="0" border="0">
+	<tr bgcolor="#000000" valign="middle">
+	  <td>
+	    <table>
+	      <tr><td height="8"></td></tr>
+	    </table>
+	  </td>
+	</tr>
+	<tr><td height="2"></td></tr>
+	<tr><td height="1" bgcolor="#000000"></td></tr>
+	<tr><td height="10"></td></tr>
+	<tr valign="middle">
+	  <td>
+	    <table width="100%" height="100%" cellpadding="10">
+	      <tr><td>
+		<table width="100%" bgcolor="{$main_tbl_color}" border="2">
+			<tr><td>
+				<table cellpadding="10" width="100%">
+					<tr><td>
+					    <table cellpadding="5" width="100%">
+						    <tr><td>
+							<table cellpadding="1" bgcolor="{$normal_tbl_color}" border="2" width="100%">
+							    <tr><td>
+							    <p><h3>Ingame related</h3></p>
+							    <table cellpadding="3" width="100%">
 								<tr>
-			    <td><strong>View Position: </strong>{$view_position}</td>
+								    <td><font color="{$info_color}">Shard ID: </font>{$shard_id}</td>
 								</tr>
 								<tr>
-			    <td><strong>client_version: </strong> {$client_version}</td>              
+								    <td><font color="{$info_color}">User_Id:  </font>{$user_id}</td>
 								</tr>
 								<tr>
-			    <td><strong>patch_version: </strong>{$patch_version}</td>
+								    <td><font color="{$info_color}">User Position: </font>{$user_position}</td> 
 							        </tr>
 								<tr>
-			    <td><strong>memory: </strong>{$memory}</td>
+								    <td><font color="{$info_color}">View Position: </font>{$view_position}</td>
-			</tr>
-			
-			<tr>
-			    <td><strong>server_tick: </strong>{$server_tick}</td>
 								</tr>
 								<tr>
-			    <td><strong>connect_state: </strong>{$connect_state}</td>
+								    <td><font color="{$info_color}">Client_Version: </font>{$client_version}</td>
 								</tr>
 								<tr>
-			    <td><strong>local_address: </strong>{$local_address}</td>
+								    <td><font color="{$info_color}">Patch_Version:  </font>{$patch_version}</td>                  
 								</tr>
 								<tr>
-			    <td><strong>os: </strong>{$os}</td>
+								    <td><font color="{$info_color}"> Server_Tick:  </font>{$server_tick}</td>
+								</tr>
+							    </table>
+							</td></tr>
+							</table>
+						    </td></tr>
+						    <tr><td>
+							<table cellpadding="1" bgcolor="{$normal_tbl_color}" border="2" width="100%">
+							    <tr><td>
+							    <p><h3>Hardware & Software related</h3></p>
+							    <table cellpadding="3" width="100%">
+								<tr>
+								    <td><font color="{$info_color}">Memory: </font>{$memory}</td>
 								</tr>
 								<tr>
-			    <td><strong>processor: </strong>{$processor}</td>
+								    <td><font color="{$info_color}">Processor:  </font>{$processor}</td>
 								</tr>
 								<tr>
-			    <td><strong>cpu_id: </strong>{$cpu_id}</td>
+								    <td><font color="{$info_color}">Cpu_Id: </font>{$cpu_id}</td> 
 							        </tr>
 								<tr>
-			    <td><strong>cpu_mask: </strong>{$cpu_mask}</td>
+								    <td><font color="{$info_color}">Cpu_Mask: </font>{$cpu_mask}</td>
 								</tr>
 								<tr>
-			    <td><strong>ht: </strong>{$ht}</td>
+								    <td><font color="{$info_color}">HT: </font>{$ht}</td>
 								</tr>
 								<tr>
-			    <td><strong>nel3d: </strong>{$nel3d}</td>
+								    <td><font color="{$info_color}">OS: </font>{$os}</td>                  
+								</tr>
+								<tr>
+								    <td><font color="{$info_color}">NeL3D: </font>{$nel3d}</td>
+								</tr>
+							    </table>
+							</td></tr>
+							</table>
+						    </td></tr>
+						    <tr><td>
+							<table cellpadding="1" bgcolor="{$normal_tbl_color}" border="2" width="100%">
+							    <tr><td>
+							    <p><h3>Network related</h3></p>
+							    <table cellpadding="3" width="100%">
+								<tr>
+								    <td><font color="{$info_color}">Connect_State: </font>{$connect_state}</td>
+								</tr>
+								<tr>
+								    <td><font color="{$info_color}">Local_Address:  </font>{$local_address}</td>
+								</tr>
+							    </table>
+							</td></tr>
+							</table>
+						    </td></tr>
+					    </table>
+					</td></tr>
+				</table>
+			</td></tr>
+		</table>
+	      </td></tr>
+	    </table>
+	  </td>
 	</tr>
       </table>
       
-	    </div>                   
+  </td></tr>
-        </div>
-    </div><!--/span-->
 
-    <div class="box span3">
-        <div class="box-header well" data-original-title="">
-            <h2><i class="icon-th"></i>Actions</h2>
-            <div class="box-icon">
-                <a href="#" class="btn btn-minimize btn-round"><i class="icon-chevron-up"></i></a>
-                <a href="#" class="btn btn-close btn-round"><i class="icon-remove"></i></a>
-            </div>
-        </div>
-        <div class="box-content">
-            <div class="row-fluid">
-		
-		<legend style="margin-bottom:9px;">Actions</legend>
-		<div class="btn-group">
-		    <button class="btn btn-primary btn-large dropdown-toggle" data-toggle="dropdown">Actions<span class="caret"></span></button>
-		    <ul class="dropdown-menu">
-			<li class="divider"></li>
-			{if isset($isMod) and $isMod eq "TRUE"}<li><a href="index.php?page=show_ticket_log&id={$ticket_id}">Show Ticket Log</a></li>{/if}
-			<li><a href="index.php?page=createticket&user_id={$ticket_author}">Send Other Ticket</a></li>
-			<li><a href="index.php?page=show_ticket&id={$ticket_id}">Show Ticket</a></li>
-			<li class="divider"></li>
-		    </ul>
-		</div>
-            </div>                   
-        </div>
-    </div>
-</div><!--/row-->
 {/block}
 	

code/ryzom/tools/server/ryzom_ams/credits.txt

@@ -0,0 +1,5 @@
+###################################################################
+CREDITS REGARDING THE AMS
+##################################################################
+- Muhammad Usman (Charisma Layout http://usman.it/themes/charisma/)
+- prdatur (Icon Set http://opengameart.org/users/prdatur) 

code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php

@@ -31,6 +31,8 @@ function show_ticket_info(){
             $result['ht'] = $ticket_info->getHT();
             $result['nel3d'] = $ticket_info->getNel3D();
             $result['user_id'] = $ticket_info->getUser_Id();
+            global $SITEBASE;
+            $result['SITEBASE'] = $SITEBASE;
             
             if(Ticket_User::isMod($_SESSION['ticket_user'])){
                 $result['isMod'] = "TRUE";

code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl

@@ -11,61 +11,71 @@
         <div class="box-content">
             <div class="row-fluid">
                 <legend>Additional Info </legend>
-		
+		<div style=" padding-left:10%;padding-right:10%;">
-		
-		<form id="changeTicket" class="form-vertical" method="post" action="index.php">
 		    <table class="table table-bordered table-condensed " >
-			<tr>
+			    <tr class="alert alert-info">
-			    <td><img src="img/shard.png" height="40" /><strong> Shard ID: </strong>{$shard_id}</td>
+				<td><center><strong> Ingame related </strong></center></td>
 			    </tr>
 			    <tr>
-			    <td><strong>User Position: </strong>{$user_position}</td> 
+				<td><img src="img/info/shard.png" height="30" /><strong> Shard ID: </strong>{$shard_id}</td>
+			    </tr>
 			    <tr>
-			    <td><strong>View Position: </strong>{$view_position}</td>
+				<td><img src="img/info/user.png" height="30" /><strong> User_Id: </strong>{$user_id}</td>
+			    </tr>   
+			    <tr>
+				<td><img src="img/info/position.png" height="30" /><strong> User Position: </strong>{$user_position}</td>
+			    </tr>
+			    <tr>
+				<td><img src="img/info/view.png" height="30" /><strong> View Position: </strong>{$view_position}</td>
 			    </tr>
     
 			    <tr>
-			    <td><strong>client_version: </strong> {$client_version}</td>              
+				<td><img src="img/info/client.png" height="30" /><strong> Client_Version: </strong> {$client_version}</td>              
 			    </tr>
 			    <tr>
-			    <td><strong>patch_version: </strong>{$patch_version}</td>
+				<td><img src="img/info/patch.png" height="30" /><strong> Patch_Version: </strong>{$patch_version}</td>
 			    </tr>
 			    <tr>
-			    <td><strong>memory: </strong>{$memory}</td>
+				<td><img src="img/info/server.png" height="30" /><strong> Server_Tick: </strong>{$server_tick}</td>
+			    </tr>
+			    <tr class="alert alert-info">
+				<td><center><strong> Hardware & Software related </strong></center></td>
+			    </tr>
+			    <tr>
+				<td><strong><img src="img/info/memory.png" height="30" /> Memory: </strong>{$memory}</td>
+			    </tr>
+			    <tr>
+				<td><img src="img/info/processor.png" height="30" /><strong> Processor: </strong>{$processor}</td>
+			    </tr>
+			    <tr>
+				<td><img src="img/info/cpuid.png" height="30" /><strong> Cpu_Id: </strong>{$cpu_id}</td>
+			    </tr>			
+			    <tr>
+				<td><img src="img/info/mask.png" height="30" /><strong> Cpu_Mask: </strong>{$cpu_mask}</td>
 			    </tr>
 			    
 			     <tr>
-			    <td><strong>server_tick: </strong>{$server_tick}</td>
+				<td><img src="img/info/ht.png" height="30" /><strong> HT: </strong>{$ht}</td>
 			    </tr>
 			    <tr>
-			    <td><strong>connect_state: </strong>{$connect_state}</td>
+				<td><img src="img/info/os.png" height="30" /><strong> OS: </strong>{$os}</td>
 			    </tr>
 			    <tr>
-			    <td><strong>local_address: </strong>{$local_address}</td>
+				<td><img src="img/info/nel.png" height="30" /><strong> NeL3D: </strong>{$nel3d}</td>
+			    </tr>
+			    
+			    <tr class="alert alert-info">
+				<td><center><strong> Network related </strong></center></td>
 			    </tr>
 			    <tr>
-			    <td><strong>os: </strong>{$os}</td>
+				<td><img src="img/info/connect.png" height="30" /><strong> Connect_State: </strong>{$connect_state}</td>
 			    </tr>
 			    <tr>
-			    <td><strong>processor: </strong>{$processor}</td>
+				<td><img src="img/info/local.png" height="30" /><strong> Local_Address: </strong>{$local_address}</td>
-			</tr>
-			<tr>
-			    <td><strong>cpu_id: </strong>{$cpu_id}</td>
-			</tr>			
-			<tr>
-			    <td><strong>cpu_mask: </strong>{$cpu_mask}</td>
-			</tr>
-			<tr>
-			    <td><strong>ht: </strong>{$ht}</td>
-			</tr>
-			<tr>
-			    <td><strong>nel3d: </strong>{$nel3d}</td>
-			</tr>
-			<tr>
-			    <td><strong>user_id: </strong>{$user_id}</td>
 			    </tr>
+			   
 		    </table>
-		
+		</div>
 	    </div>                   
         </div>
     </div><!--/span-->