From f446c0492ab105cbf3be9126012127a7831b176a Mon Sep 17 00:00:00 2001 From: David Molineus Date: Tue, 6 Jan 2015 18:49:01 +0100 Subject: [PATCH] Restructure libraries. --- {module/public => assets}/geojson.php | 4 ++-- .../libs}/control-geocoder/Control.Geocoder.css | 0 .../libs}/control-geocoder/Control.Geocoder.js | 0 .../libs}/control-geocoder/LICENSE | 0 .../libs}/control-geocoder/README.md | 0 .../libs}/control-geocoder/images/geocoder.png | Bin .../libs}/control-geocoder/images/throbber.gif | Bin .../libs}/control-geocoder/package.json | 0 .../leaflet => assets/libs}/leaflet-ajax/README.md | 0 .../libs}/leaflet-ajax/leaflet.ajax.js | 0 .../libs}/leaflet-ajax/leaflet.ajax.min.js | 0 .../leaflet => assets/libs}/leaflet-ajax/license.md | 0 .../libs}/leaflet-ajax/package.json | 0 .../libs}/leaflet-providers/CONTRIBUTING.md | 0 .../libs}/leaflet-providers/README.md | 0 .../libs}/leaflet-providers/bower.json | 0 .../libs}/leaflet-providers/index.html | 0 .../libs}/leaflet-providers/leaflet-providers.js | 0 .../libs}/leaflet-providers/license.md | 0 .../libs}/leaflet-providers/package.json | 0 .../libs}/leaflet/images/layers-2x.png | Bin .../libs}/leaflet/images/layers.png | Bin .../libs}/leaflet/images/marker-icon-2x.png | Bin .../libs}/leaflet/images/marker-icon.png | Bin .../libs}/leaflet/images/marker-shadow.png | Bin .../leaflet => assets/libs}/leaflet/leaflet-src.js | 0 .../leaflet => assets/libs}/leaflet/leaflet.css | 0 .../leaflet => assets/libs}/leaflet/leaflet.js | 0 28 files changed, 2 insertions(+), 2 deletions(-) rename {module/public => assets}/geojson.php (64%) rename {module/assets/leaflet => assets/libs}/control-geocoder/Control.Geocoder.css (100%) rename {module/assets/leaflet => assets/libs}/control-geocoder/Control.Geocoder.js (100%) rename {module/assets/leaflet => assets/libs}/control-geocoder/LICENSE (100%) rename {module/assets/leaflet => assets/libs}/control-geocoder/README.md (100%) rename {module/assets/leaflet => assets/libs}/control-geocoder/images/geocoder.png (100%) rename {module/assets/leaflet => assets/libs}/control-geocoder/images/throbber.gif (100%) rename {module/assets/leaflet => assets/libs}/control-geocoder/package.json (100%) rename {module/assets/leaflet => assets/libs}/leaflet-ajax/README.md (100%) rename {module/assets/leaflet => assets/libs}/leaflet-ajax/leaflet.ajax.js (100%) rename {module/assets/leaflet => assets/libs}/leaflet-ajax/leaflet.ajax.min.js (100%) rename {module/assets/leaflet => assets/libs}/leaflet-ajax/license.md (100%) rename {module/assets/leaflet => assets/libs}/leaflet-ajax/package.json (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/CONTRIBUTING.md (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/README.md (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/bower.json (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/index.html (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/leaflet-providers.js (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/license.md (100%) rename {module/assets/leaflet => assets/libs}/leaflet-providers/package.json (100%) rename {module/assets/leaflet => assets/libs}/leaflet/images/layers-2x.png (100%) rename {module/assets/leaflet => assets/libs}/leaflet/images/layers.png (100%) rename {module/assets/leaflet => assets/libs}/leaflet/images/marker-icon-2x.png (100%) rename {module/assets/leaflet => assets/libs}/leaflet/images/marker-icon.png (100%) rename {module/assets/leaflet => assets/libs}/leaflet/images/marker-shadow.png (100%) rename {module/assets/leaflet => assets/libs}/leaflet/leaflet-src.js (100%) rename {module/assets/leaflet => assets/libs}/leaflet/leaflet.css (100%) rename {module/assets/leaflet => assets/libs}/leaflet/leaflet.js (100%) diff --git a/module/public/geojson.php b/assets/geojson.php similarity index 64% rename from module/public/geojson.php rename to assets/geojson.php index e9cff61..7d0159c 100644 --- a/module/public/geojson.php +++ b/assets/geojson.php @@ -3,9 +3,9 @@ use Netzmacht\Contao\Leaflet\Controller\GeoJsonController; define('TL_MODE', 'FE'); -require(dirname(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME'])))) . '/initialize.php'); +require(dirname(dirname(dirname($_SERVER['SCRIPT_FILENAME']))) . '/system/initialize.php'); $container = $GLOBALS['container']; $controller = new GeoJsonController($container['leaflet.map.service'], $container['input']); -echo $controller->execute(); +$controller->execute(); diff --git a/module/assets/leaflet/control-geocoder/Control.Geocoder.css b/assets/libs/control-geocoder/Control.Geocoder.css similarity index 100% rename from module/assets/leaflet/control-geocoder/Control.Geocoder.css rename to assets/libs/control-geocoder/Control.Geocoder.css diff --git a/module/assets/leaflet/control-geocoder/Control.Geocoder.js b/assets/libs/control-geocoder/Control.Geocoder.js similarity index 100% rename from module/assets/leaflet/control-geocoder/Control.Geocoder.js rename to assets/libs/control-geocoder/Control.Geocoder.js diff --git a/module/assets/leaflet/control-geocoder/LICENSE b/assets/libs/control-geocoder/LICENSE similarity index 100% rename from module/assets/leaflet/control-geocoder/LICENSE rename to assets/libs/control-geocoder/LICENSE diff --git a/module/assets/leaflet/control-geocoder/README.md b/assets/libs/control-geocoder/README.md similarity index 100% rename from module/assets/leaflet/control-geocoder/README.md rename to assets/libs/control-geocoder/README.md diff --git a/module/assets/leaflet/control-geocoder/images/geocoder.png b/assets/libs/control-geocoder/images/geocoder.png similarity index 100% rename from module/assets/leaflet/control-geocoder/images/geocoder.png rename to assets/libs/control-geocoder/images/geocoder.png diff --git a/module/assets/leaflet/control-geocoder/images/throbber.gif b/assets/libs/control-geocoder/images/throbber.gif similarity index 100% rename from module/assets/leaflet/control-geocoder/images/throbber.gif rename to assets/libs/control-geocoder/images/throbber.gif diff --git a/module/assets/leaflet/control-geocoder/package.json b/assets/libs/control-geocoder/package.json similarity index 100% rename from module/assets/leaflet/control-geocoder/package.json rename to assets/libs/control-geocoder/package.json diff --git a/module/assets/leaflet/leaflet-ajax/README.md b/assets/libs/leaflet-ajax/README.md similarity index 100% rename from module/assets/leaflet/leaflet-ajax/README.md rename to assets/libs/leaflet-ajax/README.md diff --git a/module/assets/leaflet/leaflet-ajax/leaflet.ajax.js b/assets/libs/leaflet-ajax/leaflet.ajax.js similarity index 100% rename from module/assets/leaflet/leaflet-ajax/leaflet.ajax.js rename to assets/libs/leaflet-ajax/leaflet.ajax.js diff --git a/module/assets/leaflet/leaflet-ajax/leaflet.ajax.min.js b/assets/libs/leaflet-ajax/leaflet.ajax.min.js similarity index 100% rename from module/assets/leaflet/leaflet-ajax/leaflet.ajax.min.js rename to assets/libs/leaflet-ajax/leaflet.ajax.min.js diff --git a/module/assets/leaflet/leaflet-ajax/license.md b/assets/libs/leaflet-ajax/license.md similarity index 100% rename from module/assets/leaflet/leaflet-ajax/license.md rename to assets/libs/leaflet-ajax/license.md diff --git a/module/assets/leaflet/leaflet-ajax/package.json b/assets/libs/leaflet-ajax/package.json similarity index 100% rename from module/assets/leaflet/leaflet-ajax/package.json rename to assets/libs/leaflet-ajax/package.json diff --git a/module/assets/leaflet/leaflet-providers/CONTRIBUTING.md b/assets/libs/leaflet-providers/CONTRIBUTING.md similarity index 100% rename from module/assets/leaflet/leaflet-providers/CONTRIBUTING.md rename to assets/libs/leaflet-providers/CONTRIBUTING.md diff --git a/module/assets/leaflet/leaflet-providers/README.md b/assets/libs/leaflet-providers/README.md similarity index 100% rename from module/assets/leaflet/leaflet-providers/README.md rename to assets/libs/leaflet-providers/README.md diff --git a/module/assets/leaflet/leaflet-providers/bower.json b/assets/libs/leaflet-providers/bower.json similarity index 100% rename from module/assets/leaflet/leaflet-providers/bower.json rename to assets/libs/leaflet-providers/bower.json diff --git a/module/assets/leaflet/leaflet-providers/index.html b/assets/libs/leaflet-providers/index.html similarity index 100% rename from module/assets/leaflet/leaflet-providers/index.html rename to assets/libs/leaflet-providers/index.html diff --git a/module/assets/leaflet/leaflet-providers/leaflet-providers.js b/assets/libs/leaflet-providers/leaflet-providers.js similarity index 100% rename from module/assets/leaflet/leaflet-providers/leaflet-providers.js rename to assets/libs/leaflet-providers/leaflet-providers.js diff --git a/module/assets/leaflet/leaflet-providers/license.md b/assets/libs/leaflet-providers/license.md similarity index 100% rename from module/assets/leaflet/leaflet-providers/license.md rename to assets/libs/leaflet-providers/license.md diff --git a/module/assets/leaflet/leaflet-providers/package.json b/assets/libs/leaflet-providers/package.json similarity index 100% rename from module/assets/leaflet/leaflet-providers/package.json rename to assets/libs/leaflet-providers/package.json diff --git a/module/assets/leaflet/leaflet/images/layers-2x.png b/assets/libs/leaflet/images/layers-2x.png similarity index 100% rename from module/assets/leaflet/leaflet/images/layers-2x.png rename to assets/libs/leaflet/images/layers-2x.png diff --git a/module/assets/leaflet/leaflet/images/layers.png b/assets/libs/leaflet/images/layers.png similarity index 100% rename from module/assets/leaflet/leaflet/images/layers.png rename to assets/libs/leaflet/images/layers.png diff --git a/module/assets/leaflet/leaflet/images/marker-icon-2x.png b/assets/libs/leaflet/images/marker-icon-2x.png similarity index 100% rename from module/assets/leaflet/leaflet/images/marker-icon-2x.png rename to assets/libs/leaflet/images/marker-icon-2x.png diff --git a/module/assets/leaflet/leaflet/images/marker-icon.png b/assets/libs/leaflet/images/marker-icon.png similarity index 100% rename from module/assets/leaflet/leaflet/images/marker-icon.png rename to assets/libs/leaflet/images/marker-icon.png diff --git a/module/assets/leaflet/leaflet/images/marker-shadow.png b/assets/libs/leaflet/images/marker-shadow.png similarity index 100% rename from module/assets/leaflet/leaflet/images/marker-shadow.png rename to assets/libs/leaflet/images/marker-shadow.png diff --git a/module/assets/leaflet/leaflet/leaflet-src.js b/assets/libs/leaflet/leaflet-src.js similarity index 100% rename from module/assets/leaflet/leaflet/leaflet-src.js rename to assets/libs/leaflet/leaflet-src.js diff --git a/module/assets/leaflet/leaflet/leaflet.css b/assets/libs/leaflet/leaflet.css similarity index 100% rename from module/assets/leaflet/leaflet/leaflet.css rename to assets/libs/leaflet/leaflet.css diff --git a/module/assets/leaflet/leaflet/leaflet.js b/assets/libs/leaflet/leaflet.js similarity index 100% rename from module/assets/leaflet/leaflet/leaflet.js rename to assets/libs/leaflet/leaflet.js