Tom Hughes
5e7b7a420a
Make full screen mode in Potlatch work properly again
2012-11-01 16:56:36 +00:00
Tom Hughes
c0ee3f65bb
Disable buttons while form submission is in progress
2012-10-16 12:23:27 +01:00
Tom Hughes
e6c400bd14
Correct field name
2012-10-14 16:27:21 +01:00
Tom Hughes
c6be5f3a6f
Fix up issues with notes in the data browser
2012-10-14 16:01:37 +01:00
Tom Hughes
352d9365e4
Improve styling of notes popups
2012-10-14 16:01:36 +01:00
Tom Hughes
513bec8044
Set attributes on newly created notes
2012-10-14 16:01:36 +01:00
Tom Hughes
89fc5a7fdc
Refactor note add/update code
2012-10-14 16:01:35 +01:00
Tom Hughes
d57755b737
Allow commenting on, and closing of, notes from the web site
2012-10-14 16:01:35 +01:00
Tom Hughes
361906af9e
Localise notes interface
2012-10-14 13:52:54 +01:00
Tom Hughes
73b59c5859
Use EJS templates for notes
2012-10-14 10:17:17 +01:00
Tom Hughes
e3d5e3da52
Refactor notes code to work with recent site changes
2012-10-13 17:16:07 +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
14bc538681
Use ejs templates in browse JS
2012-10-13 13:01:00 +01:00
John Firebaugh
24c0bb1c88
Use proj/unproj consistently
2012-10-13 12:58:18 +01:00
John Firebaugh
b95f9115d7
Move browse-related JS to browse.js
2012-10-13 12:57:59 +01:00
John Firebaugh
52daf1dbc4
Move export-related JS to export.js
2012-10-13 12:57:09 +01:00
John Firebaugh
8d13c39400
Clean up diary_entry.js
2012-10-06 00:07:50 +01:00
John Firebaugh
7f6320ed10
Move diary entry JS to page-specific script file
2012-10-06 00:03:24 +01:00
John Firebaugh
237d2ad60d
Simplify further by using OSM.home
2012-10-05 22:37:21 +01:00
John Firebaugh
97eee60c99
Remove unnecessary call to closeMapPopup()
...
In the 'set_location' case no popups are ever opened.
2012-10-05 22:32:05 +01:00
John Firebaugh
330ddc1666
Use jQuery
2012-10-05 22:31:17 +01:00
John Firebaugh
dd1ec4eb9b
Move user JS to page-specific script file
...
In this case it was difficult to eliminate interpolation
in a separate step, so I didn't bother.
2012-10-05 22:24:41 +01:00
John Firebaugh
4f552430b4
Remove unnecessary delete statement
2012-10-05 19:37:21 +01:00
Tom Hughes
762d615859
Don't try and dereference an object that may not exist
2012-10-05 18:01:02 +01:00
Tom Hughes
824a474d93
Refactor updatelinks to avoid exceptions in updateLocation
2012-10-05 16:02:26 +01:00
John Firebaugh
3cf3d888b2
Refactor mapParams to compose better with apiUrl
2012-10-05 15:36:07 +01:00
John Firebaugh
e4ef507c5c
Extract OSM.apiUrl
2012-10-05 15:26:54 +01:00
John Firebaugh
c3d1123965
Merge globals.js.erb and params.js
2012-10-05 15:21:47 +01:00
John Firebaugh
cabdb65191
Move remaining inline changeset JS to changeset.js
2012-10-05 15:20:57 +01:00
John Firebaugh
898bc32f48
Move changeset JS to page-specific script file
2012-10-05 15:20:26 +01:00
John Firebaugh
b5ca3b12d1
Remove unused function
2012-10-05 15:00:32 +01:00
John Firebaugh
6ef19d7e18
Remove unnecessary $(window).load() callbacks
...
All this is already inside a $(document).ready() callback.
2012-10-02 18:22:36 +01:00
John Firebaugh
f3afd43076
Avoid a JS error on (e.g.) ?way=nnnnn
...
When showing an object, the map location is not set
until the vector layer has finished loading. Thus
map.getCenter() returns null.
Registering the events earlier avoids the need to call
updateLocation manually at all.
2012-10-02 18:22:17 +01:00
John Firebaugh
569f3cbe9b
Remove unused event argument
2012-09-30 12:16:31 +01:00
John Firebaugh
7e3ca66fff
Use $(document).ready() to initialise browse JS
2012-09-30 12:15:49 +01:00
John Firebaugh
7c5d0fff3d
Move browse JS to page-specific script file
2012-09-30 12:14:25 +01:00
John Firebaugh
605c700895
Clean up search JS
...
Move it to index.js/edit.js and eliminate the global doSearch
function. Not enough code is shared to justify it.
2012-09-30 12:05:24 +01:00
John Firebaugh
e83d43ca82
Move edit JS to page-specific script file
2012-09-30 11:59:49 +01:00
John Firebaugh
87e8cf3b58
Require index-only JS in index.js
2012-09-30 11:58:14 +01:00
John Firebaugh
c4d9f902d0
Wrap index JS in a single $(document).ready()
2012-09-29 18:00:04 +01:00
John Firebaugh
352f2a1671
Move index JS to page-specific script file
2012-09-29 18:00:04 +01:00
Tom Hughes
0b981e4b7f
Generate proper descriptions for notes
2012-09-23 15:30:19 +01:00
Tom Hughes
90fe21a04a
Remove redundant code
2012-09-23 15:07:35 +01:00
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
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
John Firebaugh
e338d11408
Move resize JS to application bundle
2012-09-07 13:05:25 -07:00