Digitalstack/myaac
2
0
Fork 0
mirror of https://github.com/slawkens/myaac.git synced 2025-10-17 03:03:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Reviewed some settings again, fixing many glitches

Browse Source
This commit is contained in:
slawkens
2023-08-24 17:20:32 +02:00
parent 3ef53aff6c
commit 0746708743
56 changed files with 181 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
system/templates/account.change_info.html.twig
View File

@@ -31,7 +31,7 @@ Here you can tell other players about yourself. This information will be display
<input name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
</td>
</tr>
{% if config.account_country %}
{% if setting('core.account_country') %}
<tr>
<td class="LabelV" >Country:</td>
<td>
@@ -97,4 +97,4 @@ Here you can tell other players about yourself. This information will be display
</table>
</td>
</tr>
</table>
</table>

4
system/templates/account.change_mail.html.twig
View File

@@ -1,4 +1,4 @@
Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <br/><b>For security reasons, the actual change will be finalised after a waiting period of {{ config.account_mail_change }} days.</b><br/><br/>
Please enter your password and the new email address. Make sure that you enter a valid email address which you have access to. <br/><b>For security reasons, the actual change will be finalised after a waiting period of {{ setting('core.account_mail_change') }} days.</b><br/><br/>
<form action="{{ getLink('account/email') }}" method="post">
<div class="TableContainer">
<table class="Table1" cellpadding="0" cellspacing="0">
@@ -67,4 +67,4 @@ Please enter your password and the new email address. Make sure that you enter a
</table>
</td>
</tr>
</table>
</table>

6
system/templates/account.create.html.twig
View File

@@ -59,13 +59,13 @@
<td></td><td><span id="email_error" class="FormFieldError">{% if errors.email is defined %}{{ errors.email }}{% endif %}</span></td>
</tr>
{% if setting('core.mail_enabled') and config.account_mail_verify %}
{% if setting('core.mail_enabled') and setting('account_mail_verify') %}
<tr><td></td><td><span><strong>Please use real address!<br/>We will send a link to validate your Email.</strong></span></td></tr>
{% endif %}
{{ hook('HOOK_ACCOUNT_CREATE_AFTER_EMAIL') }}
{% if config.account_country %}
{% if setting('core.account_country') %}
<tr>
<td class="LabelV" style="width: 150px">
<span{% if errors.country[0] is defined %} class="red"{% endif %}>Country:</span>
@@ -122,7 +122,7 @@
{{ hook('HOOK_ACCOUNT_CREATE_BETWEEN_BOXES_1') }}
{% if (not setting('core.mail_enabled') or not config.account_mail_verify) and config.account_create_character_create %}
{% if (not setting('core.mail_enabled') or not setting('core.account_mail_verify')) and setting('account_create_character_create') %}
<tr>
<td>
<div class="TableShadowContainerRightTop">

2
system/templates/account.create_character.html.twig
View File

@@ -2,7 +2,7 @@ Please choose a name{% if config.character_samples|length > 1 %}, vocation{% end
{% if config.character_towns|length > 1 %}, town{% endif %}
and sex for your character. <br/>
In any case the name must not violate the naming conventions stated in the <a href="?subtopic=rules" target="_blank" >{{ config.lua.serverName }} Rules</a>, or your character might get deleted or name locked.
{% if account_logged.getPlayersList(true)|length >= config.characters_per_account %}
{% if account_logged.getPlayersList(true)|length >= setting('core.characters_per_account') %}
<b><span style="color: red"> You have maximum number of characters per account on your account. Delete one before you make new.</span></b>
{% endif %}
<br/><br/>

6
system/templates/admin.news.html.twig
View File

@@ -21,7 +21,7 @@
<tr>
<td>{{ news.id|raw }}</td>
<td><i><a href="?p=news&action=edit&id={{ news.id }}">{{ news.title }}</a></i></td>
<td>{{ news.date|date(config.news_date_format) }}</td>
<td>{{ news.date|date(setting('core.news_date_format')) }}</td>
<td><a target="_blank" rel="noopener noreferrer" href="{{ news.player_link }}">{{ news.player_name }}</a></td>
<td>
<div class="btn-group">
@@ -66,7 +66,7 @@
<tr>
<td>{{ ticker.id|raw }}</td>
<td><i><a href="?p=news&action=edit&id={{ ticker.id }}">{{ ticker.title }}</a></i></td>
<td>{{ ticker.date|date(config.news_date_format) }}</td>
<td>{{ ticker.date|date(setting('core.news_date_format')) }}</td>
<td><a target="_blank" rel="noopener noreferrer" href="{{ ticker.player_link }}">{{ ticker.player_name }}</a></td>
<td>
<div class="btn-group">
@@ -110,7 +110,7 @@
<tr>
<td>{{ article.id|raw }}</td>
<td><i><a href="?p=news&action=edit&id={{ article.id }}">{{ article.title }}</a></i></td>
<td>{{ article.date|date(config.news_date_format) }}</td>
<td>{{ article.date|date(setting('core.news_date_format')) }}</td>
<td><a target="_blank" rel="noopener noreferrer" href="{{ article.player_link }}">{{ article.player_name }}</a></td>
<td>
<div class="btn-group">

2
system/templates/characters.html.twig
View File

@@ -17,7 +17,7 @@
{% endif %}
<table border="0" cellspacing="1" cellpadding="4" width="100%">
{% if config.characters.outfit %}
<div style="width:64px;height:64px;border:2px solid #F1E0C6; border-radius:50px; padding:13px; margin-top:38px;margin-left:376px;position:absolute;"><img style="margin-left:{% if player.getLookType() in config.outfit_images_wrong_looktypes %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}" src="{{ outfit }}" alt="player outfit"/></div>
<div style="width:64px;height:64px;border:2px solid #F1E0C6; border-radius:50px; padding:13px; margin-top:38px;margin-left:376px;position:absolute;"><img style="margin-left:{% if player.getLookType() in setting('core.outfit_images_wrong_looktypes') %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}" src="{{ outfit }}" alt="player outfit"/></div>
{% endif %}
<tr bgcolor="{{ config.vdarkborder }}">

2
system/templates/creature.html.twig
View File

@@ -155,7 +155,7 @@
{% if (item.count > 1) %}
<span class="loot_amount">{{ item.count }}</span>
{% endif %}
<a href="{{ config.monsters_items_url }}{{ item.name|title }}"><img title="{{ item.tooltip }}" src="{{ config.item_images_url }}{{ item.id }}{{ config.item_images_extension }}" class="loot_image"/></a>
<a href="{{ setting('core.monsters_items_url') }}{{ item.name|title }}"><img title="{{ item.tooltip }}" src="{{ setting('core.item_images_url') }}{{ item.id }}{{ setting('core.item_images_extension') }}" class="loot_image"/></a>
</span>
{% endfor %}
</td>

2
system/templates/forum.show_thread.html.twig
View File

@@ -24,7 +24,7 @@ Page: {{ links_to_pages|raw }}<br/>
{% set i = i + 1 %}
<td valign="top">{{ post.player_link|raw }}<br/>
{% if post.outfit is defined %}
<img style="margin-left:{% if post.player.getLookType() in config.outfit_images_wrong_looktypes %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}" src="{{ post.outfit }}" alt="player outfit"/>
<img style="margin-left:{% if post.player.getLookType() in setting('core.outfit_images_wrong_looktypes') %}-0px;margin-top:-0px;width:64px;height:64px;{% else %}-60px;margin-top:-60px;width:128px;height:128px;{% endif %}" src="{{ post.outfit }}" alt="player outfit"/>
<br />
{% endif %}
<span style="font-size: 10px">

4
system/templates/guilds.change_description.html.twig
View File

@@ -2,8 +2,8 @@
Here you can change description of your guild.<br/>
<form enctype="multipart/form-data" action="?subtopic=guilds&guild={{ guild.getName() }}&action=change_description" method="post">
<input type="hidden" name="todo" value="save"/>
<textarea name="description" cols="60" rows="{{ config.guild_description_lines_limit - 1 }}">{{ guild.getCustomField('description')|raw }}</textarea><br>
(max. {{ config.guild_description_lines_limit }} lines, max. {{ config.guild_description_chars_limit }} chars) <input type="submit" value="Save description"/></form><br/>
<textarea name="description" cols="60" rows="{{ setting('core.guild_description_lines_limit') - 1 }}">{{ guild.getCustomField('description')|raw }}</textarea><br>
(max. {{ setting('core.guild_description_lines_limit') }} lines, max. {{ setting('core.guild_description_chars_limit') }} chars) <input type="submit" value="Save description"/></form><br/>
<br/>
<div style="text-align:center">
<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">

4
system/templates/guilds.change_logo.html.twig
View File

@@ -6,7 +6,7 @@ Here you can change logo of your guild.<br/>Actuall logo: <img src="{{ constant(
Select new logo: <input name="newlogo" id="newlogo" type="file" />
<input type="submit" value="Send new logo" />
</form>
Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_size_kb }} KB</b><br>
Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ setting('core.guild_image_size_kb') }} KB</b><br>
<br/>
<div style="text-align:center">
<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
@@ -16,7 +16,7 @@ Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_siz
<script type="text/javascript">
$(function() {
$('#upload_form').submit(function (event) {
var max_img_size = {{ config.guild_image_size_kb * 1024 }};
var max_img_size = {{ setting('core.guild_image_size_kb') * 1024 }};
var input = document.getElementById("newlogo");
// check for browser support (may need to be modified)
if (input.files && input.files.length == 1) {

2
system/templates/guilds.change_motd.html.twig
View File

@@ -3,7 +3,7 @@ Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br
<form enctype="multipart/form-data" action="?subtopic=guilds&guild={{ guild.getName() }}&action=change_motd" method="post">
<input type="hidden" name="todo" value="save"/>
<textarea name="motd" cols="60" rows="3">{{ guild.getCustomField('motd')|raw }}</textarea><br/>
(max. {{ config.guild_motd_chars_limit }} chars) <input type="submit" value="Save MOTD" /></form><br/>
(max. {{ setting('core.guild_motd_chars_limit') }} chars) <input type="submit" value="Save MOTD" /></form><br/>
<br/>
<div style="text-align:center">
<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">

10
system/templates/highscores.html.twig
View File

@@ -29,13 +29,13 @@
</table>
<table border="0" cellpadding="4" cellspacing="1" width="100%">
<tr bgcolor="{{ config.vdarkborder }}">
{% if config.account_country %}
{% if setting('core.account_country') %}
<td style="width: 11px" class="white">#</td>
{% endif %}
<td style="width: 10%" class="white"><b>Rank</b></td>
{% if config.highscores_outfit %}
{% if setting('core.highscores_outfit') %}
<td class="white"><b>Outfit</b></td>
{% endif %}
@@ -56,13 +56,13 @@
<tr bgcolor="{{ getStyle(row) }}">
{% set row = row + 1 %}
{% if config.account_country %}
{% if setting('core.account_country') %}
<td>{{ player.flag|raw }}</td>
{% endif %}
<td>{{ player.rank }}.</td>
{% if config.highscores_outfit %}
{% if setting('core.highscores_outfit') %}
<td>{{ player.outfit|raw }}</td>
{% endif %}
@@ -70,7 +70,7 @@
<a href="{{ player.link }}">
<span style="color: {% if player.online > 0 %}green{% else %}red{% endif %}">{{ player.name }}</span>
</a>
{% if config.highscores_vocation %}
{% if setting('core.highscores_vocation') %}
<br/><small>{{ player.vocation }}</small>
{% endif %}
</td>

4
system/templates/news.html.twig
View File

@@ -1,9 +1,9 @@
<div class="NewsHeadline">
<div class="NewsHeadlineBackground" style="background-image:url({{ template_path }}/images/news/newsheadline_background.gif)">
<img src="{{ constant('BASE_URL') }}images/news/icon_{{ icon }}.gif" class="NewsHeadlineIcon" />
<div class="NewsHeadlineDate">{{ date|date(config.news_date_format) }} - </div>
<div class="NewsHeadlineDate">{{ date|date(setting('core.news_date_format')) }} - </div>
<div class="NewsHeadlineText">{{ title }}</div>
{% if config.news_author and author is not empty %}
{% if setting('core.news_author') and author is not empty %}
<div class="NewsHeadlineAuthor"><b>Author: </b><i>{{ author }}</i></div>
{% endif %}
</div>

18
system/templates/online.html.twig
View File

@@ -10,7 +10,7 @@
{% if not status.online %}
Server is offline.<br/>
{% else %}
{% if config.online_afk %}
{% if setting('core.online_afk') %}
{% set players_count = players|length %}
{% set afk = players_count - status.players %}
{% if afk < 0 %}
@@ -28,9 +28,9 @@
</table>
<br/>
{# vocation statistics #}
{% if config.online_vocations %}
{% if setting('core.online_vocations') %}
<br/>
{% if config.online_vocations_images %}
{% if setting('core.online_vocations_images') %}
<table width="200" cellspacing="1" cellpadding="0" border="0" align="center">
<tr bgcolor="{{ config.darkborder }}">
<td><img src="images/sorcerer.png" /></td>
@@ -70,7 +70,7 @@
{% endif %}
{# show skulls #}
{% if config.online_skulls %}
{% if setting('core.online_skulls') %}
<table width="100%" cellspacing="1">
<tr>
<td style="background: {{ config.darkborder }};" align="center">
@@ -84,10 +84,10 @@
<table border="0" cellspacing="1" cellpadding="4" width="100%">
<tr bgcolor="{{ config.vdarkborder }}">
{% if config.account_country %}
{% if setting('core.account_country') %}
<td width="11px"><a href="{{ getLink('online?order=country') }}" class="white">#</A></td>
{% endif %}
{% if config.online_outfit %}
{% if setting('core.online_outfit') %}
<td class="white"><b>Outfit</b></td>
{% endif %}
<td width="60%"><a href="{{ getLink('online?order=name') }}" class="white">Name</A></td>
@@ -98,11 +98,11 @@
{% for player in players %}
{% set i = i + 1 %}
<tr bgcolor="{{ getStyle(i) }}">
{% if config.account_country %}
{% if setting('core.account_country') %}
<td>{{ player.country_image|raw }}</td>
{% endif %}
{% if config.online_outfit %}
<td width="5%"><img style="position:absolute;margin-top:{% if player.player.looktype in config.outfit_images_wrong_looktypes %}-20px;margin-left:-0px;{% else %}-45px;margin-left:-25px;{% endif %}" src="{{ player.outfit }}" alt="player outfit"/></td>
{% if setting('core.online_outfit') %}
<td width="5%"><img style="position:absolute;margin-top:{% if player.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-20px;margin-left:-0px;{% else %}-45px;margin-left:-25px;{% endif %}" src="{{ player.outfit }}" alt="player outfit"/></td>
{% endif %}
<td>{{ player.name|raw }}{{ player.skull }}</td>
<td>{{ player.level }}</td>

4
system/templates/serverinfo.html.twig
View File

@@ -47,7 +47,7 @@
{% if houseLevel %}
<li>Houses: <b>{{ houseLevel }} level</b></li>
{% endif %}
<li>Guilds: <b>{{ config.guild_need_level }} level</b> (Create via website)</li>
<li>Guilds: <b>{{ setting('core.guild_need_level') }} level</b> (Create via website)</li>
<br>
<h2>Frags & Skull system</h2>
@@ -99,4 +99,4 @@
<h2>Other</h2>
<li>Respect our <a href="{{ getLink('rules') }}">rules</a>.</li>
<li>Please report rule violations (Botters, players breaking rules etc) with <b>CTRL + R</b>.</li>
</ul>
</ul>

12
system/templates/team.html.twig
View File

@@ -17,7 +17,7 @@
<td>
<div class="InnerTableContainer">
{% set i = 0 %}
{% if config.team_style == 1 %}
{% if setting('core.team_style') == 1 %}
<table border="0" cellpadding="4" cellspacing="1" width="100%">
<tr bgcolor="{{ config.vdarkborder }}">
@@ -63,12 +63,12 @@
{% if setting('core.team_outfit') %}
<td>
<img style="position: absolute; margin-top: {% if member.player.looktype in config.outfit_images_wrong_looktypes %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{% endif %}" src="{{ member.outfit }}" alt="player outfit"/>
<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{% endif %}" src="{{ member.outfit }}" alt="player outfit"/>
</td>
{% endif %}
<td>
{% if config.account_country %}
{% if setting('core.account_country') %}
{{ member.flag_image|raw }}
{% endif %}
{{ member.link|raw }}
@@ -100,7 +100,7 @@
{% endif %}
{% endfor %}
</table>
{% elseif config.team_style == 2 %}
{% elseif setting('core.team_style') == 2 %}
{% for group in groupmember|reverse %}
{% if group.members is not empty %}
<div style="text-align:center"><h2>{{ group.group_name|capitalize }}</h2></div>
@@ -141,12 +141,12 @@
<tr bgcolor="{{ getStyle(i) }}" style="height: 32px;">
{% if setting('core.team_outfit') %}
<td>
<img style="position: absolute; margin-top: {% if member.player.looktype in config.outfit_images_wrong_looktypes %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{% endif %}" src="{{ member.outfit }}" alt="player outfit"/>
<img style="position: absolute; margin-top: {% if member.player.looktype in setting('core.outfit_images_wrong_looktypes') %}-16px;margin-left:-0px;{% else %} -45px; margin-left: -30px;{% endif %}" src="{{ member.outfit }}" alt="player outfit"/>
</td>
{% endif %}
<td>
{% if config.account_country %}
{% if setting('core.account_country') %}
{{ member.flag_image|raw }}
{% endif %}
{{ member.link|raw }}

4
system/templates/templates.header.html.twig
View File

@@ -5,8 +5,8 @@
<base href="{{ constant('BASE_URL') }}" />
<title>{{ title }}</title>
{% endif %}
<meta name="description" content="{{ config.meta_description }}" />
<meta name="keywords" content="{{ config.meta_keywords }}, myaac, wodzaac" />
<meta name="description" content="{{ setting('core.meta_description') }}" />
<meta name="keywords" content="{{ setting('core.meta_keywords') }}, myaac, wodzaac" />
<meta name="generator" content="MyAAC" />
<link rel="stylesheet" type="text/css" href="{{ constant('BASE_URL') }}tools/css/messages.css" />
<script type="text/javascript" src="{{ constant('BASE_URL') }}tools/js/jquery.min.js"></script>