Merge branch 'ad_banner' into ldap

app/assets/javascripts/ajax_form.js

@@ -1,4 +1,4 @@
-$('#submit_button').live('click', function(){
+$(document).on('click', '#ajax_form_submit', function(){
 	$('#ajaxForm').ajaxSubmit({
 		beforeSubmit: function(a,f,o) {
 			o.dataType = 'script';

app/assets/javascripts/bulletin_form.js.erb

@@ -6,10 +6,9 @@ $('.bulletin_files_block a.delete').live('click', function(){
   $(this).parents('.list_item').remove();
 });
 
-$('.action a.remove_existing_record').live('click', function(){
+$(document).on('click', '.action a.remove_existing_record', function(){
   $(this).next('.should_destroy').attr('value', 1);
-  //$("#bulletin_" + $(this).prev().attr('value')).hide();
-  $("tr#bulletin_" + $(this).prev().attr('value')).hide();
+  $("tr #" + $(this).prev().attr('value')).hide();
 });
 
 $('.quick_edit_cancel').live('click', function(){

app/assets/javascripts/new_admin.js

@@ -6,6 +6,7 @@
 //
 //= require jquery
 //= require jquery_ujs
+//= require jquery.form
 //= require bootstrap
 //= require jquery.isotope.min
 //= require jquery.tinyscrollbar.min
@@ -13,4 +14,5 @@
 //= require tinymce-jquery
 //= require tinymce_orbit
 //= require orbit-bar-search
-//= require side_bar_history
+//= require side_bar_history
+//= require ajax_form

app/assets/javascripts/side_bar_history.js

@@ -1,28 +1,28 @@
 var history_edited = false; 
 
-// $('#back_sidebar a, #back_main a.nav').live('click',  
-//   function () {  
-//     $.getScript(this.href);
-// 		history.pushState(null, document.title, this.href);
-// 		history_edited = true;
-//     return false;
-//   }  
-// );
+$('#back_sidebar a, #back_main a.nav').live('click',  
+  function () {  
+    $.getScript(this.href);
+		history.pushState(null, document.title, this.href);
+		history_edited = true;
+    return false;
+  }  
+);
 
-// $('#back_main a.reload').live('click',
-//   function () { 
-//     $.getScript(this.href);
-// 		history.replaceState(null, document.title, this.href);
-// 		history_edited = true;
-//     return false;
-//   }
-// );
+$('#back_main a.reload').live('click',
+  function () { 
+    $.getScript(this.href);
+		history.replaceState(null, document.title, this.href);
+		history_edited = true;
+    return false;
+  }
+);
 
-// $('.form').live('submit', function () { 
-//   $.post(this.action, $(this).serialize(), null, 'script');
-// 	history_edited = true;
-//   return false;
-// });
+$('#back_main .form').live('submit', function () { 
+  $.post(this.action, $(this).serialize(), null, 'script');
+	history_edited = true;
+  return false;
+});
 
 $(document).on('click', '.js_history',
   function () { 

app/assets/javascripts/site_editor.js

@@ -6,6 +6,10 @@
 //
 //= require jquery
 //= require jquery_ujs
-//= require page_edit
+//= require bootstrap
+//= require jquery.isotope.min
+//= require jquery.tinyscrollbar.min
+//= require orbit-1.0
+//= require orbit-bar-search
 //= require side_bar_history
-//= require new_admin
+//= require page_edit

app/assets/stylesheets/site_editor.css.erb

@@ -5,6 +5,10 @@
  *= require reset
  *= require_self
  *= require message
+ *= require bootstrap
+ *= require style
+ *= require bootstrap-orbit
+ *= require scroll_style
  *= require site_items
  *= require sidebar
 */