diff --git a/Admin/Templates/Newmessage.tpl b/Admin/Templates/Newmessage.tpl index 21f341f6..3751ed9a 100644 --- a/Admin/Templates/Newmessage.tpl +++ b/Admin/Templates/Newmessage.tpl @@ -19,7 +19,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 7361c2b2..081064d4 100644 --- a/Admin/Templates/msg.tpl +++ b/Admin/Templates/msg.tpl @@ -12,8 +12,8 @@ $msg = $database->getMessage($_GET['nid'],3);; if($msg) { ?> - - + + diff --git a/Admin/Templates/report.tpl b/Admin/Templates/report.tpl index 657d4c8e..a77bc609 100644 --- a/Admin/Templates/report.tpl +++ b/Admin/Templates/report.tpl @@ -21,8 +21,8 @@ if($rep1) { //$att = $database->getUserArray($rep1['uid'],1); ?> - - + +

Under Construction

@@ -35,8 +35,8 @@ if($rep1) } if($rep) { ?> - - + + diff --git a/Admin/Templates/village.tpl b/Admin/Templates/village.tpl index 58cfc5cc..8c0050be 100644 --- a/Admin/Templates/village.tpl +++ b/Admin/Templates/village.tpl @@ -78,7 +78,7 @@ if(isset($id)) - +
diff --git a/Templates/Map/mapviewlarge.tpl b/Templates/Map/mapviewlarge.tpl index 2b734a35..03210410 100644 --- a/Templates/Map/mapviewlarge.tpl +++ b/Templates/Map/mapviewlarge.tpl @@ -401,7 +401,7 @@ if (isset($neutralarray[0])) {
-
close Map +
close Map

Map(|)

- - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/activate.php b/activate.php index 4bdec727..47485c0c 100644 --- a/activate.php +++ b/activate.php @@ -25,9 +25,9 @@ include('GameEngine/Account.php'); - - - + + + diff --git a/allianz.php b/allianz.php index ff62c459..5fd2c691 100644 --- a/allianz.php +++ b/allianz.php @@ -75,12 +75,12 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio echo GP_LOCATE; -?>lang/en/lang.css?f4b7c" rel="stylesheet" type="text/css" /> +?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" /> +?>lang/en/compact.css?f4b7d" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/anmelden.php b/anmelden.php index 4075d4b1..62832233 100644 --- a/anmelden.php +++ b/anmelden.php @@ -26,9 +26,9 @@ $invited=(isset($_GET['uid'])) ? filter_var($_GET['uid'], FILTER_SANITIZE_NUMBER - - - + + + diff --git a/berichte.php b/berichte.php index de7e59dd..46c64237 100644 --- a/berichte.php +++ b/berichte.php @@ -40,8 +40,8 @@ if(isset($_GET['t'])) { - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/build.php b/build.php index 95f07879..dbb34f75 100644 --- a/build.php +++ b/build.php @@ -279,8 +279,8 @@ $automation->isWinner(); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/crop_finder.php b/crop_finder.php index 2b788cbe..a939efa4 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -44,12 +44,12 @@ echo GP_LOCATE; -?>lang/en/lang.css?f4b7c" rel="stylesheet" type="text/css" /> +?>lang/en/lang.css?f4b7d" rel="stylesheet" type="text/css" /> +?>lang/en/compact.css?f4b7d" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/dorf2.php b/dorf2.php index c958187b..515fced1 100644 --- a/dorf2.php +++ b/dorf2.php @@ -33,8 +33,8 @@ $building->procBuild($_GET); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/dorf3.php b/dorf3.php index 4c8187e0..33e3ca49 100644 --- a/dorf3.php +++ b/dorf3.php @@ -37,8 +37,8 @@ if(isset($_GET['newdid'])) { - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/gpack/travian_default/lang/en/compact.css b/gpack/travian_default/lang/en/compact.css index 86720727..4ebcdbe6 100644 --- a/gpack/travian_default/lang/en/compact.css +++ b/gpack/travian_default/lang/en/compact.css @@ -212,9 +212,9 @@ div.popup_map div#drag { div.popup_map div#drag2 { cursor:pointer; height: 20px; - left: 1050px; + left: 300%; position: absolute; - top: -525px; + top: 100%; width: 20px; z-index: 2; } diff --git a/install/index.php b/install/index.php index 892ad921..005d34f5 100644 --- a/install/index.php +++ b/install/index.php @@ -32,11 +32,11 @@ date_default_timezone_set($t_zone); - - - - - + + + + + diff --git a/karte.php b/karte.php index 77cdfb9a..113e6516 100644 --- a/karte.php +++ b/karte.php @@ -39,11 +39,11 @@ else{ - - - - - + + + + + gpack == null || GP_ENABLE == false) { echo " diff --git a/karte2.php b/karte2.php index e5bd71ec..1076e558 100644 --- a/karte2.php +++ b/karte2.php @@ -25,8 +25,8 @@ if($session->plus){ - - + + - - - + + + diff --git a/logout.php b/logout.php index 8da25000..232258b9 100644 --- a/logout.php +++ b/logout.php @@ -27,8 +27,8 @@ $start = $generator->pageLoadTimeStart(); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/manual.php b/manual.php index f7641119..5eeb0383 100644 --- a/manual.php +++ b/manual.php @@ -26,9 +26,9 @@ include("GameEngine/config.php"); - - - + + + diff --git a/massmessage.php b/massmessage.php index be7786d1..81a20e13 100644 --- a/massmessage.php +++ b/massmessage.php @@ -87,11 +87,11 @@ if (isset($_GET['send']) && isset($_GET['from'])) - - - - - + + + + + gpack == null || GP_ENABLE == false) { echo " diff --git a/nachrichten.php b/nachrichten.php index c4009070..b3fa00e6 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -72,11 +72,11 @@ header("Location: ".$_SERVER['PHP_SELF']."?t=1"); - - - - - + + + + + gpack == null || GP_ENABLE == false) { echo " diff --git a/password.php b/password.php index ba811ab5..d1442774 100644 --- a/password.php +++ b/password.php @@ -37,9 +37,9 @@ if(!isset($_REQUEST['npw'])){ - - - + + + diff --git a/plus.php b/plus.php index 25d3a10d..831d8651 100644 --- a/plus.php +++ b/plus.php @@ -35,8 +35,8 @@ $automation->isWinner(); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/plus1.php b/plus1.php index b99f6058..b7151e12 100644 --- a/plus1.php +++ b/plus1.php @@ -24,8 +24,8 @@ else { - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/rules.php b/rules.php index fb60db15..dc90d583 100644 --- a/rules.php +++ b/rules.php @@ -32,8 +32,8 @@ if(isset($_GET['newdid'])) { - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/spieler.php b/spieler.php index 82991c46..5003464b 100644 --- a/spieler.php +++ b/spieler.php @@ -45,8 +45,8 @@ $automation->isWinner(); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/statistiken.php b/statistiken.php index 2eb105ab..148ba8d0 100644 --- a/statistiken.php +++ b/statistiken.php @@ -36,8 +36,8 @@ if(isset($_GET['newdid'])) { - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/support.php b/support.php index 5e2239a0..dfa27f85 100644 --- a/support.php +++ b/support.php @@ -34,9 +34,9 @@ $automation->isWinner(); - - - + + + - - - - + + + + + gpack == null || GP_ENABLE == false) { echo " diff --git a/unx.js b/unx.js index 065aaaee..21eb9af1 100644 --- a/unx.js +++ b/unx.js @@ -173,8 +173,16 @@ function uc2(){ $$('.popup_map')[0].setStyle('direction','rtl').getParent().setStyle('direction','ltr'); } } -function vc(){if(gb()<700||ib()<700){document.getElementById("ce").style.position='absolute';wc=true;} -else{document.getElementById("ce").style.position='fixed';wc=false;} +function vc(){ + var frm = document.getElementById("Frame"); + if (!frm || frm == null || typeof(frm) == 'undefined') { + frm = document.getElementById("ce"); + } + if(gb()<700||ib()<700){ + frm.style.position='absolute';wc=true; + } else{ + frm.style.position='fixed';wc=false; + } } function Close(){pb=document.getElementById("ce");if(pb!=null){pb.innerHTML='';} if(quest.anmstep!==false){quest.anmstep=false;} @@ -339,7 +347,7 @@ else{xe(true);fd('ajax.php?f=kp&z='+lf(m_c.z.x,m_c.z.y),function(mf){xe(false);a m_c.fields=[];mdim=mf.dat.mdim;mmode=mf.dat.mmode;map_init();} );} return false;} -function we(){if(fe){window.close();} +function we(){if(fe){pb=parent.document.getElementById("drag2");if(pb!=null){pb.innerHTML=''}else{window.close();}} else{mdim={'x':7,'y':7,'rad':3} ;var nf=[];for(var i=0;iisWinner(); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/warsim.php b/warsim.php index 0d131a38..07ff43aa 100644 --- a/warsim.php +++ b/warsim.php @@ -28,8 +28,8 @@ $battle->procSim($_POST); - - + + gpack == null || GP_ENABLE == false) { echo " diff --git a/winner.php b/winner.php index 529ba527..66afebd3 100644 --- a/winner.php +++ b/winner.php @@ -159,8 +159,8 @@ $q = " - - + + gpack == null || GP_ENABLE == false) {