Commit graph

1214 commits

Author SHA1 Message Date
Tom Hughes
8e5364b2f2 Only show each note once is the user notes view 2013-02-03 11:07:01 +00:00
Tom Hughes
9d3b419aad Improve styling of the per-user notes list view 2013-02-02 14:29:45 +00:00
Tom Hughes
3d7eb387a7 Merge branch 'master' into notes
Conflicts:
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
2013-01-15 21:11:35 +00:00
Tom Hughes
4c9a3d4803 Disable caching of pages with dynamic layout
Pages now feed back into the layout to set the content of the heading
block so we can't cache any page which has a layout as that would mean
the heading wouldn't appear when the cached page was used.
2013-01-14 22:30:03 +00:00
Saman Bemel-Benrud
a36f3558dd Site cleanup
I set out to do a quick and dirty typography overhaul to make things
more consistent and a bit cleaner, but I kept running into things I
didn't like, so this lead me down something of a rabbit hole of design
tweaks to the OSM site.

Goals here are to have better content hierarchy, better vertical
rhythm, more consistent UI, cleaner markup with less tables, all while
keeping the basics pretty much intact. There are a lot of things I
didn't touch even though they need to be updated (lots of tables where
stuff shouldn't be tables, mostly).

Basic overview of changes:

I added a new persistent header that helps segment pages. It's now
a lot easier to know what you're looking at. The header has a page
title, a description, plus a submenu of actions.

There is now a pattern of 20px/10px margins and padding for more
rhythm and breathing room throughout the site.

I know there are other problems here or things I've missed - would
love another set of eyes to look over this! I am still getting comfortable
working on the site - it's my first time ever digging into a ruby or rails
so I'm not familiar with the templating language yet.
2013-01-14 21:27:08 +00:00
Tom Hughes
ba5107ebb5 Remove the author_name field from notes 2012-12-03 14:50:54 +00:00
Tom Hughes
78f608b114 Merge branch 'master' into notes
Conflicts:
	app/assets/javascripts/browse.js
	app/assets/javascripts/map.js.erb
	app/assets/stylesheets/common.css.scss
	app/views/site/index.html.erb
2012-12-01 18:22:30 +00:00
Kai Krueger
0a3aba7f89 Remove nearby_place from the note model
Instead of storing the auto-generated meta information nearby_place
in the database, just look up the information on the fly when needed
and cache it for performance.
2012-12-01 18:18:09 +00:00
Tom Hughes
c0b47c0c2a Serve embedded maps through the assets pipeline 2012-11-23 10:40:26 +00:00
Tom Hughes
7599f98957 Merge branch 'master' into notes
Conflicts:
	Gemfile
	Gemfile.lock
	app/assets/stylesheets/common.css.scss
	app/helpers/application_helper.rb
2012-11-20 19:08:30 +00:00
Tom Hughes
cb6eb65466 Use binary mode for trace files
We don't want to try and do any enoding conversions (or indeed any
newline conversions) on uploaded trace files.
2012-11-04 14:41:01 +00:00
Tom Hughes
c2c2535b73 Make sure we always read the body of a PUT or POST request
Unfortunately if a PUT or POST request that has a body fails to
read it then Apache will sometimes fail to return the response it
is given to the client properly, instead erroring:

  https://issues.apache.org/bugzilla/show_bug.cgi?id=44782

To work round this we call rewind on the body for every request using
a filter, which forces it to be fetched from Apache into a file.
2012-11-01 12:45:37 +00:00
Tom Hughes
3ef02b86f0 Revert "Add a newline to the end of the body when reporting an error"
This reverts commit 59c97f4866.
2012-11-01 12:42:47 +00:00
Tom Hughes
59c97f4866 Add a newline to the end of the body when reporting an error
There seems to be some sort problem with ruby 1.9 where a response
body that is a single line with no newline causes the response not
to be sent properly.
2012-11-01 09:13:43 +00:00
Tom Hughes
b7b68aee36 Simplify handling of verified emails in OpenID signup
Also make sure that all paths that lead to OpenID based signup
will notice a verified email properly.
2012-10-30 21:43:38 +00:00
Kai Krueger
104727f889 Trust Google and Yahoo to return valid email addresses
Both Google and Yahoo guarantee that the email address they return
during the OpenID authentication are emails that they have already
verified:

  http://stackoverflow.com/q/5639419

Therefore special case these OpenID providers and automatically
activate the new users account without requiring a separate email
verification step.

This therefore reduces the signup procedure by one step and makes
it easier for new users of these OpenID providers, which cover the
majority of users.
2012-10-30 19:14:45 +00:00
Tom Hughes
95fa893163 Make it easier to test alternative locales
Allow a locale=xx parameter in the URL to select the locale.
2012-10-26 21:41:03 +01:00
Paweł Paprota
ad43499205 Implemented Gravatar support 2012-10-18 18:59:38 +01:00
Tom Hughes
e2f1d6017d Update list of filtered methods in notes controller 2012-10-16 12:15:37 +01:00
Tom Hughes
8b917ccd60 Allow an optional comment to be given when closing a note 2012-10-14 16:01:35 +01:00
Tom Hughes
f48d8f41d8 Return a copy of the note data on creation and update 2012-10-14 16:01:34 +01:00
Tom Hughes
92ce228cbe Get note comment notification working again 2012-10-14 16:01:34 +01:00
Tom Hughes
0037502426 Merge branch 'master' into notes
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/site/index.html.erb
2012-10-13 15:55:34 +01:00
John Firebaugh
e73ab4049f Remove unused assign of @bbox which is no longer used 2012-10-05 15:21:09 +01:00
John Firebaugh
60becd1050 Remove @midnode assign
It does not appear to be necessary and no other edit links
make use of it. SiteController#edit will calculate a precise
center coordinate.
2012-09-30 12:19:15 +01:00
Tom Hughes
3ce4de1295 Add a /api/0.6/user/NNNN call to the API 2012-09-24 18:44:11 +01:00
John Firebaugh
02bdc8f1ad Don't expose lat/lon of private traces 2012-09-21 15:29:02 -07:00
John Firebaugh
20e5f756be Support the same edit params for Potlatch 1 and 2
Trac ticket 4587
2012-09-21 15:16:56 -07:00
Tom Hughes
4d91fe3dd9 Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile
	app/helpers/application_helper.rb
	app/views/site/index.html.erb
2012-09-20 16:01:24 +01:00
Tom Hughes
1a0728ec7b Remove unused namefinder support from the geocoder backend 2012-09-18 11:54:11 +01:00
John Firebaugh
0509fc8d12 Move param-based map configuration to client
This prepares us for hash-based permalinks (#81) and removes
the duplication between index.html.erb and SiteController#edit.
2012-09-18 08:56:45 +01:00
Gnonthgol
fcddf920a3 Remove the "We are changing the license" flash on the login page 2012-09-14 15:24:36 +01:00
John Firebaugh
8ec415b060 Use a param to trigger export rather than a separate action
In site/_resize.html.erb and site/_search.html.erb, a
params[:action] conditional is used to include code that
should only run on the index action -- but it should be run
on the export action too. Cleanest fix is to eliminate that
action entirely.
2012-09-07 09:27:59 +01:00
Tom Hughes
021a17b79a Mark a message as read when a user replies via the web 2012-09-03 08:40:17 +01:00
Tom Hughes
367303f6d8 Move a chunk of non-markup ruby code from a view to the controller 2012-08-28 20:39:18 +01:00
Tom Hughes
3d874a5d61 Use start.html.erb views instead of _sidebar.html.erb partials 2012-08-27 21:28:41 +01:00
John Firebaugh
17b23b0756 Extract browse.js static asset 2012-08-27 20:23:24 +01:00
John Firebaugh
2feff4244f Reduce interpolation in browse/start.js.erb 2012-08-27 18:00:48 +01:00
John Firebaugh
cc4f133e64 Extract export.js static asset 2012-08-27 18:00:13 +01:00
Tom Hughes
0d3a9ed9cb Merge branch 'master' into openstreetbugs
Conflicts:
	Gemfile.lock
	app/views/browse/_map.html.erb
	app/views/user/view.html.erb
	config/locales/en.yml
	config/openlayers.cfg
	db/structure.sql
	vendor/assets/openlayers/OpenLayers.js
2012-08-22 20:52:08 +01:00
Tom Hughes
573991e5a9 Fixup make_friend and remove_friend properly
Requests using POST are now actioned immediately, while requests
using GET present a confirmation page.
2012-08-15 20:13:14 +01:00
Tom Hughes
fbabed694b Improve blocks on/by links on user pages
All block related links are now only shown if the user has given
or received any blocks, and include a count of active blocks.
2012-08-10 08:27:37 +01:00
Tom Hughes
703c1a83e6 Show the correct reconfirm link for OpenID login attempts 2012-07-27 21:30:06 +01:00
Tom Hughes
d38e476fa6 OpenID attributes returned via AX seem to be arrays now 2012-07-27 21:27:45 +01:00
Tom Hughes
16beaef5cf Don't try and store a user record in the session
A user record that has come from the database can't be stored in
the session as it contains singletons that can't be serialised.
2012-06-30 19:17:04 +01:00
Tom Hughes
652e94485f Use browser detection to decide how many features to show
Modern browsers are quite happy showing far more than 100 features in
the data browser, so increase the limit to 2000 by default, but keep it
restricted to 500 for IE8 and 100 for older IEs.
2012-06-05 12:59:13 +01:00
Tom Hughes
9813d9f1e4 Get all the tests passing under ruby 1.9 2012-05-27 13:51:25 +01:00
Tom Hughes
fc7ac5d086 Don't show deleted comments in a user's diary comment list 2012-05-15 18:58:13 +01:00
Tom Hughes
58559d50da Fixed diary entry and comment hiding for mass assignment protection 2012-05-13 18:44:54 +01:00
Enno Brehm
6a09f49e71 Implement API endpoint to query permissions. 2012-05-05 15:28:45 +01:00