From 1c4bb138e92044a36e11b3d60f2a0921808522ff Mon Sep 17 00:00:00 2001 From: Quitta Date: Mon, 17 Jun 2013 16:29:20 +0200 Subject: [PATCH] Select automatically if it should load with no_visible_elements on or off + minor updates --HG-- branch : quitta-gsoc-2013 --- code/ryzom/tools/server/ryzom_ams/www/html/index.php | 10 +++++++--- code/ryzom/tools/server/ryzom_ams/www/html/js/help.js | 6 +++--- .../tools/server/ryzom_ams/www/html/templates/home.tpl | 6 ++---- .../server/ryzom_ams/www/html/templates/layout.tpl | 1 - 4 files changed, 12 insertions(+), 11 deletions(-) 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 e925bb92c..e4e265903 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index.php @@ -12,12 +12,16 @@ function loadpage ( $page ){ require_once( 'autoload/' . $page . '.php' ); } -$page = 'home'; +$page = 'login'; if ( isset( $_GET["page"] ) ){ $page = $_GET["page"]; } -// temporary set permission to 1 which = admin mode -$return = array( 'permission' => 1, 'no_visible_elements' => 'FALSE' ); +//Page Handling +if($page == 'login' || $page == 'register'){ + $no_visible_elements = 'TRUE'; +} +// temporary set permission to 2 which = admin mode +$return = array( 'permission' => 1, 'no_visible_elements' => $no_visible_elements ); helpers :: loadTemplate( $page , $return ); 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 519454ef6..60a9980aa 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 @@ -1,13 +1,13 @@ function show_help(help_tip) { - if(help_tip =='test') + if(help_tip =='intro') { var tour = new Tour(); tour.addStep({ element: ".brand:first", /* html element next to which the step popover should be shown */ placement: "bottom", - title: "Custom Tour", /* title of the popover */ - content: "You can create tour like this. Click Next." /* content of the popover */ + title: "Account Management System", /* title of the popover */ + content: "Welcome to the Ryzom Core Account Management System! Let's explore it together... Click next!" /* content of the popover */ }); tour.addStep({ element: ".theme-container", 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 f517f60c4..fb14ba5ba 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 @@ -36,16 +36,14 @@

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.

+

Welcome to the Ryzom Core - Account Management System

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 90902b2f5..95432a22b 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 @@ -88,7 +88,6 @@ -