Javascript cleanup

18 files changed, 11 insertions, 15 deletions

diff --git a/web/lib/ui/keys_tags.rb b/web/lib/ui/keys_tags.rb
index 01f17d9..1412b50 100644
--- a/web/lib/ui/keys_tags.rb
+++ b/web/lib/ui/keys_tags.rb
@@ -58,6 +58,8 @@ class Taginfo < Sinatra::Base
         @img_width  = TaginfoConfig.get('geodistribution.width')  * TaginfoConfig.get('geodistribution.scale_image')
         @img_height = TaginfoConfig.get('geodistribution.height') * TaginfoConfig.get('geodistribution.scale_image')
 
+        javascript 'protovis-r3.2'
+        javascript "#{ r18n.locale.code }/key"
         erb :key
     end
 
@@ -112,6 +114,7 @@ class Taginfo < Sinatra::Base
             @desc = "<span title='#{ t.pages.tag.description_from_wiki }' tipsy='w'>#{ @desc }</span"
         end
 
+        javascript "#{ r18n.locale.code }/tag"
         erb :tag
     end
 
diff --git a/web/lib/ui/reports.rb b/web/lib/ui/reports.rb
index c26e35d..5096a4f 100644
--- a/web/lib/ui/reports.rb
+++ b/web/lib/ui/reports.rb
@@ -10,6 +10,9 @@ class Taginfo < Sinatra::Base
         get report.url do
             @title = report.title
             section :reports
+            if File.exists?("viewsjs/reports/#{ report.name }.js.erb")
+                javascript "#{ r18n.locale.code }/reports/#{ report.name }"
+            end
             erb ('reports/' + report.name).to_sym
         end
     end
diff --git a/web/lib/ui/search.rb b/web/lib/ui/search.rb
index 8630cb6..1aac663 100644
--- a/web/lib/ui/search.rb
+++ b/web/lib/ui/search.rb
@@ -5,6 +5,7 @@ class Taginfo < Sinatra::Base
     get '/search' do
         @title = t.pages.search.title
 
+        javascript "#{ r18n.locale.code }/search"
         @query = params[:q]
         if @query =~ /(.*)=(.*)/
             erb :search_tags
diff --git a/web/taginfo.rb b/web/taginfo.rb
index 409d60b..ae59a18 100755
--- a/web/taginfo.rb
+++ b/web/taginfo.rb
@@ -147,6 +147,7 @@ class Taginfo < Sinatra::Base
     #-------------------------------------
 
     get '/' do
+        javascript "#{ r18n.locale.code }/index"
         erb :index
     end
 
@@ -155,6 +156,9 @@ class Taginfo < Sinatra::Base
     %w(about download keys sources tags).each do |page|
         get '/' + page do
             @title = (page =~ /^(keys|tags)$/) ? t.osm[page] : t.taginfo[page]
+            if File.exists?("viewsjs/#{ page }.js.erb")
+                javascript "#{ r18n.locale.code }/#{ page }"
+            end
             erb page.to_sym
         end
     end
diff --git a/web/views/index.erb b/web/views/index.erb
index bf71425..67c8312 100644
--- a/web/views/index.erb
+++ b/web/views/index.erb
@@ -37,4 +37,3 @@
         </td>
     </tr>
 </table>
-<% javascript "#{ r18n.locale.code }/index" %>
diff --git a/web/views/key.erb b/web/views/key.erb
index d1cdba7..e8ed724 100644
--- a/web/views/key.erb
+++ b/web/views/key.erb
@@ -92,7 +92,6 @@
     </div>
 </div>
 <iframe id="josmiframe" name="josmiframe"></iframe>
-<% javascript 'protovis-r3.2' %>
 <% javascript do
     JS.raw(<<"JAVASCRIPT")
 function page_init2() {
@@ -136,4 +135,3 @@ function page_init2() {
 JAVASCRIPT
 end
 %>
-<% javascript "#{ r18n.locale.code }/key" %>
diff --git a/web/views/keys.erb b/web/views/keys.erb
index b383b88..a187deb 100644
--- a/web/views/keys.erb
+++ b/web/views/keys.erb
@@ -6,4 +6,3 @@
     <table id="grid-keys">
     </table>
 </div>
-<% javascript "#{ r18n.locale.code }/keys" %>
diff --git a/web/views/reports/characters_in_keys.erb b/web/views/reports/characters_in_keys.erb
index a8beabe..b318a9d 100644
--- a/web/views/reports/characters_in_keys.erb
+++ b/web/views/reports/characters_in_keys.erb
@@ -54,4 +54,3 @@
     </div>
 </div>
 <% javascript 'protovis-r3.2' %>
-<% javascript "#{ r18n.locale.code }/reports/characters_in_keys" %>
diff --git a/web/views/reports/frequently_used_keys_without_wiki_page.erb b/web/views/reports/frequently_used_keys_without_wiki_page.erb
index 90bc546..818acca 100644
--- a/web/views/reports/frequently_used_keys_without_wiki_page.erb
+++ b/web/views/reports/frequently_used_keys_without_wiki_page.erb
@@ -26,4 +26,3 @@ function page_init2() {
 JAVASCRIPT
 end
 %>
-<% javascript "#{ r18n.locale.code }/reports/frequently_used_keys_without_wiki_page" %>
diff --git a/web/views/reports/josm_styles.erb b/web/views/reports/josm_styles.erb
index 3b22a1f..83279f0 100644
--- a/web/views/reports/josm_styles.erb
+++ b/web/views/reports/josm_styles.erb
@@ -20,4 +20,3 @@ function page_init2() {
 JAVASCRIPT
 end
 %>
-<% javascript "#{ r18n.locale.code }/reports/josm_styles" %>
diff --git a/web/views/reports/key_lengths.erb b/web/views/reports/key_lengths.erb
index e6031dc..feba463 100644
--- a/web/views/reports/key_lengths.erb
+++ b/web/views/reports/key_lengths.erb
@@ -19,4 +19,3 @@
     </div>
 </div>
 <% javascript 'protovis-r3.2' %>
-<% javascript "#{ r18n.locale.code }/reports/key_lengths" %>
diff --git a/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb b/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb
index c84ffb1..9b0f58e 100644
--- a/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb
+++ b/web/views/reports/language_comparison_table_for_keys_in_the_wiki.erb
@@ -12,4 +12,3 @@
         <tr><td><img width="16" height="16" src="/img/sources/wiki/wiki-r.png" alt="[r]"/></td><td><%= t.reports.language_comparison_table_for_keys_in_the_wiki.icons.redirect %></td></tr>
     </table>
 </div>
-<% javascript "#{ r18n.locale.code }/reports/language_comparison_table_for_keys_in_the_wiki" %>
diff --git a/web/views/reports/languages.erb b/web/views/reports/languages.erb
index bb90542..2a4ffa7 100644
--- a/web/views/reports/languages.erb
+++ b/web/views/reports/languages.erb
@@ -6,4 +6,3 @@
     <table id="grid-langs">
     </table>
 </div>
-<% javascript "#{ r18n.locale.code }/reports/languages" %>
diff --git a/web/views/reports/wiki_pages_about_non_existing_keys.erb b/web/views/reports/wiki_pages_about_non_existing_keys.erb
index 48f25e4..ea1d790 100644
--- a/web/views/reports/wiki_pages_about_non_existing_keys.erb
+++ b/web/views/reports/wiki_pages_about_non_existing_keys.erb
@@ -6,4 +6,3 @@
     <table id="grid-keys">
     </table>
 </div>
-<% javascript "#{ r18n.locale.code }/reports/wiki_pages_about_non_existing_keys" %>
diff --git a/web/views/search.erb b/web/views/search.erb
index 7e085ed..92285b7 100644
--- a/web/views/search.erb
+++ b/web/views/search.erb
@@ -26,4 +26,3 @@ function page_init2() {
     })
 end
 %>
-<% javascript "#{ r18n.locale.code }/search" %>
diff --git a/web/views/search_tags.erb b/web/views/search_tags.erb
index c240c72..0146263 100644
--- a/web/views/search_tags.erb
+++ b/web/views/search_tags.erb
@@ -20,4 +20,3 @@ function page_init2() {
     })
 end
 %>
-<% javascript "#{ r18n.locale.code }/search" %>
diff --git a/web/views/tag.erb b/web/views/tag.erb
index b113686..4582606 100644
--- a/web/views/tag.erb
+++ b/web/views/tag.erb
@@ -70,4 +70,3 @@ function page_init2() {
 JAVASCRIPT
 end
 %>
-<% javascript "#{ r18n.locale.code }/tag" %>
diff --git a/web/views/tags.erb b/web/views/tags.erb
index 71d462d..ae21c85 100644
--- a/web/views/tags.erb
+++ b/web/views/tags.erb
@@ -6,4 +6,3 @@
     <table id="grid-tags">
     </table>
 </div>
-<% javascript "#{ r18n.locale.code }/tags" %>