wp icon and path for upload layout

astridx · Jun 12, 2019 · 0562a8e · 0562a8e
1 parent 4588446
commit 0562a8e
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 10 deletions.
diff --git a/agosms-update.xml b/agosms-update.xml
@@ -180,4 +180,22 @@
         <maintainerurl>https://astrid-guenther.de</maintainerurl>
         <targetplatform name="joomla" version="3.*"/>
     </update>
+    <update>
+        <name>pkg_agosms</name>
+        <description>pkg_agosms</description>
+        <element>pkg_agosms</element>
+        <type>package</type>
+        <client>site</client>
+        <version>1.0.36</version>
+        <infourl title="agosms">https://github.com/astridx/pkg_agosms/blob/v1.0.36/README.md</infourl>
+        <downloads>
+            <downloadurl type="full" format="zip">https://github.com/astridx/pkg_agosms/releases/download/v1.0.36/pkg-agosms.zip</downloadurl>
+        </downloads>
+        <tags>
+            <tag>stable</tag>
+        </tags>
+        <maintainer>Astrid Günther</maintainer>
+        <maintainerurl>https://astrid-guenther.de</maintainerurl>
+        <targetplatform name="joomla" version="3.*"/>
+    </update>
 </updates>
diff --git a/dist/current b/dist/current
@@ -1 +1 @@
-/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.35
+/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.36
diff --git a/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml b/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml
@@ -2,12 +2,12 @@
 <extension type="component" version="3.5" method="upgrade">
         <name>com_agosms</name>
 	<author>Astrid Günther</author>
-	<creationDate>2019-06-08</creationDate>
+	<creationDate>2019-06-12</creationDate>
 	<copyright>(C) 2019 Open Source Matters. All rights reserved.</copyright>
 	<license>GNU General Public License version 2 or later;</license>
 	<authorEmail>info@astrid-guenther.de</authorEmail>
 	<authorUrl>www.astrid-guenther.de</authorUrl>
-	<version>1.0.35</version>
+	<version>1.0.36</version>
 	<description>COM_AGOSMS_XML_DESCRIPTION</description>
 	<scriptfile>script.php</scriptfile>
 

diff --git a/dist/zips/com_agosms.zip b/dist/zips/com_agosms.zip
diff --git a/dist/zips/mod_agosm.zip b/dist/zips/mod_agosm.zip
diff --git a/jorobo.ini b/jorobo.ini
@@ -1,5 +1,5 @@
 extension = agosms
-version = 1.0.35
+version = 1.0.36
 source = src
 target = package
 

diff --git a/src/media/mod_agosm/js/aggpxtrack.js b/src/media/mod_agosm/js/aggpxtrack.js
@@ -12,20 +12,21 @@ document.addEventListener('DOMContentLoaded', function () {
 		var wptIconUrls = element.getAttribute('data-wptIconUrls');
 
 		var gpxfilenames = gpx_file_name.split(';;');
-
+		
 		var group = L.featureGroup([]);
 		window['mymap' + moduleId].fitBounds([[0, 0],[0, 0]]);
 
 		for (var i = 0; i < gpxfilenames.length; i++) {
+			console.log(gpxfilenames[i]);
 			new L.GPX(gpxfilenames[i],
 				{
 					marker_options: {
 						startIconUrl: startIconUrl,
 						endIconUrl: endIconUrl,
-						shadowUrl: shadowIconUrl
-					},
-					wptIconUrls: {
-						'': wptIconUrls
+						shadowUrl: shadowIconUrl,
+						wptIconUrls: {
+							'': wptIconUrls
+						}
 					},
 					async: true
 				}).on('loaded', function (e) {

diff --git a/src/modules/mod_agosm/tmpl/upload.php b/src/modules/mod_agosm/tmpl/upload.php
@@ -39,7 +39,7 @@
 {
 	for ($i = 0; $i < $total; $i++)
 	{
-		$gpxfile .= $result[$i]['rpath'] . DIRECTORY_SEPARATOR . $_FILES[$params->get('ag_variable')]["name"][$i] . ';;';
+		$gpxfile .= JURI::base() . $result[$i]['rpath'] . DIRECTORY_SEPARATOR . $_FILES[$params->get('ag_variable')]["name"][$i] . ';;';
 	}
 }
 $startIconUrl = JURI::base() . 'media/mod_agosm/leaflet-gpx/pin-icon-start.png';