Added jquery-include, which is needed for our form responses.

baphled · Jul 7, 2010 · 9b27bbd · 9b27bbd
1 parent bd51f6c
commit 9b27bbd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -18,6 +18,7 @@
   <%= javascript_include_tag "jquery-ui" %>
   <%= javascript_include_tag "jquery-icon-animation" %>
   <%= javascript_include_tag "jquery.ajax.dialog" %>
+  <%= javascript_include_tag "jquery-include" %>
   <!-- JS Head start -->
   <%= yield :js_head %>
   <!-- JS Head end -->
@@ -27,13 +28,13 @@
   <%= javascript_tag "var AUTH_TOKEN = #{form_authenticity_token.inspect};" if protect_against_forgery? %>
 
   <body class="salad">
-      <div id="container">
-        <%= render :partial => 'layouts/header' %>
-        <%= render :partial => 'layouts/flash', :locals => {:flash => flash} %>
-        <%= render :partial => 'layouts/content' %>
-        <%= render :partial => 'layouts/sidebar' %>
-		<div id="footer_layout"></div>
-      </div>
-      <%= render :partial => 'layouts/footer' %>
+    <div id="container">
+      <%= render :partial => 'layouts/header' %>
+      <%= render :partial => 'layouts/flash', :locals => {:flash => flash} %>
+      <%= render :partial => 'layouts/content' %>
+      <%= render :partial => 'layouts/sidebar' %>
+      <div id="footer_layout"></div>
+    </div>
+    <%= render :partial => 'layouts/footer' %>
   </body>
 </html>
diff --git a/app/views/layouts/no_sidebar.html.erb b/app/views/layouts/no_sidebar.html.erb
@@ -21,12 +21,8 @@
   <%= javascript_include_tag "jquery.custom.validation" %>
   <%= javascript_include_tag "jquery.render.flash.message" %>
   <%= javascript_include_tag "jquery.tipsy" %>
-  <%= javascript_include_tag "autoScroller" %>
-  <%= javascript_include_tag "scrollingHoverable" %>
-  <%= javascript_include_tag "jquery-validate" %>
-  <%= javascript_include_tag "jquery.formtastic.tooltips" %>
-	<%= javascript_include_tag "jquery.ajax.dialog" %>
-  <%= javascript_include_tag "pagination" %>
+  <%= javascript_include_tag "jquery-include" %>
+  <%= javascript_include_tag "jquery.ajax.dialog" %>
   <%= javascript_include_tag "application" %>
   <%= yield :js_head %>