Skip to content

Commit

Permalink
Merge pull request #37 from Didldu-Florian/dev
Browse files Browse the repository at this point in the history
Release v1.1.1.6
  • Loading branch information
HRIT-Florian authored Feb 20, 2018
2 parents 31b499b + 0e10b65 commit 2ab0c47
Show file tree
Hide file tree
Showing 26 changed files with 580 additions and 23 deletions.
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
- Validate a single addresses via the backend (geocoding of the address)
- Google Maps v3 integration (API key connection possible) Integrated Google JavaScript API and Geocoding API
- Adjustable map size, position and zoom level
- Styled map (including default stylepacks) https://developers.google.com/maps/documentation/javascript/examples/style-selector
- Customizable markers, cluster markers and info box (PopUp by click on map)
- Support all major web browsers

Expand Down Expand Up @@ -46,5 +47,5 @@ It is a namespace prefix, provided to avoid element name conflicts.

<br>
Author: HR IT-Solutions Florian Häusler https://www.hr-it-solution.com <br>
Copyright: (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions <br>
Copyright: (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions <br>
http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
2 changes: 1 addition & 1 deletion countries/countries.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"extension": {
"name": "country-package",
"author": "HR IT-Solutions Florian Häusler",
"copyright": "Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions",
"copyright": "Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions",
"license": "GNU/GPLv2 only",
"description": "Countries Package contains an extended and a reduced selection for smaller German Websites",
"countries": {
Expand Down
2 changes: 1 addition & 1 deletion fields/country.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion fields/extcplugins.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2017 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2017 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion fields/geohardcodescript.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2017 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2017 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion fields/locationcategory.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2017 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2017 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
2 changes: 1 addition & 1 deletion helper.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down
14 changes: 13 additions & 1 deletion inc/scriptheader.js.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down Expand Up @@ -223,6 +223,18 @@ function DDNotEmptyFlag($string)

<?php // Initialize Map ?>
var infowindow = new google.maps.InfoWindow();

var styles = {this: <?php
if($params->get('stylepack'))
{
require_once 'media/mod_dd_gmaps_module/js/styles/' . $params->get('stylepack') . '.json';
}
else
{
echo "null";
}
?>};

google.maps.event.addDomListener(window, 'load', initialize);

<?php
Expand Down
7 changes: 6 additions & 1 deletion language/de-DE/de-DE.mod_dd_gmaps_module.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Module
;
; @author HR IT-Solutions Florian Häusler <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

MOD_DD_GMAPS_MODULE="DD GMaps Module"
Expand Down Expand Up @@ -85,6 +85,11 @@ MOD_DD_GMAPS_MODULE_MARKER_IMAGE_DESC="Marker Bild (max. Größe 50px auf 50px)"
MOD_DD_GMAPS_MODULE_CLUSTERMARKER_IMAGE_LABEL="Cluster Marker Bild"
MOD_DD_GMAPS_MODULE_CLUSTERMARKER_IMAGE_DESC="Cluster Marker Bild (max. Größe 55px auf 55px)"

MOD_DD_GMAPS_MODULE_STYLE_SETTINGS_LABEL="Styles"
MOD_DD_GMAPS_MODULE_STYLE_SETTINGS_DESC="Wenden Sie benutzerdefinierte Stile auf eine Karte an. Um mehr über Styling zu erfahren, besuchen Sie: https://developers.google.com/maps/documentation/javascript/styling"
MOD_DD_GMAPS_MODULE_STYLEPACK_DESC="Wählen Sie einen Beispielstil aus /media/mod_dd_gmaps_module/js/styles/ oder setze deine eigenen styles in die custom.json Für das styling, besuchen Sie: https://mapstyle.withgoogle.com/"
MOD_DD_GMAPS_MODULE_STYLEPACK_LABEL="Stylepack"

MOD_DD_GMAPS_MODULE_ADDONFEATURES_LABEL="Addon Funktionen"
MOD_DD_GMAPS_MODULE_ADDONFEATURES_DESC="Erweiterte Erweiterung. DD GMaps Locations Komponente erforderlich."
MOD_DD_GMAPS_MODULE_ADDON_DDGMAPS_LOCATIONS="<b>Addon Funktionen für DD GMaps Location</b>:"
Expand Down
2 changes: 1 addition & 1 deletion language/de-DE/de-DE.mod_dd_gmaps_module.sys.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Module
;
; @author HR IT-Solutions Florian Häusler <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

MOD_DD_GMAPS_MODULE="DD GMaps Module"
Expand Down
7 changes: 6 additions & 1 deletion language/en-GB/en-GB.mod_dd_gmaps_module.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Module
;
; @author HR IT-Solutions Florian Häusler <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

MOD_DD_GMAPS_MODULE="DD GMaps Module"
Expand Down Expand Up @@ -85,6 +85,11 @@ MOD_DD_GMAPS_MODULE_MARKER_IMAGE_DESC="Marker image (max. size 50px to 50px)"
MOD_DD_GMAPS_MODULE_CLUSTERMARKER_IMAGE_LABEL="Cluster marker image"
MOD_DD_GMAPS_MODULE_CLUSTERMARKER_IMAGE_DESC="Cluster marker image (max. size 55px to 55px)"

MOD_DD_GMAPS_MODULE_STYLE_SETTINGS_LABEL="Styles"
MOD_DD_GMAPS_MODULE_STYLE_SETTINGS_DESC="Applie custom styles to the map. To find more about styling, visit: https://developers.google.com/maps/documentation/javascript/styling"
MOD_DD_GMAPS_MODULE_STYLEPACK_DESC="Select an example style from /media/mod_dd_gmaps_module/js/styles/ or set your own style in the custom.json For styling, visit: https://mapstyle.withgoogle.com/"
MOD_DD_GMAPS_MODULE_STYLEPACK_LABEL="Stylepack"

MOD_DD_GMAPS_MODULE_ADDONFEATURES_LABEL="Addon Features"
MOD_DD_GMAPS_MODULE_ADDONFEATURES_DESC="Extend extension. This requires the DD GMaps Locations component."
MOD_DD_GMAPS_MODULE_ADDON_DDGMAPS_LOCATIONS="<b>Addon-Features for DD GMaps Location</b>:"
Expand Down
2 changes: 1 addition & 1 deletion language/en-GB/en-GB.mod_dd_gmaps_module.sys.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Module
;
; @author HR IT-Solutions Florian Häusler <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

MOD_DD_GMAPS_MODULE="DD GMaps Module"
Expand Down
8 changes: 7 additions & 1 deletion language/ru-RU/ru-RU.mod_dd_gmaps_module.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Module
;
; @author HR IT-Solutions Valeria Rizak <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

MOD_DD_GMAPS_MODULE="DD GMaps Модуль"
Expand Down Expand Up @@ -87,6 +87,12 @@ MOD_DD_GMAPS_MODULE_MARKER_IMAGE_DESC="Изображение маркера (м
MOD_DD_GMAPS_MODULE_CLUSTERMARKER_IMAGE_LABEL="Изображение метки кластера"
MOD_DD_GMAPS_MODULE_CLUSTERMARKER_IMAGE_DESC="Изображение метки кластера (максимальный размер 55px на 55px)"

; todo: translate
MOD_DD_GMAPS_MODULE_STYLE_SETTINGS_LABEL="Styles"
MOD_DD_GMAPS_MODULE_STYLE_SETTINGS_DESC="Applie custom styles to the map. To find more about styling, visit: https://developers.google.com/maps/documentation/javascript/styling"
MOD_DD_GMAPS_MODULE_STYLEPACK_DESC="Select an example style from /media/mod_dd_gmaps_module/js/styles/ or set your own style in the custom.json For styling, visit: https://mapstyle.withgoogle.com/"
MOD_DD_GMAPS_MODULE_STYLEPACK_LABEL="Stylepack"

MOD_DD_GMAPS_MODULE_ADDONFEATURES_LABEL="Аддоны функции"
MOD_DD_GMAPS_MODULE_ADDONFEATURES_DESC="Расширенное расширение. DD GMaps Locations Компоненты требуется."
MOD_DD_GMAPS_MODULE_ADDON_DDGMAPS_LOCATIONS="<b>Аддоны функции для DD GMaps Location</b>:"
Expand Down
2 changes: 1 addition & 1 deletion language/ru-RU/ru-RU.mod_dd_gmaps_module.sys.ini
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; @package DD_GMaps_Module
;
; @author HR IT-Solutions Valeria Rizak <[email protected]>
; @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
; @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
; @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only

MOD_DD_GMAPS_MODULE="DD GMaps Модуль"
Expand Down
2 changes: 1 addition & 1 deletion media/css/dd_gmaps_module.css
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/
#dd_gmaps {
Expand Down
2 changes: 1 addition & 1 deletion media/css/dd_gmaps_module.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion media/js/dd_gmaps_module.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
* @package DD_GMaps_Module
*
* @author HR IT-Solutions Florian Häusler <[email protected]>
* @copyright Copyright (C) 2011 - 2017 Didldu e.K. | HR IT-Solutions
* @copyright Copyright (C) 2011 - 2018 Didldu e.K. | HR IT-Solutions
* @license http://www.gnu.org/licenses/gpl-2.0.html GNU/GPLv2 only
**/

Expand Down Expand Up @@ -73,6 +73,8 @@ var initialize = function initialize() // Initializes Google Map
};
map = new google.maps.Map(document.getElementById("dd_gmaps"), googleMapOptions);

map.setOptions({styles: styles.this});

// Add Locations
var count = GMapsLocations.length; // Count Locations
for(var i=0;i<count ;i++){
Expand Down
4 changes: 2 additions & 2 deletions media/js/dd_gmaps_module.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions media/js/styles/custom.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
/**
* @package DD_GMaps_Module Stylepack
* @adpated developers.google.com example style-selector
**/

null /* << replace with custom styles https://mapstyle.withgoogle.com */
15 changes: 15 additions & 0 deletions media/js/styles/hiding.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
/**
* @package DD_GMaps_Module Stylepack
* @adpated developers.google.com example style-selector
**/
[
{
featureType: 'poi.business',
stylers: [{visibility: 'off'}]
},
{
featureType: 'transit',
elementType: 'labels.icon',
stylers: [{visibility: 'off'}]
}
]
84 changes: 84 additions & 0 deletions media/js/styles/night.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
/**
* @package DD_GMaps_Module Stylepack
* @adpated developers.google.com example style-selector
**/
[
{elementType: 'geometry', stylers: [{color: '#242f3e'}]},
{elementType: 'labels.text.stroke', stylers: [{color: '#242f3e'}]},
{elementType: 'labels.text.fill', stylers: [{color: '#746855'}]},
{
featureType: 'administrative.locality',
elementType: 'labels.text.fill',
stylers: [{color: '#d59563'}]
},
{
featureType: 'poi',
elementType: 'labels.text.fill',
stylers: [{color: '#d59563'}]
},
{
featureType: 'poi.park',
elementType: 'geometry',
stylers: [{color: '#263c3f'}]
},
{
featureType: 'poi.park',
elementType: 'labels.text.fill',
stylers: [{color: '#6b9a76'}]
},
{
featureType: 'road',
elementType: 'geometry',
stylers: [{color: '#38414e'}]
},
{
featureType: 'road',
elementType: 'geometry.stroke',
stylers: [{color: '#212a37'}]
},
{
featureType: 'road',
elementType: 'labels.text.fill',
stylers: [{color: '#9ca5b3'}]
},
{
featureType: 'road.highway',
elementType: 'geometry',
stylers: [{color: '#746855'}]
},
{
featureType: 'road.highway',
elementType: 'geometry.stroke',
stylers: [{color: '#1f2835'}]
},
{
featureType: 'road.highway',
elementType: 'labels.text.fill',
stylers: [{color: '#f3d19c'}]
},
{
featureType: 'transit',
elementType: 'geometry',
stylers: [{color: '#2f3948'}]
},
{
featureType: 'transit.station',
elementType: 'labels.text.fill',
stylers: [{color: '#d59563'}]
},
{
featureType: 'water',
elementType: 'geometry',
stylers: [{color: '#17263c'}]
},
{
featureType: 'water',
elementType: 'labels.text.fill',
stylers: [{color: '#515c6d'}]
},
{
featureType: 'water',
elementType: 'labels.text.stroke',
stylers: [{color: '#17263c'}]
}
]
Loading

0 comments on commit 2ab0c47

Please sign in to comment.