Public-Repositories/contao-leaflet-maps
1
0
Fork 0
forked from Snck3rs/contao-leaflet-maps
Code Pull Requests Activity

Add panels.

Browse Source
This commit is contained in:
David Molineus
2015-01-08 16:27:55 +01:00
parent 685c9ae1d4
commit ff231c7fa0
8 changed files with 54 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
assets/libs/contao/contao-leaflet.js
View File

@@ -166,6 +166,9 @@ L.Contao = L.Class.extend({
if (feature.properties) { if (feature.properties) {
L.Util.setOptions(layer, feature.properties.options); L.Util.setOptions(layer, feature.properties.options);
console.log(feature);
console.log(layer);
this.bindPopupFromFeature(layer, feature); this.bindPopupFromFeature(layer, feature);
this.fire('feature:added', { feature: feature, layer: layer}); this.fire('feature:added', { feature: feature, layer: layer});

13
module/dca/tl_leaflet_control.php
View File

@@ -26,6 +26,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'fields' => array('sorting'), 'fields' => array('sorting'),
'headerFields' => array('title'), 'headerFields' => array('title'),
'flag' => 1, 'flag' => 1,
'sorting' => 2,
'panelLayout' => 'filter,sort;search,limit',
'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\Control', 'generateRow'), 'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\Control', 'generateRow'),
), ),
'label' => array 'label' => array
@@ -130,13 +132,17 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
), ),
'sorting' => array 'sorting' => array
( (
'sql' => "int(10) unsigned NOT NULL default '0'" 'sql' => "int(10) unsigned NOT NULL default '0'",
'sorting' => true,
), ),
'title' => array 'title' => array
( (
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['title'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['title'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'sorting' => true,
'search' => true,
'flag' => 1,
'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -145,6 +151,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['alias'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['alias'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -153,6 +160,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['type'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['type'],
'exclude' => true, 'exclude' => true,
'inputType' => 'select', 'inputType' => 'select',
'filter' => true,
'sorting' => true,
'eval' => array( 'eval' => array(
'mandatory' => true, 'mandatory' => true,
'tl_class' => 'w50', 'tl_class' => 'w50',
@@ -170,6 +179,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['position'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['position'],
'exclude' => true, 'exclude' => true,
'inputType' => 'select', 'inputType' => 'select',
'filter' => true,
'options' => array('topleft', 'topright', 'bottomleft', 'bottomright'), 'options' => array('topleft', 'topright', 'bottomleft', 'bottomright'),
'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'], 'reference' => &$GLOBALS['TL_LANG']['tl_leaflet_control'],
'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50', 'helpwizard' => true), 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50', 'helpwizard' => true),
@@ -180,6 +190,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['active'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['active'],
'exclude' => true, 'exclude' => true,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'filter' => true,
'eval' => array('tl_class' => 'w50'), 'eval' => array('tl_class' => 'w50'),
'sql' => "char(1) NOT NULL default ''" 'sql' => "char(1) NOT NULL default ''"
), ),

1
module/dca/tl_leaflet_icon.php
View File

@@ -21,6 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
'mode' => 1, 'mode' => 1,
'fields' => array('title'), 'fields' => array('title'),
'flag' => 1, 'flag' => 1,
'panelLayout' => 'limit',
'headerFields' => array('title', 'type'), 'headerFields' => array('title', 'type'),
), ),
'label' => array 'label' => array

7
module/dca/tl_leaflet_layer.php
View File

@@ -23,6 +23,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'fields' => array('title'), 'fields' => array('title'),
'flag' => 1, 'flag' => 1,
'icon' => 'system/modules/leaflet/assets/img/layers.png', 'icon' => 'system/modules/leaflet/assets/img/layers.png',
'panelLayout' => 'filter;search,limit',
'paste_button_callback' => array('Netzmacht\Contao\Leaflet\Dca\Layer', 'getPasteButtons'), 'paste_button_callback' => array('Netzmacht\Contao\Leaflet\Dca\Layer', 'getPasteButtons'),
), ),
'label' => array 'label' => array
@@ -158,7 +159,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
), ),
'sorting' => array 'sorting' => array
( (
'sql' => "int(10) unsigned NOT NULL default '0'" 'sql' => "int(10) unsigned NOT NULL default '0'",
), ),
'tstamp' => array 'tstamp' => array
( (
@@ -169,6 +170,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['title'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['title'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -177,6 +179,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['alias'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['alias'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -185,6 +188,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['type'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['type'],
'exclude' => true, 'exclude' => true,
'inputType' => 'select', 'inputType' => 'select',
'filter' => true,
'eval' => array( 'eval' => array(
'mandatory' => true, 'mandatory' => true,
'tl_class' => 'w50', 'tl_class' => 'w50',
@@ -202,6 +206,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['active'],
'exclude' => true, 'exclude' => true,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'filter' => true,
'eval' => array('tl_class' => 'w50'), 'eval' => array('tl_class' => 'w50'),
'sql' => "char(1) NOT NULL default ''" 'sql' => "char(1) NOT NULL default ''"
), ),

3
module/dca/tl_leaflet_map.php
View File

@@ -21,6 +21,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
( (
'mode' => 1, 'mode' => 1,
'fields' => array('title'), 'fields' => array('title'),
'panelLayout' => 'search,limit',
'flag' => 1, 'flag' => 1,
), ),
'label' => array 'label' => array
@@ -135,6 +136,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['title'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['title'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -143,6 +145,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_map']['alias'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),

12
module/dca/tl_leaflet_marker.php
View File

@@ -25,6 +25,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
'mode' => 4, 'mode' => 4,
'fields' => array('sorting'), 'fields' => array('sorting'),
'flag' => 1, 'flag' => 1,
'panelLayout' => 'sort,filter;search,limit',
'headerFields' => array('title', 'type'), 'headerFields' => array('title', 'type'),
'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\Marker', 'generateRow'), 'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\Marker', 'generateRow'),
), ),
@@ -125,7 +126,8 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
), ),
'sorting' => array 'sorting' => array
( (
'sql' => "int(10) unsigned NOT NULL default '0'" 'sql' => "int(10) unsigned NOT NULL default '0'",
'sorting' => true,
), ),
'pid' => array 'pid' => array
( (
@@ -135,6 +137,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
( (
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['title'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['title'],
'exclude' => true, 'exclude' => true,
'search' => true,
'sorting' => true,
'flag' => 1,
'inputType' => 'text', 'inputType' => 'text',
'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
@@ -144,6 +149,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['alias'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['alias'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -169,6 +175,9 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
( (
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['active'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['active'],
'exclude' => true, 'exclude' => true,
'filter' => true,
'sorting' => true,
'flag' => 12,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'eval' => array('tl_class' => 'w50'), 'eval' => array('tl_class' => 'w50'),
'sql' => "char(1) NOT NULL default ''" 'sql' => "char(1) NOT NULL default ''"
@@ -194,6 +203,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['addPopup'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['addPopup'],
'exclude' => true, 'exclude' => true,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'filter' => true,
'eval' => array('tl_class' => 'w50', 'submitOnChange' => true), 'eval' => array('tl_class' => 'w50', 'submitOnChange' => true),
'sql' => "char(1) NOT NULL default ''" 'sql' => "char(1) NOT NULL default ''"
), ),

18
module/dca/tl_leaflet_vector.php
View File

@@ -24,6 +24,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'mode' => 4, 'mode' => 4,
'fields' => array('sorting'), 'fields' => array('sorting'),
'flag' => 1, 'flag' => 1,
'panelLayout' => 'sort,filter;search,limit',
'headerFields' => array('title', 'type'), 'headerFields' => array('title', 'type'),
'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\Vector', 'generateRow'), 'child_record_callback' => array('Netzmacht\Contao\Leaflet\Dca\Vector', 'generateRow'),
), ),
@@ -149,13 +150,18 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
), ),
'sorting' => array 'sorting' => array
( (
'sql' => "int(10) unsigned NOT NULL default '0'" 'sql' => "int(10) unsigned NOT NULL default '0'",
'sorting' => true,
), ),
'title' => array 'title' => array
( (
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['title'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['title'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'filter' => false,
'sorting' => true,
'search' => true,
'flag' => 1,
'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => true, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -164,6 +170,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['alias'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['alias'],
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'search' => true,
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50'),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
), ),
@@ -172,6 +179,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['type'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['type'],
'exclude' => true, 'exclude' => true,
'inputType' => 'select', 'inputType' => 'select',
'filter' => true,
'sorting' => true,
'search' => false,
'flag' => 1,
'eval' => array( 'eval' => array(
'mandatory' => true, 'mandatory' => true,
'tl_class' => 'w50', 'tl_class' => 'w50',
@@ -189,6 +200,10 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['active'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['active'],
'exclude' => true, 'exclude' => true,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'filter' => true,
'sorting' => true,
'search' => false,
'flag' => 12,
'eval' => array('tl_class' => 'w50'), 'eval' => array('tl_class' => 'w50'),
'sql' => "char(1) NOT NULL default ''" 'sql' => "char(1) NOT NULL default ''"
), ),
@@ -197,6 +212,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['addPopup'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['addPopup'],
'exclude' => true, 'exclude' => true,
'inputType' => 'checkbox', 'inputType' => 'checkbox',
'filter' => true,
'eval' => array('tl_class' => 'w50', 'submitOnChange' => true), 'eval' => array('tl_class' => 'w50', 'submitOnChange' => true),
'sql' => "char(1) NOT NULL default ''" 'sql' => "char(1) NOT NULL default ''"
), ),

1
src/Netzmacht/Contao/Leaflet/Mapper/UI/MarkerMapper.php
View File

@@ -55,6 +55,7 @@ class MarkerMapper extends AbstractMapper
$this $this
->addConditionalOption('tooltip', 'title', 'tooltip') ->addConditionalOption('tooltip', 'title', 'tooltip')
->addConditionalOption('alt') ->addConditionalOption('alt')
->addConditionalOption('zIndexOffset')
->addOptions('clickable', 'keyboard', 'draggable'); ->addOptions('clickable', 'keyboard', 'draggable');
} }