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

6372 commits

Author SHA1 Message Date
Milos Brzakovic
9fe45bdfe3 iD api url update 2021-07-26 19:11:33 +02:00
Tom Hughes
f1935b1c57 Merge remote-tracking branch 'upstream/pull/3257' 2021-07-21 19:24:31 +01:00
Andy Allan
44199f23e1 Use an unstyled list for showing the languages 2021-07-21 19:10:55 +01:00
Andy Allan
403c8941a6 Ensure that flash message is shown in the updated language 2021-07-21 18:58:47 +01:00
Tom Hughes
0bbdadd727 Merge remote-tracking branch 'upstream/pull/3233' 2021-07-21 18:37:17 +01:00
Andy Allan
29efa4337c Remove incorrectly spelled helper_method 
The spelling of language is wrong here, and the correct version
is already there further down at the preferred_language method definition
 2021-07-21 17:28:23 +01:00
Josh Soref
51ba80dab3 spelling: languages 
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2021-07-21 10:45:38 -04:00
Josh Soref
a3c5bbbbb6 spelling: (self reference is superfluous) 
Signed-off-by: Josh Soref <jsoref@users.noreply.github.com>
 2021-07-21 10:45:38 -04:00
Tom Hughes
191d7f3710 Merge remote-tracking branch 'upstream/pull/3264' 2021-07-21 15:41:31 +01:00
Andy Allan
2a885c2cce Ensure the heading text appears above the illustration 
The easiest way to do this is to make the text a child of the div
with the background image. The change to min-size is so that if
the text wraps often enough on narrow screens, the header expands
vertically rather than the text spilling over.

Fixes #3259
 2021-07-21 15:08:33 +01:00
Tom Hughes
cd9a72e669 Merge remote-tracking branch 'upstream/pull/3263' 2021-07-21 12:16:08 +01:00
Tom Hughes
377f394a7c Treat association between users and OAuth 2 applications as polymorphic 2021-07-21 11:52:10 +01:00
Andy Allan
2443e7dd65 Refactor to use a heading class for height when using header-illustrations 
This fixes a glitch highlighted in #3259, where the css class stopped applying
when the view was moved to a different controller.

We're moving to having each view responsible for their layout, and commonly having
override classes explicitly in the relevant views. So we can follow that pattern here.
 2021-07-21 11:45:37 +01:00
Andy Allan
37b03e47c6 Fix various code comments 
These were found as part of #3233
 2021-07-21 11:24:23 +01:00
Tom Hughes
4d47cff5e1 Merge remote-tracking branch 'upstream/pull/3237' 2021-07-21 11:24:17 +01:00
Andy Allan
0ab9359f9f Ensure message destroy button has danger colour when showing the message, and add button to show page when viewing sent messages 2021-07-14 18:54:23 +01:00
Andy Allan
e073f93bbd Ensure the message title shows in the heading for both sent and received messages 
I'm not sure why they were ever different.
 2021-07-14 18:40:02 +01:00
Andy Allan
d89c4f887c Add a title in the heading to match the main menu text 2021-07-14 18:36:52 +01:00
Andy Allan
a8b4325be9 Convert mailbox navigation to use tabs 2021-07-14 18:34:39 +01:00
Andy Allan
caf2e2a242 Move profile-related settings to their own form 
Refs #3167
 2021-07-14 17:45:19 +01:00
Andy Allan
9b8f2bbcbe Remove code complexity around resetting language preferences 
This was originally introduced since we saved the user and showed
the result on the same action. Now that the preferences controller
saves and redirects, the user model and associated language preferences
are reloaded between requests, and this code is no longer required.
 2021-07-14 17:40:20 +01:00
Andy Allan
2403630da8 Split user preferences into a separate page 
Refs #3167
 2021-07-14 17:40:20 +01:00
Tom Hughes
da546af22e Allow acls to match on parent domains 2021-07-06 10:13:33 +01:00
Tom Hughes
e4ce1c5f2f Check that the permission is non-zero 
Fixes #3241
 2021-07-01 16:35:29 +01:00
Andy Allan
0c7ad10573 Refactor About header to use bootstrap and flex 
This reduces the amount of custom CSS required for the layout, and
makes it responsive on small screen sizes.
 2021-06-30 15:21:49 +01:00
Andy Allan
04ac7d9c03 Alight the max-width of the content to one of the bootstrap breakpoints 
This makes various things easier to reason about, as well as making
some grid things easier too.
 2021-06-30 11:48:12 +01:00
Andy Allan
014b86f91c Use bootstrap font family 
This contains and expanded list of fonts, covering more platforms
and edge cases than ours, so there's no need to override.
 2021-06-30 11:29:34 +01:00
Andy Allan
2a347e71be Remove some default styling from body 
These mirror, either exactly or pretty close to exactly, what is set
by the bootstrap reboot style, so there's no need for us to duplicate.
 2021-06-30 11:17:30 +01:00
Tom Hughes
a32b751fed Remove some references to webmaster 2021-06-29 19:22:31 +01:00
Tom Hughes
ef092045e0 Fix some broken translation lookups 2021-06-29 19:14:50 +01:00
Tom Hughes
b4a1e41968 Switch web site to use OAuth 2 2021-06-27 19:00:36 +01:00
Tom Hughes
608aafbf14 Make /api/0.6/permissions work for OAuth 2 clients 2021-06-27 00:38:16 +01:00
Tom Hughes
1bc1905248 Restore browse-section class to changeset view 
Fixes #3234
 2021-06-25 20:26:51 +01:00
Tom Hughes
8d76be71bb Merge remote-tracking branch 'upstream/pull/3177' 2021-06-24 08:43:18 +01:00
Andy Allan
0876ea0bee Refactor terms declined flash message to use a partial 
This allows us to include a link in the flash message, without having
to use html_safe. Also refactor to avoid having html angle brackets in
the translation strings, while still allowing locale-specific urls.
 2021-06-23 20:11:19 +01:00
Andy Allan
3dd639c8d0 Refactor flash messages to use a flex row for positioning 
This works better for narrow widths and needs less custom CSS.
 2021-06-23 20:11:19 +01:00
Andy Allan
7809bfa027 Ensure that all floated elements in the header stay within it 
In certain circumstance, due to either extreme narrow screen widths,
or due to padding on floating elements exceeding the header height,
some things could appear outwith the header. This clearfix avoids
this from happening.
 2021-06-23 20:11:19 +01:00
Andy Allan
e9a3c55e83 Remove unnecessary padding-bottom override on the header h1 2021-06-23 20:11:19 +01:00
Andy Allan
40589960be Use paragraphs instead of line breaks, and avoid using html in translation strings 2021-06-23 20:11:19 +01:00
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