mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1946 from laf/issue-1940

Browse Source
This commit is contained in:
Søren Rosiak
2015-09-21 18:53:48 +02:00
parent 8458851cfd 7ed3972448
commit 2da145bdc3
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/includes/common/worldmap.inc.php
View File

@@ -23,7 +23,7 @@
*/ */
if ($config['map']['engine'] == 'leaflet') { if ($config['map']['engine'] == 'leaflet') {
if ((defined('show_settings') || empty($widget_settings)) && $config['front_page'] == "pages/front/tiles.php") { if (defined('show_settings') && $config['front_page'] == "pages/front/tiles.php") {
$temp_output = ' $temp_output = '
<form class="form" onsubmit="widget_settings(this); return false;"> <form class="form" onsubmit="widget_settings(this); return false;">
<div class="form-group"> <div class="form-group">
@@ -77,7 +77,7 @@ if ($config['map']['engine'] == 'leaflet') {
<div id="leaflet-map"></div> <div id="leaflet-map"></div>
<script> <script>
'; ';
if (!empty($widget_settings)) { if (!empty($widget_settings) && !empty($widget_settings['init_lat']) && !empty($widget_settings['init_lng'])) {
$init_lat = $widget_settings['init_lat']; $init_lat = $widget_settings['init_lat'];
$init_lng = $widget_settings['init_lng']; $init_lng = $widget_settings['init_lng'];
$init_zoom = $widget_settings['init_zoom']; $init_zoom = $widget_settings['init_zoom'];

4
includes/defaults.inc.php
View File

@@ -771,8 +771,8 @@ $config['geoloc']['latlng'] = false; // True to enab
$config['geoloc']['engine'] = 'google'; $config['geoloc']['engine'] = 'google';
$config['map']['engine'] = 'leaflet'; $config['map']['engine'] = 'leaflet';
$config['mapael']['default_map'] = 'maps/world_countries.js'; $config['mapael']['default_map'] = 'maps/world_countries.js';
$config['leaflet']['default_lat'] = '50.898482'; $config['leaflet']['default_lat'] = '51.4800';
$config['leaflet']['default_lng'] = '-3.401402'; $config['leaflet']['default_lng'] = '0';
$config['leaflet']['default_zoom'] = 2; $config['leaflet']['default_zoom'] = 2;
// General GUI options // General GUI options