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

Update some about details.

Browse Source
This commit is contained in:
David Molineus
2015-01-19 11:32:22 +01:00
parent abab5e4dc5
commit 5b6f56d9f7
5 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
CREDITS.md
View File

@@ -1,5 +0,0 @@
Layers icon
[Fatcow Web Hosting](http://www.fatcow.com/free-icons)
http://creativecommons.org/licenses/by/4.0/

3
README.md
View File

@@ -48,3 +48,6 @@ Credits
The integrated icons are part of the [Farm Fresh Web Icons](http://www.fatcow.com/free-icons) and are licensed under the
[CC BY 3.0 US](http://creativecommons.org/licenses/by/3.0/us/)
The about icon is part of the [Web Blog Icons by SEM Labs](http://semlabs.co.uk/) and is licensed under the
[CC BY 4.0](http://creativecommons.org/licenses/by/4.0/).

2
module/config/autoload.php
View File

@@ -16,6 +16,6 @@ TemplateLoader::addFiles(
'leaflet_map_html' => 'system/modules/leaflet/templates',
'mod_leaflet_map' => 'system/modules/leaflet/templates',
'be_leaflet_geocode' => 'system/modules/leaflet/templates',
'be_leaflet_credits' => 'system/modules/leaflet/templates',
'be_leaflet_about' => 'system/modules/leaflet/templates',
)
);

19
module/templates/be_leaflet_credits.html5 → module/templates/be_leaflet_about.html5
View File

@@ -13,7 +13,7 @@
<p>
This software ships with an visible attribution to <em>netzmacht creative</em> in the map attribution control.
If you want to remove this attribution, you have to purchase a commercial license.
For more details see the <a href="http://contao-leaflet.netzmacht.de" target="_blank">project website</a>.
For more details visit the <a href="http://contao-leaflet.netzmacht.de" target="_blank">project website</a>.
</p>
</div>
<div class="right">
@@ -41,11 +41,26 @@
<h2>Support Contao Leaflet</h2>
<div class="row">
<div class="col">
<h3>Report issues</h3>
<p>If you found a bug, got some troubles or have a feature request - feel free to open an issue.</p>
<p><a href="http://github.com/netzmacht/contao-leaflet-maps/issues" class="btn" target="_blank">Issue tracker</a> </p>
</div>
<div class="col">
<h3>Contribute</h3>
<p>There are many ways you can con&shy;tribute. Translations,
docu&shy;mentation or code contributions are welcome.
</p>
<p><a href="http://contao-leaflet.netzmacht.de/contribute.html" class="btn" target="_blank">Contribute</a> </p>
</div>
<div class="col">
<h3>Fund a feature</h3>
<p>Contao Leaflet is not feature complete. Have a look at the list of planned feature and support them.</p>
<p><a href="http://contao-leaflet.netzmacht.de/panned-features.html" class="btn" target="_blank">Planned features</a> </p>
<p><a href="http://contao-leaflet.netzmacht.de/planned-features.html" class="btn" target="_blank">Planned features</a> </p>
</div>
</div>
<div class="row">
<div class="col">
<h3>Individual development</h3>
<p>If you have special requirements you can hire me for an individual development.</p>

14
src/Netzmacht/Contao/Leaflet/Backend/About.php
View File

@@ -25,7 +25,7 @@ class About
*/
public function generate()
{
$template = new \BackendTemplate('be_leaflet_credits');
$template = new \BackendTemplate('be_leaflet_about');
$template->headline = 'Leaftlet maps integration for Contao CMS';
$template->libraries = $this->getLibraries();
@@ -81,22 +81,22 @@ class About
*/
private function extractFromComposer()
{
$local = TL_ROOT . '/composer/vendor/netzmacht/contao-leaflet-maps/composer.json';
$composer = TL_ROOT . '/composer/composer.lock';
$extFile = TL_ROOT . '/composer/vendor/netzmacht/contao-leaflet-maps/composer.json';
$lockFile = TL_ROOT . '/composer/composer.lock';
if (!file_exists($local)) {
if (!file_exists($extFile) || !file_exists($lockFile)) {
return array();
}
$local = json_decode(file_get_contents($local), true);
$installed = json_decode(file_get_contents($composer), true);
$extension = json_decode(file_get_contents($extFile), true);
$installed = json_decode(file_get_contents($lockFile), true);
$deps = array();
$version = null;
foreach ($installed['packages'] as $package) {
if ($package['name'] === 'netzmacht/contao-leaflet-maps') {
$version = $package['version'];
} elseif (isset($local['require'][$package['name']])) {
} elseif (isset($extension['require'][$package['name']])) {
$deps[] = array(
'name' => $package['name'],
'version' => $package['version'],