Removed cms/ajax from editor plugins and moved it into page_editor

Added accepts */* to ajax.js to allow page_components modal to load properly Made the text areas respect the column setting - 80 cols

Author: gsxdsm

app/assets/javascripts/ckeditor/plugins/delete_content/plugin.js

@@ -1,5 +1,3 @@
-//= require cms/ajax
-
 CKEDITOR.plugins.add('delete_content', {
  icons:'deletecontent',
  init:function (editor) {

app/assets/javascripts/ckeditor/plugins/edit_content/plugin.js

@@ -1,5 +1,3 @@
-//= require cms/ajax
-
 CKEDITOR.plugins.add('edit_content', {
  icons:'editcontent',
  init:function (editor) {

app/assets/javascripts/ckeditor/plugins/move_content/plugin.js

@@ -1,5 +1,3 @@
-//= require cms/ajax
-
 CKEDITOR.plugins.add('move_content', {
  icons:'movecontentup,movecontentdown',
  init:function (editor) {

app/assets/javascripts/cms/ajax.js

@@ -10,13 +10,13 @@ jQuery(function ($) {
  asJS:function () {
  return function (xhr) {
  xhr.setRequestHeader('X-CSRF-Token', $.cms.csrfToken());
- xhr.setRequestHeader("Accept", "text/javascript");
+ xhr.setRequestHeader("Accept", "text/javascript, */*, q=0.1");
  }
  },
  asJSON:function () {
  return function (xhr) {
  xhr.setRequestHeader('X-CSRF-Token', $.cms.csrfToken());
- xhr.setRequestHeader("Accept", "application/json");
+ xhr.setRequestHeader("Accept", "application/json, */*, q=0.1");
  }
  },
  // Invoke a Rails aware (w/ CSRF token) PUT request.

app/assets/javascripts/cms/page_editor.js

@@ -3,6 +3,7 @@
 //= require 'cms/core_library'
 //= require 'bootstrap-modal'
 //= require 'ckeditor-jquery'
+//= require 'cms/ajax'
 
 // Since we are within the page editing iframe, add a 'target=_top' to all links so they refresh the entire page.
 $(function() {
@@ -52,8 +53,8 @@ $(function() {
  } else {
  reload.apply();
  }
- },
- beforeSend: $.cms_ajax.asJSON()
+ }
+//,beforeSend: $.cms_ajax.asJSON()
  });
 
  },
@@ -114,8 +115,8 @@ $(function() {
  afterSave.apply();
  }
  },
- data: message,
- beforeSend: $.cms_ajax.asJS()
+ data: message
+//,beforeSend: $.cms_ajax.asJS()
  });
  }
  };

app/assets/stylesheets/cms/bootstrap-customizations.css.scss

@@ -85,4 +85,10 @@ tbody .block_status.published, #sitemap .span1.Published {
 
 .navbar .nav > li > .btn:hover, .btn:focus {
  background-position: 0 0px;
+}
+
+input,
+textarea,
+.uneditable-input {
+ width: inherit;
 }

app/views/cms/dynamic_views/_form.html.erb

@@ -5,7 +5,7 @@
  <%= f.cms_text_field :name %>
  <%= f.cms_text_field :format %>
  <%= f.cms_drop_down :handler, ActionView::Template.template_handler_extensions, :default => "erb" %>
- <%= f.cms_text_area :body, :style => "height: 500px" %>
+ <%= f.cms_text_area :body, :style => "height: 500px", :cols => 80 %>
  <div class="buttons">
  <%=raw dk_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
  </div>