Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge-with-meeting-map #453

Merged
merged 64 commits into from
Jan 3, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
64 commits
Select commit Hold shift + click to select a range
d87012e
testing
otrok7 Nov 17, 2023
2abf886
filtering crouton from map, handlebars in map
otrok7 Nov 17, 2023
d8ca0b2
menu, rough
otrok7 Nov 19, 2023
ded0d6c
adjest table view window
otrok7 Nov 20, 2023
f5dca39
start work on admin page
otrok7 Nov 20, 2023
0d9f700
testing
otrok7 Nov 17, 2023
d023afe
filtering crouton from map, handlebars in map
otrok7 Nov 17, 2023
a6b40e2
menu, rough
otrok7 Nov 19, 2023
de0e31d
adjest table view window
otrok7 Nov 20, 2023
5628ecb
start work on admin page
otrok7 Nov 20, 2023
c177c2c
Merge branch 'merge-with-meeting-map' of https://github.com/bmlt-enab…
otrok7 Nov 21, 2023
013e1bd
backup
otrok7 Nov 21, 2023
2b6e474
render table, meetingMap or croutonMap
otrok7 Nov 22, 2023
6b52fc9
Add language to map parameters
otrok7 Nov 22, 2023
c6b8805
Merge branch 'main' into merge-with-meeting-map
otrok7 Nov 23, 2023
3f623b7
OSM MarkerCluster
otrok7 Nov 23, 2023
894f83a
GoogleMaps Clusters
otrok7 Nov 24, 2023
8d30a29
Meeting Map completely replaces the old default
otrok7 Nov 26, 2023
f70820a
fix createMap in Handlebars
otrok7 Nov 27, 2023
bb24a0c
switch to bugfix main mode
otrok7 Nov 27, 2023
beb804e
Merge branch 'main' into merge-with-meeting-map
otrok7 Nov 27, 2023
cd6a6a7
working on crouton_map
otrok7 Nov 29, 2023
632ac72
Click to search
otrok7 Nov 30, 2023
ec00fdb
Geolocation in crouton_map now works
otrok7 Dec 1, 2023
5bab80b
Marker contents template in UI
otrok7 Dec 1, 2023
1764e12
bug fix
otrok7 Dec 2, 2023
fb630d0
croutonjs uses OSM
otrok7 Dec 2, 2023
bf1cff7
bug fix with filters on meeting_map
otrok7 Dec 3, 2023
4dbe531
Localizations
otrok7 Dec 3, 2023
839afa1
version bump
otrok7 Dec 3, 2023
d8a1805
fix for case sensitivity
otrok7 Dec 3, 2023
90fcd3c
test with ketchup
otrok7 Dec 4, 2023
187643c
build croutonjs also with gmaps
otrok7 Dec 5, 2023
c368bac
Merge branch 'main' into merge-with-meeting-map
otrok7 Dec 6, 2023
345be39
add spiderify to gMaps
otrok7 Dec 6, 2023
aa0f321
solve some timing issues
otrok7 Dec 7, 2023
b8d51e3
Add upcoming meetings toggle
otrok7 Dec 7, 2023
d89547f
switch labels
otrok7 Dec 7, 2023
8ec82f2
fix region dropdown
otrok7 Dec 8, 2023
66375f4
italian translations
otrok7 Dec 8, 2023
bfbff27
Admin page has multiselect for dropdown filters
otrok7 Dec 9, 2023
b6b2cae
fix for tomato formats
otrok7 Dec 10, 2023
b233f0f
tabbify admin page
otrok7 Dec 10, 2023
dfd8124
Add more elements to admin-UI
otrok7 Dec 10, 2023
1787847
fix map dragging when modal is open
otrok7 Dec 10, 2023
fe7881f
Documentation fixes
otrok7 Dec 11, 2023
b07c6ff
bug fixes
otrok7 Dec 12, 2023
06ebfcd
bug fix throbber
otrok7 Dec 12, 2023
c773203
bug fix
otrok7 Dec 20, 2023
666d5e2
Add Meeting-Details Modal
otrok7 Dec 21, 2023
a00e45f
CSS corrections (hopefully)
otrok7 Dec 21, 2023
ec86678
more css
otrok7 Dec 21, 2023
94cc7e3
restore filter
otrok7 Dec 22, 2023
4f5b94b
adjust css
otrok7 Dec 23, 2023
e5ccc4e
Modal popup multilingual
otrok7 Dec 23, 2023
d532827
fix for search_map
otrok7 Dec 24, 2023
9ee65fd
default dropdowns in croutonjs
otrok7 Dec 24, 2023
d3d5dee
fix to search_map default values
otrok7 Dec 25, 2023
febd963
meetingmodal is default
otrok7 Dec 25, 2023
dc0ee1a
map_search parameters as shortcode attributes
otrok7 Dec 26, 2023
644244a
start throbber early
otrok7 Dec 26, 2023
4fc3d78
move fitBounds
otrok7 Dec 27, 2023
1a69521
nominatim url set by default
otrok7 Dec 28, 2023
25e251d
Almost always set hasMap to true
otrok7 Dec 29, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
468 changes: 254 additions & 214 deletions crouton.php

Large diffs are not rendered by default.

Binary file added croutonjs/dist/templates/NAMarker.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added croutonjs/dist/templates/NAMarkerG.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added croutonjs/dist/templates/NAMarkerSel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added croutonjs/dist/templates/Throbber.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added croutonjs/dist/templates/closebigger.gif
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added croutonjs/dist/templates/menu-32.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
60 changes: 60 additions & 0 deletions croutonjs/meetingMap/css/MarkerCluster.Default.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
.marker-cluster-small {
background-color: rgba(181, 226, 140, 0.6);
}
.marker-cluster-small div {
background-color: rgba(110, 204, 57, 0.6);
}

.marker-cluster-medium {
background-color: rgba(241, 211, 87, 0.6);
}
.marker-cluster-medium div {
background-color: rgba(240, 194, 12, 0.6);
}

.marker-cluster-large {
background-color: rgba(253, 156, 115, 0.6);
}
.marker-cluster-large div {
background-color: rgba(241, 128, 23, 0.6);
}

/* IE 6-8 fallback colors */
.leaflet-oldie .marker-cluster-small {
background-color: rgb(181, 226, 140);
}
.leaflet-oldie .marker-cluster-small div {
background-color: rgb(110, 204, 57);
}

.leaflet-oldie .marker-cluster-medium {
background-color: rgb(241, 211, 87);
}
.leaflet-oldie .marker-cluster-medium div {
background-color: rgb(240, 194, 12);
}

.leaflet-oldie .marker-cluster-large {
background-color: rgb(253, 156, 115);
}
.leaflet-oldie .marker-cluster-large div {
background-color: rgb(241, 128, 23);
}

.marker-cluster {
background-clip: padding-box;
border-radius: 20px;
}
.marker-cluster div {
width: 30px;
height: 30px;
margin-left: 5px;
margin-top: 5px;

text-align: center;
border-radius: 15px;
font: 12px "Helvetica Neue", Arial, Helvetica, sans-serif;
}
.marker-cluster span {
line-height: 30px;
}
14 changes: 14 additions & 0 deletions croutonjs/meetingMap/css/MarkerCluster.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
.leaflet-cluster-anim .leaflet-marker-icon, .leaflet-cluster-anim .leaflet-marker-shadow {
-webkit-transition: -webkit-transform 0.3s ease-out, opacity 0.3s ease-in;
-moz-transition: -moz-transform 0.3s ease-out, opacity 0.3s ease-in;
-o-transition: -o-transform 0.3s ease-out, opacity 0.3s ease-in;
transition: transform 0.3s ease-out, opacity 0.3s ease-in;
}

.leaflet-cluster-spider-leg {
/* stroke-dashoffset (duration and function) should match with leaflet-marker-icon transform in order to track it exactly */
-webkit-transition: -webkit-stroke-dashoffset 0.3s ease-out, -webkit-stroke-opacity 0.3s ease-in;
-moz-transition: -moz-stroke-dashoffset 0.3s ease-out, -moz-stroke-opacity 0.3s ease-in;
-o-transition: -o-stroke-dashoffset 0.3s ease-out, -o-stroke-opacity 0.3s ease-in;
transition: stroke-dashoffset 0.3s ease-out, stroke-opacity 0.3s ease-in;
}
Loading