From b906e94dccd2ea68f01174ccad5d96606973fa81 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Sat, 28 Oct 2017 00:38:28 +0200 Subject: [PATCH] fix: large map vertical position fix --- Admin/Templates/Newmessage.tpl | 2 +- Admin/Templates/editVillage.tpl | 2 +- Admin/Templates/message.tpl | 2 +- Admin/Templates/msg.tpl | 2 +- Admin/Templates/report.tpl | 4 ++-- Admin/Templates/village.tpl | 2 +- a2b.php | 4 ++-- a2b2.php | 4 ++-- activate.php | 4 ++-- allianz.php | 4 ++-- anmelden.php | 4 ++-- banned.php | 4 ++-- berichte.php | 4 ++-- build.php | 10 +++++++--- create_account.php | 4 ++-- crop_finder.php | 4 ++-- dorf1.php | 4 ++-- dorf2.php | 4 ++-- dorf3.php | 4 ++-- gpack/travian_default/lang/en/b/zurueck.html | 4 ++-- gpack/travian_default/lang/en/compact.css | 2 +- gpack/travian_t4/lang/en/b/zurueck.html | 4 ++-- gpack/travian_t4/lang/en/compact.css | 2 +- img/admin/b/zurueck.html | 4 ++-- install/index.php | 4 ++-- karte.php | 4 ++-- karte2.php | 4 ++-- login.php | 4 ++-- logout.php | 4 ++-- manual.php | 4 ++-- massmessage.php | 4 ++-- nachrichten.php | 2 +- notification/index.php | 2 +- packages.php | 4 ++-- password.php | 4 ++-- plus.php | 4 ++-- plus1.php | 4 ++-- rules.php | 4 ++-- spieler.php | 4 ++-- statistiken.php | 4 ++-- support.php | 4 ++-- sysmsg.php | 4 ++-- unx.js | 19 +++++++++++++++---- version.php | 4 ++-- warsim.php | 4 ++-- winner.php | 4 ++-- 46 files changed, 101 insertions(+), 86 deletions(-) diff --git a/Admin/Templates/Newmessage.tpl b/Admin/Templates/Newmessage.tpl index 38a4fa97..fc021f61 100644 --- a/Admin/Templates/Newmessage.tpl +++ b/Admin/Templates/Newmessage.tpl @@ -18,7 +18,7 @@ if(isset($id)) $varray = $database->getProfileVillages($id); $varmedal = $database->getProfileMedal($id); ?> - + - + diff --git a/Admin/Templates/msg.tpl b/Admin/Templates/msg.tpl index 61a5a7e2..bd1b3a27 100644 --- a/Admin/Templates/msg.tpl +++ b/Admin/Templates/msg.tpl @@ -13,7 +13,7 @@ $msg = $database->getMessage($_GET['nid'],3); if($msg) { ?> - + diff --git a/Admin/Templates/report.tpl b/Admin/Templates/report.tpl index f22dd2d5..5e576ea4 100644 --- a/Admin/Templates/report.tpl +++ b/Admin/Templates/report.tpl @@ -22,7 +22,7 @@ if($rep1) //$att = $database->getUserArray($rep1['uid'],1); ?> - +

Under Construction

@@ -36,7 +36,7 @@ if($rep1) if($rep) { ?> - + diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index a09fcbaa..848c3d29 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -76,7 +76,7 @@ if(isset($id)) - +
diff --git a/a2b.php b/a2b.php index 498f8170..62e5b0cc 100644 --- a/a2b.php +++ b/a2b.php @@ -90,7 +90,7 @@ if(isset($_GET['o'])) { - + +?>lang/en/compact.css?f4b7f" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/a2b2.php b/a2b2.php index c29c97ee..af0001ec 100644 --- a/a2b2.php +++ b/a2b2.php @@ -36,10 +36,10 @@ $automation->isWinner(); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/activate.php b/activate.php index 723f057e..ffcea1a9 100644 --- a/activate.php +++ b/activate.php @@ -23,9 +23,9 @@ include('GameEngine/Account.php'); - + - + diff --git a/allianz.php b/allianz.php index fe3e8a36..3aa6dcb6 100644 --- a/allianz.php +++ b/allianz.php @@ -103,7 +103,7 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio - + +?>lang/en/compact.css?f4b7f" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/anmelden.php b/anmelden.php index 3ec3ceac..6ef483b8 100644 --- a/anmelden.php +++ b/anmelden.php @@ -29,9 +29,9 @@ $invited=(isset($_GET['uid'])) ? filter_var($_GET['uid'], FILTER_SANITIZE_NUMBER - + - + diff --git a/banned.php b/banned.php index 120005df..17eb3f83 100644 --- a/banned.php +++ b/banned.php @@ -25,9 +25,9 @@ if($session->access == BANNED){ - + - + gpack == null || GP_ENABLE == false) { diff --git a/berichte.php b/berichte.php index ab63f6ba..669d6993 100644 --- a/berichte.php +++ b/berichte.php @@ -42,10 +42,10 @@ if(isset($_GET['t'])) { - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/build.php b/build.php index b45190a7..855c6dd2 100644 --- a/build.php +++ b/build.php @@ -299,10 +299,10 @@ $automation->isWinner(); - + - + gpack == null || GP_ENABLE == false) { echo " @@ -414,7 +414,11 @@ echo round(($generator->pageLoadTimeEnd()-$pagestart)*1000);
\ No newline at end of file diff --git a/create_account.php b/create_account.php index 9ab1e2a3..d6f4ed39 100644 --- a/create_account.php +++ b/create_account.php @@ -46,9 +46,9 @@ $start = $generator->pageLoadTimeStart(); - + - + gpack == null || GP_ENABLE == false) { diff --git a/crop_finder.php b/crop_finder.php index e4262a3a..8374086d 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -42,7 +42,7 @@ - + +?>lang/en/compact.css?f4b7f" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/dorf1.php b/dorf1.php index 6e40cff9..06ca73f1 100644 --- a/dorf1.php +++ b/dorf1.php @@ -34,9 +34,9 @@ if(isset($_GET['newdid'])) { - + - + gpack == null || GP_ENABLE == false) { diff --git a/dorf2.php b/dorf2.php index 3c5075c8..4c52c77f 100644 --- a/dorf2.php +++ b/dorf2.php @@ -32,10 +32,10 @@ $building->procBuild($_GET); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/dorf3.php b/dorf3.php index 3902f191..65b9f00a 100644 --- a/dorf3.php +++ b/dorf3.php @@ -37,10 +37,10 @@ if(isset($_GET['newdid'])) { - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/gpack/travian_default/lang/en/b/zurueck.html b/gpack/travian_default/lang/en/b/zurueck.html index e1197f90..ca1ac583 100644 --- a/gpack/travian_default/lang/en/b/zurueck.html +++ b/gpack/travian_default/lang/en/b/zurueck.html @@ -8,9 +8,9 @@ - + - + diff --git a/gpack/travian_default/lang/en/compact.css b/gpack/travian_default/lang/en/compact.css index 5dd9fa9e..11aec32f 100644 --- a/gpack/travian_default/lang/en/compact.css +++ b/gpack/travian_default/lang/en/compact.css @@ -196,7 +196,7 @@ div.popup_map { padding-right: 80px; padding-top: 31px; position:relative; - top: 99px; + top: 0; z-index: 80; } div.popup_map div#drag { diff --git a/gpack/travian_t4/lang/en/b/zurueck.html b/gpack/travian_t4/lang/en/b/zurueck.html index e1197f90..ca1ac583 100644 --- a/gpack/travian_t4/lang/en/b/zurueck.html +++ b/gpack/travian_t4/lang/en/b/zurueck.html @@ -8,9 +8,9 @@ - + - + diff --git a/gpack/travian_t4/lang/en/compact.css b/gpack/travian_t4/lang/en/compact.css index 427e1d66..f28de95b 100644 --- a/gpack/travian_t4/lang/en/compact.css +++ b/gpack/travian_t4/lang/en/compact.css @@ -196,7 +196,7 @@ div.popup_map { padding-right: 80px; padding-top: 31px; position:relative; - top: 99px; + top: 0; z-index: 80; } div.popup_map div#drag { diff --git a/img/admin/b/zurueck.html b/img/admin/b/zurueck.html index e1197f90..ca1ac583 100644 --- a/img/admin/b/zurueck.html +++ b/img/admin/b/zurueck.html @@ -8,9 +8,9 @@ - + - + diff --git a/install/index.php b/install/index.php index 3873ceb4..24383dec 100644 --- a/install/index.php +++ b/install/index.php @@ -37,10 +37,10 @@ date_default_timezone_set($t_zone); - + - + diff --git a/karte.php b/karte.php index 3910f2ac..fc68fb4a 100644 --- a/karte.php +++ b/karte.php @@ -43,10 +43,10 @@ else{ - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/karte2.php b/karte2.php index 569959da..ba18f111 100644 --- a/karte2.php +++ b/karte2.php @@ -23,10 +23,10 @@ if($session->plus){ - + - + - + - + diff --git a/logout.php b/logout.php index 3ced0b28..8608e7db 100644 --- a/logout.php +++ b/logout.php @@ -25,10 +25,10 @@ $start = $generator->pageLoadTimeStart(); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/manual.php b/manual.php index 44e15467..828e44da 100644 --- a/manual.php +++ b/manual.php @@ -24,9 +24,9 @@ include("GameEngine/config.php"); - + - + diff --git a/massmessage.php b/massmessage.php index c753d206..cd98930d 100644 --- a/massmessage.php +++ b/massmessage.php @@ -91,10 +91,10 @@ if (isset($_GET['send']) && isset($_GET['from'])) - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/nachrichten.php b/nachrichten.php index 4d02c6cc..9561d9db 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -81,7 +81,7 @@ exit; - + gpack == null || GP_ENABLE == false) { echo " diff --git a/notification/index.php b/notification/index.php index a65698c1..b68ff2d6 100644 --- a/notification/index.php +++ b/notification/index.php @@ -32,7 +32,7 @@ if(T4_COMING==true){ - + - + - + gpack == null || GP_ENABLE == false) { diff --git a/password.php b/password.php index 4f1e0661..ce12f62b 100644 --- a/password.php +++ b/password.php @@ -35,9 +35,9 @@ if(!isset($_REQUEST['npw'])){ - + - + diff --git a/plus.php b/plus.php index c414594b..a90dfdc6 100644 --- a/plus.php +++ b/plus.php @@ -58,10 +58,10 @@ $automation->isWinner(); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/plus1.php b/plus1.php index 06cbc986..b244e6d1 100644 --- a/plus1.php +++ b/plus1.php @@ -23,10 +23,10 @@ else { - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/rules.php b/rules.php index 0625fafb..df3faf5b 100644 --- a/rules.php +++ b/rules.php @@ -31,10 +31,10 @@ if(isset($_GET['newdid'])) { - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/spieler.php b/spieler.php index fe82ba2b..d2a181be 100644 --- a/spieler.php +++ b/spieler.php @@ -46,10 +46,10 @@ $automation->isWinner(); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/statistiken.php b/statistiken.php index 1a3ba627..0fdd5b5b 100644 --- a/statistiken.php +++ b/statistiken.php @@ -65,10 +65,10 @@ if(isset($_GET['newdid'])) { - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/support.php b/support.php index 703a0733..0a07e109 100644 --- a/support.php +++ b/support.php @@ -33,9 +33,9 @@ $automation->isWinner(); - + - + diff --git a/sysmsg.php b/sysmsg.php index ff3dc8f0..44fa0eba 100644 --- a/sysmsg.php +++ b/sysmsg.php @@ -69,10 +69,10 @@ if (@isset($_POST['confirm'])) - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/unx.js b/unx.js index d195a3ea..05a1492a 100644 --- a/unx.js +++ b/unx.js @@ -138,7 +138,7 @@ function Popup(i,j,sc){ iframeHeight = 440, iframeWidth = 412; - var tc='
'+'Move'+''+'
'; + var tc='
'+'Move'+''+'
'; pb.innerHTML=tc;uc(); } vc(); @@ -153,9 +153,9 @@ function PopupMap(i){ iframeHeight = 575, iframeWidth = 1000; if(window.dlang== 'ar'){ - var tc='
'+'
Move'+''+'
'; + var tc='
'+'
Move'+''+'
'; }else{ - var tc='
'+'
Move'+''+'
'; + var tc='
'+'
Move'+''+'
'; } pb.innerHTML=tc;uc2(); } @@ -197,8 +197,9 @@ function vc(){ window.addEvent('resize', function(){ $f = $$('#Frame'); - if (typeof($f) != 'undefined' && typeof($f[0]) != 'undefined') { + if (typeof($f) != 'undefined' && typeof($f[0]) != 'undefined' && $f[0].src.indexOf('manual.php') === -1) { $f[0].style.left = (Math.round((documentWidth() - $f[0].width) / 2)) + 'px'; + $f[0].style.top = (Math.round((documentHeight() - $f[0].height) / 2)) + 'px'; } }); @@ -876,4 +877,14 @@ function documentWidth() { document.body.offsetWidth, document.documentElement.offsetWidth ); +} + +function documentHeight() { + return Math.max( + document.documentElement.clientHeight, + //document.body.scrollHeight, + //document.documentElement.scrollHeight, + document.body.offsetHeight, + document.documentElement.offsetHeight + ); } \ No newline at end of file diff --git a/version.php b/version.php index dbba462c..02651b02 100644 --- a/version.php +++ b/version.php @@ -35,10 +35,10 @@ $automation->isWinner(); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/warsim.php b/warsim.php index 1a1795cf..f8c51166 100644 --- a/warsim.php +++ b/warsim.php @@ -26,10 +26,10 @@ $battle->procSim($_POST); - + - + gpack == null || GP_ENABLE == false) { echo " diff --git a/winner.php b/winner.php index 677758cc..d935add9 100644 --- a/winner.php +++ b/winner.php @@ -166,10 +166,10 @@ $q = " - + - + gpack == null || GP_ENABLE == false) {