From d7db1413240e17380a02148cc14a72257faad587 Mon Sep 17 00:00:00 2001 From: Botanic Date: Sat, 15 Jun 2013 07:08:38 -0700 Subject: [PATCH 1/9] changed to use .php not html --HG-- branch : rc-botanic-webdev --- .../tools/server/ryzom_ams/www/html/error.php | 2 +- .../server/ryzom_ams/www/html/header.php | 34 +++++++++---------- .../tools/server/ryzom_ams/www/html/login.php | 2 +- .../tools/server/ryzom_ams/www/html/tour.php | 4 +-- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/error.php b/code/ryzom/tools/server/ryzom_ams/www/html/error.php index e9e27be04..4d701a543 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/error.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/error.php @@ -73,7 +73,7 @@
The page your are looking for is not found. -
Go Home or
Search
+
Go Home or
Search
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/header.php b/code/ryzom/tools/server/ryzom_ams/www/html/header.php index dcf5cb115..3bc903697 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/header.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/header.php @@ -65,7 +65,7 @@ - Charisma Logo Charisma + Charisma Logo Charisma
@@ -96,7 +96,7 @@
@@ -125,21 +125,21 @@
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 63d46f3c8..713e449a0 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/login.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/login.php @@ -13,7 +13,7 @@ include('header.php'); ?>
Please login with your Username and Password.
-
+
diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/tour.php b/code/ryzom/tools/server/ryzom_ams/www/html/tour.php index b442bb60a..d4e24047f 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/tour.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/tour.php @@ -23,8 +23,8 @@
- Click Here to restart the tour
- You can create Custom Tour, like this.
For more help on implementing tour go here + Click Here to restart the tour
+ You can create Custom Tour, like this.
For more help on implementing tour go here
From 69730702300e7fb8d0759a7c95623a26006582bc Mon Sep 17 00:00:00 2001 From: Botanic Date: Sat, 15 Jun 2013 07:11:03 -0700 Subject: [PATCH 2/9] fixed to proper path --HG-- branch : rc-botanic-webdev --- code/ryzom/tools/server/ryzom_ams/www/html/header.php | 8 ++++---- code/ryzom/tools/server/ryzom_ams/www/html/login.php | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/header.php b/code/ryzom/tools/server/ryzom_ams/www/html/header.php index 3bc903697..c3af26217 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/header.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/header.php @@ -131,15 +131,15 @@
  • Charts
  • Typography
  • Gallery
    • -
  • Sample Section
    • +
  • Sample Section
  • Tables
  • Calendar
  • Grid
  • File Manager
    • -
  • Tour
    • +
  • Tour
  • Icons
    • -
  • Error Page
    • -
  • Login Page
    • +
  • Error Page
    • +
  • Login Page
    • 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 713e449a0..202441863 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/login.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/login.php @@ -13,7 +13,7 @@ include('header.php'); ?>
    Please login with your Username and Password.
    - +
    From af6dac032bde930d9be857d3584f614ca94367d1 Mon Sep 17 00:00:00 2001 From: Botanic Date: Sat, 15 Jun 2013 15:20:16 -0700 Subject: [PATCH 3/9] added .tpl.php and removed extra files --HG-- branch : rc-botanic-webdev --- .hgignore | 1 + ...9837d8190f2360e006686ab6.file.home.tpl.php | 297 ------------------ ...631573af77d92f4505c948.file.layout.tpl.php | 256 --------------- ...edfb34ea50aafba8.file.layout_admin.tpl.php | 274 ---------------- ...3573b506c58aad0b1a410.extends.home.tpl.php | 293 ----------------- ...8ac67558b081fc2e7cbb8.extends.home.tpl.php | 297 ------------------ 6 files changed, 1 insertion(+), 1417 deletions(-) delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates_c/149a5753c6489e4c9837d8190f2360e006686ab6.file.home.tpl.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates_c/82fdcb43de00a568e1631573af77d92f4505c948.file.layout.tpl.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates_c/9ae80e874700913f7c626d25edfb34ea50aafba8.file.layout_admin.tpl.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates_c/e046ca36f637970ade33573b506c58aad0b1a410.extends.home.tpl.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates_c/ec9cd121cf7179810948ac67558b081fc2e7cbb8.extends.home.tpl.php diff --git a/.hgignore b/.hgignore index 17929f871..9fb922bbb 100644 --- a/.hgignore +++ b/.hgignore @@ -146,6 +146,7 @@ external_stlport .svn thumbs.db Thumbs.db +*.tpl.php # build code/nel/build/* 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 deleted file mode 100644 index f60719246..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/149a5753c6489e4c9837d8190f2360e006686ab6.file.home.tpl.php +++ /dev/null @@ -1,297 +0,0 @@ - -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 deleted file mode 100644 index de4b7ef0f..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/82fdcb43de00a568e1631573af77d92f4505c948.file.layout.tpl.php +++ /dev/null @@ -1,256 +0,0 @@ - -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 deleted file mode 100644 index 837abc071..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/9ae80e874700913f7c626d25edfb34ea50aafba8.file.layout_admin.tpl.php +++ /dev/null @@ -1,274 +0,0 @@ - -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 deleted file mode 100644 index d449862eb..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/e046ca36f637970ade33573b506c58aad0b1a410.extends.home.tpl.php +++ /dev/null @@ -1,293 +0,0 @@ - -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 deleted file mode 100644 index 15dbfc198..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates_c/ec9cd121cf7179810948ac67558b081fc2e7cbb8.extends.home.tpl.php +++ /dev/null @@ -1,297 +0,0 @@ - -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 From 08d3d766a2d7b0d3724a05b99e3ae0674b9384aa Mon Sep 17 00:00:00 2001 From: Botanic Date: Sun, 16 Jun 2013 20:11:11 -0700 Subject: [PATCH 4/9] updated the index pages with home register and login --HG-- branch : rc-botanic-webdev --- .../ryzom_ams/ams_lib/autoload/helpers.php | 8 +- .../ryzom_ams/ams_lib/translations/en.ini | 4 + .../ryzom_ams/www/html/css/charisma-app.css | 10 +- .../server/ryzom_ams/www/html/index_old.php | 3 +- .../ryzom_ams/www/html/templates/home.tpl | 380 +++++++++++++++++- .../ryzom_ams/www/html/templates/login.tpl | 44 ++ 6 files changed, 434 insertions(+), 15 deletions(-) create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl 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 ec3e55284..091a07c64 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 @@ -1,7 +1,7 @@ display( 'register.tpl' ); + $smarty -> display( $template.'.tpl' ); } - public function create_folders(){ + static public function create_folders(){ global $AMS_LIB; global $SITEBASE; $arr = array( $AMS_LIB . '/ingame_templates/', @@ -72,7 +72,7 @@ class Helpers{ } - public function check_if_game_client() + static public function check_if_game_client() { // if HTTP_USER_AGENT is not set then its ryzom core if ( !isset( $_SERVER['HTTP_USER_AGENT'] ) ){ 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 abaa26747..e25bfd88b 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 @@ -1,6 +1,10 @@ ; This is a sample configuration file ; Comments start with ';', as in php.ini +[home] + +[login] + [register] title = "RYZOM CORE INGAME REGISTRATION" welcome_message = "Welcome! Please fill in the following fields to get your new Ryzom Core account:" 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 1684e5fd9..239446fe7 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 @@ -349,10 +349,11 @@ text-shadow:1px 1px 5px rgba(0, 0, 0, 0.5); width:166px; } .brand img{ -float:left; -height:20px; -width:20px; -margin-right:5px; + float: left; + height: 100%; + margin-bottom: -18px; + margin-top: -15px; + width: 100%; } .brand span{ float:left; @@ -411,6 +412,7 @@ min-height:80px; list-style:none; } #for-is-ajax{ +display: none; padding-left: 12px; cursor:pointer; } 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 b9f7990ce..62d4ffabf 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,7 +16,8 @@ $page = 'home'; if ( isset( $_GET["page"] ) ){ $page = $_GET["page"]; } + //temporary set permission to 1 which = admin mode $return = array('permission' => 1, 'no_visible_elements' => 'TRUE'); -helpers :: loadTemplate( 'register' , $return ); +helpers :: loadTemplate( $page , $return ); 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 357d05932..adbb04939 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 @@ -1,19 +1,387 @@ +{extends file="layout.tpl"} {block name=content} -
    + + +
    +
    +
    + + + + + + Charisma Logo + + +
    + + Change Theme / Skin + + + +
    + + + +
    + + admin + + + +
    + + + +
    +
    +
    + +
    +
    + + +
    +
    + + +
    +
    + + + + +
    + + + +
    + + +
    Total Members
    +
    507
    + 6 +     + + + +
    Pro Members
    +
    228
    + 4 +     + + + +
    Sales
    +
    $13320
    + $34 +     + + + +
    Messages
    +
    25
    + 12 +     +
    + +
    -

    Ryzom Account Management System

    +

    Introduction

    +
    + + + +
    +
    +
    +

    Charisma free, premium quality, responsive, multiple skin admin template.

    +

    Its a live demo of the template. I have created Charisma to ease the repeat work I have to do on my projects. Now I re-use Charisma as a base for my admin panel work and I am sharing it with you :)

    +

    All pages in the menu are functional, take a look at all, please share this with your followers.

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

    Member Activity

    -

    Ryzom AMS

    -

    Welcome to the Ryzom Account Management System!

    -
    +
    + +
    -
    +
    + +
    +
    +

    Realtime Traffic

    +
    + + +
    +
    +
    +
    0
    25
    50
    75
    100
    +

    You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.

    +

    Time between updates: milliseconds

    +
    +
    +
    + +
    +
    +
    +

    Buttons

    +
    + + + +
    +
    +
    +

    + + + +

    +

    + + + +

    +

    + + + +

    +

    + + + + +

    +

    + + + + +

    +

    + + + +

    +
    +
    + +
    +
    +

    Buttons

    +
    + + + +
    +
    +
    +

    + + +

    +

    + + +

    +

    + + +

    +

    + +

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

    Weekly Stat

    +
    + + + +
    +
    +
    + +
    +
    +
    + + + + + +
    +
    + +
    + + + + + +
    + {/block} 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 new file mode 100644 index 000000000..2c36c3ce3 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/login.tpl @@ -0,0 +1,44 @@ +{extends file="layout.tpl"} +{block name=content} + +
    + +
    + +
    + +
    +{/block} + From b5965029825d53cd4ebe60868e6aee91636e3ad4 Mon Sep 17 00:00:00 2001 From: Botanic Date: Sun, 16 Jun 2013 22:46:50 -0700 Subject: [PATCH 5/9] changed to default will override with custom.css --HG-- branch : rc-botanic-webdev --- .../server/ryzom_ams/www/html/css/charisma-app.css | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) 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 239446fe7..7b6ae40fa 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 @@ -349,11 +349,10 @@ text-shadow:1px 1px 5px rgba(0, 0, 0, 0.5); width:166px; } .brand img{ - float: left; - height: 100%; - margin-bottom: -18px; - margin-top: -15px; - width: 100%; +float:left; +height:20px; +width:20px; +margin-right:5px; } .brand span{ float:left; @@ -412,7 +411,6 @@ min-height:80px; list-style:none; } #for-is-ajax{ -display: none; padding-left: 12px; cursor:pointer; } @@ -454,7 +452,7 @@ background: #DEDEDE; } .login-header{ padding-top:30px; -height:190px; +height:120px; } .pull-left{ float:left !important; From 19f7b3ec9c86a61d555d36dd34aa97c2ff8b9127 Mon Sep 17 00:00:00 2001 From: Botanic Date: Sun, 16 Jun 2013 22:57:09 -0700 Subject: [PATCH 6/9] cleaned up formatting and added custom.css --HG-- branch : rc-botanic-webdev --- .../ryzom_ams/ams_lib/autoload/helpers.php | 38 +++++------ .../server/ryzom_ams/ams_lib/autoload/sql.php | 13 ++-- .../ryzom_ams/ams_lib/autoload/users.php | 25 ++++--- .../server/ryzom_ams/ams_lib/libinclude.php | 4 +- .../ryzom_ams/www/html/autoload/register.php | 8 +-- .../server/ryzom_ams/www/html/css/custom.css | 17 +++++ .../ryzom_ams/www/html/inc/add_user.php | 14 ++-- .../server/ryzom_ams/www/html/index_old.php | 12 ++-- .../server/ryzom_ams/www/html/js/charisma.js | 2 +- .../ryzom_ams/www/html/templates/home.tpl | 66 +++++++++---------- .../ryzom_ams/www/html/templates/layout.tpl | 16 +++-- 11 files changed, 116 insertions(+), 99 deletions(-) create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css 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 091a07c64..182f014cf 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 @@ -1,7 +1,7 @@ $value ){ $smarty -> assign( $key, $value ); } - if($vars['permission'] == 1){ - $inherited = "layout_admin.tpl"; - }else{ - $inherited = "layout_user.tpl"; - } - //extends:' . $inherited .'|register.tpl - $smarty -> display( $template.'.tpl' ); + if( $vars['permission'] == 1 ){ + $inherited = "layout_admin.tpl"; + }else{ + $inherited = "layout_user.tpl"; + } + // extends:' . $inherited .'|register.tpl + $smarty -> display( $template . '.tpl' ); } static public function create_folders(){ global $AMS_LIB; global $SITEBASE; - $arr = array( $AMS_LIB . '/ingame_templates/', - $AMS_LIB . '/configs', - $AMS_LIB . '/cache', - $SITEBASE . '/cache/', - $SITEBASE . '/templates/', - $SITEBASE . '/templates_c/', - $SITEBASE . '/configs' - ); - foreach ( $arr as & $value ){ + $arr = array( $AMS_LIB . '/ingame_templates/', + $AMS_LIB . '/configs', + $AMS_LIB . '/cache', + $SITEBASE . '/cache/', + $SITEBASE . '/templates/', + $SITEBASE . '/templates_c/', + $SITEBASE . '/configs' + ); + foreach ( $arr as & $value ){ if ( !file_exists( $value ) ){ mkdir( $value ); } - } + } } - static public function check_if_game_client() + static public function check_if_game_client() { // if HTTP_USER_AGENT is not set then its ryzom core if ( !isset( $_SERVER['HTTP_USER_AGENT'] ) ){ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sql.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sql.php index f64122f7c..609ed8740 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sql.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/autoload/sql.php @@ -1,11 +1,10 @@ $_POST["Username"], 'pass' => $_POST["Password"], 'mail' => $_POST["Email"], @@ -31,7 +31,7 @@ class Users{ header( 'Location: email_sent.php' ); exit; }else{ - $pageElements = array( + $pageElements = array( 'GAME_NAME' => variable_get( 'ryzommanage_game-name', '' ), 'WELCOME_MESSAGE' => variable_get( 'ryzommanage_register-welcome', '' ), 'USERNAME' => $user, @@ -44,7 +44,7 @@ class Users{ }else{ $pageElements['USERNAME_ERROR'] = 'FALSE'; } - + if ( $pass != "success" ){ $pageElements['PASSWORD_ERROR'] = 'TRUE'; }else{ @@ -68,10 +68,10 @@ class Users{ return $pageElements; } } - + /** * Function checkUser - * + * * @takes $username * @return string Info: Returns a string based on if the username is valid, if valid then "success" is returned */ @@ -84,7 +84,7 @@ class Users{ return "Username must be 5 or more characters."; }elseif ( !preg_match( '/^[a-z0-9\.]*$/', $username ) ){ return "Username can only contain numbers and letters."; - }elseif ( sql :: db_query( "SELECT COUNT(*) FROM {users} WHERE name = :name", array( + }elseif ( sql :: db_query( "SELECT COUNT(*) FROM {users} WHERE name = :name", array( ':name' => $username ) ) -> fetchField() ){ return "Username " . $username . " is in use."; @@ -98,7 +98,7 @@ class Users{ } /** * Function checkPassword - * + * * @takes $pass * @return string Info: Returns a string based on if the password is valid, if valid then "success" is returned */ @@ -117,7 +117,7 @@ class Users{ } /** * Function confirmPassword - * + * * @takes $pass * @return string Info: Verify's $_POST["Password"] is the same as $_POST["ConfirmPass"] */ @@ -132,16 +132,16 @@ class Users{ } /** * Function checkEmail - * + * * @takes $email - * @return + * @return */ public function checkEmail( $email ) { if ( isset( $email ) ){ if ( !validEmail( $email ) ){ return "Email address is not valid."; - }elseif ( db_query( "SELECT COUNT(*) FROM {users} WHERE mail = :mail", array( + }elseif ( db_query( "SELECT COUNT(*) FROM {users} WHERE mail = :mail", array( ':mail' => $email ) ) -> fetchField() ){ return "Email is in use."; @@ -230,4 +230,3 @@ class Users{ } } - \ No newline at end of file diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php b/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php index 86e7d3dbf..0d8606488 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/libinclude.php @@ -3,6 +3,6 @@ // Base include file for library functions for AMS // *********************************************** function __autoload( $className ){ - require_once 'autoload/' . strtolower ($className) . '.php'; - } + require_once 'autoload/' . strtolower ( $className ) . '.php'; + } diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/register.php b/code/ryzom/tools/server/ryzom_ams/www/html/autoload/register.php index 3821ccc3d..668b6a7a5 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/autoload/register.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/autoload/register.php @@ -16,7 +16,7 @@ if ( isset( $_POST["Username"] ) and isset( $_POST["Password"] ) and isset( $_PO } // if all are good then create user if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success" ) and ( $email == "success" ) and ( isset( $_POST["TaC"] ) ) ){ - $edit = array( + $edit = array( 'name' => $_POST["Username"], 'pass' => $_POST["Password"], 'mail' => $_POST["Email"], @@ -29,7 +29,7 @@ if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success" header( 'Location: email_sent.php' ); exit; }else{ - $pageElements = array( + $pageElements = array( 'GAME_NAME' => $GAME_NAME, 'WELCOME_MESSAGE' => $WELCOME_MESSAGE, 'USERNAME' => $user, @@ -42,7 +42,7 @@ if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success" }else{ $pageElements['USERNAME_ERROR'] = 'FALSE'; } - + if ( $pass != "success" ){ $pageElements['PASSWORD_ERROR'] = 'TRUE'; }else{ @@ -64,7 +64,7 @@ if ( ( $user == "success" ) and ( $pass == "success" ) and ( $cpass == "success" $pageElements['TAC_ERROR'] = 'TRUE'; } if ( helpers :: check_if_game_client() ){ - helpers :: loadtemplate( '../../ams_lib/ingame_templates/register.phtml', $pageElements ); + helpers :: loadtemplate( '../../ams_lib/ingame_templates/register.phtml', $pageElements ); }else{ helpers :: loadtemplate( 'templates/register.phtml', $pageElements ); } 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 new file mode 100644 index 000000000..fe0debbf4 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css @@ -0,0 +1,17 @@ +.login-header +{ + height:190px; +} + +.brand img +{ + height:100%; + margin-bottom:-18px; + margin-top:-15px; + width:100%; +} + +#for-is-ajax +{ + display:none; +} diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php b/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php index 4010619f7..41284659e 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/inc/add_user.php @@ -1,12 +1,12 @@ 1, 'no_visible_elements' => 'TRUE'); + } + +// temporary set permission to 1 which = admin mode +$return = array( 'permission' => 1, 'no_visible_elements' => 'TRUE' ); helpers :: loadTemplate( $page , $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 6445ef69a..579174176 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 ? 'spacelab' :$.cookie('current_theme'); + var current_theme = $.cookie('current_theme')==null ? 'cerulean' :$.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/templates/home.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl index adbb04939..ae7cabbfa 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 @@ -11,7 +11,7 @@ Charisma Logo - +
    @@ -31,7 +31,7 @@
    - +
    @@ -45,7 +45,7 @@
    - +
    @@ -53,7 +53,7 @@
    - +
    @@ -67,17 +67,17 @@
    - +     - +
    - +
    @@ -100,7 +100,7 @@
    $13320
    $34     - +
    Messages
    @@ -108,7 +108,7 @@ 12
    - +
    @@ -123,15 +123,15 @@

    Charisma free, premium quality, responsive, multiple skin admin template.

    Its a live demo of the template. I have created Charisma to ease the repeat work I have to do on my projects. Now I re-use Charisma as a base for my admin panel work and I am sharing it with you :)

    All pages in the menu are functional, take a look at all, please share this with your followers.

    - +
    - +
    - +

    Member Activity

    @@ -149,7 +149,7 @@ Name: Usman
    Since: 17/05/2012
    - Status: Approved + Status: Approved
  • @@ -157,7 +157,7 @@ Name: Sheikh Heera
    Since: 17/05/2012
    - Status: Pending + Status: Pending
  • @@ -165,7 +165,7 @@ Name: Abdullah
    Since: 25/05/2012
    - Status: Banned + Status: Banned
  • @@ -173,13 +173,13 @@ Name: Saruar Ahmed
    Since: 17/05/2012
    - Status: Updates + Status: Updates
    • - +

    Realtime Traffic

    @@ -241,7 +241,7 @@

    - +

    Buttons

    @@ -278,10 +278,10 @@
  • Separated link
    • - +
    - +

    Weekly Stat

    @@ -295,9 +295,9 @@
    - - - + + +
    - +
    {/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 index 3cda0b11b..56c8fe732 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 @@ -51,7 +51,9 @@ - + + + @@ -66,7 +68,7 @@ - +
    @@ -86,7 +88,7 @@
    - +
    @@ -117,14 +119,14 @@
    - + - +
    {/if} @@ -231,7 +233,7 @@ - - + + From 0b8c4968e988fda72b3220c75e449ff9b6eb2ff6 Mon Sep 17 00:00:00 2001 From: Botanic Date: Sun, 16 Jun 2013 23:13:38 -0700 Subject: [PATCH 7/9] changed index.php to correct file and created charisma index for backup --HG-- branch : rc-botanic-webdev --- .../tools/server/ryzom_ams/www/html/index.php | 340 +----------------- .../ryzom_ams/www/html/index_charisma.php | 329 +++++++++++++++++ .../server/ryzom_ams/www/html/index_old.php | 23 -- 3 files changed, 346 insertions(+), 346 deletions(-) create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php delete mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/index_old.php diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index.php b/code/ryzom/tools/server/ryzom_ams/www/html/index.php index 754a82e01..5f8479ffe 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index.php @@ -1,329 +1,23 @@ - + - -
    -
    - - -
    Total Members
    -
    507
    - 6 -     +if ( isset( $_POST["function"] ) ){ + require( "inc/" . $_POST["function"] . ".php" ); + $return = $_POST["function"](); + } - - -
    Pro Members
    -
    228
    - 4 -     +function loadpage ( $page ){ + require_once( 'autoload/' . $page . '.php' ); + } - - -
    Sales
    -
    $13320
    - $34 -     - - - -
    Messages
    -
    25
    - 12 -     -
    - -
    -
    -
    -

    Introduction

    -
    - - - -
    -
    -
    -

    Charisma free, premium quality, responsive, multiple skin admin template.

    -

    Its a live demo of the template. I have created Charisma to ease the repeat work I have to do on my projects. Now I re-use Charisma as a base for my admin panel work and I am sharing it with you :)

    -

    All pages in the menu are functional, take a look at all, please share this with your followers.

    - -

    - Back to article - Download Page -

    -
    -
    -
    -
    - -
    -
    -
    -

    Tabs

    -
    - - - -
    -
    -
    - - -
    -
    -

    Charisma a fully featued template

    -

    Its a fully featured, responsive template for your admin panel. Its optimized for tablet and mobile phones. Scan the QR code below to view it in your mobile device.

    QR Code -
    -
    -

    Custom small text

    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.

    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.

    -
    -
    -

    Messages small text

    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.

    -

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.

    -
    -
    -
    -
    - -
    -
    -

    Member Activity

    -
    - - -
    -
    -
    -
    - -
    -
    -
    - -
    -
    -

    Realtime Traffic

    -
    - - -
    -
    -
    -
    -

    You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.

    -

    Time between updates: milliseconds

    -
    -
    -
    +$page = 'home'; +if ( isset( $_GET["page"] ) ){ + $page = $_GET["page"]; + } -
    -
    -
    -

    Buttons

    -
    - - - -
    -
    -
    -

    - - - -

    -

    - - - -

    -

    - - - -

    -

    - - - - -

    -

    - - - - -

    -

    - - - -

    -
    -
    - -
    -
    -

    Buttons

    -
    - - - -
    -
    -
    -

    - - -

    -

    - - -

    -

    - - -

    -

    - -

    -
    - - - -
    - -
    -
    - -
    -
    -

    Weekly Stat

    -
    - - - -
    -
    -
    - -
    -
    -
    - +// temporary set permission to 1 which = admin mode +$return = array( 'permission' => 1, 'no_visible_elements' => 'TRUE' ); - - - +helpers :: loadTemplate( $page , $return ); diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php b/code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php new file mode 100644 index 000000000..bd2246229 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index_charisma.php @@ -0,0 +1,329 @@ + + + +
    + +
    +
    + + +
    Total Members
    +
    507
    + 6 +     + + + +
    Pro Members
    +
    228
    + 4 +     + + + +
    Sales
    +
    $13320
    + $34 +     + + + +
    Messages
    +
    25
    + 12 +     +
    + +
    +
    +
    +

    Introduction

    +
    + + + +
    +
    +
    +

    Charisma free, premium quality, responsive, multiple skin admin template.

    +

    Its a live demo of the template. I have created Charisma to ease the repeat work I have to do on my projects. Now I re-use Charisma as a base for my admin panel work and I am sharing it with you :)

    +

    All pages in the menu are functional, take a look at all, please share this with your followers.

    + +

    + Back to article + Download Page +

    +
    +
    +
    +
    + +
    +
    +
    +

    Tabs

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

    Charisma a fully featued template

    +

    Its a fully featured, responsive template for your admin panel. Its optimized for tablet and mobile phones. Scan the QR code below to view it in your mobile device.

    QR Code +
    +
    +

    Custom small text

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.

    +
    +
    +

    Messages small text

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor, quis ullamcorper ligula sodales at. Nulla tellus elit, varius non commodo eget, mattis vel eros. In sed ornare nulla. Donec consectetur, velit a pharetra ultricies, diam lorem lacinia risus, ac commodo orci erat eu massa. Sed sit amet nulla ipsum. Donec felis mauris, vulputate sed tempor at, aliquam a ligula. Pellentesque non pulvinar nisi.

    +

    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Curabitur bibendum ornare dolor.

    +
    +
    +
    +
    + +
    +
    +

    Member Activity

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

    Realtime Traffic

    +
    + + +
    +
    +
    +
    +

    You can update a chart periodically to get a real-time effect by using a timer to insert the new data in the plot and redraw it.

    +

    Time between updates: milliseconds

    +
    +
    +
    + +
    +
    +
    +

    Buttons

    +
    + + + +
    +
    +
    +

    + + + +

    +

    + + + +

    +

    + + + +

    +

    + + + + +

    +

    + + + + +

    +

    + + + +

    +
    +
    + +
    +
    +

    Buttons

    +
    + + + +
    +
    +
    +

    + + +

    +

    + + +

    +

    + + +

    +

    + +

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

    Weekly Stat

    +
    + + + +
    +
    +
    + +
    +
    +
    + + + + + 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 deleted file mode 100644 index 5b867439f..000000000 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index_old.php +++ /dev/null @@ -1,23 +0,0 @@ - 1, 'no_visible_elements' => 'TRUE' ); - -helpers :: loadTemplate( $page , $return ); From 46c1952de6e2c1259c07b5b8cb67f31a9f2b3b51 Mon Sep 17 00:00:00 2001 From: Botanic Date: Sun, 16 Jun 2013 23:28:58 -0700 Subject: [PATCH 8/9] changed default skin to cerulean and constrained proportions in css --HG-- branch : rc-botanic-webdev --- code/ryzom/tools/server/ryzom_ams/www/html/css/custom.css | 2 +- code/ryzom/tools/server/ryzom_ams/www/html/templates/home.tpl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) 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 fe0debbf4..1a9891e47 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 @@ -8,7 +8,7 @@ height:100%; margin-bottom:-18px; margin-top:-15px; - width:100%; + width:auto; } #for-is-ajax 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 ae7cabbfa..875e83091 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 @@ -20,13 +20,13 @@ From b1c97cab76121c09080846fdbbb1b54f2475d075 Mon Sep 17 00:00:00 2001 From: Botanic Date: Mon, 17 Jun 2013 00:25:04 -0700 Subject: [PATCH 9/9] working on help tips --HG-- branch : rc-botanic-webdev --- .../server/ryzom_ams/www/html/js/charisma.js | 98 +++++++++---------- .../server/ryzom_ams/www/html/js/help.js | 26 +++++ .../ryzom_ams/www/html/templates/home.tpl | 3 +- .../ryzom_ams/www/html/templates/layout.tpl | 3 + .../ryzom_ams/www/html/templates/register.tpl | 6 +- 5 files changed, 79 insertions(+), 57 deletions(-) create mode 100644 code/ryzom/tools/server/ryzom_ams/www/html/js/help.js 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..e18c7f66c 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 @@ -3,9 +3,9 @@ $(document).ready(function(){ //default theme(CSS) is cerulean, change it if needed var current_theme = $.cookie('current_theme')==null ? 'cerulean' :$.cookie('current_theme'); switch_theme(current_theme); - + $('#themes a[data-value="'+current_theme+'"]').find('i').addClass('icon-ok'); - + $('#themes a').click(function(e){ e.preventDefault(); current_theme=$(this).attr('data-value'); @@ -14,19 +14,19 @@ $(document).ready(function(){ $('#themes i').removeClass('icon-ok'); $(this).find('i').addClass('icon-ok'); }); - - + + function switch_theme(theme_name) { $('#bs-css').attr('href','css/bootstrap-'+theme_name+'.css'); } - + //ajax menu checkbox $('#is-ajax').click(function(e){ $.cookie('is-ajax',$(this).prop('checked'),{expires:365}); }); $('#is-ajax').prop('checked',$.cookie('is-ajax')==='true' ? true : false); - + //disbaling some functions for Internet Explorer if($.browser.msie) { @@ -34,16 +34,16 @@ $(document).ready(function(){ $('#for-is-ajax').hide(); $('#toggle-fullscreen').hide(); $('.login-box').find('.input-large').removeClass('span10'); - + } - - + + //highlight current / active link $('ul.main-menu li a').each(function(){ if($($(this))[0].href==String(window.location)) $(this).parent().addClass('active'); }); - + //establish history variables var History = window.History, // Note: We are using a capital H instead of a lower h @@ -65,7 +65,7 @@ $(document).ready(function(){ } }); }); - + //ajaxify menus $('a.ajax-link').click(function(e){ if($.browser.msie) e.which=1; @@ -80,9 +80,9 @@ $(document).ready(function(){ var $clink=$(this); History.pushState(null, null, $clink.attr('href')); $('ul.main-menu li.active').removeClass('active'); - $clink.parent('li').addClass('active'); + $clink.parent('li').addClass('active'); }); - + //animating menus on hover $('ul.main-menu li:not(.nav-header)').hover(function(){ $(this).animate({'margin-left':'+=5'},300); @@ -90,24 +90,24 @@ $(document).ready(function(){ function(){ $(this).animate({'margin-left':'-=5'},300); }); - + //other things to do on document ready, seperated for ajax calls docReady(); }); - - + + function docReady(){ //prevent # links from moving to top $('a[href="#"][data-top!=true]').click(function(e){ e.preventDefault(); }); - + //rich text editor $('.cleditor').cleditor(); - + //datepicker $('.datepicker').datepicker(); - + //notifications $('.noty').click(function(e){ e.preventDefault(); @@ -226,7 +226,7 @@ function docReady(){ }); //tour - if($('.tour').length && typeof(tour)=='undefined') + if($('.index').length && typeof(tour)=='undefined') { var tour = new Tour(); tour.addStep({ @@ -246,18 +246,7 @@ function docReady(){ title: "Dashboard", content: "This is your dashboard from here you will find highlights." }); - tour.addStep({ - element: "#for-is-ajax", - title: "Ajax", - content: "You can change if pages load with Ajax or not." - }); - tour.addStep({ - element: ".top-nav a:first", - placement: "bottom", - title: "Visit Site", - content: "Visit your front end from here." - }); - + tour.restart(); } @@ -284,10 +273,13 @@ function docReady(){ e.preventDefault(); $('#myModal').modal('show'); }); + $('.btn-help').click(function(e){ + alert('test'); + }); + - //initialize the external events for calender $('#external-events div.external-event').each(function() { @@ -296,17 +288,17 @@ function docReady(){ var eventObject = { title: $.trim($(this).text()) // use the element's text as the event title }; - + // store the Event Object in the DOM element so we can get to it later $(this).data('eventObject', eventObject); - + // make the event draggable using jQuery UI $(this).draggable({ zIndex: 999, revert: true, // will cause the event to go back to its revertDuration: 0 // original position after the drag }); - + }); @@ -320,31 +312,31 @@ function docReady(){ editable: true, droppable: true, // this allows things to be dropped onto the calendar !!! drop: function(date, allDay) { // this function is called when something is dropped - + // retrieve the dropped element's stored Event Object var originalEventObject = $(this).data('eventObject'); - + // we need to copy it, so that multiple events don't have a reference to the same object var copiedEventObject = $.extend({}, originalEventObject); - + // assign it the date that was reported copiedEventObject.start = date; copiedEventObject.allDay = allDay; - + // render the event on the calendar // the last `true` argument determines if the event "sticks" (http://arshaw.com/fullcalendar/docs/event_rendering/renderEvent/) $('#calendar').fullCalendar('renderEvent', copiedEventObject, true); - + // is the "remove after drop" checkbox checked? if ($('#drop-remove').is(':checked')) { // if so, remove the element from the "Draggable Events" list $(this).remove(); } - + } }); - - + + //chart with points if($("#sincos").length) { @@ -401,7 +393,7 @@ function docReady(){ previousPoint = null; } }); - + $("#sincos").bind("plotclick", function (event, pos, item) { @@ -411,14 +403,14 @@ function docReady(){ } }); } - + //flot chart if($("#flotchart").length) { var d1 = []; for (var i = 0; i < Math.PI * 2; i += 0.25) d1.push([i, Math.sin(i)]); - + var d2 = []; for (var i = 0; i < Math.PI * 2; i += 0.25) d2.push([i, Math.cos(i)]); @@ -426,7 +418,7 @@ function docReady(){ var d3 = []; for (var i = 0; i < Math.PI * 2; i += 0.1) d3.push([i, Math.tan(i)]); - + $.plot($("#flotchart"), [ { label: "sin(x)", data: d1}, { label: "cos(x)", data: d2}, @@ -449,7 +441,7 @@ function docReady(){ } }); } - + //stack chart if($("#stackchart").length) { @@ -502,7 +494,7 @@ function docReady(){ { label: "Firefox", data: 90}, { label: "Chrome", data: 112} ]; - + if($("#piechart").length) { $.plot($("#piechart"), data, @@ -520,7 +512,7 @@ function docReady(){ show: false } }); - + function pieHover(event, pos, obj) { if (!obj) @@ -530,7 +522,7 @@ function docReady(){ } $("#piechart").bind("plothover", pieHover); } - + //donut chart if($("#donutchart").length) { @@ -603,7 +595,7 @@ function docReady(){ plot.setData([ getRandomData() ]); // since the axes don't change, we don't need to call plot.setupGrid() plot.draw(); - + setTimeout(update, updateInterval); } 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 new file mode 100644 index 000000000..45ace5790 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/js/help.js @@ -0,0 +1,26 @@ +function show_help(help_tip) +{ + if(help_tip =='test') + { + var tour = new Tour(); + tour.addStep({ + element: ".span10:first", /* html element next to which the step popover should be shown */ + placement: "top", + title: "Custom Tour", /* title of the popover */ + content: "You can create tour like this. Click Next." /* content of the popover */ + }); + tour.addStep({ + element: ".theme-container", + placement: "left", + title: "Themes", + content: "You change your theme from here." + }); + tour.addStep({ + element: "ul.main-menu a:first", + title: "Dashboard", + content: "This is your dashboard from here you will find highlights." + }); + + tour.restart(); + } +} 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 875e83091..727fa9028 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 @@ -31,7 +31,7 @@ - +
    @@ -114,6 +114,7 @@

    Introduction

    + 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 56c8fe732..143babc0e 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 @@ -233,6 +233,9 @@ + + + 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 index c70fc0538..8649a7dc6 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/register.tpl @@ -12,7 +12,7 @@
    {$welcome_message}
    - +
    @@ -27,7 +27,7 @@ onfocus= "javascript:showTooltip('{$username_tooltip}', this);" /> - + @@ -124,7 +124,7 @@ - + {/block}
    {if isset($Username)}{$Username}{/if}