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

133 commits

Author SHA1 Message Date
Tom Hughes
1f06652075 Add support for creating new notes 2012-09-23 15:05:03 +01:00
Tom Hughes
74543b630e Use standard indentation 2012-09-20 16:04:25 +01: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
ebcb038c1c Suppress any border on the logo 2012-09-19 12:12:45 +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
John Firebaugh
14a7d1abfc Use jquery.cookie 2012-09-18 08:55:27 +01:00
John Firebaugh
3b1f455dd9 Extract layer configuration to map.js 2012-09-16 16:25:33 +01:00
Martijn van Exel
5f0c590c32 Add a banner for SOTM US 2012-09-16 16:20:53 +01:00
Tom Hughes
3787918d68 Remove SOTM advert 2012-09-08 14:32:27 +01:00
John Firebaugh
e338d11408 Move resize JS to application bundle 2012-09-07 13:05:25 -07:00
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
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
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
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
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
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
1e169bca25 Remove copy of Array.forEach that was committed accidentally 2012-08-30 19:17:11 +01:00
Tom Hughes
18238dd31e Prevent scrollbars showing up on the edit view 2012-08-29 15:36:51 +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
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
d9054cfe29 Move some javascript from the layout to application.js 2012-08-28 19:47:20 +01:00
Tom Hughes
b2bc61c5b1 Update the image size when we switch to the mapnik export format 2012-08-27 22:54:04 +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
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
John Firebaugh
c2333c603e Reduce interpolation in export/start.js.erb 2012-08-27 18:00:12 +01:00
Tom Hughes
7ad58d1411 Switch to using i18n-js for handling translations in javascript 2012-08-27 18:00:03 +01:00
Alex Barth
0d34f27fd5 Float user image to right correctly on per-user diary listing page 2012-08-25 10:44:58 +01:00
John Firebaugh
dcb25f0c07 Set OpenLayers lang unobtrusively 
We output the locale code as the lang attribute, so
use that rather than interpolating into embedded JS.
 2012-08-24 19:00:59 -07:00
Tom Hughes
ea63736b5c Add an entry to the edit menu for turning on the notes layer 2012-08-22 21:50:48 +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
fe16fec000 Start rewriting the notes layer for the front page 2012-08-22 20:37:09 +01:00
Tom MacWright
a9a5b6ef38 Revise SOTM logo design 2012-08-21 22:19:56 +01:00
Tom Hughes
31af63f273 Reposition the zoom slider after recreating the SimplePanZoom control 2012-08-15 19:04:40 +01:00
Tom MacWright
221ca3c1fa Improve user page navigation menu 
Add counts to edits, blocks, and traces; don't show blocks if there
are none; and move OAuth to the settings page.
 2012-08-10 08:26:48 +01:00
Tom Hughes
ada8b184ea Preserve background colour when marking messages read/unread 2012-08-09 00:26:38 +01:00
Tom Hughes
3445f447cd Add a SOTM advert to the sidebar 2012-08-08 21:37:29 +01:00