From c33322ef52c88d032e69dcc4406eef8dc7f2bf66 Mon Sep 17 00:00:00 2001
From: Vladyslav <security_2007@ukr.net>
Date: Tue, 28 Aug 2018 15:22:44 +0300
Subject: [PATCH] Minor changes and improvements
+Changed the placement of menu links https://github.com/Shadowss/TravianZ/issues/544#issuecomment-416526737
+Minor changes and improvements in the Admin panel
+Minor corrections in the display of text in the profile of the player
---
Admin/admin.php | 4 ++--
Templates/Profile/overview.tpl | 6 +++---
Templates/menu.tpl | 21 +++++++++------------
img/admin/admin.css | 4 ++--
4 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/Admin/admin.php b/Admin/admin.php
index a2d1b7b7..ad8b3ca2 100644
--- a/Admin/admin.php
+++ b/Admin/admin.php
@@ -480,7 +480,7 @@ function go_url(url) {
</div>
<div id="lmidall">
<div id="lmidlc">
- <div id="lleft" style="width: 230px;">
+ <div id="lleft">
<p class="center-img">
<a href="<?php echo HOMEPAGE; ?>"><img src="../img/en/a/travian0.gif" class="logo_plus" width="116" height="60" border="0"></a>
</p>
@@ -495,7 +495,7 @@ function go_url(url) {
<li><a href="<?php echo HOMEPAGE; ?>">Server Homepage</a></li>
<li><a href="admin.php">Control Panel Home</a></li>
<li><a href="<?php echo rtrim(SERVER, '/'); ?>/dorf1.php">Return to the server</a></li>
- <li><a href="?p=update"><font color="Red"><b>Server Update (<?php echo $up_avl; ?>)</b></font></a></li>
+ <!--<li><a href="?p=update"><font color="Red"><b>Server Update (<?php echo $up_avl; ?>)</b></font></a></li>-->
<li><a href="?action=logout">Logout</a></li>
<li class="sub"><a href="#">Server Info</a>
<ul>
diff --git a/Templates/Profile/overview.tpl b/Templates/Profile/overview.tpl
index bb2296a6..76edb9ec 100644
--- a/Templates/Profile/overview.tpl
+++ b/Templates/Profile/overview.tpl
@@ -174,12 +174,12 @@ if($displayarray['vac_mode'] == 1) echo "<tr><th colspan='2'><font color='Maroon
$hasArtifact = $database->villageHasArtefact($vil['wref']);
$coor = $database->getCoor($vil['wref']);
echo "<tr><td class=\"nam\"><a href=\"karte.php?d=".$vil['wref']."&c=".$generator->getMapCheck($vil['wref'])."\">".$vil['name']."</a>";
- if($vil['capital'] == 1) echo "<span class=\"none3\"> (capital)</span>";
+ if($vil['capital'] == 1) echo "<span class=\"none3\"> (Capital)</span>";
if(NEW_FUNCTIONS_DISPLAY_ARTIFACT){
- if($hasArtifact) echo "<span class=\"none3\"> (artifact)</span>";
+ if($hasArtifact) echo "<span class=\"none3\"> (Artifact)</span>";
}
if(NEW_FUNCTIONS_DISPLAY_WONDER){
- if($vil['natar'] == 1) echo "<span class=\"none3\"> (wonder)</span>";
+ if($vil['natar'] == 1) echo "<span class=\"none3\"> (WoW)</span>";
}
if(NEW_FUNCTIONS_OASIS){
diff --git a/Templates/menu.tpl b/Templates/menu.tpl
index 29ca87bf..1abc1da1 100644
--- a/Templates/menu.tpl
+++ b/Templates/menu.tpl
@@ -38,7 +38,7 @@ div.c1 {text-align: center}
<a id="logo" href="<?php echo HOMEPAGE; ?>" name="logo"><img src="img/x.gif" <?php if($session->plus) { echo "class=\"logo_plus\""; } ?> alt="Travian"></a>
- <p><a href="<?php echo HOMEPAGE; ?>"><?php echo HOME; ?></a> <a href="spieler.php?uid=<?php echo $session->uid; ?>"><?php echo PROFILE; ?></a> <a href="#" onclick="return Popup(0,0,1);"><?php echo INSTRUCT; ?></a> <?php if($session->access == MULTIHUNTER) {
+ <p><a href="<?php echo HOMEPAGE; ?>"><?php echo HOME; ?></a> <a href="#" onclick="return Popup(0,0,1);"><?php echo $lang['index'][0][2]; ?></a> <a href="spieler.php?uid=<?php echo $session->uid; ?>"><?php echo PROFILE; ?></a> <?php if($session->access == MULTIHUNTER) {
echo "<a href=\"Admin/admin.php\"><font color=\"Blue\">Multihunter Panel</font></a>";
} ?> <?php if($session->access == ADMIN) {
@@ -46,24 +46,21 @@ div.c1 {text-align: center}
echo "<a href=\"massmessage.php\">".MASS_MESSAGE."</a>";
echo "<a href=\"sysmsg.php\">".SYSTEM_MESSAGE."</a>";
} ?> <a href="logout.php"><?php echo LOGOUT;?></a></p>
- <?php
- // no PLUS needed for Support
- if ($_SESSION['id_user'] != 1) {
- ?>
<p>
- <a href="plus.php?id=3"><?php echo SERVER_NAME; ?> <b><span class="plus_g">P</span><span class="plus_o">l</span><span class="plus_g">u</span><span class="plus_o">s</span></b></a>
+ <a href="allianz.php?s=2"><?php echo FORUM;?></a>
</p>
- <?php
- }
- ?>
<p>
- <a href="allianz.php?s=2"><b><?php echo FORUM;?></b></a>
- <a href="rules.php"><b><?php echo GAME_RULES;?></b></a>
+ <?php
+ // no PLUS needed for Support
+ if ($_SESSION['id_user'] != 1) {
+ ?>
+ <a href="plus.php?id=3"><!--<?php echo SERVER_NAME; ?>-->Travian <b><span class="plus_g">P</span><span class="plus_o">l</span><span class="plus_g">u</span><span class="plus_o">s</span></b></a>
<?php
+ }
// no support for support :-D
if ($_SESSION['id_user'] != 1) {
?>
- <a href="spieler.php?uid=1"><b><?php echo SUPPORT;?></b></a>
+ <a href="spieler.php?uid=1"><?php echo SUPPORT;?></a>
<?php
}
include("Templates/links.tpl");
diff --git a/img/admin/admin.css b/img/admin/admin.css
index 061c3828..c2d0a874 100644
--- a/img/admin/admin.css
+++ b/img/admin/admin.css
@@ -8,7 +8,7 @@ body {
}
.center-img {
- margin: 0;
+ margin: 0 0 15px 0;
text-align: center;
}
@@ -37,7 +37,7 @@ body {
#lmidlc {position:relative; min-width:682px; float:left;}
/* Div mit linkem Menue */
-#lleft {position:relative; width:130px; height:450px; z-index:3; float:left; left:0px; top:-7px;}
+#lleft {position:relative; width:230px; height:450px; z-index:3; float:left; left:0px; top:-7px;}
/* Mittlerer Layer */
#lmid1 {position:relative; width:552px; float:left; border:0px;}