diff options
| author | Greg Roach <fisharebest@gmail.com> | 2016-06-29 08:12:41 +0100 |
|---|---|---|
| committer | Greg Roach <fisharebest@gmail.com> | 2016-06-29 08:13:49 +0100 |
| commit | c99c7c827c131804004e528ff88f03a0aa9e9fb7 (patch) | |
| tree | 02a756b0f333b1370337cdb93abe739109fafe23 /app/Module | |
| parent | 845a8279a6e773cc0ca12d4a0b427c963cb31fb8 (diff) | |
| download | webtrees-c99c7c827c131804004e528ff88f03a0aa9e9fb7.tar.gz webtrees-c99c7c827c131804004e528ff88f03a0aa9e9fb7.tar.bz2 webtrees-c99c7c827c131804004e528ff88f03a0aa9e9fb7.zip | |
Fix: #993 - Use CSS for Google Map size
Diffstat (limited to 'app/Module')
| -rw-r--r-- | app/Module/GoogleMapsModule.php | 29 |
1 files changed, 2 insertions, 27 deletions
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>'; |