From 0104d2fd3668b6f5dd0710a311b3659c3b8f9803 Mon Sep 17 00:00:00 2001 From: slawkens Date: Wed, 18 Oct 2017 17:11:05 +0200 Subject: [PATCH] * added nice looking menu for my account page in default template --- system/templates/account.management.html.twig | 311 ++++++++++-------- .../kathrine/account.change_name.html.twig | 44 --- 2 files changed, 182 insertions(+), 173 deletions(-) delete mode 100644 templates/kathrine/account.change_name.html.twig diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig index b7fdf227..a79565bb 100644 --- a/system/templates/account.management.html.twig +++ b/system/templates/account.management.html.twig @@ -1,134 +1,187 @@ -

My account

-

Welcome to your account page, {{ account }}
- You have {{ account_logged.getPremDays() }} days remaining premium account.

+ +{% set menus = { + 'Create Character': 'account/character/create','Delete Character': 'account/character/delete', + 'Change Info': 'account/info', 'Change Password': 'account/password', 'Change Email': 'account/email' +} %} +
+
+
+ My Account + {% if recovery_key is empty %} + Register Account + {% endif %} + {% for name, link in menus %} + {{ name }} + {% endfor %} + {% if config.account_change_character_name %} + Change Name + {% endif %} + {% if config.account_change_character_sex %} + Change Sex + {% endif %} + Logout +
-

-{% endif %} -

General Information

- - - - - - - - - - - - - - - - - - {% autoescape false %} - - - - - - - - - {% endautoescape %} -
Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:{{ account }}
Email Address:{{ account_email ~ email_change }} -
- +
+

My account

+

Welcome to your account page, {{ account }}
+ You have {{ account_logged.getPremDays() }} days remaining premium account.

+ + {# if account dont have recovery key show hint #} + {% if recovery_key is empty %} +
+ You can register your account for increased protection. Click on "Register Account" and get your free recovery key today!
+ + -
Created:{{ account_created|date("j F Y, G:i:s") }}
Last Login:{{ "now"|date("j F Y, G:i:s") }}
Account Status:{{ account_status }}
Registered:{{ account_registered }}
-
-

Public Information

- - - - - - - - - -
Real name:{{ account_rlname }}
Location:{{ account_location }}
-
- -
-
-

Action Log

- - - - - {% autoescape false %} - {% set i = 0 %} - {% for action in actions %} - {% set i = i + 1 %} - - - - + +
+ {% endif %} + + {% if email_request %} +
+ A request has been submitted to change the email address of this account to {{ email_new }}. After {{ email_new_time|date("j F Y, G:i:s") }} you can accept the new email address and finish the process. Please cancel the request if you do not want your email address to be changed! Also cancel the request if you have no access to the new email address! + +
+ + +
+

+ {% endif %} +

General Information

+
ActionDateIP
{{ action.action }}{{ action.date|date("jS F Y H:i:s") }}{{ action.ip }}
+ + + - {% endfor %} - {% endautoescape %} -
Account {% if constant('USE_ACCOUNT_NAME') %}Name{% else %}Number{% endif %}:{{ account }}
-
-

Character list: {{ players|length }} characters.

- - - - - {% set i = 0 %} - {% for player in players %} - {% set i = i + 1 %} - - - - {% endfor %} -
NameLevelVocationTownLast loginStatusHideEdit
{{ player.getName() }}{{ player.getLevel() }}{{ config.vocations[player.getVocation()] }}{{ config.towns[player.getTownId()] }}{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}{% if player.isOnline() %}ONLINE{% else %}Offline{% endif %}{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}[Edit]
-
- - - - {% if config.account_change_character_name %} - - {% endif %} - {% if config.account_change_character_sex %} - - {% endif %} - - -
-
- -
- 		-
- -
- 		-
- -
- 		-
- -
-
\ No newline at end of file + + Email Address: + {{ account_email ~ email_change }} +
+ +
+ + + + Created: + {{ account_created|date("j F Y, G:i:s") }} + + + Last Login: + {{ "now"|date("j F Y, G:i:s") }} + + {% autoescape false %} + + Account Status: + {{ account_status }} + + + Registered: + {{ account_registered }} + + {% endautoescape %} + +
+

Public Information

+ + + + + + + + + +
Real name:{{ account_rlname }}
Location:{{ account_location }}
+
+ +
+
+

Action Log

+ + + + + {% autoescape false %} + {% set i = 0 %} + {% for action in actions %} + {% set i = i + 1 %} + + + + + + {% endfor %} + {% endautoescape %} +
ActionDateIP
{{ action.action }}{{ action.date|date("jS F Y H:i:s") }}{{ action.ip }}
+
+

Character list: {{ players|length }} characters.

+ + + + + {% set i = 0 %} + {% for player in players %} + {% set i = i + 1 %} + + + + {% endfor %} +
NameLevelVocationTownLast loginStatusHideEdit
{{ player.getName() }}{{ player.getLevel() }}{{ config.vocations[player.getVocation()] }}{{ config.towns[player.getTownId()] }}{% if player.getLastLogin() > 0 %}{{ player.getLastLogin|date('d F Y (H:i)') }}{% else %}Never.{% endif %}{% if player.isOnline() %}ONLINE{% else %}Offline{% endif %}{% if player.isHidden() %}Hidden{% else %}Visible{% endif %}[Edit]
+
+ + + + {% if config.account_change_character_name %} + + {% endif %} + {% if config.account_change_character_sex %} + + {% endif %} + + +
+
+ +
+ 		+
+ +
+ 		+
+ +
+ 		+
+ +
+
+
+ \ No newline at end of file diff --git a/templates/kathrine/account.change_name.html.twig b/templates/kathrine/account.change_name.html.twig deleted file mode 100644 index 67b89b18..00000000 --- a/templates/kathrine/account.change_name.html.twig +++ /dev/null @@ -1,44 +0,0 @@ -To change a name of character select player and choose a new name.
-Change name cost {{ config.account_change_character_name_points }} premium points. You have {{ points }} premium points.

-
- -

Change Name

- - - - - - - - - - - - -
Character: - -
New Name: - - -
Please enter your character name.
- -
- -
-
-
-
- - - - - - -
- -
-
\ No newline at end of file