diff --git a/README.md b/README.md index 9153dec0..6a2b9379 100644 --- a/README.md +++ b/README.md @@ -48,7 +48,10 @@ a route to the address you entered in the back end. ### Show markers on a map that link to an article - you can enter the coordinate in a Custom Field -The next picture shows what the map might look like. If the markers are too close together, they will be clustered. If the resolution of the card fits, the marker will be displayed. A click on the marker opens a popup. In this popup there is a link to the post - link text is the title of the article. +The next picture shows what the map might look like. If the markers are too close together, +they will be clustered. If the resolution of the card fits, the marker will be displayed. +A click on the marker opens a popup. In this popup there is a link to the post - link text is +the title of the article. ![Home](https://user-images.githubusercontent.com/9974686/58746148-263e0580-845b-11e9-8b30-374c4256f46e.png) @@ -60,10 +63,32 @@ Any article with the custom field filled with a correct coordinate will be displ ![Articles Fields test Administration](https://user-images.githubusercontent.com/9974686/58746149-26d69c00-845b-11e9-920b-f5309b98ff37.png) +If you want to use different colors or icons, you can fill the custom field with the title `lat, lon` as +follows: `lat,lon,markercolor,iconcolor,icon`. +As color, you can choose red, darkred, orange, green, darkgreen, blue, purple, darkpurple and cardetblue. +For the icon you can choose the name of the Font Awesome Icon. +For more informations see https://fontawesome.com/icons?d=gallery. + +When you enter `50.150, 7.158, red, green, home` you will see an icon as shown in the next picture. + +![Custom Marker](https://user-images.githubusercontent.com/9974686/59145384-7250f300-89e3-11e9-96c8-772a0f63ff7e.png) + + The next picture shows where you can activate the option in the module. ![Modules AGOSM Module test Administration](https://user-images.githubusercontent.com/9974686/58746150-276f3280-845b-11e9-9678-7521c89fbe80.png) +Maybe you do not want to show the field lat lon in the frontend. +Just select the option `Do not automatically display` in the Custom Field options. + +![Beiträge Feld bearbeiten Administration](https://user-images.githubusercontent.com/9974686/59145428-19358f00-89e4-11e9-8446-6079f655e0d8.png) + +## GPX - Fileupload + +Please choose the layout `upload` +if you want to allow a user to upload a GPX file to the server and view it on the map. + +![Module AGOSM Modul Administration](https://user-images.githubusercontent.com/9974686/59145427-189cf880-89e4-11e9-8900-4a4b7f30e44e.png) ## Component diff --git a/agosms-update.xml b/agosms-update.xml index 70a75e79..6a82a3d7 100644 --- a/agosms-update.xml +++ b/agosms-update.xml @@ -162,4 +162,22 @@ https://astrid-guenther.de + + pkg_agosms + pkg_agosms + pkg_agosms + package + site + 1.0.35 + https://github.com/astridx/pkg_agosms/blob/v1.0.35/README.md + + https://github.com/astridx/pkg_agosms/releases/download/v1.0.35/pkg-agosms.zip + + + stable + + Astrid Günther + https://astrid-guenther.de + + \ No newline at end of file diff --git a/dist/current b/dist/current index b2d6d90e..101434dd 120000 --- a/dist/current +++ b/dist/current @@ -1 +1 @@ -/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.34 \ No newline at end of file +/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.35 \ No newline at end of file diff --git a/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml b/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml index 84f77a61..fdad8947 100644 --- a/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml +++ b/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml @@ -7,7 +7,7 @@ GNU General Public License version 2 or later; info@astrid-guenther.de www.astrid-guenther.de - 1.0.34 + 1.0.35 COM_AGOSMS_XML_DESCRIPTION script.php diff --git a/dist/zips/com_agosms.zip b/dist/zips/com_agosms.zip index 85abe02a..e8fc9088 100644 Binary files a/dist/zips/com_agosms.zip and b/dist/zips/com_agosms.zip differ diff --git a/dist/zips/mod_agosm.zip b/dist/zips/mod_agosm.zip index 68d635b9..f918d920 100644 Binary files a/dist/zips/mod_agosm.zip and b/dist/zips/mod_agosm.zip differ diff --git a/src/modules/mod_agosm/helper.php b/src/modules/mod_agosm/helper.php index 4f5ec96c..8bca8e38 100644 --- a/src/modules/mod_agosm/helper.php +++ b/src/modules/mod_agosm/helper.php @@ -197,9 +197,9 @@ public static function getListCustomField(&$params) $access = !JComponentHelper::getParams('com_agosms')->get('show_noauth'); $model->setState('filter.access', $access); - $ordering = $params->get('ordering', 'ordering'); +/* $ordering = $params->get('ordering', 'ordering'); $model->setState('list.ordering', $ordering == 'order' ? 'ordering' : $ordering); - $model->setState('list.direction', $params->get('direction', 'asc')); + $model->setState('list.direction', $params->get('direction', 'asc'));*/ $catid = (int) $params->get('catid', 0); $model->setState('category.id', $catid);