Commit graph

3611 commits

Author SHA1 Message Date
Tom Hughes
10033fded1 Switch to i18n version 0.5.0 but keep old style interpolation
It's impossible to stop rails 2 loading a newer i18n gem if it is
installed, so go with the flow and use the latest one but override
the interpolation pattern for now.
2011-04-06 20:39:20 +01:00
Tom Hughes
b77c6fe8ae Improve recognition of OAuth referers for triggering of slim mode 2011-04-06 13:24:08 +01:00
Tom Hughes
25815dfb4d Update Potlatch 2 to 2.0-5-gabe766c build 2011-04-05 10:12:23 +01:00
Matt Amos
5df75e9321 Changed button text to match http://stateofthemap.org banner heading. 2011-04-05 00:46:48 +01:00
Tom Hughes
685a35524a Try and patch up poor browser language selections
The HTTP RFC says that a language range specified by a browser only
matches a resource whose language tag is the same, or longer. This
means that a browser language range of de-DE will not match a resource
with a language tag of de.

Because of this browsers should always send the generic range, such
as de, as a secondary choice after a more specific range like de-DE.

Some browers don't this however, so if we don't get a language match
we try and patch up the list of language ranges by inserting the
more generic ranges.
2011-04-04 22:44:43 +01:00
Tom Hughes
c39f688ae7 Update Potlatch 2 to 2.0-4-g7d1d145 build 2011-04-04 12:52:53 +01:00
Tom Hughes
1171bd3d8d Spell adapter correctly 2011-04-03 18:22:22 +01:00
Dan Karran
8dfca713e2 Fixing the user settings page for mobile use
Also add a quick workaround for the occasions when the top right
links overlap the logo and site name. We'll need a better fix for
this in the longer run.
2011-04-03 18:05:22 +01:00
Tom Hughes
8f101a3759 Trigger mobile mode at 640px instead of 480px for iPhone 4 support 2011-04-03 18:02:27 +01:00
Tom Hughes
a9e8f14e6d Monkey patch postgres adapter for postgres 9 support 2011-04-03 17:39:06 +01:00
Tom Hughes
c53896e453 Update Potlatch 2 to 2.0-2-g954c74a build 2011-04-03 17:13:24 +01:00
Dan Karran
6ad1642dae Make the changeset browser more mobile friendly
Floating some of the cells in the changeset browser onto the following
line should mean we don't need to scroll horizontally through that table.
2011-04-03 17:05:29 +01:00
Dan Karran
504f2f7835 Making more of the site smartphone friendly
For example limiting field widths to 100%, extending other elements
to full width, etc.
2011-04-03 16:29:10 +01:00
Tom Hughes
89bd91e7d8 Link from a diary entry to the relevant user's diary
Fix #2956 by making the title on a diary entry a link back to the
diary list page for the author.
2011-04-03 16:11:20 +01:00
Tom Hughes
9e6e6c2e23 Fixup the user map code to match existing code style 2011-04-03 16:00:06 +01:00
Harry Wood
41589b6ef9 fixes http://trac.openstreetmap.org/ticket/3645 . Can now pass in show_other_users and setting_location to the map partial 2011-04-03 15:43:41 +01:00
Tom Hughes
cb6d6c2463 Report a friendly(ish) error if no OAauth key is set for Potlatch 2 2011-04-03 15:40:05 +01:00
Dan Karran
d62da73ad7 Add a smaller version of the site logo and title for small screens 2011-04-03 15:16:35 +01:00
Tom Hughes
5777c5e925 Tidy up the data browser javascript 2011-04-03 14:59:43 +01:00
Frederik Ramm
59dcc8b253 Add 'hide areas' button to data view 2011-04-03 14:54:32 +01:00
Tom Hughes
62d9dbdc23 Make Potlatch 2 the default editor in the example configuration 2011-04-03 14:40:51 +01:00
Tom Hughes
6cfa483e8b Update Potlatch 2 to 2.0 build 2011-04-03 14:33:55 +01:00
Harry Wood
940995c816 Make home location setting map default to the whole world
Defaulting to western europe doesn't seem very reasonable these
days as we have users all over the world now.
2011-04-03 13:46:18 +01:00
Tom Hughes
4b20afd51e Preserve the referer at the end of account creation 2011-04-03 13:46:18 +01:00
Tom Hughes
097fb390b8 Only show login/signup in slim mode when used from oauth 2011-04-03 13:46:18 +01:00
Tom Hughes
98f34e4534 Make CTs full width in slim mode 2011-04-03 13:46:17 +01:00
Tom Hughes
bb83f28a5e Factor out comment code from layouts into partials 2011-04-03 13:46:17 +01:00
Andy Allan
59bfcb161d Tweaks to the contributor terms styling
The 60% trick doesn't work now that the terms are what defines the height (rather than the sidebar). Also, add a margin to bring the floating buttons within range of the slim container.
2011-04-03 13:46:17 +01:00
Andy Allan
9a25d85e25 No longer needed, and messes up the login page 2011-04-03 13:46:17 +01:00
Andy Allan
54a5aabcac Change around how this works - the container adjusts to the right height, and it's the (fixed-size) header that's absolute positioned instead of the content 2011-04-03 13:46:17 +01:00
Andy Allan
6edbcc12df Use slim layout for OAuth pages too 2011-04-03 13:46:17 +01:00
Andy Allan
f272381828 Add a grey box around login dialog 2011-04-03 13:46:17 +01:00
Andy Allan
7d7416894a New version of slim layout with grey background and centered, auto-adjusting page 2011-04-03 13:46:17 +01:00
Andy Allan
7b57119146 Another approach, but this time without scattering stuff all over the methods 2011-04-03 13:46:17 +01:00
Andy Allan
0531a7dfa1 Ah, that doesn't work due to 'bugs' in the way layouts work - only the last command has any effect 2011-04-03 13:46:17 +01:00
Andy Allan
5531c0bf34 Use the slim layout on the login page 2011-04-03 13:46:16 +01:00
Andy Allan
873fe81f71 Try a different approach - grab the layout and stylesheet from slim1, and ditch the rest 2011-04-03 13:46:16 +01:00
Tom Hughes
aa8fef0f94 Don't display deleted marker for nodes 2011-04-03 13:46:16 +01:00
Frederik Ramm
935c238626 Show the position of a deleted node in browse mode 2011-04-03 13:46:16 +01:00
Tom Hughes
0169453855 Make sure the user is redirect correctly after seeing the terms 2011-04-03 13:46:16 +01:00
Tom Hughes
7fd956260e Default REQUIRE_TERMS_SEEN to false for now 2011-04-03 13:46:16 +01:00
Tom Hughes
452879ee03 Don't run the user terms tests unless REQUIRE_TERMS_SEEN is set 2011-04-03 13:46:16 +01:00
Tom Hughes
392aa71015 Tidy up a few things 2011-04-03 13:46:16 +01:00
Tom Hughes
b3bcbbeb3b Move SOTM advert above the optionals 2011-04-03 13:46:16 +01:00
Matt Amos
8b12abd5bb Phase 2 CTs implementation and tests, with config parameter 2011-04-03 13:46:16 +01:00
Matt Amos
82db7eccc8 Added SOTM 2011 banner to the side bar 2011-04-03 13:46:15 +01:00
Tom Hughes
aa121fa046 Make diary locations into a link and drop the separate view link 2011-04-03 13:46:15 +01:00
Harry Wood
53fc3e8919 Remove edit links from geo-located diary entries
Jumping straight into the editor from a diary entry is not a
particularly useful thing to do. Fixes trac ticket #3626.
2011-04-03 13:46:06 +01:00
Tom Hughes
2512337cf5 Add a marker to the edit tab to indicate that it has a menu 2011-04-02 15:40:12 +01:00
Tom Hughes
432852c041 Rebuild OpenLayers with patch for OpenLayers ticket #2848
OpenStreetMap ticket #3399 reports than the transition effects are
not working properly on the map - brining in this upstream patch is
an attempt to fix that.
2011-04-01 08:50:31 +01:00