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

6047 commits

Author SHA1 Message Date
Tom Hughes
812f5b44e8 Redirect after saving settings in case the username has changed 
Fixes #3059
 2021-01-19 18:57:34 +00:00
Andy Allan
e94a8a45ba Refactor user_blocks form to use bootstrap 
Further refactoring could involve a virtual attribute for duration.
 2021-01-14 10:03:11 +00:00
Tom Hughes
4abd9cfcf1 Merge remote-tracking branch 'upstream/pull/2994' 2021-01-13 20:40:48 +00:00
Tom Hughes
697e36f364 Merge remote-tracking branch 'upstream/pull/3046' 2021-01-13 20:35:04 +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
Andy Allan
78bf2993e4 Refactor richtext fields to use a custom bootstrap_form input. 
This allows us to use form_group_builder and get all the label and
help text handling in line with other bootstrap_form inputs.
 2021-01-13 14:05:39 +00:00
Andy Allan
ed07e17ca2 Align the richtext help text height with the height of the textarea. 
This works by setting the card to the same height as its containing flexbox. For perfect alignment, we need to make sure the extra margin at the bottom of the text-area stops applying when they are shown side by side.
 2021-01-13 10:12:15 +00:00
Tom Hughes
0654be27f9 Fix new rubocop warnings 2021-01-11 19:17:31 +00:00
Andy Allan
85bf0af488 Merge branch 'pull/3035' 2021-01-06 15:41:42 +00:00
Andy Allan
76146baf60 Remove spacing tweaks and legacy pagination spacing CSS 
No need to fight against something that we no longer use.
 2021-01-06 15:40:53 +00:00
Andy Allan
9568c7fee8 Merge branch 'pull/3024' 2021-01-06 15:25:37 +00:00
Andy Allan
b5188cae08 Remove link_to_if since it's in a clause with the same condition 2021-01-06 15:24:50 +00:00
Tom Hughes
0ff89c31e4 Remove both Potlatch versions 
Fixes #2622
 2021-01-05 21:18:45 +00:00
Tobias Jordans
18ec273038 Traces: Migrate pagination to bootstrap 
Same feature, different style.
- Change pagination to use bootstrap default styles
- … but with empty span-tags instead of non-active a-tags
- refactor partial to not use @-variables but get the variables via
the render-call, simplify render-call-syntax
- remove the additional `if @traces.size > 1` inside the pagination
partial since that caused the pagination to disappear on the last page.
The partial will be visible with inactive links.
- Add bootstrap spacer-classes to overwrite commons-css so removing. Eg.
commons also has a pagination class same as bootstrap.
 2021-01-03 20:55:50 +01:00
Tobias
36a41a8cc5
Diary entries #index: Simplify bootstrap pagination 
- We can use a span instead of a disabled link as well
- Update to use double quotes everywhere
 2021-01-02 22:24:46 +01:00
Tobias
f36b6375e9
Add noindex meta tag to diary index pages 
Google (and other search engines) should follow all links on this page, but only index the actual diary_entry#show and not the #index. This meta tag tells google to do just that (https://developers.google.com/search/docs/advanced/crawling/block-indexing?hl=en).

Part of https://github.com/openstreetmap/openstreetmap-website/issues/2851
 2021-01-02 20:22:26 +01:00
Tobias Jordans
abc83298cd Diary entries #index: Migrate to bootstrap pagination 
Use https://getbootstrap.com/docs/4.5/components/pagination/ for the pagination.

I tried using link_to_if but this does not work well in this case since multiple changes need to happen for the disabled state.
 2020-12-30 14:20:13 +01:00
Tom Hughes
e392556444 Revert "Switch to using the zeitwork autoloader" 
This reverts commit 127880a73f.
 2020-12-29 19:29:36 +00:00
Tom Hughes
127880a73f Switch to using the zeitwork autoloader 2020-12-29 18:42:22 +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
Andy Allan
547459314b Refactor diary entry forms to use a custom form builder 2020-12-24 13:32:41 +00:00
Andy Allan
170ea3399b Ensure richtext editing style rules are only applied on standard forms 2020-12-24 13:32:41 +00:00
Andy Allan
4f304e2301 Remove SystemTimer and use stdlib Timeout directly 
SystemTimer was only needed on ruby 1.8, and we dropped support for
that a long time ago.
 2020-12-23 14:25:58 +00:00
Andy Allan
bd1420a7c5
Merge pull request #3009 from gravitystorm/svg_icons 
Add updated authentication icons
 2020-12-17 11:44:22 +00:00
Andy Allan
c192bd0d40 Use bootstrap utility class instead of custom css 2020-12-16 17:34:12 +00:00
Tom Hughes
384ac46102 Convert id column for oauth_nonces to bigint 2020-12-14 14:48:59 +00:00
Tom Hughes
88ba316abe Merge remote-tracking branch 'upstream/pull/2999' 2020-12-09 14:51:04 +00:00
Andy Allan
651217e1bc Add missing html suffix to translation key 
The new key was added to the translations config file in a previous commit.
 2020-12-08 13:50:22 +00:00
Frédéric Rodrigo
bab39572a1 Add CyclOSM layer 2020-12-06 21:29:36 +01:00
Tom Hughes
92712591c9 Merge remote-tracking branch 'upstream/pull/2993' into master 2020-12-06 18:44:33 +00:00
Andy Allan
78dd142df4 Avoid using raw in html mailer views 
Use the _html suffix to mark that we expect the translations to contain links.

Unfortunately, we can't use the _html keys for the plain text emails, since the input options (e.g. username, url) will be html-escaped,
before it is passed to the view. So we need to use non-html-suffix keys for the plaintext views, in most cases. Only when the translation
options (e.g. url) are guaranteed to not contain any escapable characters can the same translation key be shared.
 2020-12-02 15:13:09 +00:00
Andy Allan
48b85a7fee
Merge pull request #2969 from tuckerrc/diary-updated-date 
Add last updated date to diary entry page
 2020-12-02 11:30:22 +00:00
Sarah Hoffmann
a7b95e2a63 Improve guessing of labels for Nominatim results 
This adapts to two changes in place handling by Nominatim:

* Place links that are computed by Nominatim are now found in
  extratags['linked_places']. Keep the check for extratags['place']
  as this may contain an explicitly mapped place label.
* Use address rank for guessing the admin level. This gets normalised
  by Nominatim with respect to country-specific use of admin_level.

Also adds additional labels for admin levels, so that we now have
complete coverage for all levels that are in use in OSM.
 2020-12-01 22:52:40 +01:00
Tucker Chapman
c274d22fd6 Update translate string and only show if different from creation time 2020-11-26 22:04:54 -05:00
Andy Allan
cc1d9592df Avoid calling raw in plain text email templates 
Rails doesn't escape text in text/plain outputs, since before Rails 4.

See https://github.com/rails/rails/pull/8235
 2020-11-25 18:28:35 +00:00
Andy Allan
342e25dd5a Remove duplicate translation strings, and use short form translation lookups 2020-11-25 18:28:35 +00:00
Andy Allan
8f157ab2b1 Rename subject translation key, for consistency 2020-11-25 18:28:35 +00:00
Andy Allan
030591e318 Use rails t helper to allow relative translation keys in email subjects 
This makes it easier to rename methods and translation keys.
 2020-11-25 18:28:35 +00:00
Andy Allan
b83c0acbd1 Fix trace tag interpolation, and add a test 2020-11-25 11:34:35 +00:00
Andy Allan
f635b98b8c Refactor trace notifications to reduce lego translations 
Fixes #2268.

Unfortunately there's still a lego translation when both halves of the sentence are joined together, but this at least reduces the number of combinations to translate.
 2020-11-18 18:14:55 +00:00
Tucker Chapman
f4239f8fc5 Add last updated date to diary entry page 2020-11-17 20:33:27 -05:00
Tom Hughes
4e78f3ae5b Fix erblint warning 2020-11-17 09:23:22 +00:00
Tom Hughes
2ecfd61ee9 Fix new rubocop warnings 2020-11-17 08:17:34 +00:00
mxdanger
aad1c1b933 Add updated authentication logos 2020-11-13 20:02:00 -08:00
Tom Hughes
99e537859a Fix HTML escaping issues with user role icons 2020-11-13 15:13:37 +00:00
Tom Hughes
bfffe7ed96 Prefer string interpolation to concatenation 2020-11-13 11:32:28 +00:00
Tom Hughes
45d4242f9d Improve readability 2020-11-13 10:51:01 +00:00
Tom Hughes
4347d9d3b0 Merge remote-tracking branch 'upstream/pull/2921' into master 2020-11-13 10:49:35 +00:00
Tom Hughes
582402ba8f Prefer keyword arguments when method has optional boolean arguments 2020-11-13 10:22:55 +00:00
Andy Allan
78b9d92207 Prefer keyword arguments when method has optional boolean arguments 2020-11-12 11:24:44 +00:00