Ongoing development.

This commit is contained in:
David Molineus
2014-12-29 16:23:08 +01:00
parent e5d11e8ed6
commit ee9d293d2e
8 changed files with 60 additions and 20 deletions

View File

@@ -54,7 +54,7 @@ class ContaoAssets implements Assets
break;
case static::TYPE_FILE:
$stylesheet .= '||static';
$stylesheet .= '|all|static';
// no break
default:

View File

@@ -14,6 +14,7 @@ namespace Netzmacht\Contao\Leaflet\Dca;
use Netzmacht\Contao\Leaflet\Mapper\DefinitionMapper;
use Netzmacht\Contao\Leaflet\Mapper\MapMapper;
use Netzmacht\Contao\Leaflet\Model\LayerModel;
use Netzmacht\Contao\Leaflet\Model\MapModel;
use Netzmacht\LeafletPHP\Definition\Type\LatLng;
@@ -60,4 +61,17 @@ class Leaflet
return $template->parse();
}
public function getLayers()
{
$options = array();
$collection = LayerModel::findBy('pid', '0', array('order' => 'title'));
if ($collection) {
foreach ($collection as $model) {
$options[$model->id] = $model->title;
}
}
return $options;
}
}

View File

@@ -112,6 +112,6 @@ class BootSubscriber implements EventSubscriberInterface
*/
public function loadAssets()
{
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/leaflet/assets/js/contao-leaflet.js';
$GLOBALS['TL_JAVASCRIPT'][] = 'system/modules/leaflet/assets/js/contao-leaflet.js|static';
}
}

View File

@@ -47,14 +47,11 @@ class EncoderSubscriber implements EventSubscriberInterface
if ($object instanceof Map) {
$attribution = <<<HTML
map.attributionControl.addAttribution(
map.map.attributionControl.addAttribution(
'<a href="http://www.netzmacht.de/contao-leaflet">netzmacht <em>creative</em></a>'
);
HTML;
$event->getOutput()->addLine($attribution);
$event->getOutput()->addLine("var tileLayer = new L.TileLayer('http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png', { attribution: \"test\"});
tileLayer.addTo(map);");
}
}