Merge branch 'develop' into feature/docker

system/templates/account.change-password.html.twig

@@ -4,6 +4,14 @@ Please enter your current password and a new password. For your security, please
 {% set background = config('darkborder') %}
 {% set content %}
 <table style="width:100%;">
+	<tr>
+		<td class="LabelV">
+			<span>Current Password:</span>
+		</td>
+		<td>
+			<input form="form" type="password" name="oldpassword" size="30" maxlength="29">
+		</td>
+	</tr>
 	<tr>
 		<td class="LabelV">
 			<span>New Password:</span>
@@ -20,14 +28,6 @@ Please enter your current password and a new password. For your security, please
 			<input form="form" type="password" name="newpassword_confirm" size="30" maxlength="29">
 		</td>
 	</tr>
-	<tr>
-		<td class="LabelV">
-			<span>Current Password:</span>
-		</td>
-		<td>
-			<input form="form" type="password" name="oldpassword" size="30" maxlength="29">
-		</td>
-	</tr>
 </table>
 {% endset %}
 {% include 'tables.headline.html.twig' %}

system/templates/account.management.html.twig

@@ -88,6 +88,7 @@
 			</div>
 		<br/><br/>
 		{% endif %}
+		{{ hook('HOOK_ACCOUNT_MANAGE_BEFORE_GENERAL_INFORMATION') }}
 		<a name="General+Information"></a>
 		<h2>General Information</h2>
 		<table width="100%">
@@ -127,6 +128,7 @@
 			{% endautoescape %}
 		</table>
 		<br/>
+		{{ hook('HOOK_ACCOUNT_MANAGE_BEFORE_PUBLIC_INFORMATION') }}
 		<a name="Public+Information"></a>
 		<h2>Public Information</h2>
 		<table width="100%">
@@ -145,8 +147,9 @@
 			{% include('buttons.base.html.twig') %}
 		</form>
 		<br/>
+		{{ hook('HOOK_ACCOUNT_MANAGE_BEFORE_ACCOUNT_LOGS') }}
 		<a name="Account+Logs" ></a>
-		<h2>Action Log</h2>
+		<h2>Account Logs</h2>
 		<table>
 			<tr bgcolor="{{ config.vdarkborder }}" class="white">
 				<th>Action</th><th>Date</th><th>IP</th>
@@ -164,6 +167,7 @@
 			{% endautoescape %}
 		</table>
 		<br/>
+		{{ hook('HOOK_ACCOUNT_MANAGE_BEFORE_CHARACTERS') }}
 		<a name="Characters" ></a>
 		<h2>Character list: {{ players|length }} characters.</h2>
 		<table>

system/templates/admin.plugins.form.html.twig

@@ -14,7 +14,7 @@
 				</div>
 			</div>
 			<div class="card-footer">
-				<button type="submit" class="btn btn-info">Upload</button>
+				<button type="submit" class="btn btn-info" {% if not pluginUploadEnabled %}disabled{% endif %}>Upload</button>
 			</div>
 		</form>
 	</div>

system/templates/highscores.html.twig

@@ -7,21 +7,21 @@
 				<tr>
 					<td>Filters</td>
 					<td>
-						<label for="vocationFilter">Choose a Skill</label>
-						<select onchange="location = this.value;" aria-label="skillFilter" id="skillFilter">
+						<label for="skillFilter">Choose a Skill</label>
+						<select onchange="location = this.value;" id="skillFilter">
 							{% set i = 0 %}
 							{% for link, name in types %}
-								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}{{ vocation }}{% endif %}" class="size_xs">{{ name }}</option>
+								<option value="{{ getLink('highscores') }}/{{ link }}{% if vocation is not null %}/{{ vocation }}{% endif %}" class="size_xs" {% if list is not null and list == link %}selected{% endif %}>{{ name }}</option>
 							{% endfor %}
 						</select>
 					</td>
 					<td>
 						<label for="vocationFilter">Choose a vocation</label>
-						<select onchange="location = this.value;" aria-label="vocationFilter" id="vocationFilter">
+						<select onchange="location = this.value;" id="vocationFilter">
 							<option value="{{ getLink('highscores') }}/{{ list }}" class="size_xs">[ALL]</option>
 							{% set i = 0 %}
-							{% for i in 1..config.vocations_amount %}
-								<option value="{{ getLink('highscores') }}/{{ list }}/{{ config.vocations[i]|lower }}" class="size_xs">{{ config.vocations[i]}}</option>
+							{% for i in 0..config.vocations_amount %}
+								<option value="{{ getLink('highscores') }}/{{ list }}/{{ config.vocations[i]|lower }}" class="size_xs" {% if vocationId is not null and vocationId == i %}selected{% endif %}>{{ config.vocations[i]}}</option>
 							{% endfor %}
 						</select>
 					</td>
@@ -119,7 +119,7 @@
 				<tr bgcolor="{{ config.lightborder }}">
 					<td>
 						<a href="{{ getLink('highscores') }}/{{ list }}" class="size_xs">[ALL]</a><br/>
-						{% for i in 1..config.vocations_amount %}
+						{% for i in 0..config.vocations_amount %}
 						<a href="{{ getLink('highscores') }}/{{ list }}/{{ config.vocations[i]|lower }}" class="size_xs">{{ config.vocations[i]}}</a><br/>
 						{% endfor %}
 					</td>

system/templates/install.admin.html.twig

@@ -9,7 +9,13 @@
 <form action="{{ constant('BASE_URL') }}install/" method="post" autocomplete="off">
 	<input type="hidden" name="step" id="step" value="finish" />
 
-	{% for value in ['email', 'account', 'password', 'password_confirm', 'player_name'] %}
+	{% set values = ['email', account, 'password', 'password_confirm'] %}
+
+	{% if hasTablePlayers %}
+		{% set values = values|merge(['player_name']) %}
+	{% endif %}
+
+	{% for value in values %}
 
 	<div class="form-group mb-2">
 		<label for="vars_{{ value }}">{{ locale['step_admin_' ~ value] }}</label>

system/templates/online.html.twig

@@ -23,6 +23,9 @@
 					Currently {{ players|length }} players are online.<br/>
 				{% endif %}
 			{% endif %}
+			{% if setting('core.online_record') %}
+				{{ record }}
+			{% endif %}
 		</td>
 	</tr>
 </table>