From 3aebdc0d4030cbc70590bf9737c2b7f2bd009dfe Mon Sep 17 00:00:00 2001 From: Quitta Date: Sat, 29 Jun 2013 20:46:38 +0200 Subject: [PATCH] added flags to inlog/logout etc, + added some base translations --- .../ryzom_ams/ams_lib/translations/en.ini | 11 ++++++++++ .../ryzom_ams/ams_lib/translations/fr.ini | 17 +++++++++++++++ .../server/ryzom_ams/www/html/css/custom.css | 7 +++++++ .../ryzom_ams/www/html/inc/libuserlist.php | 4 +++- .../server/ryzom_ams/www/html/js/help.js | 1 + .../ryzom_ams/www/html/templates/home.tpl | 4 ++-- .../ryzom_ams/www/html/templates/layout.tpl | 9 ++++++++ .../www/html/templates/libuserlist.tpl | 21 ++++++++++++------- .../ryzom_ams/www/html/templates/login.tpl | 3 +-- 9 files changed, 65 insertions(+), 12 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini index dd83a5cfe..32424d073 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/en.ini @@ -2,6 +2,8 @@ ; Comments start with ';', as in php.ini [home] +home_title = "Introduction" +home_info = "Welcome to the Ryzom Core - Account Management System" [libuserlist] libuserlist_title = "LibDB-Query List" @@ -9,6 +11,13 @@ libuserlist_info = "Here you can see the entire list of elements in the LibDB-Qu libuserlist_sync = "Synchronize" shard_online = "The shard seems to be online, manually syncing is possible: " shard_offline = "The shard seems to be offline, manually syncing is not possible!" +members = "Members" +id = "ID" +type = "Type" +name = "Name" +email = "Email" +action = "Action" + [userlist] userlist_info = "welcome to the userlist" @@ -16,6 +25,8 @@ userlist_info = "welcome to the userlist" [login] login_info = "Please login with your Username and Password." login_error_message = "The filled in username/password were not correct!" +login_register_message ="RegisterIf you dont have an account yet, create one" +login_register_message_here = "here" [logout] logout_message = "You've been logged out successfully!" diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini index 432845f91..e44f38aad 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/translations/fr.ini @@ -2,6 +2,21 @@ ; Comments start with ';', as in php.ini [home] +home_title = "Presentation" +home_info = "Bienvenue sur le Ryzom Core - Account Management System" + +[libuserlist] +libuserlist_title = "LibDB-Query Liste" +libuserlist_info = "Ici vous pouvez voir la liste complete des elements dans le tableau libdb-Query. Vous pouvez facilement supprimer des elements et appuyant sur 'Synchroniser', vous pouvez commencer le processus de synchronisation manuellement!" +libuserlist_sync = "Synchroniser" +shard_online = "Le shard semble etre ligne , la synchronisation manuellement est possible: " +shard_offline = "Le shard semble etre deconnecte , la synchronisation manuellement n' est pas possible!" +members = "Membres" +id = "ID" +type = "Categorie" +name = "Nom" +email = "Email" +action = "Action" [userlist] userlist_info = "bienvenue sur le userlist page!" @@ -9,6 +24,8 @@ userlist_info = "bienvenue sur le userlist page!" [login] login_info = "S'il vous plait vous connecter avec votre nom d'utilisateur et mot de passe." login_error_message = "Le remplie nom d'utilisateur / mot de passe ne sont pas correctes!" +login_register_message =" Inscrivez-vous Si vous n'avez pas encore de compte, creez-en un" +login_register_message_here = "ici" [logout] logout_message = "Vous avez été déconnecté avec succès!" diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css b/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css index 28e29141f..2e94ade39 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css +++ b/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css @@ -25,4 +25,11 @@ position:relative; left:290px; top:28px; +} + +.flags_no_visible_elements{ + display: block; + position:relative; + left:67%; + top:210px; } \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php index cf50dad36..3bb43d39e 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php @@ -14,6 +14,9 @@ function libuserlist(){ global $cfg; $dbl = new DBLayer($cfg['db']['lib']); $rows = $dbl->executeWithoutParams("SELECT * FROM ams_querycache")->rowCount(); + + //the array hat will contain all users + $pageResult['liblist'] = Array(); if($rows > 0){ //This is the number of results displayed per page $page_rows = 2; @@ -37,7 +40,6 @@ function libuserlist(){ //This is where we put the results in a resultArray to be sent to smarty - $pageResult['liblist'] = Array(); $i = 0; while($row = $data->fetch(PDO::FETCH_ASSOC)){ $decode = json_decode($row['query']); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/help.js b/code/ryzom/tools/server/ryzom_ams/www/html/js/help.js index 60a9980aa..3c1fad7b3 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/js/help.js +++ b/code/ryzom/tools/server/ryzom_ams/www/html/js/help.js @@ -25,3 +25,4 @@ function show_help(help_tip) } +$("#sync").click(function() {alert("Handler for .click() called.");}); \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl index fb14ba5ba..6198b53a1 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl @@ -34,7 +34,7 @@
-

Introduction

+

{$home_title}

@@ -43,7 +43,7 @@
-

Welcome to the Ryzom Core - Account Management System

+

{$home_info}

diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl index 3ef43941d..c15e668cb 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl @@ -138,6 +138,15 @@
{/if} + + {if isset($no_visible_elements) and $no_visible_elements eq "TRUE"} + +
+ + +
+ + {/if} {block name=content}{/block} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/libuserlist.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/libuserlist.tpl index cb40121b8..e8dee32fd 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/libuserlist.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/libuserlist.tpl @@ -16,7 +16,14 @@

{$libuserlist_info}

{if $shard eq "online"}
- {$shard_online}{$libuserlist_sync} + {$shard_online}{$libuserlist_sync} +
{else}
@@ -31,7 +38,7 @@
-

Members

+

{$members}

@@ -42,11 +49,11 @@ - - - - - + + + + + diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl index a31bfe6c7..2fbde3b50 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl @@ -43,8 +43,7 @@ {/if}
- Register - If you dont have an account yet, create one here! + {$login_register_message} {$login_register_message_here}!
IDTypeNameEmailAction{$id}{$type}{$name}{$email}{$action}