From c99c7c827c131804004e528ff88f03a0aa9e9fb7 Mon Sep 17 00:00:00 2001
From: Greg Roach <fisharebest@gmail.com>
Date: Wed, 29 Jun 2016 08:12:41 +0100
Subject: Fix: #993 - Use CSS for Google Map size

---
 app/Module/GoogleMapsModule.php | 29 ++---------------------------
 1 file changed, 2 insertions(+), 27 deletions(-)

(limited to 'app/Module')

diff --git a/app/Module/GoogleMapsModule.php b/app/Module/GoogleMapsModule.php
index 5cc53693c7..89fe037879 100644
--- a/app/Module/GoogleMapsModule.php
+++ b/app/Module/GoogleMapsModule.php
@@ -169,7 +169,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		}
 		if ($mapdata) {
 			$html = '<div id="' . $this->getName() . '_content" class="facts_table">';
-			$html .= '<div class="gm-wrapper" style="height:' . $this->getSetting('GM_YSIZE') . 'px;">';
+			$html .= '<div class="gm-wrapper">';
 			$html .= '<div class="gm-map"></div>';
 			$html .= $mapdata;
 			$html .= '</div>';
@@ -244,8 +244,6 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 			$this->setSetting('GM_USE_STREETVIEW', Filter::post('GM_USE_STREETVIEW'));
 			$this->setSetting('GM_MIN_ZOOM', Filter::post('GM_MIN_ZOOM'));
 			$this->setSetting('GM_MAX_ZOOM', Filter::post('GM_MAX_ZOOM'));
-			$this->setSetting('GM_XSIZE', Filter::post('GM_XSIZE'));
-			$this->setSetting('GM_YSIZE', Filter::post('GM_YSIZE'));
 			$this->setSetting('GM_PLACE_HIERARCHY', Filter::post('GM_PLACE_HIERARCHY'));
 			$this->setSetting('GM_PH_XSIZE', Filter::post('GM_PH_XSIZE'));
 			$this->setSetting('GM_PH_YSIZE', Filter::post('GM_PH_YSIZE'));
@@ -349,29 +347,6 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 				</div>
 			</fieldset>
 
-			<!-- GM_XSIZE / GM_YSIZE -->
-			<fieldset class="form-group">
-				<legend class="control-label col-sm-3">
-					<?php echo I18N::translate('Size of map (in pixels)') ?>
-				</legend>
-				<div class="col-sm-9">
-					<div class="row">
-						<div class="col-sm-6">
-							<div class="input-group">
-								<label class="input-group-addon" for="GM_XSIZE"><?php echo I18N::translate('Width') ?></label>
-								<input id="GM_XSIZE" class="form-control" type="text" name="GM_XSIZE" value="<?php echo $this->getSetting('GM_XSIZE') ?>">
-							</div>
-						</div>
-						<div class="col-sm-6">
-							<div class="input-group">
-								<label class="input-group-addon" for="GM_YSIZE"><?php echo I18N::translate('Height') ?></label>
-								<input id="GM_YSIZE" class="form-control" type="text" name="GM_YSIZE" value="<?php echo $this->getSetting('GM_YSIZE') ?>">
-							</div>
-						</div>
-					</div>
-				</div>
-			</fieldset>
-
 			<!-- GM_MIN_ZOOM / GM_MAX_ZOOM -->
 			<fieldset class="form-group">
 				<legend class="control-label col-sm-3">
@@ -843,7 +818,7 @@ class GoogleMapsModule extends AbstractModule implements ModuleConfigInterface,
 		//<!-- end of count records by type -->
 		//<!-- start of map display -->
 		echo '<div class="gm-pedigree-map">';
-		echo '<div class="gm-wrapper" style="height:' . $this->getSetting('GM_YSIZE') . 'px;">';
+		echo '<div class="gm-wrapper">';
 		echo '<div class="gm-map"><i class="icon-loading-large"></i></div>';
 		echo '<div class="gm-ancestors"></div>';
 		echo '</div>';
-- 
cgit v1.3