-
diff --git a/module/templates/leaflet_map_html.html5 b/module/templates/leaflet_map_html.html5
deleted file mode 100644
index 3be0929..0000000
--- a/module/templates/leaflet_map_html.html5
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
diff --git a/module/templates/leaflet_map_js.html5 b/module/templates/leaflet_map_js.html5
deleted file mode 100644
index 8f9f88f..0000000
--- a/module/templates/leaflet_map_js.html5
+++ /dev/null
@@ -1,5 +0,0 @@
-L.contao.addMap('', function() {
-
-
-return { map: map, layers: layers, controls: controls, icons: icons };
-}());
diff --git a/package.json b/package.json
index 96a0656..187700b 100644
--- a/package.json
+++ b/package.json
@@ -4,10 +4,10 @@
"description": "Leaflet maps for Contao",
"main": "gulpfile.js",
"dependencies": {
- "del": "^2.2.2",
+ "del": "^3.0.0",
"gulp": "^3.9.1",
"gulp-concat": "^2.6.0",
- "gulp-uglify": "^2.0.0"
+ "gulp-uglify": "^3.0.0"
},
"devDependencies": {},
"scripts": {
diff --git a/src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php b/src/Alias/DefaultAliasFilter.php
similarity index 74%
rename from src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php
rename to src/Alias/DefaultAliasFilter.php
index 3fe9e70..51f1b4a 100644
--- a/src/Netzmacht/Contao/Leaflet/Alias/DefaultAliasFilter.php
+++ b/src/Alias/DefaultAliasFilter.php
@@ -1,13 +1,17 @@
- * @copyright 2016 netzmacht David Molineus. All rights reserved.
- * @filesource
+ * Leaflet maps for Contao CMS.
*
+ * @package contao-leaflet-maps
+ * @author David Molineus
-
-
-headline; ?> version; ?>
-
-
-
-About
-
-
- - The Leaflet maps integration for Contao CMS is an Open Source Software license under the LGPL 3.0. - This extension is only exists because of great other Open Source Software which it heavenly depends on. -
-- This software ships with an visible attribution to netzmacht creative in the map attribution control. - If you want to remove this attribution, you have to purchase a commercial license. - For more details visit the project website. -
-
- >
- 
-
-
-
- netzmacht
- David Molineus
-
- DAB Bank München
- IBAN: DE52701204008354237003
- BIC: DABBDEMMXXX
-
-
-
-Support Contao Leaflet
- -
-
-
-
- Report issues
-If you found a bug, got some troubles or have a feature request - feel free to open an issue.
- -
-
- Contribute
-There are many ways you can contribute. Translations, - documentation or code contributions are welcome. -
- -
-
- Fund a feature
-Contao Leaflet is not feature complete. Have a look at the list of planned feature and support them.
- -
-
-
-
-
- Individual development
-If you have special requirements you can hire me for an individual development.
- -
-
- Commercial license
-If you want to remove the attribution in the attribution control, you can purchase a commercial license.
- -
-
-
-
-Credits
-| Name | -Version | -License | -Homepage | -
|---|---|---|---|
| Libraries | |||
| - | - | - | - |
| Graphics | -|||
| Farm Fresh-Web Icons | -3.9.2 | -CC BY 3.0 US | -fatcow.com/free-icons | -
| Web Blog Icons by SEM Labs | -3.9.2 | -CC BY 4.0 | -semlabs.co.uk | -
| Dependencies | |||
| - | - | - | - |
See http://leafletjs.com/reference.html#layergroup'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['feature'][0] = 'Feature group'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['groupTypes']['feature'][1] = 'Extended layer group with events and popup support.
See http://leafletjs.com/reference.html#featuregroup'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['gpx'][0] = 'GPX'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['gpx'][1] = 'GPS Exchange format. Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['kml'][0] = 'KML'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['kml'][1] = 'Keyhole Markup Language. Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['wkt'][0] = 'WKT'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['wkt'][1] = 'Well-known text Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['topojson'][0] = 'TopoJSON'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['topojson'][1] = 'TopoJSON is a topological geospatial data interchange format based on GeoJSON. Read the documentation for more information.'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['geojson'][0] = 'GeoJSON'; +$GLOBALS['TL_LANG']['tl_leaflet_layer']['fileFormats']['geojson'][1] = 'GeoJSON is a format for encoding a variety of geographic data structures. Read the documentation for more information.'; + $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteinto'][1] = 'Paste into layer %s'; $GLOBALS['TL_LANG']['tl_leaflet_layer']['pasteafter'][1] = 'Paste after layer %s'; diff --git a/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php new file mode 100644 index 0000000..e1cc78c --- /dev/null +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_map.php @@ -0,0 +1,117 @@ + + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + +$GLOBALS['TL_LANG']['tl_leaflet_map']['title_legend'] = 'Title'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['interaction_legend'] = 'Interaction controls'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom_legend'] = 'Center and zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locate_legend'] = 'Locate user position'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['layers_legend'] = 'Default layers'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['expert_legend'] = 'Expert settings'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['behaviour_legend'] = 'Behaviour'; + +$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][0] = 'Create map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['new'][1] = 'Create new map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][0] = 'Edit map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['edit'][1] = 'Edit map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][0] = 'Copy map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['copy'][1] = 'Copy map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][0] = 'Manage controls'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['controls'][1] = 'Manage controls of map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][0] = 'Delete map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['delete'][1] = 'Delete map ID %s'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][0] = 'Show details'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['show'][1] = 'Show map ID %s details'; + +$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][0] = 'Title'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['title'][1] = 'Title of the map.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][0] = 'Alias'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'][1] = 'Alias of the map.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][0] = 'Center'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['center'][1] = 'Initial geographical center of the map. Comma separated coordinates.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][0] = 'Dragging'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dragging'][1] = 'Whether the map be draggable with mouse/touch or not.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][0] = 'Touch zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['touchZoom'][1] = 'Whether the map can be zoomed by touch-dragging with two fingers.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][0] = 'Scroll wheel zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['scrollWheelZoom'][1] = 'Whether the map can be zoomed by using the mouse wheel.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][0] = 'Double click zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['doubleClickZoom'][1] = 'Whether the map can be zoomed in by double clicking on it and zoomed out by double clicking while holding shift.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][0] = 'Box zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boxZoom'][1] = 'Whether the map can be zoomed to a rectangular area specified by dragging the mouse while pressing shift.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][0] = 'Instant taps'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['tap'][1] = 'Enables mobile hacks for supporting instant taps.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][0] = 'Track window resize'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['trackResize'][1] = 'Whether the map automatically handles browser window resize to update itself.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][0] = 'Close popup on click'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['closeOnClick'][1] = 'Disable if you don\'t want popups to close when user clicks the map'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][0] = 'Keyboard navigation'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboard'][1] = 'Makes the map focusable and allows users to navigate the map with keyboard arrows and +/- keys'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][0] = 'Keyboard pan offset'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardPanOffset'][1] = 'Amount of pixels to pan when pressing an arrow key.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][0] = 'Keyboard zoom offset'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['keyboardZoomOffset'][1] = 'Number of zoom levels to change when pressing + or - key.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][0] = 'Zoom level'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoom'][1] = 'Initial map zoom.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][0] = 'Minimum zoom level'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['minZoom'][1] = 'Minimum zoom level of the map. Overrides any minZoom set on map layers.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][0] = 'Maximum zoom level'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['maxZoom'][1] = 'Maximum zoom level of the map. This overrides any maxZoom set on map layers.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][0] = 'Zoom snap'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomSnap'][1] = 'Forces the map\'s zoom level to always be a multiple of the number. Default is 1.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][0] = 'Zoom delta'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomDelta'][1] = 'Controls how much the map\'s zoom level will change after zoom in or zoom out.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][0] = 'Add default zoom control'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomControl'][1] = 'Whether the zoom control is added to the map by default.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][0] = 'Bounce at zoom limits'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['bounceAtZoomLimits'][1] = 'Disable if you don\'t want the map to zoom beyond min/max zoom and then bounce back when pinch-zooming'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][0] = 'Extra options'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['options'][1] = 'Add extra map options as valid json. See http://leafletjs.com/reference.html#map-options'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][0] = 'Adjust extra zoom settings'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustZoomExtra'][1] = 'Enable if you want to adjust minimum and maximum zoom as well'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][0] = 'Default layers'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['layers'][1] = 'Inital visible layers of the map. For optional layers use the layers control.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][0] = 'Adjust bounds'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBounds'][1] = 'If enabled the map will fit into bounds of data layers which are marked to affect the map bounds.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][0] = 'Locate user position'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locate'][1] = 'Initial map zoom.Tries to locate the user using the Geolocation API.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][0] = 'Watch continuously'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateWatch'][1] = 'If true, starts continous watching of location changes '; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][0] = 'Update map center'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateSetView'][1] = 'If enabled, automatically sets the map view to the user location. Otherwise only the locationfound event is triggered.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][0] = 'Locate max zoom'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaxZoom'][1] = 'Max zoom when setting updating map view.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][0] = 'Locate timeout'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateTimeout'][1] = 'Number of milliseconds to wait for a response from geolocation.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][0] = 'High accuracy'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['enableHighAccuracy'][1] = 'Enables high accuracy, see description in the W3C spec.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][0] = 'Locate maximum age'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['locateMaximumAge'][1] = 'Maximum age of detected location in milliseconds. Use cached value if time has not passed.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][0] = 'Load data dynamically in bounds'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['dynamicLoad'][1] = 'If enabled the map requests data from the layers for the current bounds only and make a new request if bounds has changed.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][0] = 'Bounds padding'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['boundsPadding'][1] = 'Padding being used then applying bounds. Use comma separated values. If 2 values are given the padding option is set. If 4 values are given paddingTopLeft and paddingBottomRight is set.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][0] = 'Enable cache'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cache'][1] = 'If enabled the generated map javascript is cached.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][0] = 'Cache lifetime'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['cacheLifeTime'][1] = 'Indicates how long a cache entry is valid in seconds.'; + +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load'][0] = 'At map initialization'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['load'][1] = 'Calculate bounds when the map is initialized. All static and already loaded deferred featured are included.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['deferred'][0] = 'After loading deferred feature'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['adjustBoundsOptions']['deferred'][1] = 'Recalculate bounds when a deferred feature is load.'; + +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'][''][0] = 'Disable'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues'][''][1] = 'Disable zoom function.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['1'][0] = 'Enable'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['1'][1] = 'Enable zoom function.'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['center'][0] = 'Center'; +$GLOBALS['TL_LANG']['tl_leaflet_map']['zoomValues']['center'][1] = 'If passed \'center\', it will zoom to the center of the view regardless of where the mouse was.'; diff --git a/module/languages/en/tl_leaflet_marker.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php similarity index 92% rename from module/languages/en/tl_leaflet_marker.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php index fde43f2..03e0398 100644 --- a/module/languages/en/tl_leaflet_marker.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_marker.php @@ -1,10 +1,20 @@ + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_marker']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['content_legend'] = 'Content'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['active_legend'] = 'Activation'; -$GLOBALS['TL_LANG']['tl_leaflet_marker']['expert_legend'] = 'Expert settings'; +$GLOBALS['TL_LANG']['tl_leaflet_marker']['expert_legend'] = 'Expert settings'; $GLOBALS['TL_LANG']['tl_leaflet_marker']['new'][0] = 'Create marker'; diff --git a/module/languages/en/tl_leaflet_popup.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php similarity index 93% rename from module/languages/en/tl_leaflet_popup.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php index a4af8c7..a2bc878 100644 --- a/module/languages/en/tl_leaflet_popup.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_popup.php @@ -1,5 +1,15 @@ + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_popup']['title_legend'] = 'Title'; $GLOBALS['TL_LANG']['tl_leaflet_popup']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_popup']['size_legend'] = 'Popup size'; diff --git a/module/languages/en/tl_leaflet_style.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php similarity index 93% rename from module/languages/en/tl_leaflet_style.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php index 44f7592..d360310 100644 --- a/module/languages/en/tl_leaflet_style.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_style.php @@ -1,5 +1,15 @@ + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_style']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_style']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_style']['config_legend'] = 'Configuration'; diff --git a/module/languages/en/tl_leaflet_vector.php b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php similarity index 93% rename from module/languages/en/tl_leaflet_vector.php rename to src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php index c89189f..5244899 100644 --- a/module/languages/en/tl_leaflet_vector.php +++ b/src/Bundle/Resources/contao/languages/en/tl_leaflet_vector.php @@ -1,11 +1,21 @@ + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_leaflet_vector']['title_legend'] = 'Title and type'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['active_legend'] = 'Activation'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['config_legend'] = 'Configuration'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['data_legend'] = 'Vector data'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['popup_legend'] = 'Popup'; -$GLOBALS['TL_LANG']['tl_leaflet_vector']['expert_legend'] = 'Expert settings'; +$GLOBALS['TL_LANG']['tl_leaflet_vector']['expert_legend'] = 'Expert settings'; $GLOBALS['TL_LANG']['tl_leaflet_vector']['new'][0] = 'Create vector'; diff --git a/module/languages/en/tl_module.php b/src/Bundle/Resources/contao/languages/en/tl_module.php similarity index 76% rename from module/languages/en/tl_module.php rename to src/Bundle/Resources/contao/languages/en/tl_module.php index a81965e..9949922 100644 --- a/module/languages/en/tl_module.php +++ b/src/Bundle/Resources/contao/languages/en/tl_module.php @@ -1,5 +1,15 @@ + * @copyright 2014-2017 netzmacht David Molineus. All rights reserved. + * @license LGPL-3.0 https://github.com/netzmacht/contao-leaflet-maps/blob/master/LICENSE + * @filesource + */ + $GLOBALS['TL_LANG']['tl_module']['leaflet_legend'] = 'Leaflet map configuration'; $GLOBALS['TL_LANG']['tl_module']['leaflet_map'][0] = 'Leaflet Map'; $GLOBALS['TL_LANG']['tl_module']['leaflet_map'][1] = 'Choose a Leaflet Map'; diff --git a/module/assets/.htaccess b/src/Bundle/Resources/contao/public/.htaccess similarity index 100% rename from module/assets/.htaccess rename to src/Bundle/Resources/contao/public/.htaccess diff --git a/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 new file mode 100644 index 0000000..dfa1178 --- /dev/null +++ b/src/Bundle/Resources/contao/templates/be_leaflet_about.html5 @@ -0,0 +1,140 @@ +
+
diff --git a/module/templates/be_leaflet_geocode.html5 b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
similarity index 88%
rename from module/templates/be_leaflet_geocode.html5
rename to src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
index 842d1f5..6375db0 100644
--- a/module/templates/be_leaflet_geocode.html5
+++ b/src/Bundle/Resources/contao/templates/be_leaflet_geocode.html5
@@ -10,21 +10,21 @@
L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {
attribution: '© OpenStreetMap contributors'
}).addTo(map);
- var element = $('field; ?>');
+ var element = $('field; ?>');
var geocoder = L.Control.geocoder({
defaultMarkGeocode: false,
collapsed: false,
placeholder: ''
}).addTo(map);
- geocoder.on('markgeocode', function(event) {
+ geocoder.on('markgeocode', function (event) {
var container = document.createElement('div');
- var link = document.createElement('button');
- var result = event.geocode;
+ var link = document.createElement('button');
+ var result = event.geocode;
link.set('style', 'margin-left: 10px;');
link.appendText('');
- link.addEvent('click', function(e) {
+ link.addEvent('click', function (e) {
e.stop();
element.set('value', result.center.lat + ',' + result.center.lng);
@@ -37,7 +37,7 @@
map.removeLayer(this._geocodeMarker);
}
- map.fitBounds(result.bbox, { padding: [0, 70]});
+ map.fitBounds(result.bbox, {padding: [0, 70]});
map.panTo(result.center);
this._geocodeMarker = new L.Marker(result.center, {draggable: true})
diff --git a/module/templates/ce_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5
similarity index 84%
rename from module/templates/ce_leaflet_map.html5
rename to src/Bundle/Resources/contao/templates/ce_leaflet_map.html5
index 61563ff..d62880d 100644
--- a/module/templates/ce_leaflet_map.html5
+++ b/src/Bundle/Resources/contao/templates/ce_leaflet_map.html5
@@ -9,5 +9,5 @@
-' . $this->javascript .''; ?>
+' . $this->javascript . ''; ?>
diff --git a/src/Bundle/Resources/contao/templates/leaflet_map_html.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5
new file mode 100644
index 0000000..8624e3d
--- /dev/null
+++ b/src/Bundle/Resources/contao/templates/leaflet_map_html.html5
@@ -0,0 +1,7 @@
+
+
diff --git a/src/Bundle/Resources/contao/templates/leaflet_map_js.html5 b/src/Bundle/Resources/contao/templates/leaflet_map_js.html5
new file mode 100644
index 0000000..31ca758
--- /dev/null
+++ b/src/Bundle/Resources/contao/templates/leaflet_map_js.html5
@@ -0,0 +1,5 @@
+L.contao.addMap('mapId ?>', function() {
+javascript ?>
+
+return { map: map, layers: layers, controls: controls, icons: icons };
+}());
diff --git a/module/templates/mod_leaflet_map.html5 b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5
similarity index 84%
rename from module/templates/mod_leaflet_map.html5
rename to src/Bundle/Resources/contao/templates/mod_leaflet_map.html5
index e0138dd..6c7ffbd 100644
--- a/module/templates/mod_leaflet_map.html5
+++ b/src/Bundle/Resources/contao/templates/mod_leaflet_map.html5
@@ -9,4 +9,4 @@
-' . $this->javascript .''; ?>
+' . $this->javascript . ''; ?>
diff --git a/module/assets/css/about.css b/src/Bundle/Resources/public/css/about.css
similarity index 96%
rename from module/assets/css/about.css
rename to src/Bundle/Resources/public/css/about.css
index 0e71c71..87f8827 100644
--- a/module/assets/css/about.css
+++ b/src/Bundle/Resources/public/css/about.css
@@ -3,7 +3,6 @@
padding: 15px;
}
-
.netzmacht-leaflet-credits a {
color: #669A00;
}
@@ -17,7 +16,7 @@
.netzmacht-leaflet-credits h1 {
color: #fff;
font-size: 1.4em;
- text-shadow: 0 -1px 1px rgba(0,0,0,0.35);
+ text-shadow: 0 -1px 1px rgba(0, 0, 0, 0.35);
}
.netzmacht-leaflet-credits .row:after {
diff --git a/src/Bundle/Resources/public/css/backend.css b/src/Bundle/Resources/public/css/backend.css
new file mode 100644
index 0000000..09d7686
--- /dev/null
+++ b/src/Bundle/Resources/public/css/backend.css
@@ -0,0 +1,60 @@
+
+.tl_listing_container.tree_view ul > li.tl_file {
+ background: url('./../img/fol-placeholder.gif') no-repeat 6px 4px;
+}
+
+.tl_listing_container.tree_view ul > li.tl_file > div {
+ line-height: 18px;
+}
+
+.tl_listing_container.tree_view > ul > li.tl_file {
+ padding-left: 26px;
+}
+
+.tl_listing_container.tree_view ul > li.parent > ul {
+ padding-left: 20px;
+}
+
+.tl_listing_container.tree_view ul > li > .tl_left > a {
+ margin-left: -20px;
+}
+
+.tl_listing_container.tree_view ul[class="level_1"] li.tl_file > .tl_left {
+ padding-left: 20px !important;
+}
+
+.long .tl_text_2 {
+ width: 325px;
+}
+
+.leaflet-mcw {
+ clear: both;
+}
+
+.leaflet-mcw .tl_modulewizard {
+ width: 100%;
+}
+
+.leaflet-mcw .multicolumnwizard textarea,
+.leaflet-mcw .multicolumnwizard .tl_select {
+ width: 100% !important;
+}
+
+.leaflet-mcw .tl_modulewizard td:first-child {
+ width: auto;
+}
+
+@media screen and (min-width: 768px) {
+ .leaflet-mcw .tl_modulewizard {
+ max-width: 75%;
+ }
+
+ .leaflet-mcw-map-layers .tl_modulewizard {
+ max-width: 45%;
+ }
+
+ .leaflet-mcw-amenity-icons td:nth-child(1),
+ .leaflet-mcw-control-layers td:nth-child(2) {
+ width: 35%;
+ }
+}
diff --git a/src/Bundle/Resources/public/css/backend_global.css b/src/Bundle/Resources/public/css/backend_global.css
new file mode 100644
index 0000000..ffc55e7
--- /dev/null
+++ b/src/Bundle/Resources/public/css/backend_global.css
@@ -0,0 +1,8 @@
+
+#tl_navigation .tl_level_1_group .group-leaflet {
+ background: url(/bundles/netzmachtcontaoleaflet/img/leaflet.svg) 3px 2px no-repeat;
+}
+
+.tl_help_table a {
+ text-decoration: underline;
+}
diff --git a/module/assets/img/about.png b/src/Bundle/Resources/public/img/about.png
similarity index 100%
rename from module/assets/img/about.png
rename to src/Bundle/Resources/public/img/about.png
diff --git a/module/assets/img/cluster.png b/src/Bundle/Resources/public/img/cluster.png
similarity index 100%
rename from module/assets/img/cluster.png
rename to src/Bundle/Resources/public/img/cluster.png
diff --git a/module/assets/img/cluster_1.png b/src/Bundle/Resources/public/img/cluster_1.png
similarity index 100%
rename from module/assets/img/cluster_1.png
rename to src/Bundle/Resources/public/img/cluster_1.png
diff --git a/module/assets/img/control.png b/src/Bundle/Resources/public/img/control.png
similarity index 100%
rename from module/assets/img/control.png
rename to src/Bundle/Resources/public/img/control.png
diff --git a/src/Bundle/Resources/public/img/file.png b/src/Bundle/Resources/public/img/file.png
new file mode 100644
index 0000000..7a7227e
Binary files /dev/null and b/src/Bundle/Resources/public/img/file.png differ
diff --git a/src/Bundle/Resources/public/img/file_1.png b/src/Bundle/Resources/public/img/file_1.png
new file mode 100644
index 0000000..502668d
Binary files /dev/null and b/src/Bundle/Resources/public/img/file_1.png differ
diff --git a/module/assets/img/fol-placeholder.gif b/src/Bundle/Resources/public/img/fol-placeholder.gif
similarity index 100%
rename from module/assets/img/fol-placeholder.gif
rename to src/Bundle/Resources/public/img/fol-placeholder.gif
diff --git a/module/assets/img/group.png b/src/Bundle/Resources/public/img/group.png
similarity index 100%
rename from module/assets/img/group.png
rename to src/Bundle/Resources/public/img/group.png
diff --git a/module/assets/img/group_1.png b/src/Bundle/Resources/public/img/group_1.png
similarity index 100%
rename from module/assets/img/group_1.png
rename to src/Bundle/Resources/public/img/group_1.png
diff --git a/module/assets/img/icons.png b/src/Bundle/Resources/public/img/icons.png
similarity index 100%
rename from module/assets/img/icons.png
rename to src/Bundle/Resources/public/img/icons.png
diff --git a/module/assets/img/layers.png b/src/Bundle/Resources/public/img/layers.png
similarity index 100%
rename from module/assets/img/layers.png
rename to src/Bundle/Resources/public/img/layers.png
diff --git a/src/Bundle/Resources/public/img/leaflet.svg b/src/Bundle/Resources/public/img/leaflet.svg
new file mode 100644
index 0000000..f499944
--- /dev/null
+++ b/src/Bundle/Resources/public/img/leaflet.svg
@@ -0,0 +1,72 @@
+
+
diff --git a/module/assets/img/logo.png b/src/Bundle/Resources/public/img/logo.png
similarity index 100%
rename from module/assets/img/logo.png
rename to src/Bundle/Resources/public/img/logo.png
diff --git a/module/assets/img/map.png b/src/Bundle/Resources/public/img/map.png
similarity index 100%
rename from module/assets/img/map.png
rename to src/Bundle/Resources/public/img/map.png
diff --git a/module/assets/img/markers.png b/src/Bundle/Resources/public/img/markers.png
similarity index 100%
rename from module/assets/img/markers.png
rename to src/Bundle/Resources/public/img/markers.png
diff --git a/module/assets/img/markers_1.png b/src/Bundle/Resources/public/img/markers_1.png
similarity index 100%
rename from module/assets/img/markers_1.png
rename to src/Bundle/Resources/public/img/markers_1.png
diff --git a/module/assets/img/overpass.png b/src/Bundle/Resources/public/img/overpass.png
similarity index 100%
rename from module/assets/img/overpass.png
rename to src/Bundle/Resources/public/img/overpass.png
diff --git a/module/assets/img/popup.png b/src/Bundle/Resources/public/img/popup.png
similarity index 100%
rename from module/assets/img/popup.png
rename to src/Bundle/Resources/public/img/popup.png
diff --git a/module/assets/img/provider.png b/src/Bundle/Resources/public/img/provider.png
similarity index 100%
rename from module/assets/img/provider.png
rename to src/Bundle/Resources/public/img/provider.png
diff --git a/module/assets/img/provider_1.png b/src/Bundle/Resources/public/img/provider_1.png
similarity index 100%
rename from module/assets/img/provider_1.png
rename to src/Bundle/Resources/public/img/provider_1.png
diff --git a/module/assets/img/reference.png b/src/Bundle/Resources/public/img/reference.png
similarity index 100%
rename from module/assets/img/reference.png
rename to src/Bundle/Resources/public/img/reference.png
diff --git a/module/assets/img/reference_1.png b/src/Bundle/Resources/public/img/reference_1.png
similarity index 100%
rename from module/assets/img/reference_1.png
rename to src/Bundle/Resources/public/img/reference_1.png
diff --git a/module/assets/img/style.png b/src/Bundle/Resources/public/img/style.png
similarity index 100%
rename from module/assets/img/style.png
rename to src/Bundle/Resources/public/img/style.png
diff --git a/module/assets/img/tile.png b/src/Bundle/Resources/public/img/tile.png
similarity index 100%
rename from module/assets/img/tile.png
rename to src/Bundle/Resources/public/img/tile.png
diff --git a/module/assets/img/tile_1.png b/src/Bundle/Resources/public/img/tile_1.png
similarity index 100%
rename from module/assets/img/tile_1.png
rename to src/Bundle/Resources/public/img/tile_1.png
diff --git a/module/assets/img/vectors.png b/src/Bundle/Resources/public/img/vectors.png
similarity index 100%
rename from module/assets/img/vectors.png
rename to src/Bundle/Resources/public/img/vectors.png
diff --git a/module/assets/img/vectors_1.png b/src/Bundle/Resources/public/img/vectors_1.png
similarity index 100%
rename from module/assets/img/vectors_1.png
rename to src/Bundle/Resources/public/img/vectors_1.png
diff --git a/src/Bundle/Resources/public/js/backend.js b/src/Bundle/Resources/public/js/backend.js
new file mode 100644
index 0000000..94c802d
--- /dev/null
+++ b/src/Bundle/Resources/public/js/backend.js
@@ -0,0 +1,64 @@
+/**
+ * Contao Open Source CMS
+ *
+ * Copyright (c) 2005-2017 Leo Feyer
+ *
+ * @license LGPL-3.0+
+ */
+
+
+/**
+ * Provide methods to handle Ajax requests.
+ *
+ * @author Leo Feyer
+
+
+ headline; ?> + version; ?> +
+
+
+
+ About
+
+
+ + The Leaflet maps integration for Contao CMS is an Open Source Software license under the LGPL 3.0. + This extension is only exists because of great other Open Source Software which it heavenly depends on. +
++ This software ships with an visible attribution to netzmacht creative in the map attribution + control. + If you want to remove this attribution, you have to purchase a commercial license. + For more details visit the project + website. +
+
+ >
+ 
+
+
+
+ netzmacht
+ David Molineus
+
+ DAB Bank München
+ IBAN: DE52701204008354237003
+ BIC: DABBDEMMXXX
+
+
+
+ Support Contao Leaflet
+ +
+
+
+
+ Report issues
+If you found a bug, got some troubles or have a feature request - feel free to open an issue.
+ +
+
+ Contribute
+There are many ways you can contribute. Translations, + documentation or code contributions are welcome. +
+ +
+
+ Fund a feature
+Contao Leaflet is not feature complete. Have a look at the list of planned feature and support + them.
+ +
+
+
+
+
+ Individual development
+If you have special requirements you can hire me for an individual development.
+ +
+
+ Commercial license
+If you want to remove the attribution in the attribution control, you can purchase a commercial + license.
+ +
+
+
+
+Credits
+| Name | +Version | +License | +Homepage | +
|---|---|---|---|
| Libraries | +|||
| + | + | + | + |
| Graphics | +|||
| Farm Fresh-Web Icons | +3.9.2 | +CC BY 3.0 US | +fatcow.com/free-icons | +
| Web Blog Icons by SEM Labs | +3.9.2 | +CC BY 4.0 | +semlabs.co.uk | +
| Dependencies | +|||
| + | + | + | + |