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

Use contao-toolkit insteand of deprecated dev-tools.

Browse Source
This commit is contained in:
David Molineus
2015-01-30 17:03:31 +01:00
parent a4d4d6a5de
commit 1bfd99746c
18 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@@ -25,7 +25,7 @@
"netzmacht/contao-leaflet-libraries": "~0.7", "netzmacht/contao-leaflet-libraries": "~0.7",
"netzmacht/php-javascript-builder": "~1.0", "netzmacht/php-javascript-builder": "~1.0",
"netzmacht/php-leaflet": "~0.7", "netzmacht/php-leaflet": "~0.7",
"netzmacht/contao-dev-tools":"~1.0", "netzmacht/contao-toolkit":"~1.0",
"bit3/contao-meta-palettes": "~1.5", "bit3/contao-meta-palettes": "~1.5",
"menatwork/contao-multicolumnwizard": "~3.2", "menatwork/contao-multicolumnwizard": "~3.2",
"doctrine/cache": "~1.0" "doctrine/cache": "~1.0"

4
module/dca/tl_leaflet_control.php
View File

@@ -81,7 +81,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_control', 'tl_leaflet_control',
'active' 'active'
) )
@@ -166,7 +166,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array
'inputType' => 'text', 'inputType' => 'text',
'search' => true, 'search' => true,
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_control', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_control', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

4
module/dca/tl_leaflet_icon.php
View File

@@ -96,7 +96,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_icon', 'tl_leaflet_icon',
'active' 'active'
) )
@@ -174,7 +174,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_icon', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_icon', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

4
module/dca/tl_leaflet_layer.php
View File

@@ -128,7 +128,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_layer', 'tl_leaflet_layer',
'active' 'active'
) )
@@ -261,7 +261,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array
'inputType' => 'text', 'inputType' => 'text',
'search' => true, 'search' => true,
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_layer', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_layer', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

2
module/dca/tl_leaflet_map.php
View File

@@ -162,7 +162,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array
'inputType' => 'text', 'inputType' => 'text',
'search' => true, 'search' => true,
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_map', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_map', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

4
module/dca/tl_leaflet_marker.php
View File

@@ -97,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_marker', 'tl_leaflet_marker',
'active' 'active'
) )
@@ -172,7 +172,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array
'inputType' => 'text', 'inputType' => 'text',
'search' => true, 'search' => true,
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_marker', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_marker', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

4
module/dca/tl_leaflet_popup.php
View File

@@ -96,7 +96,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_popup', 'tl_leaflet_popup',
'active' 'active'
) )
@@ -160,7 +160,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_popup', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_popup', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

8
module/dca/tl_leaflet_style.php
View File

@@ -95,7 +95,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_style', 'tl_leaflet_style',
'active' 'active'
) )
@@ -153,7 +153,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_style', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_style', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"
@@ -189,7 +189,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'wizard' => array( 'wizard' => array(
\Netzmacht\Contao\DevTools\Dca::createColorPickerCallback(), \Netzmacht\Contao\Toolkit\Dca::createColorPickerCallback(),
), ),
'eval' => array( 'eval' => array(
'tl_class' => 'w50 wizard clr', 'tl_class' => 'w50 wizard clr',
@@ -230,7 +230,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array
'exclude' => true, 'exclude' => true,
'inputType' => 'text', 'inputType' => 'text',
'wizard' => array( 'wizard' => array(
\Netzmacht\Contao\DevTools\Dca::createColorPickerCallback(), \Netzmacht\Contao\Toolkit\Dca::createColorPickerCallback(),
), ),
'eval' => array( 'eval' => array(
'tl_class' => 'clr w50 wizard', 'tl_class' => 'clr w50 wizard',

4
module/dca/tl_leaflet_vector.php
View File

@@ -104,7 +104,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['toggle'], 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['toggle'],
'icon' => 'visible.gif', 'icon' => 'visible.gif',
'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"', 'attributes' => 'onclick="Backend.getScrollOffset();return AjaxRequest.toggleVisibility(this,%s)"',
'button_callback' => \Netzmacht\Contao\DevTools\Dca::createToggleIconCallback( 'button_callback' => \Netzmacht\Contao\Toolkit\Dca::createToggleIconCallback(
'tl_leaflet_vector', 'tl_leaflet_vector',
'active' 'active'
) )
@@ -198,7 +198,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array
'inputType' => 'text', 'inputType' => 'text',
'search' => true, 'search' => true,
'save_callback' => array( 'save_callback' => array(
\Netzmacht\Contao\DevTools\Dca::createGenerateAliasCallback('tl_leaflet_vector', 'title'), \Netzmacht\Contao\Toolkit\Dca::createGenerateAliasCallback('tl_leaflet_vector', 'title'),
), ),
'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true), 'eval' => array('mandatory' => false, 'maxlength' => 255, 'tl_class' => 'w50', 'unique' => true),
'sql' => "varchar(255) NOT NULL default ''" 'sql' => "varchar(255) NOT NULL default ''"

4
src/Netzmacht/Contao/Leaflet/Dca/Control.php
View File

@@ -11,8 +11,8 @@
namespace Netzmacht\Contao\Leaflet\Dca; namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\DevTools\ServiceContainerTrait; use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Model\ControlModel;
use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\LayerModel;

2
src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php
View File

@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Dca; namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\Leaflet\Model\MapModel; use Netzmacht\Contao\Leaflet\Model\MapModel;
/** /**

4
src/Netzmacht/Contao/Leaflet/Dca/Layer.php
View File

@@ -11,8 +11,8 @@
namespace Netzmacht\Contao\Leaflet\Dca; namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\DevTools\ServiceContainerTrait; use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\Model\LayerModel; use Netzmacht\Contao\Leaflet\Model\LayerModel;
/** /**

2
src/Netzmacht/Contao/Leaflet/Dca/Map.php
View File

@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Dca; namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\DevTools\ServiceContainerTrait; use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
/** /**
* Class Map is the helper class for the tl_leaflet_map dca. * Class Map is the helper class for the tl_leaflet_map dca.

2
src/Netzmacht/Contao/Leaflet/Dca/Marker.php
View File

@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Dca; namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\Leaflet\Model\IconModel; use Netzmacht\Contao\Leaflet\Model\IconModel;
use Netzmacht\Contao\Leaflet\Model\PopupModel; use Netzmacht\Contao\Leaflet\Model\PopupModel;

2
src/Netzmacht/Contao/Leaflet/Dca/Vector.php
View File

@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Dca; namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder;
use Netzmacht\Contao\Leaflet\Model\StyleModel; use Netzmacht\Contao\Leaflet\Model\StyleModel;
/** /**

2
src/Netzmacht/Contao/Leaflet/Frontend/Hooks.php
View File

@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Frontend; namespace Netzmacht\Contao\Leaflet\Frontend;
use Netzmacht\Contao\DevTools\ServiceContainerTrait; use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\MapService; use Netzmacht\Contao\Leaflet\MapService;
/** /**

2
src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php
View File

@@ -12,7 +12,7 @@
namespace Netzmacht\Contao\Leaflet\Frontend; namespace Netzmacht\Contao\Leaflet\Frontend;
use ContentElement; use ContentElement;
use Netzmacht\Contao\DevTools\ServiceContainerTrait; use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\MapService; use Netzmacht\Contao\Leaflet\MapService;
/** /**

2
src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php
View File

@@ -11,7 +11,7 @@
namespace Netzmacht\Contao\Leaflet\Frontend; namespace Netzmacht\Contao\Leaflet\Frontend;
use Netzmacht\Contao\DevTools\ServiceContainerTrait; use Netzmacht\Contao\Toolkit\ServiceContainerTrait;
use Netzmacht\Contao\Leaflet\MapService; use Netzmacht\Contao\Leaflet\MapService;
/** /**