]> git.openstreetmap.org Git - rails.git/log
rails.git
11 years agoAdd anonymous comment warning to note popup
Tom Hughes [Sat, 2 Feb 2013 16:18:35 +0000 (16:18 +0000)]
Add anonymous comment warning to note popup

11 years agoImprove styling of the per-user notes list view
Tom Hughes [Sat, 2 Feb 2013 14:29:45 +0000 (14:29 +0000)]
Improve styling of the per-user notes list view

11 years agoImprove display of anonymous note comments
Tom Hughes [Sat, 2 Feb 2013 13:04:27 +0000 (13:04 +0000)]
Improve display of anonymous note comments

11 years agoTweak sizing of note popups
Tom Hughes [Sat, 2 Feb 2013 12:21:53 +0000 (12:21 +0000)]
Tweak sizing of note popups

11 years agoLocalise dates and times in notes popups
Tom Hughes [Sat, 2 Feb 2013 12:11:46 +0000 (12:11 +0000)]
Localise dates and times in notes popups

11 years agoImprove comment descriptions in note popups
Tom Hughes [Sat, 2 Feb 2013 11:22:11 +0000 (11:22 +0000)]
Improve comment descriptions in note popups

11 years agoMerge branch 'master' into notes
Tom Hughes [Sat, 2 Feb 2013 11:00:46 +0000 (11:00 +0000)]
Merge branch 'master' into notes

11 years agoUpdate Potlatch 2 translations
Tom Hughes [Sat, 2 Feb 2013 10:58:32 +0000 (10:58 +0000)]
Update Potlatch 2 translations

11 years agoMissing aerodrome symbol (referenced in browse.css.scss).
Paweł Paprota [Fri, 1 Feb 2013 12:04:43 +0000 (13:04 +0100)]
Missing aerodrome symbol (referenced in browse.css.scss).

11 years agoShow the header block on slim layout pages
Tom Hughes [Wed, 30 Jan 2013 18:17:04 +0000 (18:17 +0000)]
Show the header block on slim layout pages

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 27 Jan 2013 19:47:32 +0000 (19:47 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoAllow non-square user images
Saman Bemel-Benrud [Sat, 26 Jan 2013 00:53:15 +0000 (19:53 -0500)]
Allow non-square user images

11 years agoFix lists in rich text to display properly
Tom Hughes [Thu, 24 Jan 2013 14:54:26 +0000 (14:54 +0000)]
Fix lists in rich text to display properly

Add a "richtext" class to anything which contains text rendered
by our rich text library, and move styles which were only being
applied to diary entries to apply to all rich text.

11 years agoRemove redundant CSS rule - table headings are already bold
Tom Hughes [Thu, 24 Jan 2013 14:31:14 +0000 (14:31 +0000)]
Remove redundant CSS rule - table headings are already bold

11 years agoCompute size of rich text preview pane correctly
Tom Hughes [Thu, 24 Jan 2013 14:29:27 +0000 (14:29 +0000)]
Compute size of rich text preview pane correctly

11 years agoPut some white space back to make things readable
Tom Hughes [Thu, 24 Jan 2013 14:18:18 +0000 (14:18 +0000)]
Put some white space back to make things readable

11 years agoWrap longitude values explicitly
Tom Hughes [Tue, 22 Jan 2013 22:29:50 +0000 (22:29 +0000)]
Wrap longitude values explicitly

Leaflet 0.5 no longer wraps longitude values, so we need to do it.

11 years agoFix overflow on login page on mobile
Saman Bemel-Benrud [Tue, 22 Jan 2013 16:23:47 +0000 (11:23 -0500)]
Fix overflow on login page on mobile

11 years agoFix mobile map and other minor mobile adjustments
Saman Bemel-Benrud [Tue, 22 Jan 2013 16:09:23 +0000 (11:09 -0500)]
Fix mobile map and other minor mobile adjustments

11 years agoRemove asset pipeline overrides for unused images in embedded maps
Tom Hughes [Tue, 22 Jan 2013 15:16:55 +0000 (15:16 +0000)]
Remove asset pipeline overrides for unused images in embedded maps

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Tue, 22 Jan 2013 06:16:27 +0000 (06:16 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUse U+25BC instead of U+25BE for the menu indicator
Tom Hughes [Mon, 21 Jan 2013 22:59:06 +0000 (22:59 +0000)]
Use U+25BC instead of U+25BE for the menu indicator

11 years agoRemove asset pipeline overrides for now unused images
Tom Hughes [Mon, 21 Jan 2013 22:50:08 +0000 (22:50 +0000)]
Remove asset pipeline overrides for now unused images

11 years agoCorrect vertical position of map controls in small screen layout
Tom Hughes [Mon, 21 Jan 2013 21:42:44 +0000 (21:42 +0000)]
Correct vertical position of map controls in small screen layout

11 years agoRename historic=ruins tag symbol to match the CSS rule in browse.css.
Paweł Paprota [Sun, 20 Jan 2013 12:11:07 +0000 (13:11 +0100)]
Rename historic=ruins tag symbol to match the CSS rule in browse.css.

11 years agoMake maximising work properly again in Potlatch
Tom Hughes [Sat, 19 Jan 2013 11:29:12 +0000 (11:29 +0000)]
Make maximising work properly again in Potlatch

11 years agoDetach the permalink from the DOM so only one copy is shown
Tom Hughes [Fri, 18 Jan 2013 13:50:37 +0000 (13:50 +0000)]
Detach the permalink from the DOM so only one copy is shown

11 years agoFix formating of way and relation redaction messages as well
Tom Hughes [Fri, 18 Jan 2013 09:19:01 +0000 (09:19 +0000)]
Fix formating of way and relation redaction messages as well

11 years agoImprove testing of the trace list view
Tom Hughes [Fri, 18 Jan 2013 00:37:44 +0000 (00:37 +0000)]
Improve testing of the trace list view

11 years agoUpdate to Leaflet 0.5
Tom Hughes [Thu, 17 Jan 2013 17:44:10 +0000 (17:44 +0000)]
Update to Leaflet 0.5

11 years agoRemove style rules that are no longer needed
Tom Hughes [Thu, 17 Jan 2013 00:12:59 +0000 (00:12 +0000)]
Remove style rules that are no longer needed

11 years agoMark hide rules as important
Tom Hughes [Wed, 16 Jan 2013 23:28:08 +0000 (23:28 +0000)]
Mark hide rules as important

11 years agoFix formatting of redaction messages on browse history pages
Tom Hughes [Wed, 16 Jan 2013 23:05:09 +0000 (23:05 +0000)]
Fix formatting of redaction messages on browse history pages

11 years agoHighlight the history tab correctly
Tom Hughes [Wed, 16 Jan 2013 21:27:11 +0000 (21:27 +0000)]
Highlight the history tab correctly

11 years agoCleanup followup
Saman Bemel-Benrud [Wed, 16 Jan 2013 18:43:25 +0000 (18:43 +0000)]
Cleanup followup

Tighter copy on node list for to decrease the chance of an ugly line
break (need better fix here so the line break is smoother). Just changed
also part of way %{related_ways} to part of way %{related_ways}. This
needs a better fix to make line breaks indent properly, but this should
at least help a little (issue #185).

Properly positioned 'nearby users' block on user page to be in the left
column (issue #184).

Removed deemphasized class from search results (issue #181) lighter
highlight yellow on changesets page.

11 years agoRemove messages which have been copied from english
Tom Hughes [Wed, 16 Jan 2013 18:45:55 +0000 (18:45 +0000)]
Remove messages which have been copied from english

11 years agoFixup test failure
Tom Hughes [Wed, 16 Jan 2013 18:39:26 +0000 (18:39 +0000)]
Fixup test failure

11 years agoMake user markers display correctly
Tom Hughes [Wed, 16 Jan 2013 18:27:56 +0000 (18:27 +0000)]
Make user markers display correctly

Instead of putting the data on a bogus <td> element that will be deleted
by the browser, put it on the <div> wrapper instead.

11 years agoAvoid wrapping an <li> in a <span>
Tom Hughes [Wed, 16 Jan 2013 18:13:52 +0000 (18:13 +0000)]
Avoid wrapping an <li> in a <span>

11 years agoDisplay trace descriptions properly
Tom Hughes [Wed, 16 Jan 2013 09:53:39 +0000 (09:53 +0000)]
Display trace descriptions properly

11 years agoFix notes page in data browser to match new site style
Tom Hughes [Tue, 15 Jan 2013 22:02:53 +0000 (22:02 +0000)]
Fix notes page in data browser to match new site style

11 years agoSet width of comment entry area in note popups
Tom Hughes [Tue, 15 Jan 2013 21:42:43 +0000 (21:42 +0000)]
Set width of comment entry area in note popups

11 years agoMerge branch 'master' into notes
Tom Hughes [Tue, 15 Jan 2013 21:11:35 +0000 (21:11 +0000)]
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

11 years agoUpdate data schema
Tom Hughes [Tue, 15 Jan 2013 20:56:43 +0000 (20:56 +0000)]
Update data schema

11 years agoUpdate tests for layout changes
Tom Hughes [Tue, 8 Jan 2013 22:11:54 +0000 (22:11 +0000)]
Update tests for layout changes

11 years agoDisable caching of pages with dynamic layout
Tom Hughes [Tue, 8 Jan 2013 13:49:58 +0000 (13:49 +0000)]
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.

11 years agoSite cleanup
Saman Bemel-Benrud [Thu, 3 Jan 2013 11:20:32 +0000 (11:20 +0000)]
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.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 13 Jan 2013 15:03:06 +0000 (15:03 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoUpdate to rails 3.2.11
Tom Hughes [Tue, 8 Jan 2013 20:36:38 +0000 (20:36 +0000)]
Update to rails 3.2.11

11 years agoRemove messages which have been copied from english
Tom Hughes [Sun, 6 Jan 2013 18:01:43 +0000 (18:01 +0000)]
Remove messages which have been copied from english

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 7 Jan 2013 10:20:48 +0000 (10:20 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoStick with therubyracer 0.10.x for now
Tom Hughes [Thu, 3 Jan 2013 11:10:32 +0000 (11:10 +0000)]
Stick with therubyracer 0.10.x for now

The 0.11.x release is a complete mess, as amply documented in the github
issue tracker (https://github.com/cowboyd/therubyracer/issues/215).

11 years agoUpdate rails to 2.3.10
Tom Hughes [Thu, 3 Jan 2013 10:40:32 +0000 (10:40 +0000)]
Update rails to 2.3.10

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 30 Dec 2012 10:33:23 +0000 (10:33 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Fri, 21 Dec 2012 18:48:00 +0000 (18:48 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoEnable "destructive edit" warnings in Potlatch 2
Tom Hughes [Fri, 21 Dec 2012 08:51:34 +0000 (08:51 +0000)]
Enable "destructive edit" warnings in Potlatch 2

11 years agoUpdate Potlatch 2 to 2.3-554-ge648197 build
Tom Hughes [Fri, 21 Dec 2012 08:50:28 +0000 (08:50 +0000)]
Update Potlatch 2 to 2.3-554-ge648197 build

11 years agoPotlatch 2 localisation updates
Tom Hughes [Fri, 21 Dec 2012 08:49:39 +0000 (08:49 +0000)]
Potlatch 2 localisation updates

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sun, 16 Dec 2012 19:21:59 +0000 (19:21 +0000)]
Localisation updates from http://translatewiki.net.

11 years agoAutofocus the search field on the index page
Paweł Paprota [Thu, 13 Dec 2012 19:14:58 +0000 (19:14 +0000)]
Autofocus the search field on the index page

11 years agoRemove unused permalink styles
Tom Hughes [Tue, 4 Dec 2012 14:33:32 +0000 (14:33 +0000)]
Remove unused permalink styles

11 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 8 Dec 2012 18:48:40 +0000 (18:48 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoDon't try and add a note when the control is disabled
Tom Hughes [Tue, 4 Dec 2012 14:31:08 +0000 (14:31 +0000)]
Don't try and add a note when the control is disabled

12 years agoStyle disabled permalinks appropriately
Tom Hughes [Tue, 4 Dec 2012 14:29:42 +0000 (14:29 +0000)]
Style disabled permalinks appropriately

12 years agoUpdate Potlatch 2 to 2.3-547-g4a8c109 build
Tom Hughes [Mon, 3 Dec 2012 14:58:07 +0000 (14:58 +0000)]
Update Potlatch 2 to 2.3-547-g4a8c109 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Mon, 3 Dec 2012 14:57:24 +0000 (14:57 +0000)]
Potlatch 2 localisation updates

12 years agoConvert author_ip to a proper INET field
Tom Hughes [Mon, 3 Dec 2012 13:00:52 +0000 (13:00 +0000)]
Convert author_ip to a proper INET field

12 years agoDisplay formatted notes in the web UI
Tom Hughes [Sun, 2 Dec 2012 17:06:59 +0000 (17:06 +0000)]
Display formatted notes in the web UI

12 years agoReturn note comments as formatted HTML as well as text
Tom Hughes [Sun, 2 Dec 2012 17:00:33 +0000 (17:00 +0000)]
Return note comments as formatted HTML as well as text

12 years agoFormat note comments correctly in the data browser
Tom Hughes [Sun, 2 Dec 2012 16:46:33 +0000 (16:46 +0000)]
Format note comments correctly in the data browser

12 years agoLink user names to their pages
Tom Hughes [Sun, 2 Dec 2012 16:39:20 +0000 (16:39 +0000)]
Link user names to their pages

12 years agoInclude a user URL in JSON and XML responses
Tom Hughes [Sun, 2 Dec 2012 16:38:59 +0000 (16:38 +0000)]
Include a user URL in JSON and XML responses

12 years agoRemove the author_name field from notes
Tom Hughes [Sun, 2 Dec 2012 16:29:00 +0000 (16:29 +0000)]
Remove the author_name field from notes

12 years agoAbort any existing load before starting a new one
Tom Hughes [Sun, 2 Dec 2012 15:04:19 +0000 (15:04 +0000)]
Abort any existing load before starting a new one

12 years agoPolice the MAX_NOTE_REQUEST_AREA limit on the client
Tom Hughes [Sun, 2 Dec 2012 14:55:56 +0000 (14:55 +0000)]
Police the MAX_NOTE_REQUEST_AREA limit on the client

12 years agoMake sure popups don't overlay controls or the top bar
Tom Hughes [Sun, 2 Dec 2012 13:32:16 +0000 (13:32 +0000)]
Make sure popups don't overlay controls or the top bar

12 years agoAdd a scrollbar when a note gets too big
Tom Hughes [Sun, 2 Dec 2012 12:51:58 +0000 (12:51 +0000)]
Add a scrollbar when a note gets too big

12 years agoRework notes UI using leaflet
Tom Hughes [Sat, 1 Dec 2012 17:46:26 +0000 (17:46 +0000)]
Rework notes UI using leaflet

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Sat, 1 Dec 2012 19:43:57 +0000 (19:43 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoMerge branch 'master' into notes
Tom Hughes [Sat, 1 Dec 2012 18:22:30 +0000 (18:22 +0000)]
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

12 years agoMove caching of reverse geocodes to describe_location
Tom Hughes [Wed, 28 Nov 2012 22:44:03 +0000 (22:44 +0000)]
Move caching of reverse geocodes to describe_location

12 years agoRemove nearby_place from the note model
Kai Krueger [Tue, 20 Nov 2012 23:10:07 +0000 (16:10 -0700)]
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.

12 years agoRevert "Use Redcarpet::Render::XHTML instead of our custom renderer"
Tom Hughes [Thu, 29 Nov 2012 22:22:22 +0000 (22:22 +0000)]
Revert "Use Redcarpet::Render::XHTML instead of our custom renderer"

This reverts commit 4bb95b37735fac25467af21418cc0a973497219c.

12 years agoDon't try and compile the (non-existent) openlayers theme
Tom Hughes [Thu, 29 Nov 2012 21:29:40 +0000 (21:29 +0000)]
Don't try and compile the (non-existent) openlayers theme

12 years agoUse Redcarpet::Render::XHTML instead of our custom renderer
Tom Hughes [Thu, 29 Nov 2012 18:59:43 +0000 (18:59 +0000)]
Use Redcarpet::Render::XHTML instead of our custom renderer

Now that my :link_attributes patch has been merged we don't need
the custom renderer to add the rel=nofollow attributes.

12 years agoAvoid multiple click bindings on data layer
John Firebaugh [Thu, 29 Nov 2012 15:40:23 +0000 (07:40 -0800)]
Avoid multiple click bindings on data layer

12 years agoUse jQuery chaining
John Firebaugh [Thu, 29 Nov 2012 15:33:04 +0000 (07:33 -0800)]
Use jQuery chaining

12 years agoMove "Browse Map Data" to layers control
John Firebaugh [Thu, 29 Nov 2012 15:30:38 +0000 (07:30 -0800)]
Move "Browse Map Data" to layers control

Fixes https://trac.openstreetmap.org/ticket/4680

12 years agoSort changeset rectangles by size
John Firebaugh [Thu, 29 Nov 2012 13:50:03 +0000 (05:50 -0800)]
Sort changeset rectangles by size

This should help make more changesets accessible on the
map, without requiring precision cursor placement on the
changeset boundary (#169).

12 years agoUpdate Potlatch 2 to 2.3-538-gb4f7198 build
Tom Hughes [Tue, 27 Nov 2012 09:40:19 +0000 (09:40 +0000)]
Update Potlatch 2 to 2.3-538-gb4f7198 build

12 years agoPotlatch 2 localisation updates
Tom Hughes [Tue, 27 Nov 2012 09:39:22 +0000 (09:39 +0000)]
Potlatch 2 localisation updates

12 years agoLocalisation updates from http://translatewiki.net.
Siebrand Mazeland [Mon, 26 Nov 2012 08:18:45 +0000 (08:18 +0000)]
Localisation updates from http://translatewiki.net.

12 years agoChange map placement in small screen mode
Tom Hughes [Sun, 25 Nov 2012 18:36:55 +0000 (18:36 +0000)]
Change map placement in small screen mode

This mirrors the way the map is now handled in large screen mode, and
makes it display properly in the Android browser.

12 years agoFix "Edit Area" remote control link
John Firebaugh [Sun, 25 Nov 2012 16:05:01 +0000 (12:05 -0400)]
Fix "Edit Area" remote control link

Fixes https://trac.openstreetmap.org/ticket/4699

12 years agoHide +/- signs, take three
Tom Hughes [Sat, 24 Nov 2012 14:13:58 +0000 (14:13 +0000)]
Hide +/- signs, take three

12 years agoSet the z-index on the top bar to keep it in front
Tom Hughes [Fri, 23 Nov 2012 19:38:55 +0000 (19:38 +0000)]
Set the z-index on the top bar to keep it in front

12 years agoRevert "Stop the map overlapping the top bar"
Tom Hughes [Fri, 23 Nov 2012 19:36:56 +0000 (19:36 +0000)]
Revert "Stop the map overlapping the top bar"

This reverts commit 2ef2d7c876168d6beb606b655470f48ffabc8841.

12 years agoFall back to the mapnik layer
Tom Hughes [Fri, 23 Nov 2012 19:00:51 +0000 (19:00 +0000)]
Fall back to the mapnik layer

If there are no known layers in the layers string, then fall back to
showing the standard mapnik layer.

12 years agoSet size and anchor position for embedded markers
Tom Hughes [Fri, 23 Nov 2012 17:57:47 +0000 (17:57 +0000)]
Set size and anchor position for embedded markers

12 years agoImprove hiding of text on zoom icons
Tom Hughes [Fri, 23 Nov 2012 15:26:00 +0000 (15:26 +0000)]
Improve hiding of text on zoom icons