Merge branch 'eclipxe-browsercms-master'

Author: peakpg

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/core_library.js.erb

@@ -1,7 +1,6 @@
 //
 // Defines Core BrowserCMS functions used throughout the application.
 //
-//= require jquery
 //
 jQuery(function($) {
 

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

@@ -65,4 +65,30 @@ tbody .block_status.published, #sitemap .span1.Published {
 
 .label {margin: 12px 10px 0 0;}
 
-#loginmain {margin: 0 auto; float: none;}
+#loginmain {margin: 0 auto; float: none;}
+
+.container-fluid {
+ padding-top: 20px;
+}
+
+.navbar .nav > li > .btn {
+ color: #fff;
+ text-shadow: 0 0px 0 white;
+}
+
+.navbar .nav > li > .btn:focus,
+.navbar .nav > li > .btn:hover {
+ background-color: #eeeeee;
+ color: #fff;
+ text-decoration: none;
+}
+
+.navbar .nav > li > .btn:hover, .btn:focus {
+ background-position: 0 0px;
+}
+
+input,
+textarea,
+.uneditable-input {
+ width: inherit;
+}

app/controllers/cms/inline_content_controller.rb

@@ -5,7 +5,7 @@ class InlineContentController < Cms::BaseController
  def update
  content = Content.find_draft(params[:content_name], params[:id])
  content.update_attributes(filtered_content)
- @page = Page.find_draft(params[:page_id])
+ @page = Page.find_draft(params[:page_id].to_i)
  if (!@page.live?)
  page_status = "draft-status"
  status_label = "DRAFT"

app/controllers/cms/routes_controller.rb

@@ -14,7 +14,7 @@ def index
  @routes = Rails.application.routes.routes.collect do |route|
  name = route.name.to_s
  verb = route.verb
- segs = route.path
+ segs = route.path.spec
  reqs = route.requirements.empty? ? "" : route.requirements.inspect
  {:name => name, :verb => verb, :segs => segs, :reqs => reqs}
  end

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

@@ -5,8 +5,8 @@
  <%= 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">
- <%= lt_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
+ <%=raw dk_button_wrapper(f.submit("Save", :class => "submit", :tabindex => next_tabindex)) %>
  </div>
 <% end %>