Commit graph

20 commits

Author SHA1 Message Date
Tom Hughes
56db9ca2b7 Merge branch 'master' into notes 2013-02-02 11:00:46 +00:00
Tom Hughes
b0747c3c1e Fix formating of way and relation redaction messages as well 2013-01-18 09:19:01 +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
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
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
04017d0e7a Fix tests to cope with stricter route enforcement in rails 2.3.6 2012-06-18 13:03:03 +01:00
Matt Amos
9c098816e5 Added tests for browsing object histories with redacted elements 2012-04-05 13:49:59 +01:00
Tom Hughes
c9fb146608 Restructure notes URLs according to standard rails conventions 2012-03-10 17:04:57 +00:00
Tom Hughes
90e46a58de Add routing tests for all supported routes 2012-03-09 19:49:44 +00:00
Tom Hughes
13289d4041 Switch from Prototype to jQuery 2011-11-26 00:22:31 +00:00
Tom Hughes
fc25c3d412 Rename all ID columns that aren't unique
Having a table with a column called ID that is only part of the
primary key really doesn't work as rails likes to treat ID as a
special name so it becomes impossible to assign to it or read it.
2011-11-14 09:42:52 +00:00
Shaun McDonald
6327e3e690 fix typo which meant that it was testing the node twice, rather than the node then the node history 2009-05-07 14:10:17 +00:00
Shaun McDonald
0f25285ab6 More tests, found a bug in the data browser, no fix yet. Fix db readme. Don't show the signup page to logged in users, by redirecting them to the home page. Remove unnessesary begin blocks in the browse controller. 2009-04-12 23:20:31 +00:00
Thomas Wood
d841d3d135 <td> tags must be closed, move browse index test over to changeset, lazy fix for new format 2009-03-23 21:35:06 +00:00
Thomas Wood
747d6f1d11 Revert last commit - too many test failures 2008-12-31 16:43:44 +00:00
Thomas Wood
898beb7b7f DateTime => Time for consistency in changeset code, ok by shaun. 2008-12-31 16:33:02 +00:00
Thomas Wood
8fe53e4823 Only show changesets that are actually closed in the index view. 2008-12-31 16:14:39 +00:00
Thomas Wood
62b6d15967 Make browse controller index show recently closed changesets, rather than recently changed nodes. 2008-12-23 15:47:06 +00:00
Shaun McDonald
427becc1db Moving all the functional tests to the Rails 2 way, which uses less code by having an additional sub-class to take care of the duplicate code in every test. There is a bug in rails 2.0.2, which means that super doesn't get called in the setup method in the functional tests. This is fixed in Rails 2.1.2, thus a version bump should really be done. 2008-10-28 12:27:10 +00:00
Shaun McDonald
6df7fdbb9e Adding new browse controller test, which is mostly stubs just now. Also adding the version number of the recently changed nodes in the data browser. 2008-10-21 16:18:18 +00:00