From 6b63b0bc636c6d53b3276f02cd59c4270176ad61 Mon Sep 17 00:00:00 2001 From: Martin Ambrus Date: Wed, 8 Nov 2017 11:12:01 +0100 Subject: [PATCH] fix: manual description scrolls when space is too short --- 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 | 2 +- a2b2.php | 2 +- activate.php | 2 +- allianz.php | 2 +- anmelden.php | 2 +- banned.php | 2 +- berichte.php | 2 +- build.php | 2 +- create_account.php | 2 +- crop_finder.php | 2 +- dorf1.php | 2 +- dorf2.php | 2 +- dorf3.php | 2 +- gpack/travian_default/lang/en/b/zurueck.html | 2 +- gpack/travian_default/lang/en/compact.css | 2 ++ gpack/travian_t4/lang/en/b/zurueck.html | 2 +- gpack/travian_t4/lang/en/compact.css | 2 ++ img/admin/b/zurueck.html | 2 +- install/index.php | 2 +- karte.php | 2 +- karte2.php | 2 +- login.php | 2 +- logout.php | 2 +- manual.php | 2 +- massmessage.php | 2 +- nachrichten.php | 2 +- notification/index.php | 2 +- packages.php | 2 +- password.php | 2 +- plus.php | 2 +- plus1.php | 2 +- rules.php | 2 +- spieler.php | 2 +- statistiken.php | 2 +- support.php | 2 +- sysmsg.php | 2 +- version.php | 2 +- warsim.php | 2 +- winner.php | 2 +- 45 files changed, 48 insertions(+), 44 deletions(-) diff --git a/Admin/Templates/Newmessage.tpl b/Admin/Templates/Newmessage.tpl index fc021f61..6dfc45a3 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 bd1b3a27..55a40342 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 5e576ea4..e408217e 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 dd28fa94..08f7f2ad 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 0d0dd883..f715ef21 100644 --- a/a2b.php +++ b/a2b.php @@ -104,7 +104,7 @@ if(isset($_GET['o'])) { echo GP_LOCATE; -?>lang/en/compact.css?f4b7f" rel="stylesheet" type="text/css" /> +?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/a2b2.php b/a2b2.php index 6740f268..64672e60 100644 --- a/a2b2.php +++ b/a2b2.php @@ -42,7 +42,7 @@ $automation->isWinner(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/activate.php b/activate.php index ccd8f88e..0e0c5954 100644 --- a/activate.php +++ b/activate.php @@ -29,7 +29,7 @@ AccessLogger::logRequest(); - + diff --git a/allianz.php b/allianz.php index 6c1c406e..e34331d6 100644 --- a/allianz.php +++ b/allianz.php @@ -118,7 +118,7 @@ if(isset($_GET['aid']) or isset($_GET['fid']) or isset($_GET['fid2']) or $sessio echo GP_LOCATE; -?>lang/en/compact.css?f4b7f" rel="stylesheet" type="text/css" /> +?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/anmelden.php b/anmelden.php index 92995ab2..8d672ac1 100644 --- a/anmelden.php +++ b/anmelden.php @@ -35,7 +35,7 @@ $invited=(isset($_GET['uid'])) ? filter_var($_GET['uid'], FILTER_SANITIZE_NUMBER - + diff --git a/banned.php b/banned.php index 813a0543..71d9fc09 100644 --- a/banned.php +++ b/banned.php @@ -30,7 +30,7 @@ if($session->access == BANNED){ - + gpack == null || GP_ENABLE == false) { diff --git a/berichte.php b/berichte.php index 03e646e4..6fc7d96f 100644 --- a/berichte.php +++ b/berichte.php @@ -49,7 +49,7 @@ if(isset($_GET['t'])) { - + gpack == null || GP_ENABLE == false) { echo " diff --git a/build.php b/build.php index f44ade4a..be563bad 100644 --- a/build.php +++ b/build.php @@ -306,7 +306,7 @@ $automation->isWinner(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/create_account.php b/create_account.php index 450b294e..506348ac 100644 --- a/create_account.php +++ b/create_account.php @@ -61,7 +61,7 @@ $start_timer = $generator->pageLoadTimeStart(); - + gpack == null || GP_ENABLE == false) { diff --git a/crop_finder.php b/crop_finder.php index f0840a72..f427c4fe 100644 --- a/crop_finder.php +++ b/crop_finder.php @@ -56,7 +56,7 @@ echo GP_LOCATE; -?>lang/en/compact.css?f4b7f" rel="stylesheet" type="text/css" /> +?>lang/en/compact.css?f4b7g" rel="stylesheet" type="text/css" /> gpack == null || GP_ENABLE == false) { diff --git a/dorf1.php b/dorf1.php index fe395a76..dc2445f1 100644 --- a/dorf1.php +++ b/dorf1.php @@ -40,7 +40,7 @@ if(isset($_GET['newdid'])) { - + gpack == null || GP_ENABLE == false) { diff --git a/dorf2.php b/dorf2.php index 3b117476..f2a57144 100644 --- a/dorf2.php +++ b/dorf2.php @@ -41,7 +41,7 @@ $automation->isWinner(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/dorf3.php b/dorf3.php index 20716883..8f2ade96 100644 --- a/dorf3.php +++ b/dorf3.php @@ -44,7 +44,7 @@ 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 6987e771..1b0dc904 100644 --- a/gpack/travian_default/lang/en/b/zurueck.html +++ b/gpack/travian_default/lang/en/b/zurueck.html @@ -10,7 +10,7 @@ - + diff --git a/gpack/travian_default/lang/en/compact.css b/gpack/travian_default/lang/en/compact.css index 11aec32f..be171c15 100644 --- a/gpack/travian_default/lang/en/compact.css +++ b/gpack/travian_default/lang/en/compact.css @@ -2789,6 +2789,8 @@ body.manual table#troop_info { } body.manual div#t_desc { margin-top: 30px; + max-height: 145px; + overflow-x: auto; } body.manual img#big_unit { left: 260px; diff --git a/gpack/travian_t4/lang/en/b/zurueck.html b/gpack/travian_t4/lang/en/b/zurueck.html index fef35eb8..ad94e997 100644 --- a/gpack/travian_t4/lang/en/b/zurueck.html +++ b/gpack/travian_t4/lang/en/b/zurueck.html @@ -10,7 +10,7 @@ - + diff --git a/gpack/travian_t4/lang/en/compact.css b/gpack/travian_t4/lang/en/compact.css index f28de95b..d8c1a764 100644 --- a/gpack/travian_t4/lang/en/compact.css +++ b/gpack/travian_t4/lang/en/compact.css @@ -2772,6 +2772,8 @@ body.manual table#troop_info { } body.manual div#t_desc { margin-top: 30px; + max-height: 145px; + overflow-x: auto; } body.manual img#big_unit { left: 260px; diff --git a/img/admin/b/zurueck.html b/img/admin/b/zurueck.html index fef35eb8..ad94e997 100644 --- a/img/admin/b/zurueck.html +++ b/img/admin/b/zurueck.html @@ -10,7 +10,7 @@ - + diff --git a/install/index.php b/install/index.php index 6c6def4a..aeeb59ba 100644 --- a/install/index.php +++ b/install/index.php @@ -40,7 +40,7 @@ date_default_timezone_set($t_zone); - + diff --git a/karte.php b/karte.php index 006d7c03..e7c5c3fc 100644 --- a/karte.php +++ b/karte.php @@ -50,7 +50,7 @@ else{ - + gpack == null || GP_ENABLE == false) { echo " diff --git a/karte2.php b/karte2.php index 506ff25d..220da5da 100644 --- a/karte2.php +++ b/karte2.php @@ -30,7 +30,7 @@ if($session->plus){ - + - + diff --git a/logout.php b/logout.php index ff390129..446017e5 100644 --- a/logout.php +++ b/logout.php @@ -32,7 +32,7 @@ $start_timer = $generator->pageLoadTimeStart(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/manual.php b/manual.php index 70002910..d3df14e8 100644 --- a/manual.php +++ b/manual.php @@ -26,7 +26,7 @@ include_once("GameEngine/config.php"); - + diff --git a/massmessage.php b/massmessage.php index 622120f6..b59b34b1 100644 --- a/massmessage.php +++ b/massmessage.php @@ -102,7 +102,7 @@ if (isset($_GET['send']) && isset($_GET['from'])) - + gpack == null || GP_ENABLE == false) { echo " diff --git a/nachrichten.php b/nachrichten.php index 4c442dc8..dbb8bb9a 100644 --- a/nachrichten.php +++ b/nachrichten.php @@ -85,7 +85,7 @@ exit; - + gpack == null || GP_ENABLE == false) { echo " diff --git a/notification/index.php b/notification/index.php index b68ff2d6..bc6cf244 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 4a4c4c01..4adae503 100644 --- a/password.php +++ b/password.php @@ -40,7 +40,7 @@ if(!isset($_REQUEST['npw'])){ - + diff --git a/plus.php b/plus.php index 5a8649e1..d69b8c1f 100644 --- a/plus.php +++ b/plus.php @@ -65,7 +65,7 @@ $automation->isWinner(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/plus1.php b/plus1.php index 39e0477e..b38cffb1 100644 --- a/plus1.php +++ b/plus1.php @@ -30,7 +30,7 @@ else { - + gpack == null || GP_ENABLE == false) { echo " diff --git a/rules.php b/rules.php index 4d31e70e..ff012ee5 100644 --- a/rules.php +++ b/rules.php @@ -38,7 +38,7 @@ if(isset($_GET['newdid'])) { - + gpack == null || GP_ENABLE == false) { echo " diff --git a/spieler.php b/spieler.php index 358c61dd..389395bf 100644 --- a/spieler.php +++ b/spieler.php @@ -53,7 +53,7 @@ $automation->isWinner(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/statistiken.php b/statistiken.php index 0c76719a..21e49dad 100644 --- a/statistiken.php +++ b/statistiken.php @@ -72,7 +72,7 @@ if(isset($_GET['newdid'])) { - + gpack == null || GP_ENABLE == false) { echo " diff --git a/support.php b/support.php index 25aa8088..0f17ef6d 100644 --- a/support.php +++ b/support.php @@ -39,7 +39,7 @@ $automation->isWinner(); - + diff --git a/sysmsg.php b/sysmsg.php index 39afba64..b20e4c95 100644 --- a/sysmsg.php +++ b/sysmsg.php @@ -76,7 +76,7 @@ if (@isset($_POST['confirm'])) - + gpack == null || GP_ENABLE == false) { echo " diff --git a/version.php b/version.php index a752ed70..c5cbaee0 100644 --- a/version.php +++ b/version.php @@ -42,7 +42,7 @@ $automation->isWinner(); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/warsim.php b/warsim.php index 8d7f09ac..2091798a 100644 --- a/warsim.php +++ b/warsim.php @@ -33,7 +33,7 @@ $battle->procSim($_POST); - + gpack == null || GP_ENABLE == false) { echo " diff --git a/winner.php b/winner.php index ee6dd206..0406e030 100644 --- a/winner.php +++ b/winner.php @@ -173,7 +173,7 @@ $q = " - + gpack == null || GP_ENABLE == false) {