cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow iD and Potlatch 2 to load assets outside the asset pipeline

Browse source
This commit is contained in:
Tom Hughes 2013-08-16 17:04:13 +01:00
parent 67c314388a
commit d8a504d8db
3 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/views/site/_potlatch2.html.erb
View file

@ -32,6 +32,8 @@
flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>"; flashvars.font_library = "<%= asset_path "potlatch2/FontLibrary.swf" %>";
flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>"; flashvars.locale = "<%= Potlatch2::LOCALES[locale] %>";
flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>"; flashvars.locale_paths = "<%= Potlatch2::LOCALES[locale] %>=<%= asset_path("potlatch2/locales/#{Potlatch2::LOCALES[locale]}.swf") %>";
flashvars.intro_image = "<%= asset_path "help/introduction.jpg" %>";
flashvars.intro_video = "<%= asset_path "help/introduction.mp4" %>";
<% if params['gpx'] %> <% if params['gpx'] %>
flashvars.gpx = '<%= h(params['gpx']) %>'; flashvars.gpx = '<%= h(params['gpx']) %>';
<% end %> <% end %>

2
app/views/site/id.html.erb
View file

@ -20,7 +20,7 @@
var id = iD() var id = iD()
.embed(true) .embed(true)
.assetPath("/assets/iD/") <%# Can't use asset_path('iD/') in production. %> .assetPath("/iD/") <%# Can't use asset_path('iD/') in production. %>
.assetMap(<%= assets("iD").to_json.html_safe %>) .assetMap(<%= assets("iD").to_json.html_safe %>)
.locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>") .locale("<%= locale %>", "<%= asset_path("iD/locales/#{locale}.json") %>")
.preauth({ .preauth({

1
public/iD Symbolic link
View file

@ -0,0 +1 @@
../vendor/assets/iD/iD