]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: d371a1b)
Add asset wrappers for iD
authorTom Hughes <tom@compton.nu>
Wed, 11 Feb 2015 19:18:13 +0000 (19:18 +0000)
committerTom Hughes <tom@compton.nu>
Wed, 11 Feb 2015 19:18:13 +0000 (19:18 +0000)
app/assets/javascripts/id.js [new file with mode: 0644] patch | blob
app/assets/stylesheets/id.css [new file with mode: 0644] patch | blob
app/views/site/id.html.erb patch | blob | history
config/initializers/assets.rb patch | blob | history

diff --git a/app/assets/javascripts/id.js b/app/assets/javascripts/id.js
new file mode 100644 (file)
index 0000000..185717b
--- /dev/null
+++ b/app/assets/javascripts/id.js
@@ -0,0 +1 @@
+//= require iD
diff --git a/app/assets/stylesheets/id.css b/app/assets/stylesheets/id.css
new file mode 100644 (file)
index 0000000..1e85f05
--- /dev/null
+++ b/app/assets/stylesheets/id.css
@@ -0,0 +1,3 @@
+/*
+ *= require iD
+ */
diff --git a/app/views/site/id.html.erb b/app/views/site/id.html.erb
index 38f2e0d3d5d1ba4290eb1072db739547d54a788f..3bb20f29d82a513a7f760c4413a50a6515b0471c 100644 (file)
--- a/app/views/site/id.html.erb
+++ b/app/views/site/id.html.erb
@@ -2,9 +2,9 @@
 <html>
 <head>
   <meta charset='utf-8'>
-  <%= stylesheet_link_tag 'iD' %>
+  <%= stylesheet_link_tag 'id' %>
   <!--[if !IE || gte IE 9]><!-->
-  <%= javascript_include_tag 'iD' %>
+  <%= javascript_include_tag 'id' %>
   <!-- <![endif]-->
 </head>
 <body>
diff --git a/config/initializers/assets.rb b/config/initializers/assets.rb
index df86f2b9dae5724d1f3f1320e7018d45876c576b..21d9312a4e2ab5f9c7b728b0eb63dfddf185dd6a 100644 (file)
--- a/config/initializers/assets.rb
+++ b/config/initializers/assets.rb
@@ -13,6 +13,7 @@ Rails.application.config.assets.precompile += %w( user.js diary_entry.js )
 Rails.application.config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
 Rails.application.config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
 Rails.application.config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
+Rails.application.config.assets.precompile += %w( id.js id.css )
 Rails.application.config.assets.precompile += %w( embed.js embed.css )
 Rails.application.config.assets.precompile += %w( html5shiv.js )
 Rails.application.config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
@@ -22,7 +23,6 @@ Rails.application.config.assets.precompile += %w( potlatch2/assets.zip )
 Rails.application.config.assets.precompile += %w( potlatch2/FontLibrary.swf )
 Rails.application.config.assets.precompile += %w( potlatch2/locales/*.swf )
 Rails.application.config.assets.precompile += %w( help/introduction.* )
-Rails.application.config.assets.precompile += %w( iD.js iD.css )
 Rails.application.config.assets.precompile += %w( iD/img/*.svg iD/img/*.png iD/img/*.gif )
 Rails.application.config.assets.precompile += %w( iD/img/pattern/*.png )
 Rails.application.config.assets.precompile += %w( iD/locales/*.json )
The OpenStreetMap web site