Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Rename base controller to application

  • Loading branch information...
commit 3508625b03a2e0c73c836ef669a4f9e442ad03ed 1 parent b806b08
@galetahub galetahub authored
View
3  app/controllers/ckeditor/base_controller.rb → app/controllers/ckeditor/application_controller.rb
@@ -1,6 +1,5 @@
-class Ckeditor::BaseController < ApplicationController
+class Ckeditor::ApplicationController < ::ApplicationController
respond_to :html, :json
- layout "ckeditor"
before_filter :set_locale
before_filter :find_asset, :only => [:destroy]
View
2  app/controllers/ckeditor/attachment_files_controller.rb
@@ -1,4 +1,4 @@
-class Ckeditor::AttachmentFilesController < Ckeditor::BaseController
+class Ckeditor::AttachmentFilesController < Ckeditor::ApplicationController
def index
@attachments = Ckeditor.attachment_file_model.find_all(ckeditor_attachment_files_scope)
View
2  app/controllers/ckeditor/pictures_controller.rb
@@ -1,4 +1,4 @@
-class Ckeditor::PicturesController < Ckeditor::BaseController
+class Ckeditor::PicturesController < Ckeditor::ApplicationController
def index
@pictures = Ckeditor.picture_model.find_all(ckeditor_pictures_scope)
View
16 app/views/layouts/ckeditor.html.erb → app/views/layouts/ckeditor/application.html.erb
@@ -6,18 +6,10 @@
<%= csrf_meta_tag %>
<%= tag(:meta, :name => "ckeditor-path", :content => Ckeditor.relative_path) %>
<title><%= I18n.t('page_title', :scope => [:ckeditor]) %></title>
- <link href="<%= Ckeditor.relative_path %>/ckeditor/filebrowser/stylesheets/uploader.css" type="text/css" rel="stylesheet">
- <style type="text/css">
- .gal-holder .gal-item .gal-upload-holder .add {
- background: url(<%= Ckeditor.relative_path %>/ckeditor/filebrowser/images/gal_add.png) no-repeat left center;
- }
- .gal-more a {
- background: url(<%= Ckeditor.relative_path %>/ckeditor/filebrowser/images/gal_more.gif) no-repeat left center;
- }
- </style>
- <% ["jquery.js", "jquery.tmpl.js", "fileuploader.js", "rails.js", "application.js"].each do |js| %>
- <script src="<%= Ckeditor.relative_path %>/ckeditor/filebrowser/javascripts/<%= js %>" type="text/javascript"></script>
- <% end %>
+
+ <%= stylesheet_link_tag "ckeditor/application" %>
+ <%= javascript_include_tag "ckeditor/application" %>
+
<script type="text/javascript">
var CKEditorFuncNum = $.QueryString["CKEditorFuncNum"];
var CKEditorName = $.QueryString["CKEditor"];
Please sign in to comment.
Something went wrong with that request. Please try again.