esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

feature/place-streetview-cover-to-the-map #35

Merged
bence merged 2 commits from feature/place-streetview-cover-to-the-map into develop 2021-05-02 16:27:42 +02:00
Conversation 0 Commits 2 Files Changed 6 +19 -8
3 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c112a25409 - Show all commits

6
public/static/css/map_editor.css
View File

@ -55,6 +55,12 @@
visibility: hidden; visibility: hidden;
} }
#overlayControl {
bottom: 20px;
right: 10px;
z-index: 3;
}
#deleteButton { #deleteButton {
display: none; display: none;
} }

4
public/static/js/map_editor.js
View File

@ -404,7 +404,7 @@
LMapWrapper.loadMarkers(places); LMapWrapper.loadMarkers(places);
document.getElementById('streetViewCoverSelector').disabled = true; document.getElementById('streetViewCoverSelector').style.display = 'none';
}, },
hide: function () { hide: function () {
@ -536,7 +536,7 @@
GMapWrapper.loadMarkers(places); GMapWrapper.loadMarkers(places);
document.getElementById('streetViewCoverSelector').disabled = false; document.getElementById('streetViewCoverSelector').style.display = 'block'
}, },
hide: function () { hide: function () {

17
views/admin/map_editor.php
View File

@ -11,18 +11,13 @@
@extends(templates/layout_full) @extends(templates/layout_full)
@section(subheader) @section(subheader)
<span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!-- <span><a href="javascript:;" id="mapName" title="Edit map data"><?= $mapName ?></a></span><!--
--><span class="inline hideOnMobile" id="mapSelection"> --><span class="inline hideOnMobile" id="mapSelection">
<button id="mapSelector"> <button id="mapSelector">
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/map.svg?rev=<?= REVISION ?>" alt="Map Selector" /> <img src="<?= $_ENV['STATIC_ROOT'] ?>/img/map.svg?rev=<?= REVISION ?>" alt="Map Selector" />
</button> </button>
</span><!-- </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"> --><span class="inline hideOnMobile">
<input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" /> <input type="text" id="jumpCoordinates" placeholder="Insert coordinates here" />
<button id="jumpButton" disabled >Jump</button> <button id="jumpButton" disabled >Jump</button>
@ -71,6 +66,16 @@
<div id="map" class="map"> <div id="map" class="map">
<div id="lmap" class="map"></div> <div id="lmap" class="map"></div>
<div id="gmap" class="map"></div> <div id="gmap" class="map"></div>
<div id="overlayControl" class="circleControl">
<div id="streetViewCoverSelector" class="controlItem" title="Toggle Street View Cover">
<div>
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/circle_background.svg?rev=<?= REVISION ?>" alt="Circle Background" class="controlBackground" />
</div>
<div>
<img src="<?= $_ENV['STATIC_ROOT'] ?>/img/street-view-cover.svg?rev=<?= REVISION ?>" alt="Street View Cover" class="controlIcon" />
</div>
</div>
</div>
</div> </div>
<div id="panorama"></div> <div id="panorama"></div>
<div id="noPano"> <div id="noPano">