diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl index b876fa1c5..83712192c 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl @@ -1,14 +1,5 @@ {extends file="layout.tpl"} {block name=menu} -
  • Main
    • -
  • Dashboard
    • -
  • Profile
    • -
  • Settings
    • -
  • Actions
    • -
  • Create New Ticket
    • -
  • Logout
    • - -
    Dashboard
    Profile
     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 377f57de4..fe27b2ce7 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 @@ -10,7 +10,7 @@ {if isset($isMod) and $isMod eq "TRUE"}Show Ticket Log{/if} Send Other Ticket - Show Additional Info + {if $hasInfo}Show Additional Info{/if} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl index 2516620c2..9edb32cda 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_ticket_info.tpl @@ -1,96 +1,149 @@ {block name=content} -
    -
    -
    -

    [#{$ticket_id}] {$ticket_title}

    -
    - - -
    -
    -
    -
    - Additional Info - - -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + {/block} diff --git a/code/ryzom/tools/server/ryzom_ams/credits.txt b/code/ryzom/tools/server/ryzom_ams/credits.txt new file mode 100644 index 000000000..21c8eeb2a --- /dev/null +++ b/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) \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png new file mode 100644 index 000000000..83443dd76 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/client.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png new file mode 100644 index 000000000..f3675f0f4 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/connect.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png new file mode 100644 index 000000000..c3e531ff3 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/cpuid.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png new file mode 100644 index 000000000..fcf468e71 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/ht.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png new file mode 100644 index 000000000..4cb748c8d Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/local.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png new file mode 100644 index 000000000..2f0685bde Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/mask.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png new file mode 100644 index 000000000..35111c0ee Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/memory.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png new file mode 100644 index 000000000..b23e2534a Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/nel.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png new file mode 100644 index 000000000..30f04153a Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/os.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png new file mode 100644 index 000000000..7c00408ff Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/patch.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png new file mode 100644 index 000000000..ffa627e52 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/position.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png new file mode 100644 index 000000000..411be15c2 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/processor.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png new file mode 100644 index 000000000..7edc55e2f Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/server.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png new file mode 100644 index 000000000..414c63a70 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/shard.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png new file mode 100644 index 000000000..1267388c4 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/user.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png new file mode 100644 index 000000000..b21e63576 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/info/view.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php index 14f9c026c..84bea6d97 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/show_ticket_info.php +++ b/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"; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl index 54f8e13d2..d66d43162 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/show_ticket_info.tpl @@ -11,61 +11,71 @@
    Additional Info - - - -
    Shard ID: {$shard_id}
    User Position: {$user_position}
    View Position: {$view_position}
    client_version: {$client_version}
    patch_version: {$patch_version}
    memory: {$memory}
    server_tick: {$server_tick}
    connect_state: {$connect_state}
    local_address: {$local_address}
    os: {$os}
    processor: {$processor}
    cpu_id: {$cpu_id}
    cpu_mask: {$cpu_mask}
    ht: {$ht}
    nel3d: {$nel3d}
    + + + + + + + +
    + + + + +
    + + + {if isset($isMod) and $isMod eq "TRUE"}{/if} + + +
    Show Ticket LogSend Other TicketShow Ticket
    - - - - - -
    -
    -

    Actions

    -
    - - -
    -
    -
    -
    - - Actions -
    - - -
    -
    -
    -
    - +
    +
    +
    + + + + + + + + + +

    Additional Info For Ticket [#{$ticket_id}]

    +
    + + + + + + + + + + +
    + + +
    +
    + + +
    + + +
    + + +
    + + + + +
    + + +
    +

    Ingame related

    + + + + + + + + + + + + + + + + + + + + + + +
    Shard ID: {$shard_id}
    User_Id: {$user_id}
    User Position: {$user_position}
    View Position: {$view_position}
    Client_Version: {$client_version}
    Patch_Version: {$patch_version}
    Server_Tick: {$server_tick}
    +
    +
    + + +
    +

    Hardware & Software related

    + + + + + + + + + + + + + + + + + + + + + + +
    Memory: {$memory}
    Processor: {$processor}
    Cpu_Id: {$cpu_id}
    Cpu_Mask: {$cpu_mask}
    HT: {$ht}
    OS: {$os}
    NeL3D: {$nel3d}
    +
    +
    + + +
    +

    Network related

    + + + + + + + +
    Connect_State: {$connect_state}
    Local_Address: {$local_address}
    +
    +
    +
    +
    +
    +
    + +
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Shard ID: {$shard_id}
    User Position: {$user_position}
    View Position: {$view_position}
    client_version: {$client_version}
    patch_version: {$patch_version}
    memory: {$memory}
    server_tick: {$server_tick}
    connect_state: {$connect_state}
    local_address: {$local_address}
    os: {$os}
    processor: {$processor}
    cpu_id: {$cpu_id}
    cpu_mask: {$cpu_mask}
    ht: {$ht}
    nel3d: {$nel3d}
    user_id: {$user_id}
    - +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Ingame related
    Shard ID: {$shard_id}
    User_Id: {$user_id}
    User Position: {$user_position}
    View Position: {$view_position}
    Client_Version: {$client_version}
    Patch_Version: {$patch_version}
    Server_Tick: {$server_tick}
    Hardware & Software related
    Memory: {$memory}
    Processor: {$processor}
    Cpu_Id: {$cpu_id}
    Cpu_Mask: {$cpu_mask}
    HT: {$ht}
    OS: {$os}
    NeL3D: {$nel3d}
    Network related
    Connect_State: {$connect_state}
    Local_Address: {$local_address}
    +