cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
11093 commits 4 branches 1 tag 499 MiB
Commit graph

5828 commits

Author SHA1 Message Date
Andy Allan
24f6aeda6a Use hash-based flash objects to render complex flash messages 
Since flash objects can only be String, Hash or Array (notably excluding SafeBuffers), then this approach is necessary to render complex html in a safe manner.

Each local can be treated as an (unsafe) string, and therefore escaped normally when rendered into the template. The template (and translation strings) can
contain html since they are no longer stored in the flash as a plain string.

Fixes #3215
 2021-06-23 20:10:55 +01:00
Martin Raifer
6b73edc415 add banner for SotM 2021 2021-06-21 21:42:05 +02:00
Tom Hughes
4a45092e27 Remove the Yahoo OpenID link as they no longer support OpenID 2021-06-17 22:33:05 +01:00
Tom Hughes
d02b8d9f1e Merge remote-tracking branch 'upstream/pull/3226' 2021-06-16 18:07:38 +01:00
Tom Hughes
086f31f291 Merge remote-tracking branch 'upstream/pull/3225' 2021-06-16 18:06:40 +01:00
Andy Allan
a32854fa52 Wrap the rss and upload buttons in a div, with suitable padding for both vertical and horizontal tab layouts 
This ensures it looks right when the tabs are collapsed vertically.
 2021-06-16 17:08:26 +01:00
Andy Allan
81ad715474 Rework tabs to use flexbox 
This improves the behaviour on small widths, where the tabs stack neatly. It also avoids the use of ml-auto which isn't RTL compatible.

The change in indentation is because it was previously coded with multiple li nested inside another li
 2021-06-16 16:48:23 +01:00
Andy Allan
62349d1856 Make tab labels into nouns that describe what's on the tab 
I think that works better with tabs, whereas actions (verbs) work better with buttons.
 2021-06-16 16:27:45 +01:00
Andy Allan
7996b84380 Rearrange tabs for inter-page consistency 
The all traces tab comes first, since it's shown on every page as you click around. Otherwise the tabs appear to be constantly rearranging themselves.
 2021-06-16 16:26:25 +01:00
Michal Migurski
33f9b7c55f Fixed remaining erblint complaint 2021-06-16 15:55:55 +01:00
Michal Migurski
21eafac304 Fix erblint complaints 2021-06-16 15:55:55 +01:00
Tobias Jordans
f4e998804d Traces#index: Introduce tab navigation, fix tag-filter 
- introduce bootstrap tabs to switch the views
- introduce `content_for :heading_class` to remove the padding below the bootstrap tabs
- update the rss-image to use a svg, adopted from https://icons.getbootstrap.com/icons/rss/ (without the outer border)
- move rss- and new-button away from the view-switching actions
- the `@tag` logic was broken. introduce new link to remove the tag-filter; the tabs keep the filter once given; use params[:tag] directly in the view
- use `&.` syntax nil-safety so we can remove `@display_name`
 2021-06-16 15:55:55 +01:00
Andy Allan
db5501bb77 Remove unused padding classes 
These were last used for sidebar padding, which is now handled more easily.
 2021-06-16 15:45:59 +01:00
Andy Allan
c8f0a81eb7 Rework sidebar to use padding on the sidebar_content div 
This saves every header, list, paragraph etc having to sort out their own padding. The couple of instances where we want edge-to-edge can be acheived using the negative margin spacing utilities.

The padding is based on $spacer so that it can be adjusted automatically via bootstrap configuration.

This also means that we can remove many (mis-)uses of the browse-section class, which is only supposed to be for cases where there are multiple browse-sections in sequence (e.g. multiple nodes in the node history browse pages).
 2021-06-16 15:45:58 +01:00
Andy Allan
4e45f3a76f Fix the email address that's suggested for whitelisting 
Refs #3215
 2021-06-16 15:37:40 +01:00
Andy Allan
c2587b5b57 Rework the routing credit to use a bootstrap class 
The padding is unnecessary given it's in a paragraph anyway.
 2021-06-16 13:28:33 +01:00
Andy Allan
7407d444fb Match the width of the overlay-sidebar on narrow screens to the width on full-sized screens 
It's not clear why they are different widths, since the non-overlay sidebar doesn't change.
 2021-06-16 12:07:04 +01:00
Tom Hughes
3fff377b00 Merge remote-tracking branch 'upstream/pull/3217' 2021-06-09 17:46:45 +01:00
Tom Hughes
616f3783df Merge remote-tracking branch 'upstream/pull/3216' 2021-06-09 17:46:11 +01:00
Andy Allan
63c82ed72f Set updated_by when resolving issues 
Refs #3211
 2021-06-09 15:47:31 +01:00
Andy Allan
7e5bbce23d
Merge pull request #3208 from osm-hr/update-rcn-color 
fix map key color for regional OpenCycleMap
 2021-06-09 15:29:57 +01:00
Andy Allan
71be435886 Fix case when user block durations are slightly negative 
The output from ActiveSupport::Duration is wildly unhelpful in those cases

Fixes #3210
 2021-06-09 15:16:35 +01:00
Andy Allan
5ce14cfa4d Ensure that short duration blockss are shown as '0 hours' 
Passing `:count => nil` means that i18n.t will return the hash of translations, so use a default value of 0 when checking for hours to prevent this.

Refs #3210
 2021-06-09 14:17:56 +01:00
Tom Hughes
baa32464cd Drop last vestiges of ruby 2.5 support 2021-06-08 20:33:25 +01:00
Tom Hughes
2c5e981684 Fix erblint warnings 2021-06-05 07:40:55 +01:00
Tom Hughes
17b5395e26 Fix new rubocop warnings 2021-06-01 18:27:50 +01:00
Matija Nalis
7b3c449b46 fix map key color for regional OpenCycleMap, as it changed from light cyan to purple on the map. 
Closes: https://github.com/openstreetmap/openstreetmap-website/issues/2785
 2021-05-25 22:48:38 +02:00
Tom Hughes
e2af9941a8 Fix downloading of image variants 2021-05-19 18:44:41 +01:00
Tom Hughes
0a15112423 Mark javascript issued cookies with SameSite=Lax 2021-05-17 19:06:43 +01:00
Tom Hughes
32cc04fa5c Switch to using js-cookie to manage cookies from javascript 2021-05-17 18:57:48 +01:00
Tom Hughes
cd5d54ce4e Use image_processing macros to resize images 2021-05-12 18:49:21 +01:00
Tom Hughes
bf851691bf Fix deprecation warnings 2021-05-12 18:49:21 +01:00
Tom Hughes
9603d718c2 Fix calculation of friendship rate limit 2021-05-11 15:49:48 +01:00
Tom Hughes
84c601460f Add rate limiting to user friendships 2021-05-11 12:10:36 +01:00
Tom Hughes
0e78061cdb Merge remote-tracking branch 'upstream/pull/3029' 2021-04-29 19:42:51 +01:00
Andy Allan
2955fe4d4b Refactor user blocks information to use a dl 
This also standardises the labels to have the colon, in common with
oauth_clients#show.
 2021-04-28 17:28:30 +01:00
Andy Allan
dbf35e0cf6 Merge branch 'pull/3146' 2021-04-28 16:03:57 +01:00
Andy Allan
02bfc46ab3 Move duration to its own line, so that it can be clearly labelled 2021-04-28 16:01:03 +01:00
Andy Allan
7158426ebb
Merge pull request #3169 from harry-wood/empty-lists 
Display message when the there are no notes/comments to display
 2021-04-28 10:36:09 +01:00
Andy Allan
28af501924 Merge branch 'pull/3164' 2021-04-14 16:13:29 +01:00
Andy Allan
6bb18436a3 Add tests for routing and to ensure output format 
This avoids the tests passing if the json output is an array of kv pairs,
instead of the desired hash of attributes.
 2021-04-14 16:11:57 +01:00
Harry Wood
95d682119a Display no diary comments message when empty 
Display a 'No diary comments' message when there are no diary comments to display, rather than an empty table.
 2021-04-10 00:47:20 +01:00
Harry Wood
de8ee536b1 Display no notes message when empty 
Display a 'No notes' message when there are no notes to display, rather than an empty table with pagination features.
 2021-04-09 19:21:09 +01:00
Andy Allan
b70da7b8ea
Merge pull request #1558 from plarus/master 
Add start url and indicate minimal-ui is sufficient when added as a PWA.
 2021-04-08 14:01:08 +01:00
Michal Migurski
143a90fcac Added root elements and dict support for preferences response 2021-04-07 17:45:24 -07:00
plarus
2b5e705006
Update manifest.json.erb 
Change for minimal-ui
 2021-04-07 19:45:58 +02:00
Tom Hughes
2d111c0f34 Merge remote-tracking branch 'upstream/pull/3166' 2021-04-07 16:44:06 +01:00
Andy Allan
6f2e3e9508 Add missing root attributes to User#show and User#index json responses 2021-04-07 16:30:08 +01:00
Andy Allan
094d6c8bb9 Move confirmation methods into ConfirmationsController 2021-04-07 16:05:32 +01:00
Andy Allan
7a66c6d4eb Split password reset functionality into PasswordsController 2021-04-07 16:05:28 +01:00