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
Anton Khorev
c3500b4b81 Remove display properties from share tabs 2023-07-29 19:26:20 +03:00
Tom Hughes
e932972a4a Merge remote-tracking branch 'upstream/pull/4108' 2023-07-27 20:42:03 +01:00
Tom Hughes
edfe0dde67 Disambiguate ID queries for tagged trace lists 2023-07-27 20:29:29 +01:00
Andy Allan
0a66990911 Simplify menu-icon css 
Remove the duplicate display property, since it was force-overridden
by the `!important` keyword in the same definiton. This then makes the
`!important` keywords unnecessary. The menu-icon is floated, and
therefore can't be `inline-block`, so browsers were interpreting that
as `block` all along.
 2023-07-26 17:39:36 +01:00
Andy Allan
c23d8bfa6a Remove unused parameter 2023-07-26 17:39:12 +01:00
Andy Allan
7ea3398c79 Remove unused CSS 
The browse_details CSS classes were removed in 30ab1e91da and c4090bb150
 2023-07-26 17:15:17 +01:00
Andy Allan
925d12cc81
Merge pull request #3933 from AntonKhorev/api-changesets-limit 
Add limit parameter to api changesets query
 2023-07-26 16:45:00 +01:00
Tom Hughes
c909b29c35 Replace page numbers with ID based selection for trace indexes 2023-07-23 19:28:37 +01:00
Andy Allan
e108ec6d48 Avoid using sprockets for combining stylesheets 
There are two options for combining stylesheets, using sprockets
(via `require` statements) or using sass (via `@import` statements).

This commit switches to using `@import` statements throughout, to
avoid a bug with libsass that prevents us from using bootstrap 5.2+

See https://github.com/sass/sassc-rails/issues/174

Since R2 is not triggered when `@import`ing a file, we need to
switch the top-level stylesheet names to include the extension. We
can also take the opportunity to remove a level of indirection,
along with removing symlinks which cause problems on some platforms.

* https://github.com/openstreetmap/openstreetmap-website/issues/3984
* https://github.com/openstreetmap/openstreetmap-website/issues/3422
 2023-07-12 17:54:51 +01:00
Andy Allan
d58cae6ff6 Avoid using the zero key for pluralisation in English 
This makes it impossible to translate to other languages that use the
`zero:` key, e.g. for other numbers that end in zero.

An alternative approach would be possible in future, when ruby-i18n
and rails and translatewiki all have full support for `0:` and `1:` keys.

Fixes #3997
 2023-07-05 14:47:39 +01:00
Tom Hughes
0254f7ee09 Fix confirmation prompt when granting or revoking roles 2023-07-01 15:21:02 +01:00
Tom Hughes
466de96a91 Fix new rubocop warnings 2023-06-27 18:13:33 +01:00
Andy Allan
e9e4b10473
Merge pull request #3907 from Dimitar5555/patch-1 
Facelift `offline.html` and use Bootstrap classes for "notifications" under the search bar
 2023-06-14 14:08:38 +01:00
Branko Kokanovic
e66e2c1b16 Fix ERB Lint for copyright 2023-06-12 10:40:45 +02:00
Branko Kokanovic
8d7fca30de Adding information about Serbia sources 2023-06-08 22:15:13 +02:00
Tom Hughes
7cdf5b0b19 Fix new rubocop warnings 2023-06-06 18:45:38 +01:00
Andy Allan
fad3aedbbb Rework note events to avoid raw html in translations 2023-04-02 10:22:30 +01:00
Andy Allan
aebac722c2 Rework geocoder titles to avoid raw html in translations 2023-04-02 10:14:00 +01:00
Andy Allan
4cfb632b5e Rework the map attribution to avoid raw html in translations. 2023-04-02 10:14:00 +01:00
Andy Allan
63484a169a Rework the help text to avoid raw html in translations 
Unfortunately bootstrap_form has no method for passing interpolation
values to the automatic help text system, so instead we'll use an
explicit override.
 2023-04-02 10:14:00 +01:00
Andy Allan
7751f7a04b Avoid raw html in translations for the note icon 2023-04-02 10:14:00 +01:00
Tom Hughes
0d56dab481 Merge remote-tracking branch 'upstream/pull/3985' 2023-03-29 19:30:07 +01:00
Andy Allan
4ac0c9c1e8 Rework browse pages to avoid raw html in translations 2023-03-29 18:52:45 +01:00
Andy Allan
a859fe1acf Avoid raw html in translations for changeset comments 2023-03-29 18:52:45 +01:00
Andy Allan
dff0c82f17 Avoid using raw html in translations for the issues index 2023-03-29 18:52:45 +01:00
Andy Allan
92e3e425f1 Avoid using raw html in translations on the about page 2023-03-29 18:52:45 +01:00
Dimitar
318064b2a7 Facelift offline.html and use Bootstrap classes for "notifications" 
Update site_controller_test.rb

Update site_controller_test.rb

Remove whitespace

Reset Settings.status after test is done

Update test for offline page

Update site_controller.rb

Fix indentation

Update offline controller

Update offline.html.erb

Remove flash CSS classes and fix missed tests

Updated tests

Address most PR comments

Update _flash.html.erb

Update _flash.html.erb

Update edit.html.erb

Update offline.html.erb
 2023-03-26 13:57:51 +03:00
Andy Allan
2f3c2cdb44 Remove unused small.scss symlinks 
These should have been removed as part of 5ab682dbbd
 2023-03-23 09:46:42 +00:00
Andy Allan
071f2798d4 Avoid using raw html in credit translations 2023-03-22 14:40:55 +00:00
Andy Allan
77e6bb8577 Avoid using raw html in translations on the copyright page 2023-03-22 14:40:55 +00:00
Tom Hughes
a7051e924f Merge remote-tracking branch 'upstream/pull/3982' 2023-03-22 11:00:09 +00:00
Tom Hughes
425d568037 Merge remote-tracking branch 'upstream/pull/3981' 2023-03-22 10:52:02 +00:00
Andy Allan
3ec310b0c8 Fix indentation 2023-03-22 10:37:20 +00:00
Andy Allan
d41d52877e Use with_locale for the copyright page 
This avoids having to override the locale on each and every translation
 2023-03-22 10:37:20 +00:00
Andy Allan
a91afa0e78 Use .with_locale for about page 
This simplifies the code, since we can avoid having to specify the
locale for every translation.

The test was added since I originally developed another approach,
but that caused exceptions on invalid locales.
 2023-03-22 10:13:01 +00:00
Andy Allan
473d425c10 Remove the language block from around the original guidance 
The guidance is shown in the user's own language, not in english.
 2023-03-22 09:55:41 +00:00
Andy Allan
1d5ba57c49 Remove the language block from around the guidance 
This was unnecessary and also incorrect. The guidance is shown in the users
own language, not in the @locale of the copyright statement, and so
doesn't need any language wrapping and certainly not stating that it's in
the @locale.
 2023-03-22 09:55:41 +00:00
Tom Hughes
b5cc4449a6 Include count in messages for the "one" plural category 2023-03-15 21:01:32 +00:00
Tom Hughes
0571802b31 Remove accidental commit 2023-03-12 17:53:30 +00:00
Tom Hughes
35c59bff0d Fix "load more" button on search results 
Fixes #3969
 2023-03-12 17:52:39 +00:00
Tom Hughes
6e6d806560 Set the locale when rendering a generic error page 2023-03-12 16:10:14 +00:00
Wille Marcel
525c041743
Add space between form and Publish diary button 2023-03-10 15:16:44 -03:00
Tom Hughes
e2e79ba549 Drop legacy forums from help page 2023-03-08 17:40:34 +00:00
Tom Hughes
9241d9810d Merge remote-tracking branch 'upstream/pull/3962' 2023-03-08 17:00:48 +00:00
Andy Allan
59ed461a5d Rework confirmations page to avoid raw html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
2771921cb1 Rework shared kramdown instructions to avoid html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
235618b9c0 Remove html from translations for terms page 2023-03-08 16:09:27 +00:00
Andy Allan
8a8935c8b6 Remove remaining html in translations from fixthemap page 2023-03-08 16:09:27 +00:00
Andy Allan
e6395508c4 Refactor communities page to avoid html in translations 2023-03-08 16:09:27 +00:00
Andy Allan
9c8bb75b9d Refactor potlatch page to avoid html in translations 2023-03-08 16:09:27 +00:00