From a2e69be7d7bdc7a55f36e892dabecdd8314d7c8b Mon Sep 17 00:00:00 2001 From: Quitta Date: Tue, 30 Jul 2013 17:31:28 +0200 Subject: [PATCH] trying to get basic layout done + removed the sidebar + added a scrollbar + the home button needs correct text. --HG-- branch : quitta-gsoc-2013 --- .../data/gamedev/interfaces_v3/help.xml | 59 ++++------- .../ryzom_ams/ams_lib/autoload/helpers.php | 23 ++--- .../ams_lib/ingame_templates/home.tpl | 47 +-------- .../ams_lib/ingame_templates/layout.tpl | 74 ++++++++++++++ .../ams_lib/ingame_templates/layout_admin.tpl | 14 +++ .../ams_lib/ingame_templates/layout_mod.tpl | 14 +++ .../ams_lib/ingame_templates/layout_user.tpl | 11 +++ .../ams_lib/ingame_templates/show_user.tpl | 98 +++++++++++++++++++ 8 files changed, 243 insertions(+), 97 deletions(-) create mode 100644 code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl create mode 100644 code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl create mode 100644 code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl create mode 100644 code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl create mode 100644 code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml index 7cad23b26..a90cf5e81 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/help.xml +++ b/code/ryzom/client/data/gamedev/interfaces_v3/help.xml @@ -907,6 +907,22 @@ group_params_r="menu=ui:interface:base_menu_with_color" on_active="lua" on_active_params="help:openCSBrowserHeader('cs_browser')"> + + + + + + - - - - - - - - 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 e55ecf71a..0067881ba 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 @@ -34,21 +34,18 @@ class Helpers{ foreach ( $variables[$template] as $key => $value ){ $smarty -> assign( $key, $value ); } - if (! helpers :: check_if_game_client ()){ - if( isset($vars['permission']) && $vars['permission'] == 3 ){ - $inherited = "extends:layout_admin.tpl|"; - }else if( isset($vars['permission']) && $vars['permission'] == 2){ - $inherited = "extends:layout_mod.tpl|"; - }else if( isset($vars['permission']) && $vars['permission'] == 1){ - $inherited = "extends:layout_user.tpl|"; - }else{ - $inherited =""; - } - // extends:' . $inherited .'|register.tpl - $smarty -> display( $inherited . $template . '.tpl' ); + + if( isset($vars['permission']) && $vars['permission'] == 3 ){ + $inherited = "extends:layout_admin.tpl|"; + }else if( isset($vars['permission']) && $vars['permission'] == 2){ + $inherited = "extends:layout_mod.tpl|"; + }else if( isset($vars['permission']) && $vars['permission'] == 1){ + $inherited = "extends:layout_user.tpl|"; }else{ - $smarty -> display($template . '.tpl' ); + $inherited =""; } + // extends:' . $inherited .'|register.tpl + $smarty -> display( $inherited . $template . '.tpl' ); } static public function create_folders(){ diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl index 6198b53a1..4f1851563 100644 --- a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/home.tpl @@ -1,53 +1,12 @@ {block name=content} -
- - -
Total Members
-
507
- 6 - + - - -
Pro Members
-
228
- 4 - - - - -
Sales
-
$13320
- $34 - - - - -
Messages
-
25
- 12 - -
- -
-
-
+

{$home_title}

-
- - - - -
-
-
+

{$home_info}

-
-
-
-
{/block} diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl new file mode 100644 index 000000000..11e2c6802 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout.tpl @@ -0,0 +1,74 @@ + + + + + Ryzom Account Management System + + + + + + +
+ + + + + {block name=menu}{/block} + + + +
+ + + + + + + +

Forums

 + + + + +
+
+ + +
+
+
+ + + + + + + + + +
+
+
Public
Topics
Posts
Last post
Official News (arispotle) (1076)341244Casy
4 days ago
General (arispotle) (2564)
Come in, pull up a chair, let's discuss all things Ryzom-related. Guests can post.		4905115Fyrosfreddy
21.3 hours ago
Support (arispotle) (1240)
Have a problem getting things to work? Drop us a line here and you'll find all the help you need. Guests can post.		3152037Fyrosfreddy
2 days ago
Ideas For Ryzom (arispotle) (2478)
Do you have an idea for Ryzom? +It's time to add it and see if other people think it's a good idea!		4514403Toak
22.7 hours ago
Web Apps Bugs, Comments, Notes, Etc (355)
Only for Web Apps related things. In English please :-)		2071230Arfur
2 days ago
.......................... .................... (arispotle) (101)18110Amedala
3 weeks ago
+Espa..ol De La Comunidad (arispotle) (100)57122Kemen
4 days ago
Role Play
Topics
Posts
Last post
Events (arispotle) (363)
Dates and Venues of Future Events		58523Rollocks
3.7 hours ago
Events (OOC) (arispotle) (271)
Discussion of events and roleplay (OOC only)		53569Feylin
1 week ago
Roleplay (arispotle) (768)
Roleplay forum for every civilisations and factions		1861564Zhoi
8.7 hours ago
Bazaar (arispotle) (124)
Something to buy or to sell?		102366Chanchey
1 month ago
Guild Registry (arispotle) (798)
Public guild registry and presentation		1121048Astarth
2 days ago
Faction
Topics
Posts
Last post
Faction-neutrals (arispotle) (9)636Quittaftwin
11 +hours ago
Civilization
Topics
Posts
Last post
Civilization-neutrals (arispotle) (44)9175Irfidel
1 week ago
+
+
Last visit date#70/01/01 00:00
+ + + + + + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl new file mode 100644 index 000000000..02dc62730 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_admin.tpl @@ -0,0 +1,14 @@ +{extends file="layout.tpl"} +{block name=menu} + Dashboard + Profile + Settings + | + Users + Queues + Support Groups + | + Syncing + Logout +{/block} + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl new file mode 100644 index 000000000..e0a77d99a --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_mod.tpl @@ -0,0 +1,14 @@ +{extends file="layout.tpl"} +{block name=menu} +
  • Main
    • +
  • Dashboard
    • +
  • Profile
    • +
  • Settings
    • +
  • Admin
    • +
  • Users
    • +
  • Queues
    • +
  • Support Groups
    • +
  • Actions
    • +
  • Logout
    • +{/block} + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl new file mode 100644 index 000000000..8da6ca313 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/layout_user.tpl @@ -0,0 +1,11 @@ +{extends file="layout.tpl"} +{block name=menu} +
  • Main
    • +
  • Dashboard
    • +
  • Profile
    • +
  • Settings
    • +
  • Actions
    • +
  • Create New Ticket
    • +
  • Logout
    • +{/block} + diff --git a/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl new file mode 100644 index 000000000..e3be8f662 --- /dev/null +++ b/code/ryzom/tools/server/ryzom_ams/ams_lib/ingame_templates/show_user.tpl @@ -0,0 +1,98 @@ +{block name=content} + + + +
    +

    Profile of {$target_name}

    + + + + + + + + + + + + {if $firstName neq ""} + + + + + {/if} + {if $lastName neq ""} + + + + + {/if} + {if $country neq ""} + + + + + {/if} + {if $gender neq 0} + + + {if $gender eq 1} + + {else if $gender eq 2} + + {/if} + + {/if} + +
    Email:{$mail}
    Role: + {if $userPermission eq 1}User{/if} + {if $userPermission eq 2}Moderator{/if} + {if $userPermission eq 3}Admin{/if} +
    Firstname:{$firstName}
    LastName:{$lastName}
    Country:{$country}
    Gender:♂♀
    +     		+

    Actions

    +
    + Tickets + + + + + + + + + + + + {foreach from=$ticketlist item=ticket} + + + + + + + + + {/foreach} + + +
    IDTitleTimestampCategoryStatus
    {$ticket.tId}{$ticket.title}{$ticket.timestamp}{$ticket.category}{if $ticket.status eq 0} {/if} {$ticket.statusText}
    +
    +{/block} +