From 5b4c13f8d390df3728c8dd961f60fa4dee1d07c6 Mon Sep 17 00:00:00 2001 From: Quitta Date: Mon, 5 Aug 2013 05:37:18 +0200 Subject: [PATCH] renamed libuserlist to syncing, which is more appropriate, also made pagination work! so Now I can start to use it ingame too! --HG-- branch : quitta-gsoc-2013 --- .../ams_lib/ingame_templates/libuserlist.tpl | 73 ------------------- .../ryzom_ams/ams_lib/translations/en.ini | 8 +- .../ryzom_ams/ams_lib/translations/fr.ini | 8 +- .../html/inc/{libuserlist.php => syncing.php} | 4 +- .../www/html/templates/layout_admin.tpl | 2 +- .../{libuserlist.tpl => syncing.tpl} | 12 +-- 6 files changed, 17 insertions(+), 90 deletions(-) delete mode 100644 code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/libuserlist.tpl rename code/ryzom/tools/server/ryzom_ams/www/html/inc/{libuserlist.php => syncing.php} (94%) rename code/ryzom/tools/server/ryzom_ams/www/html/templates/{libuserlist.tpl => syncing.tpl} (86%) diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/libuserlist.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/libuserlist.tpl deleted file mode 100644 index 645de53f2..000000000 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/libuserlist.tpl +++ /dev/null @@ -1,73 +0,0 @@ -{block name=content} - -
-
-
-

{$libuserlist_title}

-
- - - - -
-
-
-
-

{$libuserlist_info}

- {if $shard eq "online"} -
- {$shard_online}{$libuserlist_sync} - -
- {else} -
- {$shard_offline} -
- {/if} -
-
-
-
-
-
-
-
-

{$members}

-
- - - -
-
-
- - - - - - - - - {foreach from=$liblist item=element} - - - - - - - {/foreach} - - -
{$id}{$type}
{$element.id}{$element.type}
-
-
- -
-{/block} - 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 7ba5aaf28..90619bcfc 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 @@ -7,10 +7,10 @@ home_info = "Welcome to the Ryzom Core - Account Management System" [settings] -[libuserlist] -libuserlist_title = "LibDB-Query List" -libuserlist_info = "Here you can see the entire list of elements in the LibDB-Query table. You can easily remove elements and by pressing 'Synchronize' you can start the syncing process manually!" -libuserlist_sync = "Synchronize" +[syncing] +syncing_title = "LibDB-Query List" +syncing_info = "Here you can see the entire list of elements in the LibDB-Query table. You can easily remove elements and by pressing 'Synchronize' you can start the syncing process manually!" +syncing_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" 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 b8f145abe..9127fd0a3 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 @@ -7,10 +7,10 @@ home_info = "Bienvenue sur le Ryzom Core - Account Management System" [settings] -[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" +[syncing] +syncing_title = "LibDB-Query Liste" +syncing_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!" +syncing_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" diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/syncing.php similarity index 94% rename from code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php rename to code/ryzom/tools/server/ryzom_ams/www/html/inc/syncing.php index 66e8b9634..bca38bd74 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/libuserlist.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/syncing.php @@ -1,10 +1,10 @@ getElements() , Array("getSID","getType"), Array("id","type")); $pageResult['links'] = $pagination->getLinks(5); $pageResult['lastPage'] = $pagination->getLast(); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl index bdda0a892..c50c1c20d 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl @@ -9,7 +9,7 @@
  • Queues
  • Support Groups
  • Actions
    • -
  • Syncing
    • +
  • Syncing
  • Logout
    • {/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/syncing.tpl similarity index 86% rename from code/ryzom/tools/server/ryzom_ams/www/html/templates/libuserlist.tpl rename to code/ryzom/tools/server/ryzom_ams/www/html/templates/syncing.tpl index 6c8f9af09..56bd0cca3 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/libuserlist.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/syncing.tpl @@ -3,7 +3,7 @@
    -

    {$libuserlist_title}

    +

    {$syncing_title}

    @@ -13,10 +13,10 @@
    -

    {$libuserlist_info}

    +

    {$syncing_info}

    {if $shard eq "online"}
    - {$shard_online}{$libuserlist_sync} + {$shard_online}{$syncing_sync}