Remove controller_action class from the content div

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

diff --git a/app/views/site/index.html.erb b/app/views/site/index.html.erb
index b7a9df068c618b042d522b389b3674abf2a50e0e..877bc177190a471cd747a52ceb4c21031783b274 100644 (file)
--- a/app/views/site/index.html.erb
+++ b/app/views/site/index.html.erb
@@ -6,11 +6,11 @@
 
 <% unless STATUS == :api_offline or STATUS == :database_offline -%>
   <% content_for :editmenu do -%>
 
 <% unless STATUS == :api_offline or STATUS == :database_offline -%>
   <% content_for :editmenu do -%>

-    <li><%= link_to t("browse.start_rjs.data_layer_name"), "#", :id => "show_data" %></li>
+    <li><%= link_to t("browse.start_rjs.data_layer_name"), { :controller => :browse, :action => :start }, :id => "show_data" %></li>

   <% end -%>
 <% end -%>
 
   <% end -%>
 <% end -%>
 

-<%= render :partial => 'sidebar', :locals => { :onopen => "resizeMap();", :onclose => "resizeMap();" } %>
+<%= render :partial => 'sidebar' %>

 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 
 <%= render :partial => 'key' %>
 <%= render :partial => 'search' %>
 


@@ -125,17 +125,12 @@ else
 end
 %>
 
 end
 %>
 

-<%= javascript_include_tag 'openlayers.js' %>
-<%= javascript_include_tag 'map.js' %>
-

 <%= render :partial => 'resize' %>
 
 <script type="text/javascript">
   var marker;
   var map;
 
 <%= render :partial => 'resize' %>
 
 <script type="text/javascript">
   var marker;
   var map;
 

-  OpenLayers.Lang.setCode("<%= I18n.locale.to_s %>");
-

   function mapInit(){
     map = createMap("map");
 
   function mapInit(){
     map = createMap("map");
 


@@ -194,8 +189,11 @@ end
   }
 
   $(document).ready(function () {
   }
 
   $(document).ready(function () {

-    $("#show_data").click(function () {
-      $.ajax({ url: "<%= url_for :controller => :browse, :action => :start %>" });
+    $("#show_data").click(function (e) {
+      $.ajax({ url: $(this).attr('href'), success: function (sidebarHtml) {
+        startBrowse(sidebarHtml);
+      }});
+      e.preventDefault();

     });
 
     $("body").on("click", "a.set_position", function () {
     });
 
     $("body").on("click", "a.set_position", function () {


@@ -287,12 +285,14 @@ end
 
   $(document).ready(function () {
     $("#exportanchor").click(function (e) {
 
   $(document).ready(function () {
     $("#exportanchor").click(function (e) {

-      $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+      $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>", success: function (sidebarHtml) {
+        startExport(sidebarHtml);
+      }});

       e.preventDefault();
     });
 
     <% if params[:action] == 'export' -%>
       e.preventDefault();
     });
 
     <% if params[:action] == 'export' -%>

-    $.ajax({ url: "<%= url_for :controller => :export, :action => :start %>" });
+    $("#exportanchor").click();

     <% end -%>
 
     <% if params[:query] -%>
     <% end -%>
 
     <% if params[:query] -%>