Merge pull request 'feature/google-maps-in-mapeditor-added' (#33) from feature/google-maps-in-mapeditor-added into develop
default-pipeline default-pipeline #155
default-pipeline default-pipeline #155
Reviewed-on: https://gitea.e5tv.hu/esoko/mapguesser/pulls/33 Reviewed-by: Pőcze Bence <bence@pocze.ch>
This commit was merged in pull request #33.
This commit is contained in:
commit
55ec226407
10 files changed
+351
-84
No files matched your search
@@ -6,13 +6,24 @@
|
||||
@js(node_modules/leaflet/dist/leaflet.js)
|
||||
@js(node_modules/leaflet.markercluster/dist/leaflet.markercluster.js)
|
||||
@js(https://maps.googleapis.com/maps/api/js?key=<?= $_ENV['GOOGLE_MAPS_JS_API_KEY'] ?>)
|
||||
@js(https://unpkg.com/@googlemaps/markerclustererplus/dist/index.min.js)
|
||||
@js(js/map_editor.js)
|
||||
|
||||
@extends(templates/layout_full)
|
||||
|
||||
@section(subheader)
|
||||
<span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
|
||||
--><span>
|
||||
--><span class="inline hideOnMobile" id="mapSelection">
|
||||
<button id="mapSelector">
|
||||
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/map.svg?rev=<?= REVISION ?>" alt="Map Selector" />
|
||||
</button>
|
||||
</span><!--
|
||||
--><span class="inline hideOnMobile" id="mapSelection">
|
||||
<button id="streetViewCoverSelector">
|
||||
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/street-view-cover.svg?rev=<?= REVISION ?>" alt="Street View Conver" />
|
||||
</button>
|
||||
</span><!--
|
||||
--><span class="inline hideOnMobile">
|
||||
<input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
|
||||
<button id="jumpButton" disabled >Jump</button>
|
||||
</span><!--
|
||||
@@ -57,7 +68,10 @@
|
||||
@endsection
|
||||
|
||||
@section(main)
|
||||
<div id="map"></div>
|
||||
<div id="map" class="map">
|
||||
<div id="lmap" class="map"></div>
|
||||
<div id="gmap" class="map"></div>
|
||||
</div>
|
||||
<div id="panorama"></div>
|
||||
<div id="noPano">
|
||||
<p class="bold">No panorama is available for this location.</p>
|
||||
|
||||
Reference in new issue
Block a user