From 6d4724f4f4ccb595a88829c3412df058e739aefd Mon Sep 17 00:00:00 2001 From: slawkens Date: Mon, 1 Apr 2024 21:54:53 +0200 Subject: [PATCH] Squashed commit of the following: commit da18629d1652c304a75b684939255a1838989279 Author: slawkens Date: Mon Apr 1 21:53:53 2024 +0200 Fixes to tables headline commit 41c3d9ad21304e99330ea42841b5932af792db92 Author: slawkens Date: Sun Mar 31 13:59:25 2024 +0200 [WIP] Tables headline --- .../templates/account.change_info.html.twig | 180 +++-- .../templates/account.change_mail.html.twig | 64 +- .../templates/account.change_name.html.twig | 133 ++-- .../account.change_password.html.twig | 136 ++-- system/templates/account.change_sex.html.twig | 135 ++-- .../account.create_character.html.twig | 266 ++++---- .../account.delete_character.html.twig | 110 ++- ...ccount.generate_new_recovery_key.html.twig | 101 ++- .../account.generate_recovery_key.html.twig | 57 +- system/templates/account.logout.html.twig | 38 +- .../guilds.change_description.html.twig | 38 +- system/templates/guilds.change_logo.html.twig | 34 +- system/templates/guilds.change_motd.html.twig | 27 +- .../templates/guilds.delete_guild.html.twig | 50 +- system/templates/guilds.list.html.twig | 198 +++--- system/templates/guilds.manager.html.twig | 71 +- .../guilds.pass_leadership.html.twig | 52 +- system/templates/guilds.view.html.twig | 397 +++++------ system/templates/houses.html.twig | 300 ++++----- system/templates/houses.view.html.twig | 73 +- system/templates/lastkills.html.twig | 119 ++-- system/templates/tables.headline.html.twig | 38 +- system/templates/team.html.twig | 348 +++++----- .../tibiacom/account.management.html.twig | 627 ++++++++---------- templates/tibiacom/tables.headline.html.twig | 24 + 25 files changed, 1606 insertions(+), 2010 deletions(-) create mode 100644 templates/tibiacom/tables.headline.html.twig diff --git a/system/templates/account.change_info.html.twig b/system/templates/account.change_info.html.twig index 067eabc5..aa097988 100644 --- a/system/templates/account.change_info.html.twig +++ b/system/templates/account.change_info.html.twig @@ -1,102 +1,84 @@ Here you can tell other players about yourself. This information will be displayed alongside the data of your characters. If you do not want to fill in a certain field, just leave it blank.

-
- {{ csrf() }} -
- -
-
- - - - -
Change Public Information
- - - - -
-
- - - -
-
- - - - - - - - - - {% if setting('core.account_country') %} - - - - - {% endif %} -
Real Name: - -
Location: - -
Country: - - - -
-
-
-
-
- - - + +
- - - + + {% endif %} +
+ $(function() { + updateFlag(); + $('#account_country').change(function() { + updateFlag(); + }); + }); + +
+{% endset %} +{% include 'tables.headline.html.twig' %} +
+ + + - - -
+ + + - -
+ + {{ csrf() }} - {{ include('buttons.submit.html.twig') }} -
- 		- - - - {{ csrf() }} - - - - -
- {{ include('buttons.back.html.twig') }} -
-
+ {{ include('buttons.submit.html.twig') }} + +
+ + + + + + +
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+ + + diff --git a/system/templates/account.change_mail.html.twig b/system/templates/account.change_mail.html.twig index f093fbff..83fe9ce3 100644 --- a/system/templates/account.change_mail.html.twig +++ b/system/templates/account.change_mail.html.twig @@ -1,47 +1,27 @@ Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to.
For security reasons, the actual change will be finalised after a waiting period of {{ setting('core.account_mail_change') }} days.

-
- {{ csrf() }} -
- -
-
- - - - -
Change Email Address
- - - - -
-
+{% set title = 'Change Email Address' %} +{% set background = config('darkborder') %} +{% set content %} +
+ + + + +
+ New Email Address: + + +
+ Password: + -
- - - - - - - - - -
- New Email Address: - - -
- Password: - - -
-
+
-
+{% endset %} +{% include 'tables.headline.html.twig' %}
@@ -49,13 +29,15 @@ Please enter your password and the new email address. Make sure that you enter a
- - {{ include('buttons.submit.html.twig') }} + + {{ csrf() }} + + {{ include('buttons.submit.html.twig') }} +
- diff --git a/system/templates/account.change_name.html.twig b/system/templates/account.change_name.html.twig index 1fd10609..e40ea6ed 100644 --- a/system/templates/account.change_name.html.twig +++ b/system/templates/account.change_name.html.twig @@ -1,79 +1,62 @@ To change a name of character select player and choose a new name.
Change name cost {{ setting('core.account_change_character_name_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.

- - {{ csrf() }} - -
-
-
-
- - - - -
Change Name
- - - - -
-
- - - -
-
- - - - - - - - - -
Character: - -
New Name: - - -
- -
Please enter your character name.
- -
-
-
- -
- - - + + +
- - - + +
+ +{% set title = 'Change Name' %} +{% set background = config('darkborder') %} +{% set content %} + + + + + + + + + +
Character: + +
New Name: + + +
+ +
Please enter your character name.
+ +
+{% endset %} +{% include 'tables.headline.html.twig' %} +
+ + + - - -
+ + + - - -
+ + {{ csrf() }} + {{ include('buttons.submit.html.twig') }} -
- 		- - - {{ csrf() }} - - - - -
- {{ include('buttons.back.html.twig') }} -
-
+ +
+ 		+ + + + +
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+
diff --git a/system/templates/account.change_password.html.twig b/system/templates/account.change_password.html.twig index 89ccf592..bfece757 100644 --- a/system/templates/account.change_password.html.twig +++ b/system/templates/account.change_password.html.twig @@ -1,80 +1,62 @@ Please enter your current password and a new password. For your security, please enter the new password twice.

-
- {{ csrf() }} -
- -
-
- - - - -
Change Password
- - - - -
-
- - - -
-
- - - - - - - - - - - - - -
- New Password: - - -
- New Password Again: - - -
- Current Password: - - -
-
-
-
-
- - - + + +
- - - + +
+{% set title = 'Change Password' %} +{% set background = config('darkborder') %} +{% set content %} + + + + + + + + + + + + + +
+ New Password: + + +
+ New Password Again: + + +
+ Current Password: + + +
+{% endset %} +{% include 'tables.headline.html.twig' %} +
+ + + - - - -
+ + + - -
+ + {{ csrf() }} {{ include('buttons.submit.html.twig') }} -
- 		- - - {{ csrf() }} - - - - -
- {{ include('buttons.back.html.twig') }} -
-
+ +
+ 		+ + + + +
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+
diff --git a/system/templates/account.change_sex.html.twig b/system/templates/account.change_sex.html.twig index fe0ef6e7..244418cf 100644 --- a/system/templates/account.change_sex.html.twig +++ b/system/templates/account.change_sex.html.twig @@ -1,78 +1,61 @@ To change a sex of character select player and choose a new sex.
-Change sex cost {{ setting('core.account_change_character_sex_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}.

-
- {{ csrf() }} - -
- -
-
- - - - -
Change sex
- - - - -
-
- - - -
-
- - - - - - - - - -
Character: - -
New Sex: - -
-
-
-
-
- - - + + +
- - - + +
+Change sex cost {{ setting('core.account_change_character_sex_price') }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. You have {{ points }} {{ setting('core.donate_column') == 'coins' ? 'coins' : 'premium points' }}. +

+{% set title = 'Change sex' %} +{% set background = config('darkborder') %} +{% set content %} + + + + + + + + + +
Character: + +
New Sex: + +
+{% endset %} +{% include 'tables.headline.html.twig' %} + +
+ + + - - -
+ + + - - - -
+ + {{ csrf() }} + {{ include('buttons.submit.html.twig') }} -
- 		- - - {{ csrf() }} - - - - -
- {{ include('buttons.back.html.twig') }} -
-
+ +
+ 		+ + + + +
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+
diff --git a/system/templates/account.create_character.html.twig b/system/templates/account.create_character.html.twig index a860a8b1..280e71c3 100644 --- a/system/templates/account.create_character.html.twig +++ b/system/templates/account.create_character.html.twig @@ -6,145 +6,145 @@ In any case the name must not violate the naming conventions stated in the You have maximum number of characters per account on your account. Delete one before you make new. {% endif %}

-
- {{ csrf() }} - -
- -
-
- - - - -
Create Character
- - - - -
+
+
+
+
+ + + + +
Create Character
+ + + +
-
- - -
-
- - -
-
-
-
-
-
- - - - - - - - - -
- Name - - Sex -
- - -
- -
{% if not save or errors.name is defined %}Please enter your character name.{% endif %}
- - 		- {% set i = 0 %} - {% for id, gender in config.genders|reverse(true) %} - {% set i = i + 1 %} -
- {% endfor %} -
-
-
-
-
-
- - - {% if config.character_samples|length > 1 %} - - {% endif %} - -
- - - - - -

Select your vocation:		 - - {% for key, sample_char in config.character_samples %} - - - - {% endfor %} -
- - -
-
- {% endif %} - {% if config.character_towns|length > 1 %} - 		- - - - - -

Select your city:		 - - {% for town_id in config.character_towns %} - - - - {% endfor %} -
- - -
-
-
-
-
-
-
- - + + -
- - - - - -
- {{ include('buttons.submit.html.twig') }} -
- 		- - - {{ csrf() }} +
+
-
- {{ include('buttons.back.html.twig') }} + +
+
+
+
+
+ + + + + + + + + +
+ Name + + Sex +
+ + +
+ +
{% if not save or errors.name is defined %}Please enter your character name.{% endif %}
+ + 		+ {% set i = 0 %} + {% for id, gender in config.genders|reverse(true) %} + {% set i = i + 1 %} +
+ {% endfor %} +
+
+
+
+ +
+ + + {% if config.character_samples|length > 1 %} + + {% endif %} - -
+ + + + + +

Select your vocation:		 + + {% for key, sample_char in config.character_samples %} + + + + {% endfor %} +
+ + +
+
+ {% endif %} + {% if config.character_towns|length > 1 %} + 		+ + + + + +

Select your city:		 + + {% for town_id in config.character_towns %} + + + + {% endfor %} +
+ + +
+
+
+ + +
+ + + + + +
+ + + + +
+
+ {{ csrf() }} + + {{ include('buttons.submit.html.twig') }} +
+
+ 		+ + + + +
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+
diff --git a/system/templates/account.delete_character.html.twig b/system/templates/account.delete_character.html.twig index c5953cc7..cc0ca0f5 100644 --- a/system/templates/account.delete_character.html.twig +++ b/system/templates/account.delete_character.html.twig @@ -1,68 +1,50 @@ To delete a character enter the name of the character and your password.

-
- {{ csrf() }} - -
- -
-
- - - - -
Delete Character
- - - - -
-
- - - -
-
- - - - - - - - - -
Character Name: - -
Password: - -
-
-
-
-
- - - + +
- +{% set title = 'Delete Character' %} +{% set background = config('darkborder') %} +{% set content %} +
+ + + + + + + + +
Character Name: + +
Password: + +
+{% endset %} +{% include 'tables.headline.html.twig' %} +
+ + + + - - -
+ + + + +
+ + {{ csrf() }} + + {{ include('buttons.submit.html.twig') }} + +
+ 		+ + + {{ csrf() }} - - -
- {{ include('buttons.submit.html.twig') }} + {{ include('buttons.back.html.twig') }}
- 		- - - {{ csrf() }} - - - - -
- {{ include('buttons.back.html.twig') }} -
-
+
+ + + diff --git a/system/templates/account.generate_new_recovery_key.html.twig b/system/templates/account.generate_new_recovery_key.html.twig index 9b28cebc..fc378d54 100644 --- a/system/templates/account.generate_new_recovery_key.html.twig +++ b/system/templates/account.generate_new_recovery_key.html.twig @@ -1,61 +1,44 @@ To generate new recovery key for your account please enter your password.
-New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points. You have {{ points }} premium points. You will receive e-mail with this recovery key.
-
- {{ csrf() }} - -
- -
-
- - - - -
Generate recovery key
- - - - -
-
- - - -
-
- - - - - -
Password:
-
-
-
-
- - - + + +
- - - + +
+New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points. You have {{ points }} premium points. You will receive e-mail with this recovery key. +
+{% set title = 'Generate recovery key' %} +{% set background = config('darkborder') %} +{% set content %} + + + + + +
Password:
+{% endset %} +{% include 'tables.headline.html.twig' %} +
+ + + - - -
+ + + - - -
+ + {{ csrf() }} + {{ include('buttons.submit.html.twig') }} -
- 		- - - {{ csrf() }} - - - - -
- {{ include('buttons.back.html.twig') }} -
-
+ +
+ 		+ + + + +
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+
diff --git a/system/templates/account.generate_recovery_key.html.twig b/system/templates/account.generate_recovery_key.html.twig index cb69476c..de6292ac 100644 --- a/system/templates/account.generate_recovery_key.html.twig +++ b/system/templates/account.generate_recovery_key.html.twig @@ -1,40 +1,18 @@ To generate recovery key for your account please enter your password.

-
- {{ csrf() }} - -
- -
-
- - - - -
Generate recovery key
- - - - -
-
- - - -
-
- - - - - -
- Password: - - -
-
-
-
+{% set title = 'Generate recovery key' %} +{% set content %} + + + + + +
+ Password: + + +
+{% endset %} +{% include 'tables.headline.html.twig' %}
@@ -42,12 +20,15 @@ To generate recovery key for your account please enter your password.

- {{ include('buttons.submit.html.twig') }} + + {{ csrf() }} + + {{ include('buttons.submit.html.twig') }} +
- diff --git a/system/templates/account.logout.html.twig b/system/templates/account.logout.html.twig index f74c9ffd..d71c4130 100644 --- a/system/templates/account.logout.html.twig +++ b/system/templates/account.logout.html.twig @@ -1,28 +1,10 @@ -
-
-
-
- - - - -
Logout Successful
- - - - -
-
- - - -
-
- - - - -
You have logged out of your {{ config.serverName }} account. In order to view your account you need to log in again.
-
-
- \ No newline at end of file +{% set title = 'Logout Successful' %} +{% set background = config('darkborder') %} +{% set content %} + + + + +
You have logged out of your {{ config.serverName }} account. In order to view your account you need to log in again.
+{% endset %} +{% include 'tables.headline.html.twig' %} diff --git a/system/templates/guilds.change_description.html.twig b/system/templates/guilds.change_description.html.twig index 4576ae0a..9c656920 100644 --- a/system/templates/guilds.change_description.html.twig +++ b/system/templates/guilds.change_description.html.twig @@ -1,14 +1,24 @@ -

Change guild description

-Here you can change description of your guild.
- - {{ csrf() }} - -
- (max. {{ setting('core.guild_description_lines_limit') }} lines, max. {{ setting('core.guild_description_chars_limit') }} chars)
-
-
-
- {{ csrf() }} - {{ include('buttons.back.html.twig') }} -
-
+{% set title = 'Change guild description' %} +{% set background = config('darkborder') %} +{% set content %} + + + + +
+ Here you can change description of your guild.
+
+ {{ csrf() }} + +
+ (max. {{ setting('core.guild_description_lines_limit') }} lines, max. {{ setting('core.guild_description_chars_limit') }} chars)

+
+
+
+ {{ csrf() }} + {{ include('buttons.back.html.twig') }} +
+
+
+{% endset %} +{% include 'tables.headline.html.twig' %} diff --git a/system/templates/guilds.change_logo.html.twig b/system/templates/guilds.change_logo.html.twig index 016c13c9..13813e9b 100644 --- a/system/templates/guilds.change_logo.html.twig +++ b/system/templates/guilds.change_logo.html.twig @@ -1,20 +1,32 @@ -

Change guild logo

-Here you can change logo of your guild.
Actuall logo:

-
- {{ csrf() }} - - - Select new logo: - -
-Only jpg, gif, png, bmp pictures. Max. size: {{ setting('core.guild_image_size_kb') }} KB
-
+{% set title = 'Change guild logo' %} +{% set background = config('darkborder') %} +{% set content %} + + + + +
+ Here you can change logo of your guild.
Actuall logo:

+
+ {{ csrf() }} + + + Select new logo: + +
+ Only jpg, gif, png, bmp pictures. Max. size: {{ setting('core.guild_image_size_kb') }} KB
+
+
+{% endset %} +{% include 'tables.headline.html.twig' %} +
{{ csrf() }} {{ include('buttons.back.html.twig') }}
+