mirror of
https://github.com/slawkens/myaac.git
synced 2025-10-14 09:44:55 +02:00
Merge branch 'develop' into feature/login-by-email
This commit is contained in:
@@ -1,21 +1,21 @@
|
||||
<b>Boards</b>
|
||||
<table width="100%">
|
||||
<tr bgcolor="{{ config.vdarkborder }}">
|
||||
<tr bgcolor="{{ config.vdarkborder }}" class="white">
|
||||
<td>
|
||||
<span style="color: white; font-size: 10px"><b>Board</b></span>
|
||||
<span style="font-size: 10px"><b>Board</b></span>
|
||||
</td>
|
||||
<td>
|
||||
<span style="color: white; font-size: 10px"><b>Posts</b></span>
|
||||
<span style="font-size: 10px"><b>Posts</b></span>
|
||||
</td>
|
||||
<td>
|
||||
<span style="color: white; font-size: 10px"><b>Threads</b></span>
|
||||
<span style="font-size: 10px"><b>Threads</b></span>
|
||||
</td>
|
||||
<td align="center">
|
||||
<span style="color: white; font-size: 10px"><b>Last Post</b></span>
|
||||
<span style="font-size: 10px"><b>Last Post</b></span>
|
||||
</td>
|
||||
{% if canEdit %}
|
||||
<td>
|
||||
<span style="color: white; font-size: 10px"><b>Options</b></span>
|
||||
<span style="font-size: 10px"><b>Options</b></span>
|
||||
</td>
|
||||
{% endif %}
|
||||
</tr>
|
||||
|
@@ -12,8 +12,8 @@ Page: {{ links_to_pages|raw }}<br/>
|
||||
</td>
|
||||
</tr>
|
||||
<tr bgcolor="{{ config.vdarkborder }}">
|
||||
<td width="200">
|
||||
<span style="color: white; font-size: 10px"><b>Author</b></span>
|
||||
<td width="200" class="white">
|
||||
<span style="font-size: 10px"><b>Author</b></span>
|
||||
</td>
|
||||
<td> </td>
|
||||
</tr>
|
||||
|
@@ -8,15 +8,11 @@ Here you can change logo of your guild.<br/>Actuall logo: <img src="images/guild
|
||||
</form>
|
||||
Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_size_kb }} KB</b><br>
|
||||
<br/>
|
||||
{% spaceless %}
|
||||
<div style="text-align:center">
|
||||
<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
|
||||
<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
|
||||
{{ include('buttons.back.html.twig') }}
|
||||
</div>
|
||||
{{ include('buttons.back.html.twig') }}
|
||||
</form>
|
||||
</div>
|
||||
{% endspaceless %}
|
||||
<script type="text/javascript">
|
||||
$(function() {
|
||||
$('#upload_form').submit(function (event) {
|
||||
@@ -34,4 +30,4 @@ Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_siz
|
||||
return true;
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</script>
|
||||
|
@@ -5,12 +5,8 @@ Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br
|
||||
<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/>
|
||||
<br/>
|
||||
{% spaceless %}
|
||||
<div style="text-align:center">
|
||||
<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
|
||||
<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
|
||||
{{ include('buttons.back.html.twig') }}
|
||||
</div>
|
||||
{{ include('buttons.back.html.twig') }}
|
||||
</form>
|
||||
</div>
|
||||
{% endspaceless %}
|
@@ -28,7 +28,6 @@
|
||||
cursor: pointer;
|
||||
font-weight: 600;
|
||||
background-color: {{ config.vdarkborder }};
|
||||
color: #fff;
|
||||
}
|
||||
</style>
|
||||
|
||||
@@ -61,13 +60,13 @@
|
||||
|
||||
<div class="ts_Spells">
|
||||
<input type="radio" name="ts_Spells" id="tab_instant" aria-controls="instant" checked>
|
||||
<label for="tab_instant">Instant</label>
|
||||
<label for="tab_instant" class="white">Instant</label>
|
||||
|
||||
<input type="radio" name="ts_Spells" id="tab_conjure" aria-controls="conjure">
|
||||
<label for="tab_conjure">Conjure</label>
|
||||
<label for="tab_conjure" class="white">Conjure</label>
|
||||
|
||||
<input type="radio" name="ts_Spells" id="tab_rune" aria-controls="rune">
|
||||
<label for="tab_rune">Rune</label>
|
||||
<label for="tab_rune" class="white">Rune</label>
|
||||
|
||||
<div class="tab-panels">
|
||||
<section id="instant" class="tab-panel">
|
||||
|
Reference in New Issue
Block a user