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

3041 commits

Author SHA1 Message Date
Tom Hughes
1cb92c9d2a Send meta information with error pages 2020-04-22 12:21:42 +01:00
Tom Hughes
9b634f3493 Cache OpenID provider names on a per-locale basis 
Fixes #2591
 2020-04-15 22:48:28 +01:00
Tom Hughes
6ad0340b05 Localise formatting of point count for traces 
Fixes #2592
 2020-04-15 22:42:41 +01:00
Tom Hughes
3666b67433 Merge remote-tracking branch 'upstream/pull/2431' 2020-04-15 19:18:10 +01:00
Andy Allan
055a976051 Remove custom table styling 
This removes the custom table styling code, and move to using bootstrap table styling for almost all remaining tables.
 2020-04-01 12:29:01 +02: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
5fdada204c Use bootstrap table striping to replace hand-cycled table stripes 
This cuts down on the complexity of having to use the `cycle` function
and makes the templates easier to read. CSS-based striping has been
around for many years.

The CSS is in order to keep our custom colour for striped tables.
 2020-03-18 12:14:24 +01:00
Andy Allan
73c95847a6
Merge pull request #2485 from mmd-osm/patch/json2 
JSON output nodes, ways, relations, map
 2020-02-26 15:55:48 +01:00
Anton Melnichuk
292f38a6ce fix help page, grid card layout on mobile 2020-02-13 14:18:49 +02:00
Andy Allan
e22b9c35f5 Remove list styling from various sidebar lists 2020-01-30 13:14:53 +01:00
Andy Allan
a2abce0f4a Use an unstyled list for the login buttons 2020-01-30 10:24:08 +01:00
Andy Allan
e5c33c119a Switch to bootstrap for dropdowns and tooltips 
Due to the javascript involved, it was more straightforward to combine
the two together. Moving to bootstrap v4 for dropdowns required some
redesign of the dropdown menu html, and the opportunity was taken to
move to using standard buttons for those menus.
 2020-01-29 18:23:47 +01:00
mmd-osm
7fcb76aa9a JSON: move root_attributes to shared folder 2020-01-22 22:47:47 +01:00
Andy Allan
a3795cddbb Move the search results to use list-group-flush 2020-01-16 12:39:13 +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
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
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
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
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
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
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
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
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
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
b54333fa6d Unify lat/lon formatting for json output 2020-01-02 14:52:53 +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
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
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
mmd-osm
75a49786f8 API JSON output 2019-12-30 16:37:52 +01:00
Kristjan
81c244e273
fixed "end tag" -> "source" 
Fixed inattentiveness from my last commit.
 2019-12-26 11:23:45 +01:00
Kristjan
0d3f269aa8
removed end tag ("source" is a self-closing tag) 2019-12-24 23:44:50 +01:00
Kristjan
ec56eaf0f2
removed end tag ("source" is a self-closing tag) 2019-12-24 23:44:22 +01:00