From bd779aff23a0cd4debac41675f3d5f3845eb8de7 Mon Sep 17 00:00:00 2001 From: astridx Date: Sat, 8 Jun 2019 11:57:13 +0200 Subject: [PATCH] v35 --- README.md | 27 +++++++++++++++++- agosms-update.xml | 18 ++++++++++++ dist/current | 2 +- .../components/com_agosms/agosms.xml | 2 +- dist/zips/com_agosms.zip | Bin 116080 -> 116080 bytes dist/zips/mod_agosm.zip | Bin 1691394 -> 1691402 bytes src/modules/mod_agosm/helper.php | 4 +-- 7 files changed, 48 insertions(+), 5 deletions(-) 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 85abe02a9f92799d62b8451a793d62719954be57..e8fc9088db22456013a743c331f8fb07c513accd 100644 GIT binary patch delta 4077 zcmeHK`CrWI7w<^>G$rYlEEUPOtA&yX$r2hWSt5K}(B|6+i72D8E7JJ-P)ebdYBHut zOP2O=Nft6 zaLqJIaQdXCppaxDjMmZ>Rvgh28hNUSLp@0fLbnz>ra=mt!g60iciWf7w%9O@jDt4i zX(F9|lq*7D)G`cmElRA0xb?srQh@iNPo&&8E9@Be3{X?2ldQ^4vN-KXmI~S~6jmUk zP$P8#4wt9i8H{LpUK#Tyi5$xUtsh+@v#p3OFK;fIe8{UsD9vAl(AZ`tbfojPw!o8> zh>HrYDIAl?6ckDY}|c{$DVCbu@&~%H)pxFYKI)G(XQL&yzA+>!iz~7r!^!Ej_(uvyd>Hl zbuQiFI9J2EfH5EBa`|ue6}!@Q{WANg15*|y4|J@}(GmQ|cW&oxq4(2gb$0`{f1dLB z!*hQAE5`HlFXfT_AA97btDWV$Rgc8(OGuFOA51WGp8s;_N1a>KETdEpezCbS^ku-p z!WXqM8d!+w8g+2|wS8kTs8Tl^0f zh3M7I7<;2T!FHpdnP)C?DwioMHs8Kz9Xey}fz5rFLT>H&+TXZpc74biTki1RPp0_C zebCb9#oj!d*ZPNQnAK~p<^8Fs6mm4l~4ByNTbGMyf zzS3-&`-QaQ-{u;{i~6@OyO!VcSaG4z=WRuXeeqRZJNITc+%m8*6|{bdo+ygT?C6SL z{YY`++L))+HN&`Ht(@#s^qg{Dtu#n&A3AAP%Z*hv?#YXb zt1B5jME*X=+_+5U($~(9se|zlPDuZ%Kt66K~r}TGjkER5@d2%x^T>nX; zLkyE7GugIrWQ0PDmExwfv93Z-8Napjf&NED9bKioZgGdliD)Hny{hG}8TwSk~vf0*GqTkrI+vt*Rz|cwD9>37haywC6`2M3s{_{D`$@!WyEHwu* z>;~^zvPbe{kaqM@#|4i%4F=M_M#hBOtUMU(9bPhCYp(cLhcVBlj-CFbt2Hrw zpn&^UeaN%rCeBkBmFHrCf;;c~*~Z>0Y^rd^Q*2mC4s%fD5`%7xwoW(Wrd zCLzcMW}S!7cjFWhsT!)WmUn=%s_0+xyQG=!o`97=t7uoDZHK3xnl5+unD<`Bx~9^ix? zCQAVqP#U}xl5sAiDr;diNn^ba!~wZ`BpR0IYZVm~_`{e`AF!9&`9TvQ(eQ_Q^l9;j zd_sRX5PHcRv5Cw<`pOVkfEF5j_<$}&TYyh83Jrq@GBZ6p;0YnS5eYNUMI{PmqYEzz z>WGCw3}_)cV;&1~)O?7AI;H>J42=8`nEkvOeqIefuZI7ds{vn((u{aWC0%LWDZqxx zM4X~0y!aI06PWq)6#N^}>ohD!EIbXX5IISJFJ)#<5;!34NrI(_%}L;fI4+sW*CkVV zaWa*wogpoinRkXZAJ-xn!DOBR{9(W}p8;P)`xIDoW$=1}MV=1}F|IkdbDx#0CfpUtHdN6T2(sTb*7 z6Q1K2DNoZyTDjdN*o;APEFqcK-x?=tm(P;`Qq)f!}ec=z5?w6_Msmtsg$a3n6VIyL+7oFcGC}xJ?qebI(iY?DtFPeqcAxLNq>IMCE-&bO$e#(w&$jrK|E$ z3iu#m<`)A#M404az;_b!x)@v#CtrmXi1AmczWplQ(RL;DBpfdR{JqAsmry^eQgWSQ zazvh1!6w;NN;4lNqg!eBcWjlxYIJreqe-yqMuNR8qpR$8jaFWIjjr0La*EOAbnCR0 zQ@&Xh6xm?p82(W~i*u`_t5i}6>oCsfDvEon=oWoh1^9epCRfwq4pq}F+w~otYG{#X SYJS{hf7gIDdRbqGS^og5@nBy7 delta 4077 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 P)?Wws6P~fI2j_nPAY9^^ diff --git a/dist/zips/mod_agosm.zip b/dist/zips/mod_agosm.zip index 68d635b9dcab1bcc6084ae904b74b00ffb2da40f..f918d92022862972b3212c6acfd95c9f1df906dc 100644 GIT binary patch delta 3761 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'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);