xinyin025/TravianZ
1
0
Fork 0
mirror of https://github.com/Shadowss/TravianZ.git synced 2026-07-07 05:14:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/Shadowss/TravianZ

Browse Source 
Conflicts:
	Admin/Templates/village.tpl
This commit is contained in:
Shadow
2014-03-04 13:47:54 +02:00
parent 19767cf6a6 f343a4a791
commit 2b02c0aadf
7 changed files with 50 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Admin/Templates/village.tpl
+21 -1
View File
@@ -164,24 +164,44 @@ if(isset($id))
<td><img class="r1" src="../img/x.gif"> Lumber</td>
<td><center><?php echo floor($village['wood']); ?></center></td>
<td rowspan="3"><center><?php echo $village['maxstore'];?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['wood'];?></td>
=======
<td><center><?php echo $village->getProd("wood"); ?></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr>
</tr>
<tr>
<td><img class="r2" src="../img/x.gif"> Clay</td>
<td><center><?php echo floor($village['clay']); ?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['clay'];?></center></td>
=======
<td><center><?php echo $village->getProd("clay"); ?></center></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr>
<tr>
<td><img class="r3" src="../img/x.gif"> Iron</td>
<td><center><?php echo floor($village['iron']); ?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['iron'];?></center></td>
=======
<td><center><?php echo $village->getProd("iron"); ?></center></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr>
<tr>
<td><img class="r4" src="../img/x.gif"> Crop</td>
<td><center><?php echo floor($village['crop']); ?></center></td>
<td><center><?php echo $village['maxcrop'];?></center></td>
<<<<<<< HEAD
<td><center><?php echo $production['crop'];?></center></td>
=======
<td><center><?php echo $village->getProd("crop"); ?></center></td>
<td><a href="admin.php?p=editResources&did=<?php echo $_GET['did']; ?>"><img src="../img/admin/edit.gif" title="Edit Resources and Capacity"></a></td>
>>>>>>> f343a4a791674f8f8eb4866de9e9a9fe67b15824
</tr>
</tbody>
</table>
@@ -415,4 +435,4 @@ else
include("404.tpl");
}
}
?>
?>