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

5883 commits

Author SHA1 Message Date
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
ee8ce8c3ab Merge remote-tracking branch 'upstream/pull/2507' 2020-01-15 14:19:11 +00:00
Tom Hughes
f07bdbf905 Merge remote-tracking branch 'upstream/pull/2506' 2020-01-15 14:18:11 +00:00
Tom Hughes
50b2f4f656 Merge remote-tracking branch 'upstream/pull/2505' 2020-01-15 12:17:10 +00:00
Andy Allan
cd801b2c12 Rework issues display page to be responsive 
This change uses the bootstrap grid to make the issues page responsive,
and avoids having lots of custom widths of divs specified via CSS.

It also changes the display of the reports and comments to be more
like diary entry comments, by having all metadata on one line and shown
before the comment / report text.
 2020-01-15 12:20:27 +01:00
Andy Allan
1a75b1ba72 Minor tweaks to copyright heading 
This fixes a small bug where the hr was shown even when not required,
by ensuring the test is run before creating the content.

Also fixes where an h1 tag was used instead of a div.
 2020-01-15 12:09:14 +01:00
mmd-osm
03ca0b2c69 Added Accept header unit tests 2020-01-12 17:46:11 +01:00
Andy Allan
0a0ff5e7d6 Remove extra div wrappings from list items 
These are unnecessary, and also prevent the secondary-actions vertical
border from appearing.
 2020-01-10 15:53:42 +01:00
Tom Hughes
1c062165f6 Avoid double escaping a name 2020-01-09 11:05:08 +00:00
Tom Hughes
bd7c279604 Merge remote-tracking branch 'upstream/pull/2500' 2020-01-09 11:03:34 +00:00
Tom Hughes
7b0d3aaf9f Fix translation names 2020-01-09 11:00:46 +00:00
Tom Hughes
b1e1572af3 Don't validate the revoker for a block if it hasn't changed 
The revoker only has to be a moderator at the time they make the
revocation - as things stood trying to view a block that had been
revoked by somebody that was no longer a moderator failed.
 2020-01-09 10:59:34 +00:00
Tom Hughes
928465764e Merge remote-tracking branch 'upstream/pull/2499' 2020-01-09 10:36:31 +00:00
Tom Hughes
e39d227dd0 Merge remote-tracking branch 'upstream/pull/2498' 2020-01-09 10:31:37 +00:00
Tom Hughes
ffb671b80d Fix indentation of query results 2020-01-09 10:26:16 +00:00
Tom Hughes
d76756d202 Merge remote-tracking branch 'upstream/pull/2497' 2020-01-09 10:10:10 +00:00
Andy Allan
ff363832f8 Fix typos 2020-01-09 10:06:20 +01: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
59f0760bf3 Remove the custom basic grid css rules 
This is now unused, and the bootstrap grid is much more powerful.
 2020-01-08 17:36:38 +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
Andy Allan
82fd7a10ac Remove the custom layout css from the terms page 
This uses bootstrap utilities where necessary. It also removes the
terms page from a padding override, which was then in turn overridden
by a padding class applied to the form!
 2020-01-08 17:04:53 +01:00
Andy Allan
f0ee117cff Refactor the welcome page to use the bootstrap grid and alert box 
The two columns work well side-by-side even at small screen widths.
 2020-01-08 16:41:17 +01:00
Andy Allan
0b1aafb701 Refactor the fixthemap page to use the bootstrap responsive grid 
This ensures that on small screens, the 'how to help' sections
are one above the other, and on larger screens they are side-by-side
 2020-01-08 16:27:39 +01:00
Andy Allan
68422c7ff2 Remove extra styling for rss icon 
This brings it into line with e.g. the new diary entry icon
 2020-01-08 16:08:18 +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
1a9595862f Remove font size override on sidebar tags tables 2020-01-08 16:01:07 +01:00
Andy Allan
712e67ed4a Refactor the query results to use bootstrap list-group-flush 2020-01-08 16:00:18 +01:00
Andy Allan
8a774e7519 Use a post link to logout 
This avoids needing to access the session id, which is currently
only working with the memcache store.

The fallback page is preserved for anyone who wants to logout without
using javascript.

Refs #2488
 2020-01-08 14:03:05 +01:00
Tom Hughes
5a668bfbe4 Add some missing _html suffixes 2020-01-05 19:01:54 +00:00
Tom Hughes
a570f59187 Merge remote-tracking branch 'upstream/pull/2494' 2020-01-05 18:51:42 +00:00
Tom Hughes
6c22bf4b9a Set X-Entity-Ref-ID header on notification emails 
This disables threading in gmail completely - without it all
notifications of a given type are grouped together.
 2020-01-02 21:45:41 +00:00
Andy Allan
53f2c36f1d Use ActionView's safe_join to avoid using raw when joining arrays of text 2020-01-02 18:07:23 +01: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
mmd-osm
97036c181e JSON output, handle Accept header 2020-01-02 15:17:11 +01:00
mmd-osm
b54333fa6d Unify lat/lon formatting for json output 2020-01-02 14:52:53 +01:00
Tom Hughes
e7332b0c41 Merge remote-tracking branch 'upstream/pull/2491' 2020-01-02 13:29:26 +00:00
Andy Allan
4ca2721c63 Remove the dashed underline from prose headings 
No other headings are underlined, and the underlines look more like
a section separator (e.g. dashed hr) and so visually separated the
heading from its content.
 2020-01-02 13:40:30 +01:00
Andy Allan
304deb3ca7 Remove usused css for about page 
Also removes some whitespace on sections and headings that can be
better left as default.
 2020-01-02 11:15:26 +01:00
Andy Allan
fc5260d71b Split the legal_html into two, so that we can use proper paragraphs instead of a linebreak 
Also add a missing full stop.
 2020-01-02 11:14:54 +01:00
Andy Allan
ca8195c8a3 Reinstate background colour for sidebars 
This is required when the sidebar overlaps the map, for example when
it is not full height on the welcome message.
 2020-01-02 10:50:02 +01:00
Tom Hughes
23e763ea95 Mark language and direction for about page 2019-12-30 22:49:17 +00:00
Tom Hughes
3426976606 Merge remote-tracking branch 'upstream/pull/2444' 2019-12-30 22:34:24 +00:00
Tom Hughes
29aac6e149 Merge remote-tracking branch 'upstream/pull/2462' 2019-12-30 22:29:24 +00:00
mmd-osm
480eaa1b36 Added helper function set_references for mail header 2019-12-30 23:04:15 +01:00
Tom Hughes
1c5642637a Merge remote-tracking branch 'upstream/pull/2471' 2019-12-30 21:40:10 +00:00
Tom Hughes
1597a2f879 Merge remote-tracking branch 'upstream/pull/2470' 2019-12-30 21:37:32 +00:00
Tom Hughes
5ff4e4e331 Merge remote-tracking branch 'upstream/pull/2469' 2019-12-30 21:29:00 +00:00
mmd-osm
45a1d298a9 Move default_format_xml to api_controller 2019-12-30 17:26:00 +01:00
mmd-osm
75a49786f8 API JSON output 2019-12-30 16:37:52 +01:00