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

93 commits

Author SHA1 Message Date
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
Tom Hughes
a32b751fed Remove some references to webmaster 2021-06-29 19:22:31 +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
Tom Hughes
2c5e981684 Fix erblint warnings 2021-06-05 07:40:55 +01:00
Tom Hughes
e222329d04 Add support for OAuth2 using doorkeeper 2021-05-18 12:05:32 +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
Andy Allan
f18baae22e Refactor login/logout into sessions controller 
Certain controller methods are shared with oauth-based logins, and these have been
moved to a concern.
 2021-03-24 11:32:46 +00:00
Andy Allan
926576881f Remove final uses of the deemphasize class 2021-03-03 15:51:11 +00:00
Andy Allan
a17bd24f82 Refactor the third-party login form to use bootstrap 2021-02-10 15:39:55 +00:00
Andy Allan
f9b0490afc Update terms form to use bootstrap 2021-02-10 15:09:29 +00:00
Tom Hughes
d15041f847 Use POST to submit OpenID login form 
Fixes #3084
 2021-02-06 15:04:33 +00:00
Andy Allan
b6277bda20 Use bootstrap form styles for update home checkbox 
This slipped through the refactoring last week.
 2021-02-03 09:39:43 +00:00
Tom Hughes
e6db73f8d3 Avoid password manager autocompletion on user settings page 2021-01-28 11:33:01 +00:00
Andy Allan
1f4d334dfe Use boolean instead of string for hiding labels 2021-01-28 10:10:03 +00:00
Andy Allan
a7d959e588 Refactor account form to use bootstrap 
There's further refactoring that could be done, but this is sufficient for now.
 2021-01-27 17:59:58 +00:00
Andy Allan
f737d2d34a Use model attributes and attribute help for the registration fields 
The disply name keeps its specific help, since it is different on the account settings page
 2021-01-27 12:36:21 +00:00
Andy Allan
cc8bb7c6a5 Refactor user registration form to use bootstrap 2021-01-20 15:38:10 +00:00
Andy Allan
e8e4aa53d4 Refactor login form to use bootstrap 
Care has been taken to preserve exact tabindexes, field values etc.
 2021-01-13 19:20:06 +00:00
Tom Hughes
0654be27f9 Fix new rubocop warnings 2021-01-11 19:17:31 +00:00
Tom Hughes
0ff89c31e4 Remove both Potlatch versions 
Fixes #2622
 2021-01-05 21:18:45 +00:00
Tobias Jordans
b470e01f84 Break long URLs where richtext is used. 
For example on the blog post show page.

This uses https://getbootstrap.com/docs/4.4/utilities/text/#word-break to break long URLs on the blog post show view.
 2020-12-27 22:11:36 +01:00
Tom Hughes
99e537859a Fix HTML escaping issues with user role icons 2020-11-13 15:13:37 +00:00
Andy Allan
c8e1b3c662 Prefer string interpolation to concatenation in erb files 2020-11-11 14:44:42 +00:00
Andy Allan
a988ad6f51 Style changeset descriptions with italics on browse pages 
Alternative to #580

This reworks changeset descriptions to use italics instead of header
elements, in order to make them more like quotes.

Care has been taken to make sure that there is still a header element
as the first element of the common details partial, in order to make
the history pages look right (where the partial appears multiple times).
 2020-09-16 18:51:20 +02:00
Tom Hughes
21adea321b Convert password reset forms to use bootstrap 2020-09-04 00:36:43 +01:00
Tom Hughes
c11142d5c0 Convert logout form to use bootstrap 2020-09-03 23:52:59 +01:00
Tom Hughes
e33848091e Convert user confirmation forms to use bootstrap 2020-09-03 23:51:23 +01:00
Tom Hughes
c24c2e481c Merge remote-tracking branch 'upstream/pull/2667' 2020-08-05 21:50:08 +01:00
Tom Hughes
c4abe8eb28 Fix the CrossSiteScripting warnings from Brakeman 2020-07-22 20:57:16 +01:00
Tom Hughes
efa2c20bff Merge remote-tracking branch 'upstream/pull/2696' 2020-07-08 19:09:55 +01:00
Tom Hughes
3a43f9fe04 Merge remote-tracking branch 'upstream/pull/2697' 2020-07-08 18:57:32 +01:00
Andy Allan
41d6f19a6b Rename the notes#mine action to index 2020-07-08 18:43:30 +02:00
Andy Allan
1977e66ace Use bootstrap text-muted in place of custom deemphasze class 
This avoids changing anything related to forms, since they will be
switched over to bootstrap separately.
 2020-07-08 18:30:15 +02:00
Andy Allan
8192c0bd17 Rework the users#show page to avoid custom column css 
This uses bootstrap instead, ensuring the map shows before the
text on small screens, but to the right of it on md+ widths. The
height of the map also changes at this breakpoint instead of being
based on the menu width (body.small).

The account edit page was also changed to match the content_map
changes, and a full width map is now used. This can be changed, if
required, using bootstrap breakpoints but I like it as it is.
 2020-07-08 16:46:15 +02:00
Andy Allan
627f2493fa Refactor away from global form control styling 
This enables forms to be converted one-by-one to bootstrap. Without this
refactoring, these global styles interfere with form control styling from
bootstrap.

The rearrangement of the search and directions styling is to solve CSS selector specitivity issues.
 2020-07-01 17:23:02 +02:00
Tom Hughes
a13b40ace9 Fix new erblint warnings 2020-06-11 19:44:22 +01:00
Tom Hughes
81a5a55f57 Show user delete links to admins 2020-06-11 17:26:05 +01:00
Andy Allan
600812f6ad Rework user#set_status and #delete to avoid GET requests 
This renames the delete action to destroy, and starts using resourceful
routing for user actions.
 2020-06-10 11:49:18 +02:00
Andy Allan
8ebfdbc1ff Move make_friend and remove_friend to friendships controller 2020-06-03 18:23:07 +02:00
Tom Hughes
9b634f3493 Cache OpenID provider names on a per-locale basis 
Fixes #2591
 2020-04-15 22:48:28 +01:00
Andy Allan
b8c1bbb4f8 Remove unnecessary h() calls on model attributes 
These were necessary in the rails 2.x era, but not now.
 2020-03-18 14:33:30 +01:00
Andy Allan
5fdada204c Use bootstrap table striping to replace hand-cycled table stripes 
This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.
 2020-03-18 12:14:24 +01:00
Andy Allan
a2abce0f4a Use an unstyled list for the login buttons 2020-01-30 10:24:08 +01:00
Andy Allan
f885cfe0f5 Rename form-row to standard-form-row to avoid clashing with a bootstrap class 2020-01-15 17:16:11 +01:00
Tom Hughes
bd7c279604 Merge remote-tracking branch 'upstream/pull/2500' 2020-01-09 11:03:34 +00:00
Tom Hughes
e39d227dd0 Merge remote-tracking branch 'upstream/pull/2498' 2020-01-09 10:31:37 +00:00
Andy Allan
bff3676d93 Avoid double-escaping display names when sent through the translation system 
They are escaped properly without the h() call, and doing that just double-escapes them
 2020-01-08 19:07:18 +01:00
Andy Allan
523565fb21 Use bootstrap grid for signup page 
This allows us to have the two sections one above the other on small screens,
with the call to action text first, and then side-by-side above the sm
breakpoint with the cta on the right.
 2020-01-08 17:26:11 +01:00