* moved most of guilds html-in-php code to twig

* moved buttons to separate templates
* moved online search for to twig

templates/tibiacom/account.login.html.twig

@@ -45,17 +45,11 @@
 														</table>
 														<div style="float: right; font-size: 1px;" >
 															<input type="hidden" name="page" value="overview" >
-															<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/sbutton_over.gif);" ></div>
-																	<input class="ButtonText" type="image" name="Login" alt="Login" src="{{ template_path }}/images/global/buttons/_sbutton_login.gif" >
-																</div>
-															</div>
+															{{ include('buttons.login.html.twig') }}
 </form>
 															<div style="width: 2px; height: 2px;" ></div>
 																<form action="{{ getLink('account/lost') }}" method="post" style="padding:0px;margin:0px;" >
-																	<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/sbutton_over.gif);" ></div>
-																			<input class="ButtonText" type="image" name="Account lost?" alt="Account lost?" src="{{ template_path }}/images/global/buttons/_sbutton_accountlost.gif" >
-																		</div>
-																	</div>
+																	{{ include('buttons.account_lost.html.twig') }}
 																</form>
 															</div>
 													</td>

templates/tibiacom/account.management.html.twig

@@ -14,9 +14,7 @@
 							<form action="{{ getLink('account/logout') }}" method="post" >
 								<tr>
 									<td style="border:0px;">
-										<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
-											<input class="ButtonText" type="image" name="Logout" alt="Logout" src="{{ template_path }}/images/buttons/_sbutton_logout.gif" ></div>
-										</div>
+										{{ include('buttons.logout.html.twig') }}
 									</td>
 								</tr>
 							</form>
@@ -64,9 +62,7 @@
 					<form action="{{ getLink('account/register') }}" method="post">
 						<tr>
 							<td style="border:0px;">
-								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
-									<input class="ButtonText" type="image" name="Register Account" alt="Register Account" src="{{ template_path }}/images/buttons/_sbutton_registeraccount.gif" ></div>
-								</div>
+								{{ include('buttons.register_account.html.twig') }}
 							</td>
 						</tr>
 					</form>
@@ -101,9 +97,7 @@
 					<form action="{{ getLink('account/email') }}" method="post">
 						<tr>
 							<td style="border:0px;">
-								<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
-									<input class="ButtonText" type="image" name="Edit" alt="Edit" src="{{ template_path }}/images/buttons/_sbutton_edit.gif" ></div>
-								</div>
+								{{ include('buttons.edit.html.twig') }}
 							</td>
 						</tr>
 					</form>
@@ -197,8 +191,7 @@
 												<form action="{{ getLink('account/password') }}" method="post">
 													<tr>
 														<td style="border:0px;" >
-															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Password" alt="Change Password" src="{{ template_path }}/images/buttons/_sbutton_changepassword.gif" ></div>
-															</div>
+															{{ include('buttons.change_password.html.twig') }}
 														</td>
 													</tr>
 												</form>
@@ -211,8 +204,7 @@
 														<td style="border:0px;">
 															<input type="hidden" name="newemail" value=""/>
 															<input type="hidden" name="newemaildate" value="0">
-															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Email" alt="Change Email" src="{{ template_path }}/images/buttons/_sbutton_changeemail.gif" ></div>
-															</div>
+															{{ include('buttons.change_email.html.twig') }}
 														</td>
 													</tr>
 												</form>
@@ -226,8 +218,7 @@
 												<form action="{{ getLink('account/register') }}" method="post">
 													<tr>
 														<td style="border:0px;">
-															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)"><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Register Account" alt="Register Account" src="{{ template_path }}/images/buttons/_sbutton_registeraccount.gif" ></div>
-															</div>
+															{{ include('buttons.register_account.html.twig') }}
 														</td>
 													</tr>
 												</form>
@@ -298,8 +289,7 @@
 														<form action="{{ getLink('account/info') }}" method="post">
 															<tr>
 																<td style="border:0px;">
-																	<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Edit" alt="Edit" src="{{ template_path }}/images/buttons/_sbutton_edit.gif" ></div>
-																	</div>
+																	{{ include('buttons.edit.html.twig') }}
 																</td>
 															</tr>
 														</form>
@@ -471,9 +461,8 @@
 											<table border="0" cellspacing="0" cellpadding="0" >
 												<form action="{{ getLink('account/character/create') }}" method="post" >
 													<tr>
-														<td style="border:0px;" ><div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div>
-															<input class="ButtonText" type="image" name="Create Character" alt="Create Character" src="{{ template_path }}/images/buttons/_sbutton_createcharacter.gif" ></div>
-														</div>
+														<td style="border:0px;" >
+															{{ include('buttons.create_character.html.twig') }}
 														</td>
 													</tr>
 												</form>
@@ -484,8 +473,8 @@
 											<table border="0" cellspacing="0" cellpadding="0" >
 												<form action="{{ getLink('account/character/name') }}" method="post" >
 													<tr>
-														<td style="border:0px;" ><div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Name" alt="Change Name" src="images/buttons/_sbutton_change_name.gif" ></div>
-														</div>
+														<td style="border:0px;" >
+															{{ include('buttons.change_name.html.twig') }}
 														</td>
 													</tr>
 												</form>
@@ -497,8 +486,8 @@
 											<table border="0" cellspacing="0" cellpadding="0" >
 												<form action="{{ getLink('account/character/sex') }}" method="post" >
 													<tr>
-														<td style="border:0px;" ><div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url('.$template_path.'/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Change Sex" alt="Change Sex" src="images/buttons/_sbutton_change_sex.gif" ></div>
-														</div>
+														<td style="border:0px;" >
+															{{ include('buttons.change_sex.html.twig') }}
 														</td>
 													</tr>
 												</form>
@@ -511,8 +500,7 @@
 												<form action="{{ getLink('account/character/delete') }}" method="post">
 													<tr>
 														<td style="border:0px;">
-															<div class="BigButton" style="background-image:url({{ template_path }}/images/buttons/sbutton.gif)" ><div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" ><div class="BigButtonOver" style="background-image:url({{ template_path }}/images/buttons/sbutton_over.gif);" ></div><input class="ButtonText" type="image" name="Delete Character" alt="Delete Character" src="{{ template_path }}/images/buttons/_sbutton_deletecharacter.gif" ></div>
-															</div>
+															{{ include('buttons.delete_character.html.twig') }}
 														</td>
 													</tr>
 												</form>

templates/tibiacom/buttons.account_lost.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Account lost?' %}
+{% set button_image = '_sbutton_accountlost' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.back.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Back' %}
+{% set button_image = '_sbutton_back' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.base.html.twig

@@ -0,0 +1,8 @@
+{% spaceless %}
+<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
+	<div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);">
+		<div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/sbutton_over.gif);" ></div>
+		<input class="ButtonText" type="image" name="{{ button_name }}" alt="{{ button_name }}" src="{{ template_path }}/images/global/buttons/{{ button_image }}.gif" />
+	</div>
+</div>
+{% endspaceless %}

templates/tibiacom/buttons.cancel.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Cancel' %}
+{% set button_image = '_sbutton_cancel' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.change_email.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Change Email' %}
+{% set button_image = '_sbutton_changeemail' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.change_name.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Change Name' %}
+{% set button_image = '_sbutton_change_name' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.change_password.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Change Password' %}
+{% set button_image = '_sbutton_changepassword' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.change_sex.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Change Sex' %}
+{% set button_image = '_sbutton_change_sex' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.create_character.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Create Character' %}
+{% set button_image = '_sbutton_createcharacter' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.delete_character.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Delete Character' %}
+{% set button_image = '_sbutton_deletecharacter' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.edit.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Edit' %}
+{% set button_image = '_sbutton_edit' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.login.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Login' %}
+{% set button_image = '_sbutton_login' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.logout.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Logout' %}
+{% set button_image = '_sbutton_logout' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.register_account.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Register Account' %}
+{% set button_image = '_sbutton_registeraccount' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/buttons.submit.html.twig

@@ -0,0 +1,3 @@
+{% set button_name = 'Submit' %}
+{% set button_image = '_sbutton_submit' %}
+{% include('buttons.base.html.twig') %}

templates/tibiacom/index.php

@@ -36,13 +36,13 @@ if(isset($config['boxes']))
 		{
 		  if(loginStatus == "false") {
 			document.getElementById('LoginstatusText_1').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-you-are-not-logged-in.gif')";
-			document.getElementById('ButtonText').style.backgroundImage = "url('" + IMAGES + "/buttons/_sbutton_login.gif')";
+			document.getElementById('ButtonText').style.backgroundImage = "url('" + IMAGES + "/global/buttons/_sbutton_login.gif')";
 			document.getElementById('LoginstatusText_2').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-create-account.gif')";
 			document.getElementById('LoginstatusText_2_1').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-create-account.gif')";
 			document.getElementById('LoginstatusText_2_2').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-create-account-over.gif')";
 		  } else {
 			document.getElementById('LoginstatusText_1').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-welcome.gif')";
-			document.getElementById('ButtonText').style.backgroundImage = "url('" + IMAGES + "/buttons/_sbutton_myaccount.gif')";
+			document.getElementById('ButtonText').style.backgroundImage = "url('" + IMAGES + "/global/buttons/_sbutton_myaccount.gif')";
 			document.getElementById('LoginstatusText_2').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-logout.gif')";
 			document.getElementById('LoginstatusText_2_1').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-logout.gif')";
 			document.getElementById('LoginstatusText_2_2').style.backgroundImage = "url('" + IMAGES + "/loginbox/loginbox-font-logout-over.gif')";
@@ -214,10 +214,10 @@ if(isset($config['boxes']))
     </div>
 
     <div id="LoginButtonContainer" style="background-image:url(<?php echo $template_path; ?>/images/loginbox/loginbox-textfield-background.gif)" >
-      <div id="LoginButton" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif)" >
-        <div onClick="LoginButtonAction();" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="Button" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif)" ></div>
+      <div id="LoginButton" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton.gif)" >
+        <div onClick="LoginButtonAction();" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);"><div class="Button" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton_over.gif)" ></div>
 			<?php
-          echo '<div id="ButtonText" '.($logged ? '' : 'style="background-image:url('.$template_path.'/images/buttons/_sbutton_login.gif)"').'>
+          echo '<div id="ButtonText" '.($logged ? '' : 'style="background-image:url('.$template_path.'/images/global/buttons/_sbutton_login.gif)"').'>
 			 </div>';
 			 ?>
         </div>
@@ -740,18 +740,18 @@ if($logged):
         <div id="Themeboxes">
 			<?php if(in_array("newcomer", $config['boxes'])): ?>
 			<div id="NewcomerBox" class="Themebox" style="background-image:url(<?php echo $template_path; ?>/images/themeboxes/newcomer/newcomerbox.gif);">
-				<a class="ThemeboxButton" href="<?php echo getLink('account/create'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
-					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif);"></div>
-					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/buttons/_sbutton_jointibia.gif);"></div>
+				<a class="ThemeboxButton" href="<?php echo getLink('account/create'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton.gif);">
+					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton_over.gif);"></div>
+					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/_sbutton_jointibia.gif);"></div>
 				</a>
 				<div class="Bottom" style="background-image:url(<?php echo $template_path; ?>/images/general/box-bottom.gif);"></div>
 			</div>
 			<?php endif; ?>
 			<?php if(in_array("premium", $config['boxes'])): ?>
 			<div id="PremiumBox" class="Themebox" style="background-image:url(<?php echo $template_path; ?>/images/themeboxes/premium/premiumbox.gif);">
-				<a class="ThemeboxButton" href="<?php echo getLink('premium'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
-					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif);"></div>
-					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/buttons/_sbutton_getpremium.gif);"></div>
+				<a class="ThemeboxButton" href="<?php echo getLink('premium'); ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton.gif);">
+					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton_over.gif);"></div>
+					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/_sbutton_getpremium.gif);"></div>
 				</a>
 				<div class="Bottom" style="background-image:url(<?php echo $template_path; ?>/images/general/box-bottom.gif);"></div>
 			</div>
@@ -778,9 +778,9 @@ if($logged):
 					?>
 			<div id="CurrentPollBox" class="Themebox" style="background-image:url(<?php echo $template_path; ?>/images/themeboxes/current-poll/currentpollbox.gif);">
 				<div id="CurrentPollText"><?php echo $poll['question']; ?></div>
-					<a class="ThemeboxButton" href="<?php echo getLink('polls') . '&id=' . $poll['id']; ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton.gif);">
-					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/buttons/sbutton_over.gif);"></div>
-					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/buttons/_sbutton_votenow.gif);"></div>
+					<a class="ThemeboxButton" href="<?php echo getLink('polls') . '&id=' . $poll['id']; ?>" onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton.gif);">
+					<div class="BigButtonOver" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/sbutton_over.gif);"></div>
+					<div class="ButtonText" style="background-image:url(<?php echo $template_path; ?>/images/global/buttons/_sbutton_votenow.gif);"></div>
 				</a>
 				<div class="Bottom" style="background-image:url(<?php echo $template_path; ?>/images/general/box-bottom.gif);"></div>
 			</div>