feat: indicator for fields under construction

Also, all line separators are now Linux-style :-P

Closes #321
This commit is contained in:
Martin Ambrus
2017-11-22 15:32:31 +01:00
parent 63fadba36e
commit 2f9d134ec9
53 changed files with 227 additions and 128 deletions
+1 -1
View File
@@ -18,7 +18,7 @@ if(isset($id))
$varray = $database->getProfileVillages($id);
$varmedal = $database->getProfileMedal($id); ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<style type="text/css">
input.dynamic_img, img.dynamic_img
{
+1 -1
View File
@@ -17,7 +17,7 @@ $fdata = $database->getResourceLevel($village['wref']);
if(isset($id))
{
include("search2.tpl"); ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<form action="../GameEngine/Admin/Mods/editBuildings.php" method="POST">
<input type="hidden" name="admid" id="admid" value="<?php echo $_SESSION['id']; ?>">
<input type="hidden" name="id" value="<?php echo $_GET['did']; ?>" />
+1 -1
View File
@@ -12,7 +12,7 @@
<style>
.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);}
</style>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<table id="member" style="width:225px">
<thead>
<tr>
+1 -1
View File
@@ -13,7 +13,7 @@ $msg = $database->getMessage($_GET['nid'],3);
if($msg)
{ ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>travian.css?e21d2" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css">
+2 -2
View File
@@ -22,7 +22,7 @@ if($rep1)
//$att = $database->getUserArray($rep1['uid'],1);
?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>travian.css?e21d2" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css">
<h1>Under Construction</h1>
@@ -36,7 +36,7 @@ if($rep1)
if($rep)
{ ?>
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>travian.css?e21d2" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/lang.css?e21d2" rel="stylesheet" type="text/css">
+7 -7
View File
@@ -20,7 +20,7 @@ if(isset($id))
$type = $database->getVillageType($village['wref']);
$fdata = $database->getResourceLevel($village['wref']);
$units = $database->getUnit($village['wref']);
$abtech = $database->getABTech($id); // Armory/blacksmith level
$abtech = $database->getABTech($id); // Armory/blacksmith level
if($type == 1){ $typ = array(3,3,3,9); }
elseif($type == 2){ $typ = array(3,4,5,6); }
elseif($type == 3){ $typ = array(4,4,4,6); }
@@ -40,7 +40,7 @@ if(isset($id))
if(count($result) >0)
{
foreach($result as $row)
{
{
$type = $row['type'];
if($type==1) { $type = '<img src="../img/admin/r/1.gif"> + 25%'; $wood+=1;}
elseif($type==2) { $type = '<img src="../img/admin/r/1.gif"> + 25%'; $wood+=1;}
@@ -54,13 +54,13 @@ if(isset($id))
elseif($type==10){ $type = '<img src="../img/admin/r/4.gif"> + 25%'; $crop+=1;}
elseif($type==11){ $type = '<img src="../img/admin/r/4.gif"> + 25%'; $crop+=1;}
elseif($type==12){ $type = '<img src="../img/admin/r/4.gif"> + 50%'; $crop+=2;}
}
}
}
$ocounter = array($wood,$clay,$iron,$crop);
$production=$admin->calculateProduction($id,$user['id'],$user['b1'],$user['b2'],$user['b3'],$user['b4'],$fdata, $ocounter, $village['pop']);
$refreshiconfrm = "../img/admin/refresh.png";
$refreshicon = "<img src=\"".$refreshiconfrm."\">";
class MyGenerator
{
public function getMapCheck($wref)
@@ -69,14 +69,14 @@ if(isset($id))
}
};
$generator = new MyGenerator;
if($village and $user)
{
include("search2.tpl"); ?>
<style>
.del {width:12px; height:12px; background-image: url(img/admin/icon/del.gif);}
</style>
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css">
<link href="../<?php echo GP_LOCATE; ?>lang/en/compact.css?f4b7h" rel="stylesheet" type="text/css">
<br />
<table id="profile" cellpadding="1" cellspacing="1" >
@@ -249,7 +249,7 @@ if(isset($id))
<td class=\"hab\">".round($row['loyalty'])."%</td>
<td class=\"hab\">$type</td>
</tr>";
}
}
}
elseif($result ==0)
{