Merge branch 'develop' into feature/phpstan

.github/workflows/phpstan.yml

@@ -36,8 +36,9 @@ jobs:
         with:
           path: ${{ steps.composer-cache.outputs.dir }}
           # Use composer.json for key, if composer.lock is not committed.
-          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-          restore-keys: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          #key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }}
+          restore-keys: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
 
       - name: "Install composer dependencies"
         run: "composer install"

.gitignore

@@ -7,6 +7,7 @@ Thumbs.db
 
 # composer
 composer.phar
+composer.lock
 vendor
 
 # npm

CHANGELOG.md

@@ -1,6 +1,6 @@
 # Changelog
 
-## [1.0-beta - 18.05.2024]
+## [1.0-beta - 02.02.2024]
 
 Minimum PHP version for this release is 8.1.
 
@@ -22,7 +22,7 @@ Minimum PHP version for this release is 8.1.
   * list of open source libraries used in project page
 * auto-loading of themes, commands & pages from plugins/ folder. You need just to place them in correct folder and they will be loaded automatically - this allows better customization, without interfering with core AAC folders. This will allow in the future automatic updates for plugins as well the AAC as whole.
 * config.php moved to Admin Panel -> Settings page
-* new console script: aac - using symfony/console
+* new console script: aac (comes from MyAAC) - using symfony/console
   * usage: `php aac` (will list all commands by default)
   * example: `php aac cache:clear`
   * example: `php aac plugin:install theme-example.zip`
@@ -46,7 +46,7 @@ Minimum PHP version for this release is 8.1.
 * phpdebug bar (http://phpdebugbar.com/). Activated if env == 'dev', can be also activated in production by enabling "enable_debugbar" in local config
 
 ### Changed
-* Composer and NPM is now used for external libraries like: Twig, PHPMailer, fast-route, jQuery, Bootstrap etc.
+* Composer is now used for external libraries like: Twig, PHPMailer, fast-route etc.
 * mail support is disabled on fresh install, can be manually enabled by user
 * disable add php pages in admin panel for security. Option to disable plugins upload
 * visitors counter shows now user browser, and also if its bot

admin/pages/accounts.php

@@ -404,7 +404,6 @@ else if (isset($_REQUEST['search'])) {
 											   autocomplete="off" maxlength="20"
 											   value="<?php echo $account->getLocation(); ?>"/>
 									</div>
-									<?php if(setting('core.account_country')): ?>
 									<div class="col-12 col-sm-12 col-lg-4">
 										<label for="rl_country">Country:</label>
 										<select name="rl_country" id="rl_country" class="form-control">
@@ -413,7 +412,6 @@ else if (isset($_REQUEST['search'])) {
 											<?php endforeach; ?>
 										</select>
 									</div>
-									<?php endif; ?>
 								</div>
 								<div class="form-group row">
 									<div class="col-12 col-sm-12 col-lg-6">

admin/template/template.php

@@ -6,7 +6,7 @@
 	<?php echo template_header(true); ?>
 	<title><?php echo (isset($title) ? $title . ' - ' : '') . $config['lua']['serverName'];?></title>
 	<meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/adminlte.min.css">
+	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/ext/admin-lte/css/adminlte.min.css">
 	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/font-awesome.min.css">
 	<?php if (isset($use_datatable)) { ?>
 	<link rel="stylesheet" href="<?php echo BASE_URL; ?>tools/css/datatables.bs.min.css">
@@ -197,7 +197,7 @@ if ($logged && admin()) {
 <script src="<?php echo BASE_URL; ?>tools/js/datatables.min.js"></script>
 <script src="<?php echo BASE_URL; ?>tools/js/datatables.bs.min.js"></script>
 <?php } ?>
-<script src="<?php echo BASE_URL; ?>tools/js/adminlte.min.js"></script>
+<script src="<?php echo BASE_URL; ?>tools/ext/admin-lte/js/adminlte.min.js"></script>
 <?php $hooks->trigger(HOOK_ADMIN_BODY_END); ?>
 </body>
 </html>

composer.json

@@ -15,12 +15,11 @@
         "illuminate/database": "^10.18",
         "peppeocchi/php-cron-scheduler": "4.*",
         "symfony/console": "^6.4",
-        "symfony/string": "^6.4",
+        "symfony/string": "^6.4"
-        "symfony/var-dumper": "^6.4",
-        "filp/whoops": "^2.15",
-        "maximebf/debugbar": "dev-master"
     },
     "require-dev": {
+        "filp/whoops": "^2.15",
+        "maximebf/debugbar": "dev-master",
         "phpstan/phpstan": "^1.10"
     },
     "autoload": {

cypress/e2e/1-install.cy.js

@@ -67,7 +67,7 @@ describe('Install MyAAC', () => {
 
 		cy.get('form').submit()
 
-		cy.contains('[class="alert alert-success"]', 'Congratulations', { timeout: 60000 }).should('be.visible')
+		cy.contains('[class="alert alert-success"]', 'Congratulations', { timeout: 30000 }).should('be.visible')
 
 		cy.wait(2000);
 

cypress/e2e/2-create-account.cy.js

@@ -22,7 +22,7 @@ describe('Create Account Page', () => {
 		cy.get('#vocation1').check()
 		cy.get('#accept_rules').check()
 
-		cy.get('#form').submit()
+		cy.get('#createaccount').submit()
 
 		// no errors please
 		cy.contains('The Following Errors Have Occurred:').should('not.exist')

nginx-sample.conf

@@ -13,16 +13,9 @@ server {
 		return 404;
 	}
 
-	location /vendor {
+	# block .htaccess
+	location ~ /\.ht {
 		deny all;
-		return 404;
-	}
-
-	# block .htaccess, CHANGELOG.md, composer.json etc.
-	# this is to prevent finding software versions
-	location ~\.(ht|md|json|dist)$ {
-		deny all;
-		return 404;
 	}
 
 	# block git files and folders

release.sh

@@ -38,11 +38,7 @@ if [ $1 = "prepare" ]; then
 	cd $dir || exit
 
 	# dependencies
-	composer install --no-dev --prefer-dist --optimize-autoloader
+	composer install --prefer-dist --optimize-autoloader
-	npm install
-
-	# node_modules is useless, we already have copy in tools/ext
-	rm -R node_modules
 
 	echo "Now you can make changes to $dir. When you are ready, type 'release.sh pack'"
 	exit

system/functions.php

@@ -87,29 +87,18 @@ function getForumBoardLink($board_id, $page = NULL): string {
 	return BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . 'forum/board/' . (int)$board_id . (isset($page) ? '/' . $page : '');
 }
 
-function getPlayerLink($name, $generate = true, bool $colored = false): string
+function getPlayerLink($name, $generate = true): string
+{
+	if(is_numeric($name))
 	{
 		$player = new OTS_Player();
-
-	if(is_numeric($name)) {
 		$player->load((int)$name);
-	}
+		if($player->isLoaded())
-	else {
-		$player->find($name);
-	}
-
-	if (!$player->isLoaded()) {
-		return '(error)';
-	}
-
 			$name = $player->getName();
+	}
 
 	$url = BASE_URL . (setting('core.friendly_urls') ? '' : 'index.php/') . 'characters/' . urlencode($name);
 
-	if ($colored) {
-		$name = '<span style="color: ' . ($player->isOnline() ? 'green' : 'red') . ';">' . $name . '</span>';
-	}
-
 	if(!$generate) return $url;
 	return generateLink($url, $name);
 }
@@ -1634,7 +1623,7 @@ function removeIfFirstSlash(&$text) {
 };
 
 function escapeHtml($html) {
-	return htmlspecialchars($html);
+	return htmlentities($html, ENT_QUOTES | ENT_SUBSTITUTE, 'UTF-8');
 }
 
 function getGuildNameById($id)

system/libs/pot/OTS_Player.php

@@ -1229,13 +1229,6 @@ class OTS_Player extends OTS_Row_DAO
         $this->data['direction'] = (int) $direction;
     }
 
-	public function getOutfit(): string
-	{
-		$hasLookAddons = $this->db->hasColumn('players', 'lookaddons');
-
-		return setting('core.outfit_images_url') . '?id=' . $this->getLookType() . ($hasLookAddons ? '&addons=' . $this->getLookAddons() : '') . '&head=' . $this->getLookHead() . '&body=' . $this->getLookBody() . '&legs=' . $this->getLookLegs() . '&feet=' . $this->getLookFeet();
-	}
-
 /**
  * Body color.
  *

system/logout.php

@@ -22,5 +22,11 @@ if(isset($account_logged) && $account_logged->isLoaded()) {
 
 		$logged = false;
 		unset($account_logged);
+
+		if(isset($_REQUEST['redirect']))
+		{
+			header('Location: ' . urldecode($_REQUEST['redirect']));
+			exit;
+		}
 	}
 }

system/pages/account/change_info.php

@@ -26,13 +26,12 @@ if(setting('core.account_country'))
 $account = Account::find($account_logged->getId());
 
 $show_form = true;
-$new_rlname = isset($_POST['info_rlname']) ? htmlspecialchars(stripslashes($_POST['info_rlname'])) : '';
+$new_rlname = isset($_POST['info_rlname']) ? htmlspecialchars(stripslashes($_POST['info_rlname'])) : NULL;
-$new_location = isset($_POST['info_location']) ? htmlspecialchars(stripslashes($_POST['info_location'])) : '';
+$new_location = isset($_POST['info_location']) ? htmlspecialchars(stripslashes($_POST['info_location'])) : NULL;
-$new_country = isset($_POST['info_country']) ? htmlspecialchars(stripslashes($_POST['info_country'])) : '';
+$new_country = isset($_POST['info_country']) ? htmlspecialchars(stripslashes($_POST['info_country'])) : NULL;
 if(isset($_POST['changeinfosave']) && $_POST['changeinfosave'] == 1) {
-	if(setting('core.account_country') && !isset($config['countries'][$new_country])) {
+	if(!isset($config['countries'][$new_country]))
 		$errors[] = 'Country is not correct.';
-	}
 
 	if(empty($errors)) {
 		//save data from form
@@ -40,14 +39,7 @@ if(isset($_POST['changeinfosave']) && $_POST['changeinfosave'] == 1) {
 		$account->location = $new_location;
 		$account->country = $new_country;
 		$account->save();
-
+		$account_logged->logAction('Changed Real Name to <b>' . $new_rlname . '</b>, Location to <b>' . $new_location . '</b> and Country to <b>' . $config['countries'][$new_country] . '</b>.');
-		$log = 'Changed Real Name to <b>' . $new_rlname . '</b>, Location to <b>' . $new_location . '</b>';
-		if(setting('core.account_country')) {
-			$log .= ' and Country to <b>' . $config['countries'][$new_country] . '</b>';
-		}
-		$log .= '.';
-
-		$account_logged->logAction($log);
 		$twig->display('success.html.twig', array(
 			'title' => 'Public Information Changed',
 			'description' => 'Your public information has been changed.'

system/pages/account/manage.php

@@ -22,12 +22,6 @@ if(isset($_REQUEST['redirect']))
 {
 	$redirect = urldecode($_REQUEST['redirect']);
 
-	// should never happen, unless hacker modify the URL
-	if (!str_contains($redirect, BASE_URL)) {
-		error('Fatal error: Cannot redirect outside the website.');
-		return;
-	}
-
 	$twig->display('account.redirect.html.twig', array(
 		'redirect' => $redirect
 	));

system/pages/account/redirect.php

@@ -12,12 +12,6 @@ defined('MYAAC') or die('Direct access not allowed!');
 
 $redirect = urldecode($_REQUEST['redirect']);
 
-// should never happen, unless hacker modify the URL
-if (!str_contains($redirect, BASE_URL)) {
-	error('Fatal error: Cannot redirect outside the website.');
-	return;
-}
-
 $twig->display('account.redirect.html.twig', array(
 	'redirect' => $redirect
 ));

system/pages/characters.php

@@ -199,7 +199,7 @@ if($player->isLoaded() && !$player->isDeleted())
 		unset($storage);
 	}
 
-	if($db->hasTable('player_items') && $db->hasColumn('player_items', 'pid') && $db->hasColumn('player_items', 'sid') && $db->hasColumn('player_items', 'itemtype')) {
+	if($config['characters']['equipment'] && $db->hasTable('player_items') && $db->hasColumn('player_items', 'pid') && $db->hasColumn('player_items', 'sid') && $db->hasColumn('player_items', 'itemtype')) {
 		$eq_sql = $db->query('SELECT `pid`, `itemtype` FROM player_items WHERE player_id = '.$player->getId().' AND (`pid` >= 1 and `pid` <= 10)');
 		$equipment = array();
 		foreach($eq_sql as $eq)

system/pages/forum/edit_post.php

@@ -19,7 +19,7 @@ if ($ret === false) {
 }
 
 if(!$logged) {
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/move_thread.php

@@ -19,7 +19,7 @@ if ($ret === false) {
 }
 
 if(!$logged) {
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/new_post.php

@@ -24,7 +24,7 @@ if(!$logged) {
 		$extra_url = '?action=new_post&thread_id=' . $_GET['thread_id'];
 	}
 
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/new_thread.php

@@ -24,7 +24,7 @@ if(!$logged) {
 		$extra_url = '?action=new_thread&section_id=' . $_GET['section_id'];
 	}
 
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum') . $extra_url) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/remove_post.php

@@ -19,7 +19,7 @@ if ($ret === false) {
 }
 
 if(!$logged) {
-	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
+	echo 'You are not logged in. <a href="' . getLink('account/manage') . '?redirect=' . BASE_URL . urlencode(getLink('forum')) . '">Log in</a> to post on the forum.<br /><br />';
 	return;
 }
 

system/pages/forum/show_thread.php

@@ -60,7 +60,7 @@ foreach($posts as &$post) {
 	}
 
 	if($config['characters']['outfit']) {
-		$post['outfit'] = $player->getOutfit();
+		$post['outfit'] = setting('core.outfit_images_url') . '?id=' . $player->getLookType() . ($lookaddons ? '&addons=' . $player->getLookAddons() : '') . '&head=' . $player->getLookHead() . '&body=' . $player->getLookBody() . '&legs=' . $player->getLookLegs() . '&feet=' . $player->getLookFeet();
 	}
 
 	$groupName = '';

system/pages/monsters.php

@@ -79,7 +79,7 @@ if (isset($monster['name'])) {
 	));
 
 } else {
-	echo "Monster with name <b>" . htmlspecialchars($monster_name) . "</b> doesn't exist.";
+	echo "Monster with name <b>" . $monster_name . "</b> doesn't exist.";
 }
 
 // back button

system/pages/polls.php

@@ -51,7 +51,7 @@ function getColorByPercent($percent)
 					if($logged)
 						echo $link.'?id='.$poll['id'];
 					else
-						echo getLink('account/manage') . '?redirect=' . urlencode($link.'?id='.$poll['id']);
+						echo getLink('account/manage') . '?redirect=' . BASE_URL . urlencode($link.'?id='.$poll['id']);
 
 					echo '">'.$poll['question'] . '</a>
 				</td>
@@ -80,7 +80,7 @@ function getColorByPercent($percent)
 					if($logged)
 						echo $link.'?id='.$poll['id'];
 					else
-						echo getLink('account/manage') . '?redirect=' . urlencode($link.'?id='.$poll['id']);
+						echo getLink('account/manage') . '?redirect=' . BASE_URL . urlencode($link.'?id='.$poll['id']);
 
 					echo '">'.$poll['question'] . '</a>
 				</td>

system/src/Plugins.php

@@ -23,9 +23,6 @@ class Plugins {
 
 		$routes = [];
 		foreach(self::getAllPluginsJson() as $plugin) {
-			//
-			// Get all plugins/*/pages/*.php pages
-			//
 			$pluginPages = glob(PLUGINS . $plugin['filename'] . '/pages/*.php');
 			foreach ($pluginPages as $file) {
 				$file = str_replace(PLUGINS, 'plugins/', $file);
@@ -34,22 +31,6 @@ class Plugins {
 				$routes[] = [['get', 'post'], $name, $file, 1000];
 			}
 
-			//
-			// Get all plugins/*/pages/subFolder/*.php pages
-			//
-			$pluginPagesSubFolders = glob(PLUGINS . $plugin['filename'] . '/pages/*', GLOB_ONLYDIR);
-			foreach ($pluginPagesSubFolders as $folder) {
-				$folderName = pathinfo($folder, PATHINFO_FILENAME);
-
-				$subFiles = glob(PLUGINS . $plugin['filename'] . '/pages/' . $folderName . '/*.php');
-				foreach ($subFiles as $file) {
-					$file = str_replace(PLUGINS, 'plugins/', $file);
-					$name = $folderName . '/' . pathinfo($file, PATHINFO_FILENAME);
-
-					$routes[] = [['get', 'post'], $name, $file, 1000];
-				}
-			}
-
 			$warningPreTitle = 'Plugin: ' . $plugin['name'] . ' - ';
 
 			if (isset($plugin['routes'])) {

system/src/Twig/Extension/TypeCastingExtension.php

@@ -1,36 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace MyAAC\Twig\Extension;
-
-use Twig\Extension\AbstractExtension;
-use Twig\TwigFilter;
-
-final class TypeCastingExtension extends AbstractExtension
-{
-	/** @return array<int, TwigFilter> */
-	public function getFilters(): array
-	{
-		return [
-			new TwigFilter('int', function ($value) {
-				return (int)$value;
-			}),
-			new TwigFilter('float', function ($value) {
-				return (float)$value;
-			}),
-			new TwigFilter('string', function ($value) {
-				return (string)$value;
-			}),
-			new TwigFilter('bool', function ($value) {
-				return (bool)$value;
-			}),
-			new TwigFilter('array', function (object $value) {
-				return (array)$value;
-			}),
-			new TwigFilter('object', function (array $value) {
-				return (object)$value;
-			}),
-		];
-	}
-}

system/templates/account.change_info.html.twig

@@ -1,25 +1,42 @@
 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.<br/><br/>
-{% set title = 'Change Public Information' %}
+<form action="{{ getLink('account/info') }}" method="post">
-{% set background = config('darkborder') %}
+	{{ csrf() }}
-{% set content %}
+	<div class="TableContainer" >
+		<table class="Table1" cellpadding="0" cellspacing="0" >
+			<div class="CaptionContainer" >
+				<div class="CaptionInnerContainer" >
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
+					<div class="Text" >Change Public Information</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer" >
 						<table style="width:100%;" >
 							<tr>
 								<td class="LabelV" >Real Name:</td>
 								<td style="width:90%;" >
-			<input form="form" name="info_rlname" value="{{ account_rlname }}" size="30" maxlength="50" >
+									<input name="info_rlname" value="{{ account_rlname }}" size="30" maxlength="50" >
 								</td>
 							</tr>
 							<tr>
 								<td class="LabelV" >Location:</td>
 								<td>
-			<input form="form" name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
+									<input name="info_location" value="{{ account_location }}" size="30" maxlength="50" >
 								</td>
 							</tr>
 							{% if setting('core.account_country') %}
 							<tr>
 								<td class="LabelV" >Country:</td>
 								<td>
-			<select form="form" name="info_country" id="account_country">
+									<select name="info_country" id="account_country">
 										{% for code, country in countries %}
 										<option value="{{ code}}"{% if account_country == code %} selected{% endif %}>{{ country }} </option>
 										{% endfor %}
@@ -50,8 +67,11 @@ Here you can tell other players about yourself. This information will be display
 							</tr>
 							{% endif %}
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</table>
+	</div>
 	<br/>
 	<table width="100%">
 		<tr align="center">
@@ -59,25 +79,23 @@ Here you can tell other players about yourself. This information will be display
 				<table border="0" cellspacing="0" cellpadding="0" >
 					<tr>
 						<td style="border:0px;" >
-						<form id="form" action="{{ getLink('account/info') }}" method="post">
-							{{ csrf() }}
 							<input type="hidden" name="changeinfosave" value="1">
 								{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
 					</tr>
 				</table>
 			</td>
 			<td>
+</form>
 				<table border="0" cellspacing="0" cellpadding="0" >
-				<tr>
-					<td style="border:0px;" >
 					<form action="{{ getLink('account/manage') }}" method="post" >
 						{{ csrf() }}
+						<tr>
+							<td style="border:0px;" >
 								{{ include('buttons.back.html.twig') }}
+							</td>
+						</tr>
 					</form>
-					</td>
-				</tr>
 				</table>
 			</td>
 		</tr>

system/templates/account.change_mail.html.twig

@@ -1,14 +1,31 @@
 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/>
-{% set title = 'Change Email Address' %}
+<form action="{{ getLink('account/email') }}" method="post">
-{% set background = config('darkborder') %}
+	{{ csrf() }}
-{% set content %}
+<div class="TableContainer">
+	<table class="Table1" cellpadding="0" cellspacing="0">
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer" >
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Change Email Address</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;">
 						<tr>
 							<td class="LabelV" >
 								<span >New Email Address:</span>
 							</td>
 							<td style="width:90%;">
-				<input form="form" name="new_email" value="{% if new_email is defined %}{{ new_email }}{% endif %}" size="30" maxlength="50" autofocus/>
+								<input name="new_email" value="{% if new_email is defined %}{{ new_email }}{% endif %}" size="30" maxlength="50" autofocus/>
 							</td>
 						</tr>
 						<tr>
@@ -16,12 +33,15 @@ Please enter your password and the new email address. Make sure that you enter a
 								<span >Password:</span>
 							</td>
 							<td>
-				<input form="form" type="password" name="password" size="30" maxlength="29">
+								<input type="password" name="password" size="30" maxlength="29">
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <table style="width:100%;">
 	<tr align="center">
@@ -29,15 +49,13 @@ Please enter your password and the new email address. Make sure that you enter a
 			<table border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/email') }}" method="post">
-							{{ csrf() }}
 						<input type="hidden" name="changeemailsave" value="1"/>
 						{{ include('buttons.submit.html.twig') }}
-						</form>
 					</td>
 				<tr>
 			</table>
 		</td>
+</form>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<form action="{{ getLink('account/manage') }}" method="post">

system/templates/account.change_name.html.twig

@@ -1,14 +1,31 @@
 To change a name of character select player and choose a new name.<br/>
 <span style="color: red">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' }}.</span><br/><br/>
-
+<form action="{{ getLink('account/character/name') }}" method="post">
-{% set title = 'Change Name' %}
+	{{ csrf() }}
-{% set background = config('darkborder') %}
+	<input type="hidden" name="changenamesave" value="1">
-{% set content %}
+	<div class="TableContainer">
+		<table class="Table1" cellpadding="0" cellspacing="0">
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer" >
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >Change Name</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer" >
 						<table style="width:100%;" >
 							<tr>
                                 <td class="LabelV" ><span>Character:</span></td>
 								<td style="width:90%;" >
-			<select form="form" name="player_id">
+									<select name="player_id">
 										{% for player in account_logged.getPlayersList(false) %}
 										<option value="{{ player.getId() }}">{{ player.getName() }}</option>
 										{% endfor %}
@@ -18,7 +35,7 @@ To change a name of character select player and choose a new name.<br/>
 							<tr>
                                 <td class="LabelV" ><span>New Name:</span></td>
 								<td>
-			<input form="form" type="text" name="name" id="character_name" size="25" maxlength="25" >
+									<input type="text" name="name" id="character_name" size="25" maxlength="25" >
 									<img id="character_indicator" src="images/global/general/{% if not save or errors|length > 0 %}n{% endif %}ok.gif" />
 									<br/>
 									<span style="font-size: 10px">
@@ -27,8 +44,11 @@ To change a name of character select player and choose a new name.<br/>
 								</td>
 							</tr>
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</table>
+	</div>
 	<br/>
 	<table style="width:100%" >
 		<tr align="center">
@@ -36,25 +56,22 @@ To change a name of character select player and choose a new name.<br/>
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
 						<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/character/name') }}" method="post">
-							{{ csrf() }}
-							<input type="hidden" name="changenamesave" value="1">
 							{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
 					</tr>
+</form>
 				</table>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0px;">
 					<form action="{{ getLink('account/manage') }}" method="post">
 						{{ csrf() }}
+						<tr>
+							<td style="border:0px;">
 								{{ include('buttons.back.html.twig') }}
-						</form>
 							</td>
 						</tr>
+					</form>
 				</table>
 			</td>
 		</tr>

system/templates/account.change_password.html.twig

@@ -1,15 +1,32 @@
 Please enter your current password and a new password. For your security, please enter the new password twice.<br/>
 <br/>
-{% set title = 'Change Password' %}
+<form action="{{ getLink('account/password') }}" method="post">
-{% set background = config('darkborder') %}
+	{{ csrf() }}
-{% set content %}
+	<div class="TableContainer">
+		<table class="Table1" cellpadding="0" cellspacing="0">
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer">
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >Change Password</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						<table style="width:100%;">
 							<tr>
 								<td class="LabelV">
 									<span>New Password:</span>
 								</td>
 								<td style="width:90%;">
-			<input form="form" type="password" name="newpassword" size="30" maxlength="29">
+									<input type="password" name="newpassword" size="30" maxlength="29">
 								</td>
 							</tr>
 							<tr>
@@ -17,7 +34,7 @@ Please enter your current password and a new password. For your security, please
 									<span>New Password Again:</span>
 								</td>
 								<td>
-			<input form="form" type="password" name="newpassword_confirm" size="30" maxlength="29">
+									<input type="password" name="newpassword_confirm" size="30" maxlength="29">
 								</td>
 							</tr>
 							<tr>
@@ -25,12 +42,15 @@ Please enter your current password and a new password. For your security, please
 									<span>Current Password:</span>
 								</td>
 								<td>
-			<input form="form" type="password" name="oldpassword" size="30" maxlength="29">
+									<input type="password" name="oldpassword" size="30" maxlength="29">
 								</td>
 							</tr>
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</table>
+	</div>
 	<br/>
 	<table style="width:100%;">
 		<tr align="center">
@@ -38,24 +58,22 @@ Please enter your current password and a new password. For your security, please
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
 						<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/password') }}" method="post">
-							{{ csrf() }}
 							{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
 					<tr>
 				</table>
 			</td>
+</form>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0px;">
 					<form action="{{ getLink('account/manage') }}" method="post">
 						{{ csrf() }}
+						<tr>
+							<td style="border:0px;">
 								{{ include('buttons.back.html.twig') }}
+							</td>
+						</tr>
 					</form>
-					</td>
-				</tr>
 				</table>
 			</td>
 		</tr>

system/templates/account.change_sex.html.twig

@@ -1,14 +1,31 @@
 To change a sex of character select player and choose a new sex.<br/>
-<span style="color: red">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' }}.</span>
+<span style="color: red">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' }}.</span><br/><br/>
-<br/><br/>
+<form action="{{ getLink('account/character/sex') }}" method="post">
-{% set title = 'Change sex' %}
+	{{ csrf() }}
-{% set background = config('darkborder') %}
+	<input type="hidden" name="changesexsave" value="1"/>
-{% set content %}
+	<div class="TableContainer">
+		<table class="Table1" cellpadding="0" cellspacing="0">
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer">
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >Change sex</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						<table style="width:100%;" >
 							<tr>
-		<td class="LabelV" ><span>Character:</span></td>
+								<td class="LabelV" ><span >Character:</td>
 								<td style="width:90%;" >
-			<select form="form" name="player_id">
+									<select name="player_id">
 										{% for player in players %}
 										<option value="{{ player.getId() }}">{{ player.getName() }}</option>
 										{% endfor %}
@@ -16,9 +33,9 @@ To change a sex of character select player and choose a new sex.<br/>
 								</td>
 							</tr>
 							<tr>
-		<td class="LabelV" ><span>New Sex:</span></td>
+								<td class="LabelV" ><span >New Sex:</td>
 								<td>
-			<select form="form" name="new_sex">
+									<select name="new_sex">
 										{% for id, gender in config.genders %}
 										<option value="{{ id }}"{% if player_sex == id %} selected{% endif %}>{{ gender }}</option>
 										{% endfor %}
@@ -26,9 +43,11 @@ To change a sex of character select player and choose a new sex.<br/>
 								</td>
 							</tr>
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
-
+			</tr>
+		</table>
+	</div>
 	<br/>
 	<table style="width:100%">
 		<tr align="center">
@@ -36,25 +55,23 @@ To change a sex of character select player and choose a new sex.<br/>
 				<table border="0" cellspacing="0" cellpadding="0" >
 					<tr>
 						<td style="border:0px;" >
-						<form id="form" action="{{ getLink('account/character/sex') }}" method="post">
-							{{ csrf() }}
-							<input type="hidden" name="changesexsave" value="1"/>
 							{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
 					</tr>
+					<tr>
+</form>
 				</table>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0px;">
 					<form action="{{ getLink('account/manage') }}" method="post">
 						{{ csrf() }}
+						<tr>
+							<td style="border:0px;" >
 								{{ include('buttons.back.html.twig') }}
+							</td>
+						</tr>
 					</form>
-					</td>
-				</tr>
 				</table>
 			</td>
 		</tr>

system/templates/account.create.html.twig

@@ -1,8 +1,24 @@
 {{ hook('HOOK_ACCOUNT_CREATE_BEFORE_FORM') }}
-{% set title = 'Create ' ~ config.lua.serverName ~ ' Account' %}
+<form action="{{ getLink('account/create') }}" method="post" id="createaccount">
-{% set background = config('darkborder') %}
+	{{ csrf() }}
-{% set tableClass = 'Table5' %}
+	<div class="TableContainer" >
-{% set content %}
+		<table class="Table5" cellpadding="0" cellspacing="0" >
+			<div class="CaptionContainer" >
+				<div class="CaptionInnerContainer" >
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
+					<div class="Text" >Create {{ config.lua.serverName }} Account</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer" >
 						<table style="width:100%;" >
 							{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_BOXES') }}
 							<tr>
@@ -24,7 +40,7 @@
 														{% endif %}
 													</td>
 													<td>
-								<input form="form" type="text" name="account" id="account_input" size="30" maxlength="{% if constant('USE_ACCOUNT_NAME') %}30{% else %}10{% endif %}" value="{{ account }}" autofocus/>
+														<input type="text" name="account" id="account_input" size="30" maxlength="{% if constant('USE_ACCOUNT_NAME') %}30{% else %}10{% endif %}" value="{{ account }}" autofocus/>
 														<img id="account_indicator" src="images/global/general/{% if not save or errors.account is defined %}n{% endif %}ok.gif" style="display: none;" />
 													</td>
 												</tr>
@@ -36,7 +52,7 @@
 														<span{% if errors.email is defined %} class="red"{% endif %}>Email Address:</span>
 													</td>
 													<td>
-								<input form="form" type="text" name="email" id="email" size="30" maxlength="50" value="{{ email }}" />
+														<input type="text" name="email" id="email" size="30" maxlength="50" value="{{ email }}" />
 														<img id="email_indicator" src="images/global/general/{% if not save or errors.email is defined %}n{% endif %}ok.gif" style="display: none;" />
 													</td>
 												</tr>
@@ -56,7 +72,7 @@
 															<span{% if errors.country[0] is defined %} class="red"{% endif %}>Country:</span>
 														</td>
 														<td>
-									<select form="form" name="country" id="account_country">
+															<select name="country" id="account_country">
                                                                 {% for code, country_ in countries %}
 																	<option value="{{ code }}"{% if(country is defined and country == code) or (country is null and country_recognized == code) %}selected{% endif %}>{{ country_ }}</option>
                                                                 {% endfor %}
@@ -76,7 +92,7 @@
 														<span{% if errors.password is defined %} class="red"{% endif %}>Password:</span>
 													</td>
 													<td>
-								<input form="form" type="password" name="password" id="password" value="" size="30" maxlength="29" />
+														<input type="password" name="password" id="password" value="" size="30" maxlength="29" />
 														<img id="password_indicator" src="images/global/general/{% if not save or errors.password is defined %}n{% endif %}ok.gif" style="display: none;" />
 													</td>
 												</tr>
@@ -89,7 +105,7 @@
 														<span{% if errors.password is defined %} class="red"{% endif %}>Repeat password:</span>
 													</td>
 													<td>
-								<input form="form" type="password" name="password_confirm" id="password_confirm" value="" size="30" maxlength="29" />
+														<input type="password" name="password_confirm" id="password_confirm" value="" size="30" maxlength="29" />
 														<img id="password_confirm_indicator" src="images/global/general/{% if not save or errors.password is defined %}n{% endif %}ok.gif" style="display: none;" />
 													</td>
 												</tr>
@@ -125,7 +141,7 @@
 														<span{% if errors.name is defined %} class="red"{% endif %}>Character Name:</span>
 													</td>
 													<td>
-								<input form="form" id="character_name" name="name" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" value="{{ name }}"/>
+														<input id="character_name" name="name" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" value="{{ name }}"/>
 														<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" style="display: none;" />
 														<br>
 													</td>
@@ -152,7 +168,7 @@
                                                                     {% for id, gender in config.genders|reverse(true) %}
                                                                         {% set i = i + 1 %}
 																		<span style="margin-right:15px;" class="OptionContainer">
-													<input form="form" type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}>
+																			<input type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}>
 																			<label for="sex{{ i }}">{{ gender|lower }}</label>
 																		</span>
                                                                     {% endfor %}
@@ -185,7 +201,7 @@
 																<td>
                                                            		{% for key, sample_char in config.character_samples %}
 																	<span style="margin-right:15px;" class="OptionContainer">
-												<input form="form" type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
+																		<input type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
                                                                                 {% if vocation is not null and vocation == key %} checked="checked"{% endif %}>
 																		<label for="vocation{{ key }}">{{ config['vocations'][key] }}</label>
 																	</span>
@@ -218,7 +234,7 @@
 																<td>
 																	{% for town_id in config.character_towns %}
 																		<span style="margin-right:15px;" class="OptionContainer">
-													<input form="form" type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
+																			<input type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
 																					{% if town is not null and town == town_id %} checked="checked"{% endif %}>
 																			<label for="town{{ town_id }}">{{ config.towns[town_id] }}</label>
 																		</span>
@@ -263,7 +279,7 @@
 												</tr>
 												<tr>
 													<td colspan="2" >
-								<span><input form="form" type="checkbox" id="accept_rules" name="accept_rules" value="true"{% if accept_rules %}checked{% endif %}/> <label for="accept_rules">I agree to the <a href="?subtopic=rules" target="_blank">{{ config.lua.serverName }} Rules</a>.</label></span>
+														<span><input type="checkbox" id="accept_rules" name="accept_rules" value="true"{% if accept_rules %}checked{% endif %}/> <label for="accept_rules">I agree to the <a href="?subtopic=rules" target="_blank">{{ config.lua.serverName }} Rules</a>.</label></span>
 													</td>
 												</tr>
                                                 {% if errors.accept_rules is defined %}
@@ -287,8 +303,11 @@
 							{{ hook('HOOK_ACCOUNT_CREATE_AFTER_BOXES') }}
 
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</table>
+	</div>
 	<br/>
 	{{ hook('HOOK_ACCOUNT_CREATE_BEFORE_SUBMIT_BUTTON') }}
 	<table width="100%">
@@ -297,17 +316,15 @@
 				<table border="0" cellspacing="0" cellpadding="0" >
 					<tr>
 						<td style="border:0px;" >
-						<form id="form" action="{{ getLink('account/create') }}" method="post">
-							{{ csrf() }}
 							<input type="hidden" name="save" value="1" >
 							{{ include('buttons.submit.html.twig') }}
+						</td>
+					</tr>
+				</table>
+			</td>
+		</tr>
+	</table>
 </form>
-					</td>
-				</tr>
-			</table>
-		</td>
-	</tr>
-</table>
 {{ hook('HOOK_ACCOUNT_CREATE_AFTER_FORM') }}
 <script type="text/javascript" src="{{ constant('BASE_URL') }}tools/check_name.js"></script>
 <style>

system/templates/account.create_character.html.twig

@@ -6,6 +6,9 @@ In any case the name must not violate the naming conventions stated in the <a hr
 <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/>
+<form action="{{ getLink('account/character/create') }}" method="post">
+	{{ csrf() }}
+	<input type="hidden" name="save" value="1">
 	<div class="TableContainer">
 		<table class="Table3" cellpadding="0" cellspacing="0">
 			<div class="CaptionContainer">
@@ -43,7 +46,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 												</tr>
 												<tr class="Odd">
 													<td>
-													<input form="form" name="name" id="character_name" value="{{ name }}" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" >
+														<input name="name" id="character_name" value="{{ name }}" size="{{ setting('core.create_character_name_max_length') }}" maxlength="{{ setting('core.create_character_name_max_length') }}" >
 														<img id="character_indicator" src="images/global/general/{% if not save or errors.name is defined %}n{% endif %}ok.gif" />
 														<br/>
 														<span style="font-size: 10px">
@@ -54,7 +57,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 														{% set i = 0 %}
 														{% for id, gender in config.genders|reverse(true) %}
 														{% set i = i + 1 %}
-													<input form="form" type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}
+														<input type="radio" name="sex" id="sex{{ i }}" value="{{ id }}"{% if sex is not null and sex == id %} checked="checked"{% endif %}
 														><label for="sex{{ i }}">{{ gender|lower }}</label><br/>
 														{% endfor %}
 													</td>
@@ -77,7 +80,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 													{% for key, sample_char in config.character_samples %}
 													<tr>
 														<td>
-														<input form="form" type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
+															<input type="radio" name="vocation" id="vocation{{ key }}" value="{{ key }}"
 															{% if vocation is not null and vocation == key %} checked="checked"{% endif %}>
 															<label for="vocation{{ key }}">{{ config['vocations'][key] }}</label>
 														</td>
@@ -98,7 +101,7 @@ In any case the name must not violate the naming conventions stated in the <a hr
 													{% for town_id in config.character_towns %}
 													<tr>
 														<td>
-														<input form="form" type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
+															<input type="radio" name="town" id="town{{ town_id }}" value="{{ town_id }}"
 															{% if town is not null and town == town_id %} checked="checked"{% endif %}>
 															<label for="town{{ town_id }}">{{ config.towns[town_id] }}</label>
 														</td>
@@ -124,25 +127,22 @@ In any case the name must not violate the naming conventions stated in the <a hr
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
 						<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/character/create') }}" method="post">
-							{{ csrf() }}
-							<input type="hidden" name="save" value="1">
 							{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
 					</tr>
+</form>
 				</table>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0px;">
 					<form action="{{ getLink('account/manage') }}" method="post">
 						{{ csrf() }}
+						<tr>
+							<td style="border:0px;">
 								{{ include('buttons.back.html.twig') }}
-						</form>
 							</td>
 						</tr>
+					</form>
 				</table>
 			</td>
 		</tr>

system/templates/account.delete_character.html.twig

@@ -1,23 +1,44 @@
 To delete a character enter the name of the character and your password.<br/><br/>
-{% set title = 'Delete Character' %}
+<form action="{{ getLink('account/character/delete') }}" method="post">
-{% set background = config('darkborder') %}
+	{{ csrf() }}
-{% set content %}
+	<input type="hidden" name="deletecharactersave" value="1"/>
+	<div class="TableContainer">
+		<table class="Table1" cellpadding="0" cellspacing="0" >
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer">
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >Delete Character</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						<table style="width:100%;">
 							<tr>
 								<td class="LabelV" ><span>Character Name:</span></td>
 								<td style="width:90%;">
-			<input form="form" name="delete_name" value="" size="30" maxlength="29"/>
+									<input name="delete_name" value="" size="30" maxlength="29"/>
 								</td>
 							</tr>
 							<tr>
 								<td class="LabelV" ><span>Password:</span></td>
 								<td>
-			<input form="form" type="password" name="delete_password" size="30" maxlength="29"/>
+									<input type="password" name="delete_password" size="30" maxlength="29"/>
 								</td>
 							</tr>
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</table>
+	</div>
 	<br/>
 	<table style="width:100%">
 		<tr align="center">
@@ -25,13 +46,10 @@ To delete a character enter the name of the character and your password.<br/><br
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
 						<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/character/delete') }}" method="post">
-							{{ csrf() }}
-							<input type="hidden" name="deletecharactersave" value="1"/>
 							{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
-				</tr>
+					<tr>
+</form>
 				</table>
 			</td>
 			<td>

system/templates/account.generate_new_recovery_key.html.twig

@@ -1,17 +1,37 @@
 To generate new recovery key for your account please enter your password.<br/>
-<span style="color: red"><b>New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points</b>.</span> You have {{ points }} premium points. You will receive e-mail with this recovery key.
+<span style="color: red"><b>New recovery key cost {{ setting('core.account_generate_new_reckey_price') }} Premium Points.</span> You have {{ points }} premium points. You will receive e-mail with this recovery key.</b><br/>
-<br/>
+<form action="{{ getLink('account/register/new') }}" method="post">
-{% set title = 'Generate recovery key' %}
+	{{ csrf() }}
-{% set background = config('darkborder') %}
+	<input type="hidden" name="registeraccountsave" value="1">
-{% set content %}
+	<div class="TableContainer" >
+		<table class="Table1" cellpadding="0" cellspacing="0">
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer">
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >Generate recovery key</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				</div>
+			</div>
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						<table style="width:100%;">
 							<tr>
 								<td class="LabelV" ><span>Password:</span></td>
-		<td><input form="form" type="password" name="reg_password" size="30" maxlength="29" ></td>
+								<td><input type="password" name="reg_password" size="30" maxlength="29" ></td>
 							</tr>
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</table>
+	</div>
 	<br/>
 	<table style="width:100%">
 		<tr align="center">
@@ -19,25 +39,22 @@ To generate new recovery key for your account please enter your password.<br/>
 				<table border="0" cellspacing="0" cellpadding="0">
 					<tr>
 						<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/register/new') }}" method="post">
-							{{ csrf() }}
-							<input type="hidden" name="registeraccountsave" value="1">
 							{{ include('buttons.submit.html.twig') }}
-						</form>
 						</td>
 					</tr>
+</form>
 				</table>
 			</td>
 			<td>
 				<table border="0" cellspacing="0" cellpadding="0">
-				<tr>
-					<td style="border:0px;">
 					<form action="{{ getLink('account/manage') }}" method="post">
 						{{ csrf() }}
+						<tr>
+							<td style="border:0px;">
 								{{ include('buttons.back.html.twig') }}
+							</td>
+						</tr>
 					</form>
-					</td>
-				</tr>
 				</table>
 			</td>
 		</tr>

system/templates/account.generate_recovery_key.html.twig

@@ -1,19 +1,40 @@
 To generate recovery key for your account please enter your password.<br/><br/>
-{% set title = 'Generate recovery key' %}
+<form action="{{ getLink('account/register') }}" method="post">
-{% set background = config('darkborder') %}
+	{{ csrf() }}
-{% set content %}
+<input type="hidden" name="registeraccountsave" value="1"/>
+<div class="TableContainer">
+	<table class="Table1" cellpadding="0" cellspacing="0">
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Generate recovery key</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;" >
 						<tr>
 							<td class="LabelV">
 								<span>Password:</span>
 							</td>
 							<td>
-			<input form="form" type="password" name="reg_password" size="30" maxlength="29" autofocus/>
+								<input type="password" name="reg_password" size="30" maxlength="29" autofocus/>
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <table style="width:100%">
 	<tr align="center">
@@ -21,15 +42,12 @@ To generate recovery key for your account please enter your password.<br/><br/>
 			<table border="0" cellspacing="0" cellpadding="0" >
 				<tr>
 					<td style="border:0px;">
-						<form id="form" action="{{ getLink('account/register') }}" method="post">
-							{{ csrf() }}
-							<input type="hidden" name="registeraccountsave" value="1"/>
 						{{ include('buttons.submit.html.twig') }}
-						</form>
 					</td>
 				<tr>
 			</table>
 		</td>
+</form>
 		<td>
 			<table border="0" cellspacing="0" cellpadding="0">
 				<form action="{{ getLink('account/manage') }}" method="post">

system/templates/account.logout.html.twig

@@ -1,10 +1,28 @@
-{% set title = 'Logout Successful' %}
+<div class="TableContainer">
-{% set background = config('darkborder') %}
+	<table class="Table1" cellpadding="0" cellspacing="0" >
-{% set content %}
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer" >
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"/></span>
+				<div class="Text">Logout Successful</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"/></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"/></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;">
 						<tr>
 							<td>You have logged out of your {{ config.serverName }} account. In order to view your account you need to <a href="{{ getLink('account/manage') }}" >log in</a> again.</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>

system/templates/account.redirect.html.twig

@@ -1,13 +1,31 @@
-{% set title = 'Login Successful' %}
+<div class="TableContainer">
-{% set background = config('darkborder') %}
+	<table class="Table1" cellpadding="0" cellspacing="0">
-{% set content %}
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
+				<div class="Text" >Login Successful</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" /></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" /></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;" >
 						<tr>
 							<td>You have logged in.<br/>Press <a href="{{ redirect }}" >here</a> if you are not returned automatically.</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 
 <script language="javascript" type="text/javascript">
 	// Automatic redirect

system/templates/forum.add_board.html.twig

@@ -39,9 +39,7 @@
 						</td>
 					</tr>
 					<tr>
-						<td colspan="2" align="center">
+						<td colspan="2" align="center"><input type="submit" value="Submit"/>
-							{{ include('buttons.submit.html.twig') }}
-						</td>
 					</tr>
 				</table>
 			</td>

system/templates/forum.boards.html.twig

@@ -1,26 +1,24 @@
 <b>Boards</b>
 <table width="100%">
-	<thead>
 	<tr bgcolor="{{ config.vdarkborder }}" class="white">
-		<th>
+		<td>
 			<span style="font-size: 10px"><b>Board</b></span>
-		</th>
+		</td>
-		<th>
+		<td>
 			<span style="font-size: 10px"><b>Posts</b></span>
-		</th>
+		</td>
-		<th>
+		<td>
 			<span style="font-size: 10px"><b>Threads</b></span>
-		</th>
+		</td>
-		<th align="center">
+		<td align="center">
 			<span style="font-size: 10px"><b>Last Post</b></span>
-		</th>
+		</td>
 		{% if canEdit %}
-			<th>
+			<td>
 				<span style="font-size: 10px"><b>Options</b></span>
-			</th>
+			</td>
 		{% endif %}
 	</tr>
-	</thead>
 	{% set i = 0 %}
 	{% for board in boards %}
 	{% set i = i + 1 %}

system/templates/guilds.change_description.html.twig

@@ -1,9 +1,4 @@
-{% set title = 'Change guild description' %}
+<div style="text-align:center"><h2>Change guild description</h2></div>
-{% set background = config('darkborder') %}
-{% set content %}
-<table style="width:100%;" >
-	<tr>
-		<td>
 Here you can change description of your guild.<br/>
 <form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_description" method="post">
 	{{ csrf() }}
@@ -17,8 +12,3 @@
 		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
-		</td>
-	</tr>
-</table>
-{% endset %}
-{% include 'tables.headline.html.twig' %}

system/templates/guilds.change_logo.html.twig

@@ -1,9 +1,4 @@
-{% set title = 'Change guild logo' %}
+<div style="text-align:center"><h2>Change guild logo</h2></div>
-{% set background = config('darkborder') %}
-{% set content %}
-<table style="width:100%;" >
-	<tr>
-		<td>
 Here you can change logo of your guild.<br/>Actuall logo: <img src="{{ constant('GUILD_IMAGES_DIR') }}{{ guild_logo }}" height="64" width="64"><br/><br/>
 <form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_logo" method="post" id="upload_form">
 	{{ csrf() }}
@@ -14,19 +9,12 @@
 </form>
 Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ setting('core.guild_image_size_kb') }} KB</b><br>
 <br/>
-		</td>
-	</tr>
-</table>
-{% endset %}
-{% include 'tables.headline.html.twig' %}
-
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">
 		{{ csrf() }}
 		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
-
 <script type="text/javascript">
 	$(function() {
 		$('#upload_form').submit(function (event) {

system/templates/guilds.change_motd.html.twig

@@ -1,22 +1,11 @@
-{% set title = 'Change guild MOTD' %}
+<div style="text-align:center"><h2>Change guild MOTD</h2></div>
-{% set background = config('darkborder') %}
-{% set content %}
-<table style="width:100%;" >
-	<tr>
-		<td>
 Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br/>
 <form enctype="multipart/form-data" action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=change_motd" method="post">
 	{{ csrf() }}
 	<input type="hidden" name="todo" value="save"/>
 	<textarea name="motd" cols="60" rows="3">{{ guild.getCustomField('motd')|raw }}</textarea><br/>
-				(max. {{ setting('core.guild_motd_chars_limit') }} chars) <input type="submit" value="Save MOTD" />
+	(max. {{ setting('core.guild_motd_chars_limit') }} chars) <input type="submit" value="Save MOTD" /></form><br/>
-			</form>
+<br/>
-		</td>
-	</tr>
-</table>
-{% endset %}
-{% include 'tables.headline.html.twig' %}
-
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">
 		{{ csrf() }}

system/templates/guilds.delete_guild.html.twig

@@ -1,6 +1,21 @@
-{% set title = 'Delete Guild' %}
+<div class="TableContainer">
-{% set background = config('darkborder') %}
+	<table class="Table1" cellpadding="0" cellspacing="0">
-{% set content %}
+		<div class="CaptionContainer" >
+			<div class="CaptionInnerContainer" >
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Delete Guild</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;" >
 						<tr>
 							<td>Are you sure you want delete guild <b>{{ guild.getName() }}</b>?<br/>
@@ -12,8 +27,11 @@
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">

system/templates/guilds.list.html.twig

@@ -1,5 +1,23 @@
-{% set title = 'Active Guilds on ' ~ config.lua.serverName %}
+<div class="TableContainer">
-{% set content %}
+	<div class="CaptionContainer">
+		<div class="CaptionInnerContainer">
+			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<div class="Text">Active Guilds on {{ config.lua.serverName }}</div>
+			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+		</div>
+	</div>
+
+	<table class="Table3">
+		<tbody>
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						<table style="width:100%;">
 							<tbody>
 								<tr>
@@ -89,8 +107,12 @@
 								</tr>
 							</tbody>
 						</table>
-{% endset %}
+					</div>
-{% include 'tables.headline.html.twig' %}
+				</td>
+			</tr>
+		</tbody>
+	</table>
+</div>
 <br>
 
 <table border="0" cellspacing="1" cellpadding="4" width="100%">

system/templates/guilds.manager.html.twig

@@ -54,8 +54,23 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 	</tr>
 </table>
 <br/>
-{% set title = 'Add new rank' %}
+<div class="TableContainer">
-{% set content %}
+	<table class="Table1" cellpadding="0" cellspacing="0">
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>        <span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Add new rank</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;">
 						<tr>
 							<td width="120" valign="top">New rank name:</td>
@@ -68,11 +83,12 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
-
+		</tr>
-{% set title = 'Change rank names and levels' %}
+	</table>
-{% set content %}
+</div>
+<div style="text-align:center"><h3>Change rank names and levels</h3></div>
 <form action="{{ getLink('guilds') }}?action=save_ranks&guild={{ guild.getName() }}" method="post">
 	{{ csrf() }}
 	<table style="clear:both" border="0" cellpadding="0" cellspacing="0" width="100%">
@@ -130,7 +146,6 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 		</tr>
 	</table>
 </form>
-
 <h3>Ranks info:</h3>
 <b>0. Owner of guild</b> - it's highest rank, only one player in guild may has this rank. Player with this rank can:
 <li>Invite/Cancel Invitation/Kick Player from guild</li>
@@ -140,18 +155,14 @@ Here you can change names of ranks, delete and add ranks, pass leadership to oth
 <li>Change {% if constant('MOTD_EXISTS') %}MOTD, {% endif %}logo and description of guild</li>
 <hr/>
 <b>1. Leader</b> - it's second rank in guild. Player with this rank can:
-<li>Invite/Cancel Invitation/Kick Player from guild (only with lower rank than his)</li>
+<li>Invite/Cancel Invitation/Kick Player from guild (only with lower rank than his)
-<li>Change ranks of players with lower rank level ("vice leader", "member") in guild</li>
+<li>Change ranks of players with lower rank level ("vice leader", "member") in guild<hr>
-<hr>
 <b>2. Vice Leader</b> - it's third rank in guild. Player with this rank can:
-<li>Invite/Cancel Invitation</li>
+<li>Invite/Cancel Invitation
-<li>Change ranks of players with lower rank level ("member") in guild</li>
+<li>Change ranks of players with lower rank level ("member") in guild<hr>
-<hr>
 <b>3. Member</b> - it's lowest rank in guild. Player with this rank can:
-<li>Be a member of guild</li>
+<li>Be a member of guild
 <br/>
-{% endset %}
-{% include 'tables.headline.html.twig' %}
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?action=show&guild={{ guild.getName() }}" method="post">
 		{{ csrf() }}

system/templates/guilds.pass_leadership.html.twig

@@ -1,9 +1,24 @@
-{% set title = 'Pass leadership' %}
+<div class="TableContainer">
-{% set background = config('darkborder') %}
+	<table class="Table1" cellpadding="0" cellspacing="0">
-{% set content %}
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Pass leadership</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer" >
 					<table style="width:100%;">
 						<tr>
-		<td><strong>Pass leadership to: </strong><br>
+							<td>Pass leadership to: </b><br>
 								<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=pass_leadership" method="post">
 									{{ csrf() }}
 									<input type="hidden" name="todo" value="save"/>
@@ -13,8 +28,11 @@
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <div style="text-align:center">
 	<form action="{{ getLink('guilds') }}?guild={{ guild.getName() }}&action=manager" method="post">

system/templates/guilds.view.html.twig

@@ -21,9 +21,32 @@
 
 			{{ hook('HOOK_GUILDS_AFTER_GUILD_HEADER') }}
 
-			{% set title = 'Guild Information' %}
+			<table width="100%">
-			{% set background = config('darkborder') %}
+				<tbody>
-			{% set content %}
+				<tr>
+					<td style="vertical-align:top;">
+						<div class="TableContainer">
+							<div class="TableContainer">
+								<div class="CaptionContainer">
+									<div class="CaptionInnerContainer">
+										<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+										<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+										<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+										<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+										<div class="Text">Guild Information</div>
+										<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+										<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+										<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+										<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+									</div>
+								</div>
+							</div>
+
+							<table class="Table1" cellpadding="0" cellspacing="0">
+								<tbody>
+								<tr>
+									<td>
+										<div class="InnerTableContainer">
 											<table style="width:100%;">
 												<tbody>
 												<tr>
@@ -45,8 +68,7 @@
 															The guild was founded on {{ config.lua.serverName }} on {{ guild_creation_date|date("j F Y") }}.
 															{% if isLeader %}
 																<a href="{{ getLink('guilds') }}?action=manager&guild={{ guild_name }}" style="float: right;">
-									{% set button_name = 'Manage Guild' %}
+																	<img src="{{ template_path }}/images/global/buttons/sbutton_manageguild.png" style="width: 120px; height: 20px;" alt="Manage Guild">
-									{% include('buttons.base.html.twig') %}
 																</a>
 															{% endif %}
 														</div>
@@ -54,14 +76,42 @@
 												</tr>
 												</tbody>
 											</table>
-			{% endset %}
+										</div>
-			{% include 'tables.headline.html.twig' %}
+									</td>
+								</tr>
+								</tbody>
+							</table>
+						</div>
+					</td>
+				</tr>
+				</tbody>
+			</table>
 			<br/>
 
 			{{ hook('HOOK_GUILDS_AFTER_GUILD_INFORMATION') }}
 
-			{% set title = 'Guild Members' %}
+			<div class="TableContainer">
-			{% set content %}
+				<div class="TableContainer">
+					<div class="CaptionContainer">
+						<div class="CaptionInnerContainer">
+							<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+							<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+							<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+							<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+							<div class="Text">Guild Members</div>
+							<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+							<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+							<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+							<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+						</div>
+					</div>
+				</div>
+
+				<table class="Table3" cellpadding="0" cellspacing="0">
+					<tbody>
+					<tr>
+						<td>
+							<div class="InnerTableContainer">
 								<table style="width:100%;">
 									<tbody>
 									<tr>
@@ -143,13 +193,36 @@
 									</tr>
 									</tbody>
 								</table>
-			{% endset %}
+							</div>
-			{% include 'tables.headline.html.twig' %}
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
 			<br/>
 
 			{{ hook('HOOK_GUILDS_AFTER_GUILD_MEMBERS') }}
-			{% set title = 'Invited Characters' %}
+
-			{% set content %}
+			<div class="TableContainer">
+				<div class="CaptionContainer">
+					<div class="CaptionInnerContainer">
+						<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+						<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+						<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+						<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+						<div class="Text">Invited Characters</div>
+						<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+						<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+						<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+						<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					</div>
+				</div>
+
+				<table class="Table3" cellpadding="0" cellspacing="0">
+					<tbody>
+					<tr>
+						<td>
+							<div class="InnerTableContainer">
 								<table style="width:100%;">
 									<tbody>
 									<tr>
@@ -192,8 +265,12 @@
 									</tr>
 									</tbody>
 								</table>
-			{% endset %}
+							</div>
-			{% include 'tables.headline.html.twig' %}
+						</td>
+					</tr>
+					</tbody>
+				</table>
+			</div>
 			<br/>
 
 			{{ hook('HOOK_GUILDS_AFTER_INVITED_CHARACTERS', { 'guild': guild, 'isLeader': isLeader }) }}

system/templates/houses.html.twig

@@ -1,10 +1,27 @@
-{% set title = 'House Search' %}
+<div class="TableContainer">
-{% set content %}
 	{% if errors is not empty %}
 		{% for error in errors %}
 			<p class="error">{{ error }}</p>
 		{% endfor %}
 	{% else %}
+		<table class="Table1" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer">
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >House Search</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				</div>
+			</div>
+
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						Here you can see the list of all available houses, flats{{ guildString }}.
 						Click on any view button to get more information about a house or adjust
 						the search criteria and start a new search.
@@ -146,6 +163,9 @@ the search criteria and start a new search.
 								</tbody>
 							</table>
 						</form>
+					</div>
+				</td>
+			</tr>
+		</table>
 	{% endif %}
-{% endset %}
+</div>
-{% include 'tables.headline.html.twig' %}

system/templates/houses.view.html.twig

@@ -1,11 +1,27 @@
-{% set title = houseName %}
+<div class="TableContainer">
-{% set content %}
-
 	{% if errors is not empty %}
 		{% for error in errors %}
 			<p class="error">{{ error }}</p>
 		{% endfor %}
 	{% else %}
+		<table class="Table1" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
+			<div class="CaptionContainer">
+				<div class="CaptionInnerContainer">
+					<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<div class="Text" >{{ houseName }}</div>
+					<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+					<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+					<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+					<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				</div>
+			</div>
+
+			<tr>
+				<td>
+					<div class="InnerTableContainer">
 						<table border="0" cellpadding="4" cellspacing="1" width="100%">
 							<tr style="display: inline-flex;">
 								<td><img src="{{ imgPath }}"></td>
@@ -25,8 +41,11 @@
 								</td>
 							</tr>
 						</table>
+					</div>
+				</td>
+			</tr>
+		</table>
 	{% endif %}
 
-{% endset %}
+</div>
-{% include 'tables.headline.html.twig' %}
 <br><br>

system/templates/lastkills.html.twig

@@ -1,5 +1,21 @@
-{% set title = 'Last Kills' %}
+<div class="TableContainer" >
-{% set content %}
+	<table class="Table3">
+		<div class="CaptionContainer" >
+			<div class="CaptionInnerContainer" >
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" ></span>
+				<div class="Text" >Last Kills</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);" ></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);" ></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);" ></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer" >
 					<table style="width:100%;">
 						<tbody>
 						<tr>
@@ -49,5 +65,8 @@
 						</tr>
 						</tbody>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>

system/templates/success.html.twig

@@ -1,17 +1,31 @@
-<table border="0" cellspacing="1" cellpadding="4" width="100%">
+<div class="TableContainer">
-	<thead>
+	<table class="Table1" cellpadding="0" cellspacing="0">
-	<tr bgcolor="{{ config.vdarkborder }}">
+		<div class="CaptionContainer">
-		<td colspan="3" class="white"><b>{{ title|raw }}</b></td>
+			<div class="CaptionInnerContainer">
-	</tr>
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-	</thead>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-	<tbody>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-	<tr style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.darkborder }}{% endif %}">
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >{{ title|raw }}</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
 			<td>
-			{{ description|raw }}
+				<div class="InnerTableContainer">
+					<table style="width:100%;">
+						<tr>
+							<td>{{ description|raw }}</td>
+						</tr>
+					</table>
+				</div>
 			</td>
 		</tr>
-	</tbody>
 	</table>
+</div>
 <br/>
 {% if custom_buttons is defined %}
 {{ custom_buttons|raw }}

system/templates/tables.headline.html.twig

@@ -1,14 +1,24 @@
-<table border="0" cellspacing="1" cellpadding="4" width="100%">
+<div class="TableContainer">
-	<thead>
+	<div class="CaptionContainer">
-	<tr bgcolor="{{ config.vdarkborder }}">
+		<div class="CaptionInnerContainer">
-		<td colspan="3" class="white"><b>{{ title|raw }}</b></td>
+			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-	</tr>
+			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-	</thead>
+			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-	<tbody>
+			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-	<tr style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.lightborder }}{% endif %}">
+			<div class="Text" >{{ title|raw }}</div>
+			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+		</div>
+	</div>
+	<table class="Table5" cellpadding="0" cellspacing="0" style="background-color: {{ config.lightborder }}">
+		<tr>
 			<td>
+				<div class="InnerTableContainer">
 					{{ content|raw }}
+				</div>
 			</td>
 		</tr>
-	</tbody>
 	</table>
+</div>

system/templates/team.html.twig

@@ -1,8 +1,24 @@
-{% set title = 'Support in game' %}
+<div class="TableContainer">
-{% set content %}
+	<div class="CaptionContainer">
+		<div class="CaptionInnerContainer">
+			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<div class="Text" >Support in game</div>
+			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+		</div>
+	</div>
+	<table class="Table1" cellpadding="0" cellspacing="0" style="background-color: {{ config.darkborder }}">
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					{% set i = 0 %}
-
 					{% if setting('core.team_style') == 1 %}
+
 						<table border="0" cellpadding="4" cellspacing="1" width="100%">
 							<tr bgcolor="{{ config.vdarkborder }}">
 								<td width="10%" class="white">
@@ -84,9 +100,7 @@
 								{% endif %}
 							{% endfor %}
 						</table>
-
 					{% 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>
@@ -165,6 +179,8 @@
 							{% endif %}
 						{% endfor %}
 					{% endif %}
-
+				</div>
-{% endset %}
+			</td>
-{% include 'tables.headline.html.twig' %}
+		</tr>
+	</table>
+</div>

system/twig.php

@@ -31,8 +31,6 @@ if($dev_mode) {
 }
 unset($dev_mode);
 
-$twig->addExtension(new MyAAC\Twig\Extension\TypeCastingExtension());
-
 $filter = new TwigFilter('timeago', function ($datetime) {
 
 	$time = time() - strtotime($datetime);
@@ -73,8 +71,8 @@ $function = new TwigFunction('generateLink', function ($s, $n, $b = false) {
 });
 $twig->addFunction($function);
 
-$function = new TwigFunction('getPlayerLink', function ($s, $p = true, $colored = false) {
+$function = new TwigFunction('getPlayerLink', function ($s, $p = true) {
-	return getPlayerLink($s, $p, $colored);
+	return getPlayerLink($s, $p);
 });
 $twig->addFunction($function);
 

templates/kathrine/success.html.twig

@@ -0,0 +1,17 @@
+<h2>{{ title }}</h2><br/>
+{{ description|raw }}
+{% if custom_buttons is defined %}
+{{ custom_buttons|raw }}
+{% else %}
+<div style="text-align: center; margin: 0 auto;">
+	<table border="0" cellspacing="0" cellpadding="0">
+		<form action="{{ getLink('account/manage') }}" method="post">
+			<tr>
+				<td style="border:0px; text-align: center;">
+					<input type="submit" name="Back" value="Back"/>
+				</td>
+			</tr>
+		</form>
+	</table>
+</div>
+{% endif %}

templates/tibiacom/account.management.html.twig

@@ -119,9 +119,24 @@
 		</a>
 	</div>
 </div>
-{% set title = 'General Information' %}
+<div class="TableContainer">
-{% set tableClass = 'Table3' %}
+	<table class="Table3" cellpadding="0" cellspacing="0">
-{% set content %}
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >General Information</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;" >
 						<tr>
 							<td>
@@ -165,8 +180,7 @@
 								<div class="TableShadowContainer">
 									<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bm.gif);" >
 										<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bl.gif);"></div>
-					<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>
+										<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>  									</div>
-				</div>
 								</div>
 							</td>
 						</tr>
@@ -218,8 +232,11 @@
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <a name="Public+Information"></a>
 <div class="TopButtonContainer">
@@ -229,9 +246,24 @@
 		</a>
 	</div>
 </div>
-{% set title = 'Public Information' %}
+<div class="TableContainer">
-{% set tableClass = 'Table5' %}
+	<table class="Table5" cellpadding="0" cellspacing="0">
-{% set content %}
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Public Information</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;">
 						<tr>
 							<td>
@@ -277,8 +309,11 @@
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <a name="Account+Logs" ></a>
 <div class="TopButtonContainer">
@@ -288,9 +323,24 @@
 		</a>
 	</div>
 </div>
-{% set title = 'Account logs' %}
+<div class="TableContainer">
-{% set tableClass = 'Table3' %}
+	<table class="Table5" cellpadding="0" cellspacing="0">
-{% set content %}
+		<div class="CaptionContainer">
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text" >Account logs</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;">
 						<tr>
 							<td>
@@ -330,8 +380,11 @@
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/>
 <a name="Characters" ></a>
 <div class="TopButtonContainer">
@@ -341,8 +394,24 @@
 		</a>
 	</div>
 </div>
-{% set title = 'Characters' %}
+<div class="TableContainer">
-{% set content %}
+	<table class="Table5" cellpadding="0" cellspacing="0">
+		<div class="CaptionContainer" >
+			<div class="CaptionInnerContainer">
+				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<div class="Text">Characters</div>
+				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
+				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
+				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
+			</div>
+		</div>
+		<tr>
+			<td>
+				<div class="InnerTableContainer">
 					<table style="width:100%;">
 						<tr>
 							<td>
@@ -380,10 +449,9 @@
 									</div>
 								</div>
 								<div class="TableShadowContainer">
-				<div class="TableBottomShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bm.gif);" >
+									<div class="TableBottomShadow" style="background-image:url('.$template_path.'/images/content/table-shadow-bm.gif);" >
 										<div class="TableBottomLeftShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-bl.gif);"></div>
-					<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>
+										<div class="TableBottomRightShadow" style="background-image:url({{ template_path }}/images/content/table-shadow-br.gif);"></div>  									</div>
-				</div>
 								</div>
 							</td>
 						</tr>
@@ -393,51 +461,51 @@
 									<tr>
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0" >
+												<form action="{{ getLink('account/character/create') }}" method="post" >
 													<tr>
 														<td style="border:0px;" >
-									<form action="{{ getLink('account/character/create') }}" method="post" >
 															{{ include('buttons.create_character.html.twig') }}
-									</form>
 														</td>
 													</tr>
+												</form>
 											</table>
 										</td>
 										{% if setting('core.account_change_character_name') %}
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0" >
+												<form action="{{ getLink('account/character/name') }}" method="post" >
 													<tr>
 														<td style="border:0px;" >
-									<form action="{{ getLink('account/character/name') }}" method="post" >
 															{{ include('buttons.change_name.html.twig') }}
-									</form>
 														</td>
 													</tr>
+												</form>
 											</table>
 										</td>
 										{% endif %}
 										{% if setting('core.account_change_character_sex') %}
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0" >
+												<form action="{{ getLink('account/character/sex') }}" method="post" >
 													<tr>
 														<td style="border:0px;" >
-									<form action="{{ getLink('account/character/sex') }}" method="post">
 															{{ include('buttons.change_sex.html.twig') }}
-									</form>
 														</td>
 													</tr>
+												</form>
 											</table>
 										</td>
 										{% endif %}
 										<td style="width:100%;" ></td>
 										<td>
 											<table border="0" cellspacing="0" cellpadding="0">
+												<form action="{{ getLink('account/character/delete') }}" method="post">
 													<tr>
 														<td style="border:0px;">
-									<form action="{{ getLink('account/character/delete') }}" method="post">
 															{{ include('buttons.delete_character.html.twig') }}
+														</td>
+													</tr>
 												</form>
-								</td>
-							</tr>
 											</table>
 										</td>
 									</tr>
@@ -445,6 +513,9 @@
 							</td>
 						</tr>
 					</table>
-{% endset %}
+				</div>
-{% include 'tables.headline.html.twig' %}
+			</td>
+		</tr>
+	</table>
+</div>
 <br/><br/>

templates/tibiacom/success.html.twig

@@ -1,44 +0,0 @@
-<div class="TableContainer">
-	<table class="Table1" cellpadding="0" cellspacing="0">
-		<div class="CaptionContainer">
-			<div class="CaptionInnerContainer">
-				<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<div class="Text" >{{ title|raw }}</div>
-				<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-				<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-				<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-				<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			</div>
-		</div>
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					<table style="width:100%;">
-						<tr>
-							<td>{{ description|raw }}</td>
-						</tr>
-					</table>
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>
-<br/>
-{% if custom_buttons is defined %}
-{{ custom_buttons|raw }}
-{% else %}
-<div style="text-align:center">
-	<table border="0" cellspacing="0" cellpadding="0">
-		<form action="{{ getLink('account/manage') }}" method="post">
-			<tr>
-				<td style="border:0px;">
-					{{ include('buttons.back.html.twig') }}
-				</td>
-			</tr>
-		</form>
-	</table>
-</div>
-{% endif %}

templates/tibiacom/tables.headline.html.twig

@@ -1,24 +0,0 @@
-<div class="TableContainer">
-	<div class="CaptionContainer">
-		<div class="CaptionInnerContainer">
-			<span class="CaptionEdgeLeftTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightTop" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionBorderTop" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionVerticalLeft" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<div class="Text" >{{ title|raw }}</div>
-			<span class="CaptionVerticalRight" style="background-image:url({{ template_path }}/images/content/box-frame-vertical.gif);"></span>
-			<span class="CaptionBorderBottom" style="background-image:url({{ template_path }}/images/content/table-headline-border.gif);"></span>
-			<span class="CaptionEdgeLeftBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-			<span class="CaptionEdgeRightBottom" style="background-image:url({{ template_path }}/images/content/box-frame-edge.gif);"></span>
-		</div>
-	</div>
-	<table class="{% if tableClass is not null %}{{ tableClass }}{% else %}Table3{% endif %}" cellpadding="0" cellspacing="0" style="background-color: {% if background is not null %}{{ background }}{% else %}{{ config.lightborder }}{% endif %}">
-		<tr>
-			<td>
-				<div class="InnerTableContainer">
-					{{ content|raw }}
-				</div>
-			</td>
-		</tr>
-	</table>
-</div>