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 182f014cf..daed71db8 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 @@ -44,13 +44,15 @@ class Helpers{ foreach ( $variables[$template] as $key => $value ){ $smarty -> assign( $key, $value ); } - if( $vars['permission'] == 1 ){ - $inherited = "layout_admin.tpl"; - }else{ - $inherited = "layout_user.tpl"; - } + if( $vars['permission'] == 2 ){ + $inherited = "extends:layout_admin.tpl|"; + }else if($vars['permission'] == 1){ + $inherited = "extends:layout_user.tpl|"; + }else{ + $inherited =""; + } // extends:' . $inherited .'|register.tpl - $smarty -> display( $template . '.tpl' ); + $smarty -> display( $inherited . $template . '.tpl' ); } static public function create_folders(){ diff --git a/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore.png b/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore.png new file mode 100755 index 000000000..ff2295854 Binary files /dev/null and b/code/ryzom/tools/server/ryzom_ams/www/html/img/ryzomcore.png differ 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 5f8479ffe..e925bb92c 100644 --- a/code/ryzom/tools/server/ryzom_ams/www/html/index.php +++ b/code/ryzom/tools/server/ryzom_ams/www/html/index.php @@ -18,6 +18,6 @@ if ( isset( $_GET["page"] ) ){ } // temporary set permission to 1 which = admin mode -$return = array( 'permission' => 1, 'no_visible_elements' => 'TRUE' ); +$return = array( 'permission' => 1, 'no_visible_elements' => 'FALSE' ); 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 3f34f46ec..519454ef6 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 @@ -4,8 +4,8 @@ function show_help(help_tip) { var tour = new Tour(); tour.addStep({ - element: ".dashboard-avatar:first", /* html element next to which the step popover should be shown */ - placement: "top", + 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 */ }); 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 87b8f36ad..f517f60c4 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,388 +1,55 @@ -{extends file="layout.tpl"} {block name=content} - -
-
-
- - - - - - Charisma Logo - -
- - Change Theme / Skin - - - +
+ + +
Total Members
+
507
+ 6 + + + + +
Pro Members
+
228
+ 4 + + + + +
Sales
+
$13320
+ $34 + + + + +
Messages
+
25
+ 12 + +
+ +
+
+
+

Introduction

+
+ + + +
- - - -
- - admin - - - -
- - - +
+
+

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.

+ +
- -
-
- - -
-
- - -
-
- - - - -
- - - -
- - -
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.

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

Member Activity

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

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/homebackup.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/homebackup.tpl new file mode 100644 index 000000000..8ba4ae14f --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/www/html/templates/homebackup.tpl @@ -0,0 +1,388 @@ +{extends file="layout.tpl"} +{block name=content} + + +
+
+
+ + + + + + Ryzom Core Logo + + +
+ + Change Theme / Skin + + + +
+ + + +
+ + admin + + + +
+ + + +
+
+
+ +
+
+ + +
+
+ + +
+
+ + + + +
+ + + +
+ + +
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.

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

Member Activity

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

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/layout.tpl b/code/ryzom/tools/server/ryzom_ams/www/html/templates/layout.tpl index 143babc0e..defca39d3 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 @@ -58,7 +58,6 @@ {if ! isset($no_visible_elements) or $no_visible_elements eq "FALSE"} -
@@ -67,17 +66,17 @@ - + Ryzom Core Logo -
+
Change Theme / Skin
- + -
+
admin @@ -98,10 +97,12 @@
+ +
@@ -115,7 +116,7 @@
    {block name=menu}{/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 index 81d2c7cc6..5c5c25689 100644 --- 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 @@ -1,11 +1,8 @@ {extends file="layout.tpl"} {block name=menu} -
  • Main
    • -
  • Dashboard
    • -
  • Settings
    • -
  • Logout
    • -
  • Ticketing
    • -
  • New Ticket
    • -
  • Ticket Queue
    • +
  • Main
    • +
  • Dashboard
    • +
  • Sample Section
    • +
  • Login Page
    • {/block}