From 1bfd99746c26d49daabca3da8f95d0ddd9222af0 Mon Sep 17 00:00:00 2001 From: David Molineus Date: Fri, 30 Jan 2015 17:03:31 +0100 Subject: [PATCH] Use contao-toolkit insteand of deprecated dev-tools. --- composer.json | 2 +- module/dca/tl_leaflet_control.php | 4 ++-- module/dca/tl_leaflet_icon.php | 4 ++-- module/dca/tl_leaflet_layer.php | 4 ++-- module/dca/tl_leaflet_map.php | 2 +- module/dca/tl_leaflet_marker.php | 4 ++-- module/dca/tl_leaflet_popup.php | 4 ++-- module/dca/tl_leaflet_style.php | 8 ++++---- module/dca/tl_leaflet_vector.php | 4 ++-- src/Netzmacht/Contao/Leaflet/Dca/Control.php | 4 ++-- src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php | 2 +- src/Netzmacht/Contao/Leaflet/Dca/Layer.php | 4 ++-- src/Netzmacht/Contao/Leaflet/Dca/Map.php | 2 +- src/Netzmacht/Contao/Leaflet/Dca/Marker.php | 2 +- src/Netzmacht/Contao/Leaflet/Dca/Vector.php | 2 +- src/Netzmacht/Contao/Leaflet/Frontend/Hooks.php | 2 +- src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php | 2 +- src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php | 2 +- 18 files changed, 29 insertions(+), 29 deletions(-) diff --git a/composer.json b/composer.json index 6c38dee..f43d3b8 100644 --- a/composer.json +++ b/composer.json @@ -25,7 +25,7 @@ "netzmacht/contao-leaflet-libraries": "~0.7", "netzmacht/php-javascript-builder": "~1.0", "netzmacht/php-leaflet": "~0.7", - "netzmacht/contao-dev-tools":"~1.0", + "netzmacht/contao-toolkit":"~1.0", "bit3/contao-meta-palettes": "~1.5", "menatwork/contao-multicolumnwizard": "~3.2", "doctrine/cache": "~1.0" diff --git a/module/dca/tl_leaflet_control.php b/module/dca/tl_leaflet_control.php index e4f7e03..6177904 100644 --- a/module/dca/tl_leaflet_control.php +++ b/module/dca/tl_leaflet_control.php @@ -81,7 +81,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_control']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -166,7 +166,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_control'] = array 'inputType' => 'text', 'search' => true, '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/module/dca/tl_leaflet_icon.php b/module/dca/tl_leaflet_icon.php index b218be9..806908f 100644 --- a/module/dca/tl_leaflet_icon.php +++ b/module/dca/tl_leaflet_icon.php @@ -96,7 +96,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_icon']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -174,7 +174,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_icon'] = array 'exclude' => true, 'inputType' => 'text', '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/module/dca/tl_leaflet_layer.php b/module/dca/tl_leaflet_layer.php index 1cf3870..1d10ccd 100644 --- a/module/dca/tl_leaflet_layer.php +++ b/module/dca/tl_leaflet_layer.php @@ -128,7 +128,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_layer']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -261,7 +261,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_layer'] = array 'inputType' => 'text', 'search' => true, '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/module/dca/tl_leaflet_map.php b/module/dca/tl_leaflet_map.php index cd04eaf..fa05784 100644 --- a/module/dca/tl_leaflet_map.php +++ b/module/dca/tl_leaflet_map.php @@ -162,7 +162,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_map'] = array 'inputType' => 'text', 'search' => true, '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/module/dca/tl_leaflet_marker.php b/module/dca/tl_leaflet_marker.php index 78b8012..12bfb6d 100644 --- a/module/dca/tl_leaflet_marker.php +++ b/module/dca/tl_leaflet_marker.php @@ -97,7 +97,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_marker']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -172,7 +172,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_marker'] = array 'inputType' => 'text', 'search' => true, '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/module/dca/tl_leaflet_popup.php b/module/dca/tl_leaflet_popup.php index 2f55354..ef59223 100644 --- a/module/dca/tl_leaflet_popup.php +++ b/module/dca/tl_leaflet_popup.php @@ -96,7 +96,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_popup']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -160,7 +160,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_popup'] = array 'exclude' => true, 'inputType' => 'text', '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/module/dca/tl_leaflet_style.php b/module/dca/tl_leaflet_style.php index 2410dd1..0c8a6f3 100644 --- a/module/dca/tl_leaflet_style.php +++ b/module/dca/tl_leaflet_style.php @@ -95,7 +95,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_style']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -153,7 +153,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'exclude' => true, 'inputType' => 'text', '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), 'sql' => "varchar(255) NOT NULL default ''" @@ -189,7 +189,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'exclude' => true, 'inputType' => 'text', 'wizard' => array( - \Netzmacht\Contao\DevTools\Dca::createColorPickerCallback(), + \Netzmacht\Contao\Toolkit\Dca::createColorPickerCallback(), ), 'eval' => array( 'tl_class' => 'w50 wizard clr', @@ -230,7 +230,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_style'] = array 'exclude' => true, 'inputType' => 'text', 'wizard' => array( - \Netzmacht\Contao\DevTools\Dca::createColorPickerCallback(), + \Netzmacht\Contao\Toolkit\Dca::createColorPickerCallback(), ), 'eval' => array( 'tl_class' => 'clr w50 wizard', diff --git a/module/dca/tl_leaflet_vector.php b/module/dca/tl_leaflet_vector.php index 7322529..44c8944 100644 --- a/module/dca/tl_leaflet_vector.php +++ b/module/dca/tl_leaflet_vector.php @@ -104,7 +104,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'label' => &$GLOBALS['TL_LANG']['tl_leaflet_vector']['toggle'], 'icon' => 'visible.gif', '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', 'active' ) @@ -198,7 +198,7 @@ $GLOBALS['TL_DCA']['tl_leaflet_vector'] = array 'inputType' => 'text', 'search' => true, '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), 'sql' => "varchar(255) NOT NULL default ''" diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Control.php b/src/Netzmacht/Contao/Leaflet/Dca/Control.php index 858a225..5cf37f7 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/Control.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/Control.php @@ -11,8 +11,8 @@ namespace Netzmacht\Contao\Leaflet\Dca; -use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\DevTools\ServiceContainerTrait; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; +use Netzmacht\Contao\Toolkit\ServiceContainerTrait; use Netzmacht\Contao\Leaflet\Model\ControlModel; use Netzmacht\Contao\Leaflet\Model\LayerModel; diff --git a/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php b/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php index 7385f86..1bf1ded 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/FrontendIntegration.php @@ -11,7 +11,7 @@ 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; /** diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Layer.php b/src/Netzmacht/Contao/Leaflet/Dca/Layer.php index a153a11..d5afa99 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/Layer.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/Layer.php @@ -11,8 +11,8 @@ namespace Netzmacht\Contao\Leaflet\Dca; -use Netzmacht\Contao\DevTools\Dca\Options\OptionsBuilder; -use Netzmacht\Contao\DevTools\ServiceContainerTrait; +use Netzmacht\Contao\Toolkit\Dca\Options\OptionsBuilder; +use Netzmacht\Contao\Toolkit\ServiceContainerTrait; use Netzmacht\Contao\Leaflet\Model\LayerModel; /** diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Map.php b/src/Netzmacht/Contao/Leaflet/Dca/Map.php index 1751f4a..20788a2 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/Map.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/Map.php @@ -11,7 +11,7 @@ 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. diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Marker.php b/src/Netzmacht/Contao/Leaflet/Dca/Marker.php index d4f0ad8..b5e697c 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/Marker.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/Marker.php @@ -11,7 +11,7 @@ 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\PopupModel; diff --git a/src/Netzmacht/Contao/Leaflet/Dca/Vector.php b/src/Netzmacht/Contao/Leaflet/Dca/Vector.php index 53dadf7..adeb619 100644 --- a/src/Netzmacht/Contao/Leaflet/Dca/Vector.php +++ b/src/Netzmacht/Contao/Leaflet/Dca/Vector.php @@ -11,7 +11,7 @@ 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; /** diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/Hooks.php b/src/Netzmacht/Contao/Leaflet/Frontend/Hooks.php index 7d1c856..1f29c49 100644 --- a/src/Netzmacht/Contao/Leaflet/Frontend/Hooks.php +++ b/src/Netzmacht/Contao/Leaflet/Frontend/Hooks.php @@ -11,7 +11,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; -use Netzmacht\Contao\DevTools\ServiceContainerTrait; +use Netzmacht\Contao\Toolkit\ServiceContainerTrait; use Netzmacht\Contao\Leaflet\MapService; /** diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php b/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php index 67754bf..638ccec 100644 --- a/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php +++ b/src/Netzmacht/Contao/Leaflet/Frontend/MapElement.php @@ -12,7 +12,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; use ContentElement; -use Netzmacht\Contao\DevTools\ServiceContainerTrait; +use Netzmacht\Contao\Toolkit\ServiceContainerTrait; use Netzmacht\Contao\Leaflet\MapService; /** diff --git a/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php b/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php index 0769393..7b09da0 100644 --- a/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php +++ b/src/Netzmacht/Contao/Leaflet/Frontend/MapModule.php @@ -11,7 +11,7 @@ namespace Netzmacht\Contao\Leaflet\Frontend; -use Netzmacht\Contao\DevTools\ServiceContainerTrait; +use Netzmacht\Contao\Toolkit\ServiceContainerTrait; use Netzmacht\Contao\Leaflet\MapService; /**