Commit graph

398 commits

Author SHA1 Message Date
Tom Hughes
2c5e981684 Fix erblint warnings 2021-06-05 07:40:55 +01:00
Tom Hughes
01b84a8107 Merge remote-tracking branch 'upstream/pull/3125' 2021-03-10 14:55:58 +00:00
Andy Allan
38ad8fbc36 Use login_path instead of explicit controller and actions
This makes future refactoring easier.
2021-03-10 14:31:55 +00:00
Andy Allan
926576881f Remove final uses of the deemphasize class 2021-03-03 15:51:11 +00:00
Andy Allan
3debff60ef Merge branch 'pull/3091' 2021-02-24 10:49:39 +00:00
mxdanger
ea92d66cc0 Add btn-wrapper class 2021-02-17 18:27:41 -08:00
Andy Allan
696db6d433 Convert the new note form to use bootstrap 2021-02-10 14:23:11 +00:00
Andy Allan
8ee31df2a0 Rework changeset comments form to use bootstrap styling 2021-02-10 10:55:41 +00:00
mxdanger
ba982e48c4 Fix unexpected spacing on note buttons when overflowed 2021-02-08 17:32:29 -08:00
Andy Allan
c0adab7aba Convert note form to use bootstrap 2021-01-27 16:33:11 +00:00
Tom Hughes
4e78f3ae5b Fix erblint warning 2020-11-17 09:23:22 +00:00
Tom Hughes
4347d9d3b0 Merge remote-tracking branch 'upstream/pull/2921' into master 2020-11-13 10:49:35 +00:00
Andy Allan
78b9d92207 Prefer keyword arguments when method has optional boolean arguments 2020-11-12 11:24:44 +00:00
Andy Allan
c8e1b3c662 Prefer string interpolation to concatenation in erb files 2020-11-11 14:44:42 +00:00
Tom Hughes
e9ad6d852c Merge remote-tracking branch 'upstream/pull/2901' 2020-10-21 20:51:03 +01:00
Andy Allan
c233bec67b Use flexbox to position the close icon on the sidebars
This ensures that the text and the close icon don't overlap, regardless
of the length of the title. The title div grows to use all available
space, while ensuring the text breaks if necessary to prevent it from
pushing the close icon offscreen.
2020-10-21 17:11:28 +02:00
Andy Allan
2559226be3 Avoid various uses of html_safe
We can avoid using `html_safe` in various circumstances, through alternative approaches like i18n keys ending in `_html` or using `safe_join` to avoid converting via unsafe string types.

The `_html` keys approach only work for ActionView helper version of `t`, not the base `I18n.t` method.
2020-10-21 15:43:14 +02:00
Tom Hughes
3b56c005eb Merge remote-tracking branch 'upstream/pull/2838' 2020-09-30 11:57:18 +01: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
6078e642ba Fix erblint warnings 2020-09-16 16:59:10 +01:00
Andy Allan
b4b59df75e Show linked features as collapsable detail panels on feature browse pages
Fixes #2823

The panels are collapsed by default, when there is a long list of features, but
open on short lists to save on clicks. 10 items is arbitrary but seemed reasonable.
2020-09-16 15:28:03 +02:00
Andy Allan
613b748c55 Avoid lego translations for coordinates
Use the i18n system for joining coordinate values together, while
avoiding making any changes or standardisation involving the exact
symbol used in each situation.

Refs #2732
2020-08-19 16:43:16 +02:00
Tom Hughes
c24c2e481c Merge remote-tracking branch 'upstream/pull/2667' 2020-08-05 21:50:08 +01:00
Tom Hughes
eee84267f9 Fix rubocop warning 2020-08-02 13:00:21 +01:00
Andy Allan
20ed4df472 Add a browse map link to notes
This matches the one for nodes. Fixes #1355. Replacement for #1773.

An unstyled list works better for the details section, particularly
when all three are shown.
2020-07-22 14:18:59 +02:00
Andy Allan
499a60c330 Use a named path instead of explicit controllers and actions 2020-07-22 14:04:42 +02:00
Andy Allan
3012201160 Convert warnings to use bootstrap alerts
The new note is guidance, rather than a warning, so it gets the info
background
2020-07-15 19:09:46 +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
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
7e925c3c00 Look at all note comments to find the close event
Fixes #2612
2020-05-06 14:06:04 +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
e22b9c35f5 Remove list styling from various sidebar lists 2020-01-30 13:14:53 +01:00
Andy Allan
65c3c2a915 Remove list style reset, and add overrides where necessary
This allows the bootstrap list typography to work without being overridden. It also means
that lists look like normal lists by default, instead of needing to be recreated from
scratch each time. Only the cases where padding and discs are unwanted need to have
custom CSS.
2020-01-15 17:16:11 +01:00
Andy Allan
827123a8f6 Rework changeset descriptions to use h6 tags, and refactor changeset lists to use list-group-flush
The descriptions are probably best not as a header, but still needs to be something more prominent than surrounding text.
2020-01-08 16:04:45 +01:00
Andy Allan
712e67ed4a Refactor the query results to use bootstrap list-group-flush 2020-01-08 16:00:18 +01:00
Tom Hughes
5a668bfbe4 Add some missing _html suffixes 2020-01-05 19:01:54 +00:00
Andy Allan
5aa255e13f Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2020-01-02 17:43:34 +01:00
Andy Allan
8dba8cd4a0 Use _html suffix to avoid using raw when displaying translated strings
This is safer than raw, since any user input is still escaped.
2020-01-02 17:13:41 +01:00
Tom Hughes
6f8966e7c1 Note events use "opened" not "open" as the status 2019-12-16 22:26:33 +00:00
Tom Hughes
783b5e3729 Merge remote-tracking branch 'upstream/pull/1926' 2019-08-28 17:23:10 +01:00
Andy Allan
3167e6b4bb Use friendly_date_ago helper for chnagesets
Refs #2255
2019-06-19 18:04:08 +02:00
Andy Allan
00f75c175e Use scope for common details and changeset display in browse pages
Refs #2255
2019-06-19 18:04:08 +02:00
Tom Hughes
7ce40eeb38 erblint: use consistent spacing in HTML tags 2019-03-28 00:30:48 +00:00
Tom Hughes
49da87fb6d erblint: remove leading blank lines 2019-03-28 00:29:04 +00:00
Tom Hughes
ecd81eadbe erblint: use parentheses for nested function calls 2019-03-27 18:55:48 +00:00
Tom Hughes
3af16f6337 erblint: fix remaining single quoted strings 2019-03-27 16:15:19 +00:00
Andy Allan
74b91c0e3e erblint: Add or remove curly braces around hash parameters as required 2019-03-27 10:30:48 +01:00
Andy Allan
3c410bcd7e Whitespace fixes for browse erb files 2019-03-26 20:23:35 +00:00
Andy Allan
b38343e5bd Move node/way/relation/old_* controllers into the api namespace 2019-02-28 17:12:28 +01:00