Commit graph

304 commits

Author SHA1 Message Date
David Larlet
46cf432eb4
Paginate user’s maps combined downloads 2024-02-07 12:32:00 -05:00
David Larlet
5476cbee0f
Ability to download all maps from user’s dashboard 2024-02-07 12:32:00 -05:00
David Larlet
1ee9d7dd52
feat: allow to inject a header.html template
Useful to add scripts integration like Sentry
2024-02-06 12:45:40 -05:00
Yohan Boniface
5926eb53ba chore: catch error in getMore 2024-02-05 07:22:53 +01:00
Yohan Boniface
16265b566e chore: remove xhr module, now replaced by request.js 2024-02-05 07:22:53 +01:00
Yohan Boniface
8b2778116d wip: make the getMore button work again with new Request 2024-02-05 07:22:53 +01:00
Yohan Boniface
49f600adfa wip: refactor login flow
Instead of dealing with in JavaScript, let's do a more classic
HTTP flow.

The main flows work, but there is still at least one to deal with:
when editing a map without being logged in, the server may ask for
login, and in this case we should login THEN reissue the request,
so we need to interrupt the first request in some way,
otherwise the server will still answer with a 403, which is what
happens after this commit.
2024-02-05 07:22:53 +01:00
Yohan Boniface
074fc1bc18
Merge pull request #1552 from umap-project/preconnect-tilelayer
feat: set preconnect link for tilelayer
2024-01-29 18:26:24 +01:00
Yohan Boniface
caeb9d5b44
Merge pull request #1531 from umap-project/home-highlighted
Introduce UMAP_HOME_FEED to control which maps are shown on the home page
2024-01-29 12:48:24 +01:00
Yohan Boniface
dadcaa0b76
Merge pull request #1526 from umap-project/oembed
Create an oEmbed endpoint for maps
2024-01-29 12:44:03 +01:00
Yohan Boniface
d4e253190f feat: set preconnect link for tilelayer 2024-01-22 18:14:41 +01:00
Yohan Boniface
abbc5237bd chore: try to force browser to load Leaflet script soon
Leaflet file is the bigger, and it is otherwise only loaded
when the browser understand that it needs it, which means when
global.js is parsed, which means after all scripts have been loaded.
2024-01-22 14:41:22 +01:00
David Larlet
7c4009965a
Use minified versions + sourcemaps of vendor statics 2024-01-21 14:02:16 -05:00
Yohan Boniface
96ae7ddbc7 chore: deactivate custom statics manager for test by default
And add one file that run it and check all js files are loaded.
2024-01-17 18:42:46 +01:00
Yohan Boniface
1b8e6164ed fix: use dynamic path for locale javascript 2024-01-17 16:36:17 +01:00
David Larlet
656e29c72b
Use custom storage instead of django-compressor 2024-01-17 09:09:00 -05:00
Yohan Boniface
9f377da1b2 Introduce UMAP_HOME_FEED to control which maps are shown on the home page
For now we have only three modes:
- latest, which is the default and shows the last updated maps
- highlighted, which shows only the map that have been starred by a least
  one staff member
- None, which does not show any map
2024-01-16 12:31:50 +01:00
1eb0f352c9 Expose the MAP variable at the global scope to ease debugging 2024-01-15 12:15:35 +01:00
David Larlet
df76ffd80e
feat: Create an oEmbed endpoint for maps
Fix #162
2024-01-11 15:08:10 -05:00
Yohan Boniface
66d2345841 Escape map settings in map_fragment.html 2024-01-11 11:13:13 +01:00
David Larlet
5d758ebc0d
Create a dedicated js/components folder 2024-01-10 14:31:54 -05:00
David Larlet
7b5b5b1b22
Set a umap-fragment web component for lists 2024-01-09 14:49:14 -05:00
4b34a7d300 merge index.js with global.js 2024-01-08 19:29:43 +01:00
7c697f7529 Merge @ybon changes 2024-01-08 18:49:03 +01:00
Yohan Boniface
c6ce22f319 Also run login javascript when page is loaded 2024-01-08 18:43:54 +01:00
Yohan Boniface
ce22a2ee74 Only load Leaflet once, as module 2024-01-08 18:43:54 +01:00
95212dbdf5 [refactor] Use JS modules for client URL routing
Also expose some vendorized libs as modules in `modules/vendors.js`
2024-01-08 18:43:54 +01:00
Yohan Boniface
ab82fd975f
Merge pull request #1478 from umap-project/preview-map-on-click
Preview map only on click in user’s dashboard
2024-01-03 22:17:55 +01:00
Yohan Boniface
37b97403dc Use neutral button for preview in user dashboard 2024-01-03 21:49:20 +01:00
David Larlet
36f72e3154
Linting templates 2023-12-27 13:50:21 -05:00
David Larlet
7484e52142
Improve maps’ pagination for the dashboard 2023-12-27 13:26:31 -05:00
Yohan Boniface
c3cb813c23
Allow to reopen a dialog in dashboard previews 2023-12-27 11:41:08 -05:00
David Larlet
ded244c9ff
Put CSS and JS blocks to their dedicated places 2023-12-27 11:41:08 -05:00
David Larlet
7ff543e1d5
Create the unique_id in the template (vs. model) 2023-12-27 11:41:08 -05:00
David Larlet
c9b4b96c01
Preview map only on click in user’s dashboard
Refs #1459
2023-12-27 11:41:07 -05:00
Joachim Schleicher
d19cc60a7a refactor shareBox into separate class
download() and format() functions as well as dialog itself and
IFrameExporter helper moved into new file umap.share.js
2023-12-18 19:26:16 +01:00
Yohan Boniface
fe9f4b4a48 WIP: POC of using Leaflet.IconLayers as tilelayers switcher 2023-12-15 11:40:52 +01:00
Yohan Boniface
84b5e2188a Move importer panel to a separate class 2023-12-05 12:59:43 +01:00
aff0181636 [style] Format the code 2023-11-24 23:31:18 +01:00
David Larlet
56bb414113
Provide space/separators between Dashboard actions 2023-11-24 15:32:44 -05:00
David Larlet
b4464a7ca2
Reuse the map_download view/url for the dashboard
Refs #1396
2023-11-24 15:28:58 -05:00
David Larlet
6f73038f92
Redirect favicon.ico and dynamic webmanifest 2023-11-14 22:50:25 -05:00
David Larlet
915d6b6db4
Set a default favicon 2023-11-14 17:32:40 -05:00
Yohan Boniface
739626351c Choropleth: replace chromajs by colorbrewer + simple-statistics
simple-statistics has a few advantages:
- faster
- more accurate kmeans algo
- Jenks-Fisher algo

Also, I suspect will use it again for next step, which is Bubble
mode layer.
2023-10-11 19:36:12 +02:00
Yohan Boniface
8e12e6cf24 POC of a choropleth layer 2023-10-10 21:16:01 +02:00
Yohan Boniface
0ad6e425b5 Refactor data browser
- move a dedicated class (function was becoming big)
- user FormBuilder instead of custom form elements
2023-09-25 13:42:14 +02:00
Yohan Boniface
3cbd6cca40 Add back Map.edit_status
Revert "Fix existing permissions related tests"

This reverts commit 36d7d87301.

WIP
2023-09-22 17:32:19 +02:00
Yohan Boniface
3d2e62c858 Do not use Map.edit_status anymore
But keep it for now, for data migration, and just in case
2023-09-22 17:26:55 +02:00
Yohan Boniface
89ab029cab WIP: move edit_status from Map to DataLayer 2023-09-22 17:25:55 +02:00
Yohan Boniface
174e6ddc6b i18n 2023-08-25 10:18:22 +02:00
Yohan Boniface
1b769bf07c Change "My Maps" to "My Dashboard" in navigation 2023-08-25 10:11:04 +02:00
Brice Maron
cd29486b84 fix: correct changelog link 2023-08-23 08:31:15 +02:00
Yohan Boniface
a89e6622ed User profile page: only display providers if there are some
Someone uses uMap with classic auth username/password, and they
don't want those empty HTML elements
2023-08-21 17:16:34 +02:00
Yohan Boniface
25b3a66351 Allow to add more than one OAuth provider 2023-08-21 17:08:57 +02:00
Yohan Boniface
2b471be171 Very lite "My Profile" page to allow changing username 2023-08-21 15:09:30 +02:00
Yohan Boniface
e7212e8dff
Merge pull request #1208 from umap-project/dashboard-popup-end
Fallback user to dashboard after OAuth process
2023-07-17 15:07:26 +02:00
Yohan Boniface
77cedd3288 Display share status in dashboard 2023-07-17 09:08:59 +02:00
Yohan Boniface
a2da1d64f7 Fallback user to dashboard after OAuth process
Now that we have a dashboard page, this makes more sense than the
"public profile" page.
2023-07-16 12:04:51 +02:00
Yohan Boniface
891c23747f 1.4.0 2023-07-15 11:36:42 +02:00
Yohan Boniface
6b539b9d40 Add pagination to map table in user dashboard 2023-07-15 09:31:55 +02:00
Yohan Boniface
7adc409cdb Add html title to dashboard page 2023-07-15 09:31:55 +02:00
Yohan Boniface
7fb776c2a4 add thead and tbody in maps table 2023-07-15 09:31:54 +02:00
Yohan Boniface
bb4c027ec7 Allow to use http://umap.fr/map/xxxx?share to open shareBox on load
That way is more consistent with ?download and ?edit
2023-07-15 09:31:37 +02:00
Yohan Boniface
8f76252b3a Apply suggestions from code review
Co-authored-by: David Larlet <3556+davidbgk@users.noreply.github.com>
2023-07-12 09:09:01 +02:00
Yohan Boniface
4d0ced9a98 Add very basic user dashboard 2023-07-12 09:09:01 +02:00
Yohan Boniface
cf397956f9 i18n 2023-07-03 22:07:21 +02:00
David Larlet
51978f9f2a
Display latest created maps on empty search 2023-06-30 21:40:35 -04:00
David Larlet
7ccb804231
Manual JS conversion in content template 2023-06-20 10:10:40 -04:00
David Larlet
de37721c40
Manually reformat JS parts for djLint 2023-06-20 10:05:28 -04:00
David Larlet
be5d27d292
Lint template files with djLint 2023-06-20 10:00:02 -04:00
David Larlet
70e3852c0c
Prettify template files with djlint 2023-06-20 09:40:32 -04:00
Yohan Boniface
b324e59cd4 Fix stars link in header 2023-06-17 15:59:16 +02:00
Yohan Boniface
608c54d4bf
Merge pull request #1145 from umap-project/custom-username
Allow to customize user display name and URL slug
2023-06-17 06:39:55 +02:00
Yohan Boniface
81fcc080d9 Allow to customize user display name and URL slug 2023-06-16 14:59:59 +02:00
Yohan Boniface
8b4ffba859 Show messages also in the content part
Messages are already shown in the map, if any.
2023-06-16 14:45:43 +02:00
David Larlet
3edad3976d
Display the number of maps on search results page 2023-06-14 09:58:48 -04:00
David Larlet
fad196bff7
Display the current version + link to changelog 2023-06-06 14:05:35 -04:00
David Larlet
b6628a3015
Merge pull request #1112 from umap-project/1095-read-only-banner
Banner + no create buttons when in read only mode
2023-05-30 18:25:33 -04:00
David Larlet
3f28c04241
Banner + no create buttons when in read only mode
Fix #1095
2023-05-30 16:17:12 -04:00
David Larlet
fd3f854a9c
Use DOMPurify to escape malicious input from user 2023-05-30 14:22:04 -04:00
David Larlet
8d6185c476
Manual review of Lebab for let/const conversions 2023-05-30 14:16:10 -04:00
Yohan Boniface
50091ec0fa Redirect to "user_maps" at login end when window.opener is not accessibile
This is the case for Twitter.
We'll try to refactor the process later, but let's make it "acceptable"
for now.

cf #1097
2023-05-30 08:42:23 +02:00
Yohan Boniface
7b65820b73 HOT fix: add message in login_popup_end.html to work around Twitter issues
In case of logging through Twitter, we don't have access to
window.opener, so we cannot close the window and tell uMap to
finish the login process.
2023-05-30 08:42:23 +02:00
Yohan Boniface
37b4d05da5 (WIP) Allow to star map and retrieve starred maps 2023-05-15 12:22:26 +02:00
Yohan Boniface
238401f983 i18n 2023-02-27 14:39:59 +01:00
Aleksejs Popovs
c4415e1e99 Vendor leaflet.locatecontrol 2022-11-24 13:55:09 -05:00
Yohan Boniface
4358a35a5d Set dir=rtl when appropriate
cf #752
2020-03-23 11:30:45 +01:00
Yohan Boniface
95a16b2aaf Set unique map id per page in map_list
This words around the issue where a map is displayed twice while
loading more maps in the home page because while loading maps some
have been updated
2019-04-09 11:47:02 +02:00
Ward Muylaert
2ffdd0594b Fix original English translation strings
It seems mistakes in the original English (en) translation strings are
not fixed in the website despite them being correct for en_US in
Transifex for several years. My guess is that they are the default for
en, so unless you somehow manage to explicitly select en_US (which does
not seem possible), you are stuck with the incorrect English.
2019-02-25 14:06:57 +01:00
Yohan Boniface
f11fe36865 Fix button bar on home 2018-07-07 19:35:02 +02:00
Yohan Boniface
1a815b313d Add an explicit button to attach an owner to an anonymous map
fix #568
2018-07-07 16:44:40 +02:00
Yohan Boniface
48185650b0 Move permissions form building to JS 2018-06-15 23:25:38 +02:00
Yohan Boniface
6b3d45064c Fix wrong class in auth panel 2018-06-02 19:17:57 +02:00
Yohan Boniface
a7ec9b173d Add a basic language switcher in the home footer
fix #74
2018-06-02 19:04:32 +02:00
Yohan Boniface
27bb306fd3 Consolidate CSS files after merge 2018-06-02 18:24:19 +02:00
Yohan Boniface
a0bff73401 Fix generate_js_locale paths 2018-06-02 14:44:01 +02:00
Yohan Boniface
887a9fc7e0 Renamed L.Storage in L.U 2018-06-02 12:36:28 +02:00
Yohan Boniface
19d2b39423 Leaflet.Storage is now integrated inside this repository 2018-06-02 12:21:40 +02:00
Yohan Boniface
e55d03bd5e Django 2.0
And update other deps
2018-05-19 10:05:18 +02:00
Ltrlg
2de13a8dfa Mark a string for translation 2017-12-09 11:02:04 +01:00
David Larlet
732ede7aab
Remove useless leaflet tags from templates 2017-04-26 17:07:16 -04:00
David Larlet
445abf0fff
Switch to Flexbox for main navigation 2017-04-26 16:01:08 -04:00
Yohan Boniface
cb185a4500 More theming hooks 2017-04-24 18:56:31 +02:00
Yohan Boniface
1af1846cfd 0.8.0-rc.10 2016-11-05 12:42:51 +01:00
Yohan Boniface
af8745e2d7 Do use an ancestors of maps for ui
Otherwise, each map will react to the `.storage-ui xxx` css rule.
2016-09-18 15:27:18 +02:00
Yohan Boniface
d4f7837ee5 Remove dark strips from home 2016-09-17 22:56:45 +02:00
Yohan Boniface
f0e97913d5 Add field errors in login form 2016-09-09 21:09:24 +02:00
Yohan Boniface
2437334940 Merge branch 'auth-login' of https://github.com/plepe/umap into plepe-auth-login 2016-09-09 20:55:16 +02:00
Yohan Boniface
e5e0ad8823 Add LEAFLET_STORAGE_KEEP_VERSIONS 2016-09-09 20:42:17 +02:00
Yohan Boniface
fe9d99550b Remove Leaflet.Label 2016-07-19 08:46:07 +02:00
Yohan Boniface
0c86f7a132 Add Path.Drag.js 2016-07-19 08:45:59 +02:00
Yohan Boniface
da6cff729c Allow to override site name in pages title 2016-06-30 14:41:10 +02:00
Yohan Boniface
a34d163449 Do not override "content" block in content.html template 2016-06-29 17:20:47 +02:00
Yohan Boniface
a1676d56ca Use a specific prefix for maps ids in search results 2016-06-27 15:16:55 +02:00
Yohan Boniface
0bca23cca4 Put back bottom_js block removed by mistake 2016-05-20 11:11:31 +02:00
Yohan Boniface
2f77c08465 Use our own fork of Leaflet.Label 2016-05-20 09:45:26 +02:00
Yohan Boniface
72202b0d3d Small CSS/HTML tricks to follow changes in Leaflet.Storage 2016-05-17 22:37:20 +02:00
Yohan Boniface
bd0fff41ad Add link for Leaflet.Fullscreen 2016-04-26 09:54:45 +02:00
Yohan Boniface
5aa853761c Follow Leaflet.Storage UI refactoring
cf umap-project/Leaflet.Storage/commit/59583db7bef28b2fd13ac98c0a62e1a770d3fb66
2016-04-26 00:07:06 +02:00
Yohan Boniface
bfe26adfad Add Leaflet.Photon to js 2016-04-24 14:31:11 +02:00
Stephan Bösch-Plepelits
5f63943458 Authentication: configure availability of account login (default True) 2016-02-05 05:44:15 +01:00
Stephan Bösch-Plepelits
8f5b59604e Authentication: show errors for username / password login failures 2016-01-14 21:26:44 +01:00
Stephan Bösch-Plepelits
7477adec05 Authentication: custom templates for password change 2016-01-14 21:26:43 +01:00
Stephan Bösch-Plepelits
2f2e0f510d Authentication: include a change password menu entry 2016-01-14 21:26:43 +01:00
Stephan Bösch-Plepelits
0d3046e711 Authentication: hide block with OAuth providers, when no providers configured 2016-01-14 21:26:43 +01:00
Stephan Bösch-Plepelits
5ed0361998 Authentication: login via username / password 2016-01-14 21:26:43 +01:00
Yohan Boniface
d593000630 Change repository links from bitbucket to github (fix #214) 2015-09-23 12:13:56 +02:00
Yohan Boniface
3eab361009 Include Leaflet.Measurable 2015-09-23 09:18:51 +02:00
Yohan Boniface
7b5ea8df67 First shot in Django 1.8 / python 3 support
This also replaced pg_index with a simple builting seach
based on tsvector, as pg_index is not compliant with Django 1.8,
and as some old dependencies that would need to be upgrade too.
2015-08-02 18:08:31 +02:00
Bryce Nesbitt
a08f05e203 Found some errors when trying to install uMap 2015-05-27 22:02:48 -07:00
Yohan Boniface
8cef5885e5 add noindex when map status isn't public 2014-10-02 22:45:22 +02:00
Yohan Boniface
acd8c2dd8a Display current version in footer 2014-08-25 10:09:39 +02:00
Yohan Boniface
3ae4b86893 Allow to override the feedback link 2014-08-25 09:42:17 +02:00
Yohan Boniface
b837e2dfa1 Bad path for leaflet.draw (we need to keep if for Leaflet.MeasureControl) 2014-08-02 23:34:36 +02:00
Yohan Boniface
e27ff67fe1 0.7.0 2014-08-02 23:31:50 +02:00
Yohan Boniface
26322010df 0.6.8 2014-06-22 19:34:30 +02:00
Yohan Boniface
c52d63faf9 0.6.7 2014-06-19 14:39:45 +02:00
Yohan Boniface
9257264b8d Refactor autocomplete and add a simple select one 2014-06-19 00:11:12 +02:00
Yohan Boniface
785f0bf252 Add slideshow module 2014-06-18 18:09:26 +02:00
Yohan Boniface
f6a6cae716 0.6.2 2014-06-16 14:18:34 +02:00
Yohan Boniface
e0e5707906 0.6.0 2014-06-16 14:02:18 +02:00
Yohan Boniface
10ab653cad Remove small icons from feature list 2014-05-01 15:18:38 +02:00
Yohan Boniface
63e4ba90b3 Remove useless template 2014-04-25 11:20:37 +02:00
Yohan Boniface
7240f5eaf5 Add leaflet-heat 2014-04-20 17:42:18 +02:00
Yohan Boniface
2083f1d93c Working on 404 page 2014-04-20 12:11:47 +02:00
Yohan Boniface
fdc28c9f28 Add logo in 500.html 2014-04-20 11:08:22 +02:00
Yohan Boniface
e105686d5a from osm_and_geojson to osmtogeojson 2014-04-19 22:59:07 +02:00
Yohan Boniface
39f672641c First shot in GeoRSS support 2014-04-19 11:48:54 +02:00
Yohan Boniface
d37d165839 Add Leaflet.label plugin 2014-03-21 12:37:48 +01:00
Yohan Boniface
40d5ac7e3a Upgrade django-social-auth to python-social-auth 2014-03-06 23:22:37 +01:00