diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php index 56715943b..09cec04e9 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/helpers.php @@ -10,14 +10,14 @@ class Helpers{ $smarty = new Smarty; // turn smarty debugging on/off - $smarty -> debugging = true; + $smarty -> debugging = false; // caching must be disabled for multi-language support $smarty -> caching = false; $smarty -> cache_lifetime = 120; helpers :: create_folders (); - if ( !helpers :: check_if_game_client () or $forcelibrender = true ){ + if ( helpers :: check_if_game_client () or $forcelibrender = false ){ $smarty -> template_dir = $AMS_LIB . '/ingame_templates/'; $smarty -> setConfigDir( $AMS_LIB . '/configs' ); }else{ @@ -44,7 +44,12 @@ class Helpers{ foreach ( $variables[$template] as $key => $value ){ $smarty -> assign( $key, $value ); } - $smarty -> display( $template . '.tpl' ); + if($vars['permission'] == 1){ + $inherited = "layout_admin.tpl"; + }else{ + $inherited = "layout_user.tpl"; + } + $smarty -> display( 'extends:' . $inherited .'|home.tpl' ); } public function create_folders(){ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css b/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css index 7b6ae40fa..1684e5fd9 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css +++ b/code/ryzom/tools/server/ryzom_ams/www/html/css/charisma-app.css @@ -452,7 +452,7 @@ background: #DEDEDE; } .login-header{ padding-top:30px; -height:120px; +height:190px; } .pull-left{ float:left !important; diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/mainlogo.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/mainlogo.png new file mode 100644 index 000000000..06d01c716 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/mainlogo.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomlogo.psd b/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomlogo.psd new file mode 100644 index 000000000..e7f614c29 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomlogo.psd differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomtop.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomtop.png new file mode 100755 index 000000000..bbed52f46 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomtop.png differ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php b/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php index 9556f50c7..b8be452dd 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php @@ -16,5 +16,7 @@ $page = 'home'; if ( isset( $_GET["page"] ) ){ $page = $_GET["page"]; } +//temporary set permission to 1 which = admin mode +$return = array('permission' => 1); -helpers :: loadTemplate( 'register' , $return ); +helpers :: loadTemplate( 'home' , $return ); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/js/charisma.js b/code/ryzom/tools/server/ryzom_ams/www/html/js/charisma.js index 579174176..6445ef69a 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/js/charisma.js +++ b/code/ryzom/tools/server/ryzom_ams/www/html/js/charisma.js @@ -1,7 +1,7 @@ $(document).ready(function(){ //themes, change CSS with JS //default theme(CSS) is cerulean, change it if needed - var current_theme = $.cookie('current_theme')==null ? 'cerulean' :$.cookie('current_theme'); + var current_theme = $.cookie('current_theme')==null ? 'spacelab' :$.cookie('current_theme'); switch_theme(current_theme); $('#themes a[data-value="'+current_theme+'"]').find('i').addClass('icon-ok'); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/login.php b/code/ryzom/tools/server/ryzom_ams/www/html/login.php index 202441863..9bb640c2c 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/login.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/login.php @@ -4,7 +4,7 @@ include('header.php'); ?>
-

Welcome to Charisma

+
@@ -16,12 +16,12 @@ include('header.php'); ?>
- +
- +
@@ -35,6 +35,10 @@ include('header.php'); ?>

+
+ Register + If you dont have an account yet, create one here! +
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 new file mode 100644 index 000000000..357d05932 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl @@ -0,0 +1,19 @@ +{block name=content} +
+
+
+

Ryzom Account Management System

+
+ + +
+
+
+

Ryzom AMS

+

Welcome to the Ryzom Account Management System!

+
+
+
+
+{/block} + 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 new file mode 100644 index 000000000..0c1c3655b --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl @@ -0,0 +1,234 @@ + + + + + + Ryzom Account Management System + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+
+ + + + + + + + +
+ + Change Theme / Skin + + + +
+ + + +
+ + admin + + + +
+ +
+
+
+
+
+ + +
+
+
    + {block name=menu}{/block} +
+ +
+
+ + + + +
+ + + {block name=content}{/block} + +
+ +
+ +
+ + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 new file mode 100644 index 000000000..73cddd510 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl @@ -0,0 +1,15 @@ +{extends file="layout.tpl"} +{block name=menu} +
  • Main
    • +
  • Dashboard
    • +
  • Settings
    • +
  • Logout
    • +
  • Admin
    • +
  • UserList
    • +
  • BanList
    • +
  • Ticketing
    • +
  • General Queue
    • +
  • Personal Queue
    • +
  • Ticket Archive
    • +{/block} + diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl new file mode 100644 index 000000000..81d2c7cc6 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl @@ -0,0 +1,11 @@ +{extends file="layout.tpl"} +{block name=menu} +
  • Main
    • +
  • Dashboard
    • +
  • Settings
    • +
  • Logout
    • +
  • Ticketing
    • +
  • New Ticket
    • +
  • Ticket Queue
    • +{/block} + diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl new file mode 100644 index 000000000..17100d13d --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl @@ -0,0 +1,115 @@ +{config_load file="ams_lib.conf" section="setup"} +
    + {$title} +
    + +
    + {$welcome_message} +
    + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    {$username_tag} + + {if isset($Username)}{$Username}{/if}
    {$password_tag} + + {if isset($PASSWORD_ERROR) && $PASSWORD_ERROR eq "TRUE"}{$Password}{/if}
    {$cpassword_tag} + {if isset($CPASSWORD_ERROR) && $CPASSWORD_ERROR eq "TRUE"}{$ConfirmPass}{/if}
    {$email_tag} + + {if isset($EMAIL_ERROR) && $EMAIL_ERROR eq "TRUE"}{$Email}{/if}
    {$tac_tag}{$tac_message}
    + +
    + +
    + +
    + +
    + +
    + {$username_tooltip} +
    + + +
    + {$password_message} +
    + +
    + {$cpassword_message} +
    + +
    + {$email_message} +
    + +
    \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/149a5753c6489e4c9837d8190f2360e006686ab6.file.home.tpl.php b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/149a5753c6489e4c9837d8190f2360e006686ab6.file.home.tpl.php new file mode 100644 index 000000000..f60719246 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/149a5753c6489e4c9837d8190f2360e006686ab6.file.home.tpl.php @@ -0,0 +1,297 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + '149a5753c6489e4c9837d8190f2360e006686ab6' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl', + 1 => 1371327630, + 2 => 'file', + ), + '9ae80e874700913f7c626d25edfb34ea50aafba8' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl', + 1 => 1371327397, + 2 => 'file', + ), + '82fdcb43de00a568e1631573af77d92f4505c948' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl', + 1 => 1371326024, + 2 => 'file', + ), + ), + 'nocache_hash' => '182818190051bcbf3b50f736-14104775', + 'function' => + array ( + ), + 'version' => 'Smarty-3.1.13', + 'unifunc' => 'content_51bcbf3b574410_14327703', + 'has_nocache_code' => false, +),false); /*/%%SmartyHeaderCode%%*/?> + + + + + + Ryzom Account Management System + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + Charisma + + +
    + + Change Theme / Skin + + + +
    + + + +
    + + admin + + + +
    + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + + + +
    +
    +
    +

    Ryzom Account Management System

    +
    + + +
    +
    +
    +

    Ryzom AMS

    +

    Welcome to the Ryzom Account Management System!

    +
    +
    +
    +
    + + +
    + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/82fdcb43de00a568e1631573af77d92f4505c948.file.layout.tpl.php b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/82fdcb43de00a568e1631573af77d92f4505c948.file.layout.tpl.php new file mode 100644 index 000000000..de4b7ef0f --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/82fdcb43de00a568e1631573af77d92f4505c948.file.layout.tpl.php @@ -0,0 +1,256 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + '82fdcb43de00a568e1631573af77d92f4505c948' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl', + 1 => 1371322463, + 2 => 'file', + ), + ), + 'nocache_hash' => '160017253151bca2b5a70430-40836818', + 'function' => + array ( + ), + 'version' => 'Smarty-3.1.13', + 'unifunc' => 'content_51bca2b5ab3437_35089772', + 'has_nocache_code' => false, +),false); /*/%%SmartyHeaderCode%%*/?> + + + + + + Ryzom Account Management System + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + Charisma + + +
    + + Change Theme / Skin + + + +
    + + + +
    + + admin + + + +
    + +
    +
    +
    +
    +
    + + +
    +
    +
      + +
    + +
    +
    + + + + +
    + + + + +
    + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/9ae80e874700913f7c626d25edfb34ea50aafba8.file.layout_admin.tpl.php b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/9ae80e874700913f7c626d25edfb34ea50aafba8.file.layout_admin.tpl.php new file mode 100644 index 000000000..837abc071 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/9ae80e874700913f7c626d25edfb34ea50aafba8.file.layout_admin.tpl.php @@ -0,0 +1,274 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + '9ae80e874700913f7c626d25edfb34ea50aafba8' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl', + 1 => 1371324061, + 2 => 'file', + ), + '82fdcb43de00a568e1631573af77d92f4505c948' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl', + 1 => 1371322463, + 2 => 'file', + ), + ), + 'nocache_hash' => '33219468451bcbeabacc0d9-76997576', + 'function' => + array ( + ), + 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.13', + 'unifunc' => 'content_51bcbeabb3c189_52163969', +),false); /*/%%SmartyHeaderCode%%*/?> + + + + + + Ryzom Account Management System + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + Charisma + + +
    + + Change Theme / Skin + + + +
    + + + +
    + + admin + + + +
    + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + + + + +
    + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/e046ca36f637970ade33573b506c58aad0b1a410.extends.home.tpl.php b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/e046ca36f637970ade33573b506c58aad0b1a410.extends.home.tpl.php new file mode 100644 index 000000000..d449862eb --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/e046ca36f637970ade33573b506c58aad0b1a410.extends.home.tpl.php @@ -0,0 +1,293 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + 'e046ca36f637970ade33573b506c58aad0b1a410' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl', + 1 => 1371327917, + 2 => 'file', + ), + 'f877c777d98fc313c8d29f39b0859e2aa1879e2e' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_user.tpl', + 1 => 1371327403, + 2 => 'file', + ), + '82fdcb43de00a568e1631573af77d92f4505c948' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl', + 1 => 1371326024, + 2 => 'file', + ), + ), + 'nocache_hash' => '37341928851bcce16930ba2-45846425', + 'function' => + array ( + ), + 'has_nocache_code' => false, + 'version' => 'Smarty-3.1.13', + 'unifunc' => 'content_51bcce1698f268_66900106', +),false); /*/%%SmartyHeaderCode%%*/?> + + + + + + Ryzom Account Management System + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + Charisma + + +
    + + Change Theme / Skin + + + +
    + + + +
    + + admin + + + +
    + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + + + +
    +
    +
    +

    Ryzom Account Management System

    +
    + + +
    +
    +
    +

    Ryzom AMS

    +

    Welcome to the Ryzom Account Management System!

    +
    +
    +
    +
    + + +
    + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/ec9cd121cf7179810948ac67558b081fc2e7cbb8.extends.home.tpl.php b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/ec9cd121cf7179810948ac67558b081fc2e7cbb8.extends.home.tpl.php new file mode 100644 index 000000000..15dbfc198 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/ec9cd121cf7179810948ac67558b081fc2e7cbb8.extends.home.tpl.php @@ -0,0 +1,297 @@ + +decodeProperties(array ( + 'file_dependency' => + array ( + 'ec9cd121cf7179810948ac67558b081fc2e7cbb8' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl', + 1 => 1371329107, + 2 => 'file', + ), + '9ae80e874700913f7c626d25edfb34ea50aafba8' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout_admin.tpl', + 1 => 1371327397, + 2 => 'file', + ), + '82fdcb43de00a568e1631573af77d92f4505c948' => + array ( + 0 => '/home/daan/ryzom/ryzomcore/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl', + 1 => 1371329620, + 2 => 'file', + ), + ), + 'nocache_hash' => '188962902651bcce005d1445-21118150', + 'function' => + array ( + ), + 'version' => 'Smarty-3.1.13', + 'unifunc' => 'content_51bcce0062ca40_45088230', + 'has_nocache_code' => false, +),false); /*/%%SmartyHeaderCode%%*/?> + + + + + + Ryzom Account Management System + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    +
    +
    + + + + + + + + +
    + + Change Theme / Skin + + + +
    + + + +
    + + admin + + + +
    + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + + + +
    +
    +
    +

    Ryzom Account Management System

    +
    + + +
    +
    +
    +

    Ryzom AMS

    +

    Welcome to the Ryzom Account Management System!

    +
    +
    +
    +
    + + +
    + +
    + +
    + + + + + +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file