Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

EZP-28647: Difference in edit and preview mode for map location #2236

Merged
merged 1 commit into from
Feb 21, 2018
Merged

EZP-28647: Difference in edit and preview mode for map location #2236

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions eZ/Bundle/EzPublishCoreBundle/DependencyInjection/Configuration/Parser/Common.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ public function addSemanticConfig(NodeBuilder $nodeBuilder)
->addDefaultsIfNotSet()
->children()
->scalarNode('google_maps')
->setDeprecated('The child node "%node%" at path "%path%" is no longer used and deprecated.')
->info('Google Maps API Key, required as of Google Maps v3 to make sure maps show up correctly.')
->defaultNull()
->end()
Expand Down
21 changes: 21 additions & 0 deletions eZ/Bundle/EzPublishCoreBundle/Resources/translations/content_fields.en.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>
</header>
<body>
<trans-unit id="f337a8fd9042dbc4de8b5d305b6d8df3c0c374c4" resname="content-field.latitude.not_set">
<source>Not set</source>
<target state="new">Not set</target>
<note>key: content-field.latitude.not_set</note>
</trans-unit>
<trans-unit id="687973ca20983f27a99c50243e364e346c9c4814" resname="content-field.longitude.not_set">
<source>Not set</source>
<target state="new">Not set</target>
<note>key: content-field.longitude.not_set</note>
</trans-unit>
</body>
</file>
</xliff>
79 changes: 38 additions & 41 deletions eZ/Bundle/EzPublishCoreBundle/Resources/views/content_fields.html.twig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
# containing <fieldtypeidentifier>-field
#}

{% trans_default_domain "content_fields" %}

{% block ezstring_field %}
{% spaceless %}
{% set field_value = field.value.text %}
Expand Down Expand Up @@ -280,8 +282,7 @@
{% block ezgmaplocation_field %}
{##
# This field type block accepts the following parameters:
# - string mapType the Google map type (ROADMAP, SATELLITE, HYBRID or TERRAIN), default is ROADMAP
# - boolean showMap whether to show the Google map or not, default is true
# - boolean showMap whether to show the map or not, default is true
# - boolean showInfo whether to show the latitude, longitude and address or not, default is true
# - integer zoom the default zoom level, default is 13
# - boolean draggable whether to enable or not draggable map (useful on mobile / responsive layout), default is true
Expand All @@ -291,27 +292,28 @@
# set to false to not set any height style inline, default is 200px
# - boolean scrollWheel If false, disables scrollwheel zooming on the map. Enabled by default.
#
# For further reading: https://developers.google.com/maps/documentation/javascript/reference
# For further reading:
# - https://wiki.openstreetmap.org
# - http://leafletjs.com/reference-1.3.0.html
#}
{% spaceless %}
<div {{ block( 'field_attributes' ) }}>
{% set defaultWidth = '500px' %}
{% set defaultHeight = '200px' %}
{% set defaultShowMap = true %}
{% set defaultShowInfo = true %}
{% set defaultZoom = 13 %}
{% set defaultMapType = 'ROADMAP' %}
{% set defaultDraggable = 'true' %}
{% set defaultScrollWheel = 'true' %}

{% set hasContent = field.value is not null %}
{% set latitude = field.value.latitude|default( 0 ) %}
{% set longitude = field.value.longitude|default( 0 ) %}
{% set latitude = field.value.latitude %}
{% set longitude = field.value.longitude %}
{% set address = field.value.address|default( "" ) %}
{% set mapId = "maplocation-map-" ~ field.id %}

{% set defaultZoom = latitude is null and longitude is null ? 1 : 15 %}

{% set zoom = parameters.zoom|default( defaultZoom ) %}
{% set mapType = parameters.mapType|default( defaultMapType ) %}

{% set mapWidth, mapHeight = defaultWidth, defaultHeight %}
{% if parameters.width is defined %}
Expand Down Expand Up @@ -345,9 +347,9 @@
{% if showInfo %}
<dl>
<dt>Latitude</dt>
<dd>{{ hasContent ? latitude : "Not set" }}</dd>
<dd>{{ latitude is not null ? latitude : 'content-field.latitude.not_set'|trans|desc("Not set") }}</dd>
<dt>Longitude</dt>
<dd>{{ longitude ? longitude : "Not set" }}</dd>
<dd>{{ longitude is not null ? longitude : 'content-field.longitude.not_set'|trans|desc("Not set") }}</dd>
{% if address %}
<dt>Address</dt>
<dd>{{ address }}</dd>
Expand All @@ -356,56 +358,51 @@
{% endif %}

{% if hasContent and showMap %}
{% set apiKey = ezpublish.configResolver.hasParameter('api_keys.google_maps') ? ezpublish.configResolver.getParameter('api_keys.google_maps'): "" %}
{% set latitude = latitude|default(0) %}
{% set longitude = longitude|default(0) %}
<script>
if (typeof(window.ezgmaplocationMapsScriptLoaded) == 'undefined') {
(function (win, doc) {
var myScript = document.createElement('script');
myScript.src = '//maps.googleapis.com/maps/api/js{% if apiKey %}?key={{ apiKey }}{% endif %}';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If this is not used anymore we should deprecate the setting (including describing that it is not used anymore)

var myCss = document.createElement('link');
myScript.src = 'https://unpkg.com/leaflet@1.3.1/dist/leaflet.js';
myCss.rel = "stylesheet";
myCss.href = "https://unpkg.com/leaflet@1.3.1/dist/leaflet.css";
win.ezgmaplocationMapsScriptLoaded = true;
doc.body.appendChild(myCss);
doc.body.appendChild(myScript);
})(window, document)
}
</script>
<script type="text/javascript">
(function(win, doc) {
var mapView = function (mapId, latitude, longitude) {
var mapElt = doc.getElementById("{{ mapId }}"),
startPoint = new google.maps.LatLng(latitude, longitude),
zoom = {{ zoom }},
draggable = {{ draggable }};

new google.maps.Marker({
map: new google.maps.Map(mapElt, {
center: startPoint,
zoom: zoom,
draggable: draggable,
scrollwheel: {{ scrollWheel }},
mapTypeId: google.maps.MapTypeId.{{ mapType }}
}),
position: startPoint
});
}
if ( win.addEventListener ) {
(function (win) {
var mapView = function (mapId, latitude, longitude) {
var coordinates = [latitude, longitude];
var mapConfig = {
dragging: {{ draggable }},
scrollWheelZoom: {{ scrollWheel }},
zoom: {{ zoom }},
center: coordinates
};
var map = L.map(mapId, mapConfig);

L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors'
}).addTo(map);

L.marker(coordinates).addTo(map);
};
win.addEventListener(
'load',
function () {
mapView("{{ mapId }}", {{ latitude }}, {{ longitude }});
},
false
);
} else if ( win.attachEvent ) {
win.attachEvent(
'onload',
function () {
mapView("{{ mapId }}", {{ latitude }}, {{ longitude }});
}
);
}
})(window, document);
})(window);
</script>
{% set mapStyle = mapWidth ? "width:" ~ mapWidth ~ ";": "" %}
{% set mapStyle = mapHeight ? mapStyle ~ " height:" ~ mapHeight : mapStyle %}
{% set mapStyle = mapHeight ? mapStyle ~ " height:" ~ mapHeight : mapStyle %}
<div class="maplocation-map" id="{{ mapId }}" style="{{ mapStyle }}"></div>
{% endif %}
</div>
Expand Down