avatar inline attachment

[rails.git] / app / views / site / _potlatch2.html.erb

diff --git a/app/views/site/_potlatch2.html.erb b/app/views/site/_potlatch2.html.erb
index 69940c8eaf8593ff7149843fffa5285c5c97fc00..1c203b2fb3e57ee6c9c5dfd2b80cdf5a559908bb 100644 (file)
--- a/app/views/site/_potlatch2.html.erb
+++ b/app/views/site/_potlatch2.html.erb
@@ -10,7 +10,7 @@
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 
 <script type="text/javascript">alert("<%= t 'site.edit.potlatch2_not_configured' %>")</script>
 <% end %>
 

-<% locale = select_locale(Potlatch2::LOCALES.keys).to_s %>
+<% locale = Locale.list(Potlatch2::LOCALES.keys).preferred(preferred_languages).to_s %>

 
 <script type="text/javascript" defer="defer">
   var changesaved=true;
 
 <script type="text/javascript" defer="defer">
   var changesaved=true;


@@ -70,10 +70,10 @@
     }
   }
 
     }
   }
 

-  var mapParams = OSM.mapParams();

 <% if @lat && @lon -%>
 <% if @lat && @lon -%>

-  doSWF(<%= @lat %>, <%= @lon %>, mapParams.zoom || <%= @zoom %>);
+  doSWF(<%= @lat %>, <%= @lon %>, <%= @zoom %>);

 <% else -%>
 <% else -%>

+  var mapParams = OSM.mapParams();

   doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
 <% end -%>
 
   doSWF(mapParams.lat, mapParams.lon, mapParams.zoom || 17);
 <% end -%>