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

6545 commits

Author SHA1 Message Date
Adam Hoyle
62ecf15975 Merge branch 'master' into feature/add-communities-page 2021-08-12 19:41:12 +01:00
Tom Hughes
9778714046 Merge remote-tracking branch 'upstream/pull/3293' 2021-08-12 18:10:54 +01:00
Tom Hughes
700bf13279 Merge remote-tracking branch 'upstream/pull/3292' 2021-08-12 17:57:54 +01:00
Andy Allan
2436f9e580 Use named paths for diary comments path 2021-08-12 17:57:40 +01:00
Andy Allan
536dee8fc7 Use named paths for various user blocks links 2021-08-12 17:57:40 +01:00
Andy Allan
d797de4317 Use user_account_path for links to settings page 
Much easier to read than having to be explicit about controllers etc
 2021-08-12 17:09:07 +01:00
Andy Allan
06d73857d1 Avoid using raw html in translations for links. 
This is a followup to 26698d6 which introduced the html. It's better
to use interpolation for links, since this avoids the translations
from introducing html syntax errors.

I had to change the translation key, since changing the interpolation
variables alone would lead to breakages.
 2021-08-12 16:35:54 +01:00
Andy Allan
57302832a4 Update the link for changing your editor preferences 
I've left the internal name of the link the same, to avoid having to
change the translation key and retranslate everything.
 2021-08-12 16:30:34 +01:00
Adam Hoyle
5df061f558 improve link ordering 2021-08-12 09:53:43 +01:00
Adam Hoyle
3eb80baaea tidy up / remove debug 2021-08-12 09:43:27 +01:00
Adam Hoyle
116cfe2f4d render local chapters in html 2021-08-11 23:45:58 +01:00
Adam Hoyle
59e6cdebdc add osm-community-index and parse in communities 2021-08-11 23:45:44 +01:00
Adam Hoyle
26aecfb2bf add route to pass locale 2021-08-10 10:13:24 +01:00
Tom Hughes
26698d6d26 Use correct link for users with no location 
Fixes #3290
 2021-08-09 18:29:54 +01:00
Adam Hoyle
86912a61df stub model and show in view 2021-08-08 23:28:44 +01:00
Adam Hoyle
ffc6b697f0 add communities page 2021-08-08 23:27:34 +01:00
Adam Hoyle
d8d1ab1776 add route for communities 2021-08-07 15:46:39 +01:00
Tom Hughes
08e2a06e41 Merge remote-tracking branch 'upstream/pull/3279' 2021-07-28 20:18:07 +01:00
Andy Allan
36f6d8d85d Fix redirect to terms path when not logged in 
This was missed during #3147 since it wasn't covered by a test.
 2021-07-28 16:36:13 +01:00
Andy Allan
dd9eca9346 Switch to html5-compatible fragment encoding for wikipedia URLs 
Fixes #3269

In the HTML4 days, fragments weren't allowed to have `%` signs, so
mediawiki generated fragments with `%` replaced with a `.`

In HTML5, fragments can have % encoded characters, and so in 2017
wikipedia switched over to this for their automatically generated
fragments, while keeping the "dot" versions available as a fallback.

However, we have been automatically converting all fragments,
including manually specified anchors that do not have "dot"-encoded
versions available. So we can now simplify everything by just using
the HTML5 percent-encoded fragments.
 2021-07-28 16:01:48 +01:00
Andy Allan
ab8d3485bd Use our darkgrey for bootstrap secondary colour 
Our blue is less saturated and lighter, and so the bootstrap-default
secondary colour is too dark and too saturated when beside our
primary buttons.
 2021-07-28 14:17:55 +01:00
Tom Hughes
e842c7be97 Add missing autocomplete attributes 2021-07-27 19:36:47 +01:00
Tom Hughes
9bf0dee51a Update path to js-cookie 2021-07-27 08:18:53 +01:00
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