From 18c0212f9a6225c0a8b6bf463297e144ee74c10e Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 14:04:34 +0100 Subject: [PATCH 1/6] Forum better button styling --- system/templates/forum.new_post.html.twig | 5 +++-- system/templates/forum.new_thread.html.twig | 3 ++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/system/templates/forum.new_post.html.twig b/system/templates/forum.new_post.html.twig index d267b7db..af2a4c1a 100644 --- a/system/templates/forum.new_post.html.twig +++ b/system/templates/forum.new_post.html.twig @@ -1,7 +1,7 @@
{{ csrf() }} - + @@ -43,7 +43,8 @@
- + {% set button_name = 'Post Reply' %} + {{ include('buttons.base.html.twig') }}
diff --git a/system/templates/forum.new_thread.html.twig b/system/templates/forum.new_thread.html.twig index e37bda08..bb9e0129 100644 --- a/system/templates/forum.new_thread.html.twig +++ b/system/templates/forum.new_thread.html.twig @@ -44,6 +44,7 @@
- + {% set button_name = 'Post Thread' %} + {{ include('buttons.base.html.twig') }}
From 5c68fba82adbe1b6422844229478bd54b561eeb4 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 15:51:10 +0100 Subject: [PATCH 2/6] Add labels to some inputs + some small adjustments --- system/pages/account/change-password.php | 2 +- system/pages/account/register-new.php | 2 +- system/templates/account.change-email.html.twig | 8 ++++---- system/templates/account.change-info.html.twig | 16 +++++++++++----- .../templates/account.change-password.html.twig | 6 +++--- .../account.characters.change-name.html.twig | 12 ++++++++---- .../account.characters.change-sex.html.twig | 12 ++++++++---- .../account.characters.delete.html.twig | 12 ++++++++---- system/templates/account.create.html.twig | 2 +- .../account.generate_new_recovery_key.html.twig | 14 ++++++++------ .../account.generate_recovery_key.html.twig | 6 +++--- 11 files changed, 56 insertions(+), 36 deletions(-) diff --git a/system/pages/account/change-password.php b/system/pages/account/change-password.php index 157515b7..a48902e7 100644 --- a/system/pages/account/change-password.php +++ b/system/pages/account/change-password.php @@ -22,7 +22,7 @@ csrfProtect(); $new_password = $_POST['new_password'] ?? null; $new_password_confirm = $_POST['new_password_confirm'] ?? null; $old_password = $_POST['old_password'] ?? null; -if(empty($new_password) && empty($new_password_confirm) && empty($old_password)) { +if(is_null($new_password) && is_null($new_password_confirm) && is_null($old_password)) { $twig->display('account.change-password.html.twig'); } else { diff --git a/system/pages/account/register-new.php b/system/pages/account/register-new.php index bca3b798..d328a310 100644 --- a/system/pages/account/register-new.php +++ b/system/pages/account/register-new.php @@ -48,7 +48,7 @@ else $account_logged->setCustomField('key', $new_rec_key); $account_logged->setCustomField(setting('core.donate_column'), $account_logged->getCustomField(setting('core.donate_column')) - setting('core.account_generate_new_reckey_price')); $account_logged->logAction('Generated new recovery key for ' . setting('core.account_generate_new_reckey_price') . ' premium points.'); - $message = '
Your recovery key were send on email address '.$account_logged->getEMail().' for '.setting('core.account_generate_new_reckey_price').' premium points.'; + $message = '
Your recovery key was sent on email address '.$account_logged->getEMail().' for '.setting('core.account_generate_new_reckey_price').' premium points.'; } else $message = '

An error occurred while sending email ( '.$account_logged->getEMail().' ) with recovery key! Recovery key not changed. Try again later. For Admin: More info can be found in system/logs/mailer-error.log

'; diff --git a/system/templates/account.change-email.html.twig b/system/templates/account.change-email.html.twig index ab2a8c06..3fde55a9 100644 --- a/system/templates/account.change-email.html.twig +++ b/system/templates/account.change-email.html.twig @@ -5,18 +5,18 @@ Please enter your password and the new email address. Make sure that you enter a
- New Email Address: + - +
- Password: + - +
diff --git a/system/templates/account.change-info.html.twig b/system/templates/account.change-info.html.twig index e3481472..9461b986 100644 --- a/system/templates/account.change-info.html.twig +++ b/system/templates/account.change-info.html.twig @@ -4,20 +4,26 @@ Here you can tell other players about yourself. This information will be display {% set content %} - + - + {% if setting('core.account_country') %} - +
Real Name: + + - +
Location: + + - +
Country: + +
- Current Password: + @@ -17,7 +17,7 @@ Please enter your current password and a new password. For your security, please
- New Password: + @@ -28,7 +28,7 @@ Please enter your current password and a new password. For your security, please
- New Password Again: + diff --git a/system/templates/account.characters.change-name.html.twig b/system/templates/account.characters.change-name.html.twig index 7a0cfe22..f70eaf89 100644 --- a/system/templates/account.characters.change-name.html.twig +++ b/system/templates/account.characters.change-name.html.twig @@ -1,4 +1,4 @@ -To change a name of character select player and choose a new name.
+To change the name of a character, select a 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' }}.

{% set title = 'Change Name' %} @@ -6,9 +6,11 @@ To change a name of character select player and choose a new name.
{% set content %} - + - + {% if setting('core.mail_enabled') and setting('core.account_mail_verify') %} - + {% endif %} {{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }} diff --git a/system/templates/account.generate_new_recovery_key.html.twig b/system/templates/account.generate_new_recovery_key.html.twig index fc48d3a9..2c743378 100644 --- a/system/templates/account.generate_new_recovery_key.html.twig +++ b/system/templates/account.generate_new_recovery_key.html.twig @@ -1,13 +1,15 @@ -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. +To generate a new recovery key for your account, please enter your password.
+New recovery key 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' }}. You will receive an e-mail with this recovery key.
{% set title = 'Generate recovery key' %} {% set background = config('darkborder') %} {% set content %}
Character: + + - {% for player in account_logged.getPlayersList(false) %} {% endfor %} @@ -16,7 +18,9 @@ To change a name of character select player and choose a new name.
New Name: + + diff --git a/system/templates/account.characters.change-sex.html.twig b/system/templates/account.characters.change-sex.html.twig index 440fed9f..7dd35fa1 100644 --- a/system/templates/account.characters.change-sex.html.twig +++ b/system/templates/account.characters.change-sex.html.twig @@ -6,9 +6,11 @@ To change a sex of character select player and choose a new sex.
{% set content %} - + - + - + - +
Character: + + - {% for player in players %} {% endfor %} @@ -16,9 +18,11 @@ To change a sex of character select player and choose a new sex.
New Sex: + + - {% for id, gender in config.genders %} {% endfor %} diff --git a/system/templates/account.characters.delete.html.twig b/system/templates/account.characters.delete.html.twig index b946d221..172c36b1 100644 --- a/system/templates/account.characters.delete.html.twig +++ b/system/templates/account.characters.delete.html.twig @@ -4,15 +4,19 @@ To delete a character enter the name of the character and your password.

Character Name: + + - +
Password: + + - +
diff --git a/system/templates/account.create.html.twig b/system/templates/account.create.html.twig index 2e5267e2..6e71d045 100644 --- a/system/templates/account.create.html.twig +++ b/system/templates/account.create.html.twig @@ -48,7 +48,7 @@
Please use real address!
We will send a link to validate your Email.
Please use a real address!
We will send a link to validate your Email.
- - + +
Password: + +
{% endset %} @@ -18,7 +20,7 @@ To generate new recovery key for your account please enter your password.
 -
+
{{ csrf() }} @@ -31,7 +33,7 @@ To generate new recovery key for your account please enter your password.
 -
+ {{ 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 526d4659..82901be8 100644 --- a/system/templates/account.generate_recovery_key.html.twig +++ b/system/templates/account.generate_recovery_key.html.twig @@ -5,10 +5,10 @@ To generate recovery key for your account please enter your password.

- Password: + - +
@@ -20,7 +20,7 @@ To generate recovery key for your account please enter your password.

 - {% if players|length > 0 %} - + From aba50ca0f12ae0b2cca03c1587e8cb9054a9f765 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 20:07:17 +0100 Subject: [PATCH 5/6] Better delete rank button --- images/news/delete.png | Bin 1005 -> 0 bytes system/templates/guilds.manager.html.twig | 3 ++- 2 files changed, 2 insertions(+), 1 deletion(-) delete mode 100644 images/news/delete.png diff --git a/images/news/delete.png b/images/news/delete.png deleted file mode 100644 index 417be1b52324478148104edfac9752007aca1c62..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1005 zcmV<-3T9?xT3cH}LqmQ{N`{7niHV1R zfq+U%N}wPhZg6mTd3kz!dxkA7Z#_M9LP2LiLZu`llrAlCa&tB|I9N?hwhs@VA0Wj9 z1ZP`Xc}GTUZEk#he3LmiogE#f85)i>G{Ff8mLnr|c6Mw@5W zZd6lKM@Xs`7h_9HjwdHvP*Hk2JBvO&ZB0#kJv_D*6@xuHY+zoWEG&6bP<2~cnkXlF zIyz%lRh!?78~^|S4|GyaQvl%lY3Al>B_;mg`rv8$I=;b90006^NklQxQ~Ie{S>SWF<1AIcaE)~-L+_VxAE z1IJJDA<*)-u+bwZoxUO*&+!PFSzi#86iUrAQer013n>DC z{L3y(WHc}nFUlT*Pz9dfQUPdCYLF?mrJ{6VVii_a8cY27@TOlMcRL$$n;bKF_+J%AFSJ|bZAhuv~>p8zqM`#zaJJ8sb3${g$6$wOX4 zL1iUYk*f^gxy@|=`V?RDp_pFG8j6hBZV4b8xVAlM0UU}P7lvWZLVKf0@ZXU7ysjh>iyt*BXH?Epbc$@FM7tm7J%Jr^^xHfDA5GA~-(E3I|fh b$7T8-x`HWdAqUzZ00000NkvXXu0mjfjY64@ diff --git a/system/templates/guilds.manager.html.twig b/system/templates/guilds.manager.html.twig index adebdff2..b7fcc67b 100644 --- a/system/templates/guilds.manager.html.twig +++ b/system/templates/guilds.manager.html.twig @@ -105,7 +105,8 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth {{ csrf() }} - + +
+ {{ csrf() }} From ba1c63921dc45665d43c9311e65a7c4d1916ebb0 Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 20:02:57 +0100 Subject: [PATCH 3/6] Update guilds.leave_guild.html.twig --- system/templates/guilds.leave_guild.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/guilds.leave_guild.html.twig b/system/templates/guilds.leave_guild.html.twig index 4d865cef..b168e31f 100644 --- a/system/templates/guilds.leave_guild.html.twig +++ b/system/templates/guilds.leave_guild.html.twig @@ -6,7 +6,7 @@ Leave guild
Select character to leave guild:Select a character to leave the guild:
From 0110bf6ea2a66bb05be4ad4cc26a36edc4a786fd Mon Sep 17 00:00:00 2001 From: slawkens Date: Fri, 2 Jan 2026 20:06:07 +0100 Subject: [PATCH 4/6] Account character list: Add [ DELETED ] for deleted characters --- system/templates/account.management.html.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/templates/account.management.html.twig b/system/templates/account.management.html.twig index 03e2c2a6..7df72d9e 100644 --- a/system/templates/account.management.html.twig +++ b/system/templates/account.management.html.twig @@ -179,7 +179,7 @@ {% set i = i + 1 %}
- {{ player.getName() }} + {{ player.getName() }}{% if player.isDeleted() %} [ DELETED ] {% endif %} {{ player.getLevel() }} {{ player.getVocationName() }} From 2d8d35f5c8fbe38fce0f9ec3a265d2e7e506ae5e Mon Sep 17 00:00:00 2001 From: slawkens Date: Sat, 3 Jan 2026 13:21:13 +0100 Subject: [PATCH 6/6] Some adjustments to the online page Use tables.headline Use .myaac-table --- system/templates/online.html.twig | 56 +++++++++++++++++++------------ 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/system/templates/online.html.twig b/system/templates/online.html.twig index 6f798740..a15cb5f3 100644 --- a/system/templates/online.html.twig +++ b/system/templates/online.html.twig @@ -4,24 +4,35 @@
{% endif %} +
+ {# vocation statistics #} {% if setting('core.online_vocations') %} -
+ + {% set title = 'Vocation statistics' %} + {% set tableClass = 'Table3' %} + {% set background = config('darkborder') %} + {% set content %} + {% if setting('core.online_vocations_images') %} - - - - - - - - +
+ + - + + + + + + + + + + @@ -29,30 +40,30 @@
Sorcerers Druids Paladins Knights
{{ vocs[1] }} {{ vocs[2] }} {{ vocs[3] }}
 
- {% else %} - - - - - + {% else %} +
Vocation statistics
{% for i in 1..config.vocations_amount %} - + {% endfor %}
{{ config.vocations[i] }} {{ vocs[i] }}
-
+
{% endif %} + +{% endset %} +{% include 'tables.headline.html.twig' %} + {% endif %}
{# show skulls #} {% if setting('core.online_skulls') %} - +
-
+ - 1 - 6 Frags
- 6+ Frags or Red Skull
- 10+ Frags or Black Skull @@ -125,7 +136,8 @@ {% set title = 'Players Online' %} {% set tableClass = 'Table2' %} {% set content %} - +
+ {% if setting('core.account_country') %} + {% if setting('core.account_country') %} {% endif %}
#   @@ -151,7 +163,7 @@ {% for player in players %} {% set i = i + 1 %} -
{{ player.country_image|raw }}