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

show time elapsed as tooltip, which could be handy, started making the show_reply.tpl

Browse source 
--HG--
branch : quitta-gsoc-2013
This commit is contained in:
Quitta 2013-07-13 18:04:40 +02:00
parent 26faa286bf
commit c1b7915219
5 changed files with 61 additions and 57 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php
View file

@ -29,31 +29,8 @@ class Helpers{
$smarty -> assign( $key, $value );
}
global $DEFAULT_LANGUAGE;
//if language get param is given = set cookie
//else if no get param is given and a cookie is set, use that language, else use default.
if ( isset( $_GET['language'] ) ) {
//check if the language is supported
if ( file_exists( $AMS_TRANS . '/' . $_GET['language'] . '.ini' ) ){
//if it's supported, set cookie!
setcookie( 'language',$_GET['language'], time() + 60*60*24*30 );
$language = $_GET['language'];
}else{
//the language is not supported, use the default.
$language = $DEFAULT_LANGUAGE;
}
}else{
//if no get param is given, check if a cookie value for language is set
if ( isset( $_COOKIE['language'] ) ) {
$language = $_COOKIE['language'];
}
//else use the default
else{
$language = $DEFAULT_LANGUAGE;
}
}
$variables = parse_ini_file( $AMS_TRANS . '/' . $language . '.ini', true );
$variables = Helpers::handle_language();
foreach ( $variables[$template] as $key => $value ){
$smarty -> assign( $key, $value );
}
@ -97,5 +74,36 @@ class Helpers{
return false;
}
}
static public function handle_language(){
global $DEFAULT_LANGUAGE;
global $AMS_TRANS;
//if language get param is given = set cookie
//else if no get param is given and a cookie is set, use that language, else use default.
if ( isset( $_GET['language'] ) ) {
//check if the language is supported
if ( file_exists( $AMS_TRANS . '/' . $_GET['language'] . '.ini' ) ){
//if it's supported, set cookie!
setcookie( 'language',$_GET['language'], time() + 60*60*24*30 );
$language = $_GET['language'];
}else{
//the language is not supported, use the default.
$language = $DEFAULT_LANGUAGE;
}
}else{
//if no get param is given, check if a cookie value for language is set
if ( isset( $_COOKIE['language'] ) ) {
$language = $_COOKIE['language'];
}
//else use the default
else{
$language = $DEFAULT_LANGUAGE;
}
}
return parse_ini_file( $AMS_TRANS . '/' . $language . '.ini', true );
}
}

27
code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/ticket_log.php
View file

@ -143,32 +143,7 @@ class Ticket_Log{
}
public function getActionTextArray(){
global $DEFAULT_LANGUAGE;
global $AMS_TRANS;
//if language get param is given = set cookie
//else if no get param is given and a cookie is set, use that language, else use default.
if ( isset( $_GET['language'] ) ) {
//check if the language is supported
if ( file_exists( $AMS_TRANS . '/' . $_GET['language'] . '.ini' ) ){
//if it's supported, set cookie!
setcookie( 'language',$_GET['language'], time() + 60*60*24*30 );
$language = $_GET['language'];
}else{
//the language is not supported, use the default.
$language = $DEFAULT_LANGUAGE;
}
}else{
//if no get param is given, check if a cookie value for language is set
if ( isset( $_COOKIE['language'] ) ) {
$language = $_COOKIE['language'];
}
//else use the default
else{
$language = $DEFAULT_LANGUAGE;
}
}
$variables = parse_ini_file( $AMS_TRANS . '/' . $language . '.ini', true );
$variables = Helpers::handle_language();
$result = array();
foreach ( $variables['ticket_log'] as $key => $value ){
$result[$key] = $value;

3
code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_log.php
View file

@ -23,7 +23,7 @@ function show_ticket_log(){
if($log['action'] == 2){
$query_backpart = WebUsers::getUsername($log['argument']);
}else if($log['action'] == 4){
$query_backpart = "<a href='index.php?page=show_reply&id=" . $log['argument'] . "'>" . $log['argument'] . "</a>";
$query_backpart = "<a href='index.php?page=show_reply&id=" . $log['argument'] . "'>ID#" . $log['argument'] . "</a>";
}else if($log['action'] == 5){
$statusArray = Ticket::getStatusArray();
$query_backpart = $statusArray[$log['argument'] ];
@ -32,6 +32,7 @@ function show_ticket_log(){
$query_backpart = $priorityArray[$log['argument'] ];
}
$result['ticket_logs'][$i]['query'] = $author . " " . $log_action_array[$log['action']] . " " . $query_backpart;
$result['ticket_logs'][$i]['timestamp_elapsed'] = Gui_Elements::time_elapsed_string($log['timestamp']);
$i++;
}
if(WebUsers::isAdmin()){

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

@ -0,0 +1,20 @@
{block name=content}
<div class="row-fluid sortable ui-sortable">
<div class="box span12">
<div class="box-header well" data-original-title="">
<h2><i class="icon-user"></i> Reply ID# of Ticket #</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>Info</legend>
</div>
</div>
</div><!--/span-->
</div><!--/row-->
{/block}

2
code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_log.tpl
View file

@ -23,7 +23,7 @@
{foreach from=$ticket_logs item=log}
<tr>
<td>{$log.tLogId}</td>
<td>{$log.timestamp}</td>
<td><a href="#" title="{$log.timestamp_elapsed}" data-rel="tooltip" data-placement="right">{$log.timestamp}</td>
<td>{$log.query}</td>
</tr>
{/foreach}