cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
4677 commits 4 branches 1 tag 499 MiB
Commit graph

4677 commits

This branch
This branch
All branches
Author SHA1 Message Date
John Firebaugh
7ff77d9d3d Trigger map.updateSize() via a custom event 2012-09-07 13:04:48 -07:00
Tom Hughes
b507f6c887 Make active highlighting work properly again 2012-09-07 09:40:05 +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
6358f8190d Float the user image right in the global diary list 2012-09-06 22:03:15 +01:00
Tom Hughes
ec4ef1ad2b Remove controller_action class from the content div 
It's duplicated by the new controller-action class on the body
element, so just use that instead.
 2012-09-06 22:01:49 +01:00
Tom Hughes
800dbbf41b Use named routes in the layout 2012-09-06 21:49:02 +01:00
Tom Hughes
d76aa13ddd Use the jQuery data() function to access HTML 5 data attributes 2012-09-06 21:29:16 +01:00
Tom Hughes
7af04f8691 Move rich text support code into a separate file 2012-09-06 20:44:24 +01:00
Tom MacWright
02de53eb45 Refactor view and css code around homepage links 
This adds a new class to the body which we can use to do more styling
in CSS rather than erb-embedded Ruby. The only visual change is that
there's now a subtle transition for homepage links becoming active.
 2012-09-06 20:28:23 +01:00
Tom Hughes
7c0055b5d7 Move piwik code to a static JS asset 2012-09-06 09:02:51 +01:00
Tom Hughes
24453e7230 Issue piwik goal tracking calls correctly 2012-09-05 21:10:23 +01:00
Tom Hughes
adcf9edc54 Clear the openid URL when an account is deleted 2012-09-05 15:33:01 +01:00
Tom Hughes
b5e61565b9 Potlatch 2 localisation updates 2012-09-03 09:02:29 +01:00
Tom Hughes
3478c5b71f Update Potlatch 2 to 2.3-446-gf5ffc13 build 2012-09-03 09:01:38 +01:00
Tom Hughes
2fac41bf93 Fix incorrect interpolation variables 2012-09-03 08:54:23 +01:00
Tom Hughes
1eab17f82e Test that replying to a message marks it as read 2012-09-03 08:47:51 +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
Siebrand Mazeland
960ae1773c Localisation updates from http://translatewiki.net. 2012-09-01 11:28:06 +00:00
Tom Hughes
81336c4a87 Monkey patch I18n::JS to ensure translations are in a fixed order 
Without this the result of converting the hash to JSON can vary
which causes different hashes for the result JS asset.

This is only an issue with ruby 1.8 as ruby 1.9 hashes behave like
the ActiveSupport::OrderedHash and enumerate in insertion order.
 2012-08-31 11:51:58 +01:00
Tom Hughes
815c98c977 Select which key entries to show on the client 
Rather than requesting a new key every time the zoom or layer
changes, serve up all the entries initially with appropriate
annotations to allow the client to decide which ones to show.
 2012-08-31 10:29:32 +01:00
Tom Hughes
51f5984c1c Use CSS to centre the images in the key 2012-08-31 10:27:45 +01:00
Tom Hughes
721aaae777 Remove unused osmarender key data 2012-08-31 10:03:31 +01:00
Tom Hughes
a5f5dcce5d Remove unused osmarender key data 2012-08-31 09:30:44 +01:00
John Firebaugh
519c7dc2dd Move key JS to application bundle 2012-08-30 15:34:26 -07:00
John Firebaugh
e83fba2b47 Eliminate interpolation in key JS 2012-08-30 15:33:48 -07:00
Tom Hughes
d7da1562c3 Get rid of the sidebar's onclose global state 2012-08-30 23:02:54 +01:00
Tom MacWright
93c392cf5f Basic javascript cleanup 
Unifies some logic, cleans up style.
 2012-08-30 21:27:57 +01:00
John Firebaugh
d6a8aaa369 Move sidebar JS to application bundle 
It's required on the main page so will nearly always be loaded anyway.

Enclosed in an anonymous function to avoid leaking the onclose global.
 2012-08-30 20:30:11 +01:00
Tom Hughes
434e603cd6 Use custom events to resize the map on sidebar open/close 2012-08-30 20:27:11 +01:00
Tom Hughes
1e169bca25 Remove copy of Array.forEach that was committed accidentally 2012-08-30 19:17:11 +01:00
Tom Hughes
420ebbbb87 Fix maximisation of Potlatch 2012-08-29 15:37:26 +01:00
Tom Hughes
18238dd31e Prevent scrollbars showing up on the edit view 2012-08-29 15:36:51 +01:00
Tom Hughes
ce054eed22 Improve handling of sidebar close link 2012-08-29 14:08:18 +01:00
Tom Hughes
2184e6310a Set an explicit 0px border on the map 
The JS code which resizes the map relies on being able to parse
the border widths as a number, and by default IE7 seems to have
a border of "medium" which fails to parse.
 2012-08-29 14:02:54 +01:00
Tom Hughes
e82c758cea Switch to the HTML5 DOCTYPE 2012-08-29 12:31:50 +01:00
Tom Hughes
7b626f31be Use augment.js for improved cross browser compatibility 
Remove the quick hack for that I added for Array.forEach and pull
in augment.js instead to add missing JS methods to older browsers.
 2012-08-29 12:29:47 +01:00
Tom Hughes
a35cff243e Implement Array.forEach for browsers which don't have it 2012-08-29 09:30:14 +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
d9054cfe29 Move some javascript from the layout to application.js 2012-08-28 19:47:20 +01:00
Tom Hughes
96a4fb0805 Potlatch 2 localisation updates 2012-08-28 11:54:12 +01:00
Siebrand Mazeland
6d76f89e5c Localisation updates from http://translatewiki.net. 2012-08-28 10:01:13 +00:00
Tom Hughes
b2bc61c5b1 Update the image size when we switch to the mapnik export format 2012-08-27 22:54:04 +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
07c997d1d2 Avoid polluting the global scope 
Only startBrowse and startExport need to be exposed;
everything else can be scoped inside those functions.
 2012-08-27 21:05:52 +01:00
John Firebaugh
5aa09fbfd0 Use a standard application.js bundle 
Include map.js and menu.js in the bundle.
 2012-08-27 20:31:17 +01:00
John Firebaugh
e2fed14ab8 Remove unused helper 2012-08-27 20:30:16 +01:00
John Firebaugh
2e349ab51a Remove unused gem and add a comment where it was replaced 2012-08-27 20:29:56 +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