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

648 commits

Author SHA1 Message Date
Anton Khorev
4ba24bdd5d Remove some custom css for pages with embedded iD 2023-11-13 10:46:17 +03:00
Andy Allan
98bfaace9a
Merge pull request #4170 from osmcz/cuzk 
Add contributor info for Czechia for copyright web page
 2023-10-26 13:06:56 +01:00
tom.k
016ab83a22 add contributor info for Czechia 2023-10-19 08:22:32 +02:00
Andy Allan
5d4c96878a Remove sass division for export input boxes margins 2023-09-13 11:42:12 +01:00
Andy Allan
c162a9660e Use standard padding size for map-ui sidebar 
The previous padding didn't match the main sidebar, and also used
sass division as part of the calculation.
 2023-09-06 18:10:02 +01:00
Anton Khorev
672c79c79c Remove setting 100% width with w-100 where it's the default width 2023-07-28 20:27:58 +03: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
Andy Allan
7751f7a04b Avoid raw html in translations for the note icon 2023-04-02 10:14:00 +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
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
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
e2e79ba549 Drop legacy forums from help page 2023-03-08 17:40:34 +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
Andy Allan
9101705656 Remove html from translations for the welcome page 
This also refactors the "any questions" section, which is shared with the fixthemap page.
 2023-02-22 10:25:51 +00:00
Andy Allan
317b1871f4 Refactor translation to avoid raw html tags 2023-02-22 09:16:17 +00:00
Dimitar
3247ffd57c
Added missing </p> tag 2023-01-01 16:06:41 +02:00
Tom Hughes
8cef62cd2c Merge remote-tracking branch 'upstream/pull/3301' 2022-11-22 18:47:24 +00:00
Andy Allan
af6fec502a Validate URLs against supply-chain attacks 
Unfortunately validates_url gem doesn't support mailto or xmpp urls,
so we need to write our own validation.
 2022-11-02 18:21:00 +00:00
Andy Allan
b0a741412f
Merge pull request #3700 from AntonKhorev/about 
Replace <h5> used to set the font size with Bootstrap class h5
 2022-10-19 15:58:17 +01:00
Anton Khorev
7c4dff7445 Vertically center about page icons with flex align-items 2022-09-19 11:48:57 +03:00
Anton Khorev
21cc9f3af1 Replace <h5> used to set the font size with Bootstrap class h5 2022-09-19 08:20:01 +03:00
Adam Hoyle
7e5cbe87ed Merge branch 'master' into feature/add-communities-page 
# Conflicts:
#	Gemfile.lock
#	package.json
#	yarn.lock
 2022-09-10 16:13:17 +01:00
Grant Slater
7d2206393b
Add Link and text for the new community forum 2022-08-31 23:12:12 +01:00
Andy Allan
e59ba78575 Use lead text highlighting for lede paragraph 2022-08-03 10:35:13 +01:00
Andy Allan
83a0ea14f1 Refactor i18n so that all community information is available 
This makes it easier to use non-chapter communities on the site in future.
 2022-08-03 10:11:30 +01:00
Andy Allan
09631b53e9 Remove extra container div from fixthemap page 
This created extra margins and padding either side of the blocks
of text, which was unnecessary
 2022-07-27 16:32:16 +01:00
Andy Allan
1bf671f684 Rework welcome and fixthemap pages 
* Use lead class for lede paragraphs
* Change headings to start from h2
* Remove custom css and use bootstrap utilities where required
 2022-07-27 16:32:16 +01:00
Andy Allan
c8ddd63280 Fix the font weight on the about page title, and use lead styling for the lede 2022-07-27 13:08:06 +01:00
Andy Allan
e2f17abd3d Bootstrap 5: Replace card-deck with a row-cols-* based grid 2022-07-20 14:43:00 +01:00
Andy Allan
934d81aa55 Bootstrap 5: Replace all form-group classes with mb-3 2022-07-20 14:42:57 +01:00
Tom Hughes
16210d9f4f Rename id_oauth_application to id_application in settings 2022-06-08 13:28:07 +01:00
Martin Raifer
c55d346d5f
Update to iD v2.21.0 
major changes in this release:
* dropped support for Internet Explorer 11
* switched authentication to OAuth 2

for further changes please refer to https://github.com/openstreetmap/iD/blob/release/CHANGELOG.md#2210
 2022-06-03 15:32:27 +02:00
Harry Wood
51b7c3a5be More readable multi-line ruby in erbs 
A couple of erb files had unnecessary start and end erb tags around every line in a multi-line block of ruby. More readable this way.
 2022-03-05 02:56:43 +00:00
Harry Wood
2ce44a2a85 Fix minor HTML tag mismatches 
Fix some HTML tag mismatches and other glitches. These are minor, and don't appear to cause browsers any problems, but for the sake of correctness:
* A closing td which should be a closing div.
* A closing h3 for a corresponding h6
* Two tables with `<thead>` tag and missing `<tr>` around the `<th>` headings.

test change for thead fix
 2022-03-05 02:44:59 +00:00
Andy Allan
9e496e44c4 Simplify template markup 2022-03-02 15:48:51 +00:00
Adam Hoyle
46875fdde3
Merge branch 'master' into feature/add-communities-page 2021-12-14 10:42:42 +00:00
Andy Allan
a8e8ba1a64 Refactor the account edit/update pages out into a separate accounts controller 2021-12-08 15:17:50 +00:00
Adam Hoyle
764f808d5a Remove hand rolled i18n support 2021-11-24 22:47:19 +00:00
Adam Hoyle
ad900553cb Add relevant osm-community-index data into I18n 2021-11-24 22:22:32 +00:00