Remove CKEditor due to conflicts with the jQuery library
This commit is contained in:
1 parent
a8c4e17c56
commit
964440fa86
659 files changed
+6
-119298
No files matched your search
@@ -1,3 +1,3 @@
|
||||
<%= f.error_messages %>
|
||||
|
||||
<%= f.cktext_area :content, :toolbar=>'Custom', :width=>'700px', :height=>'200px' %>
|
||||
<%= f.text_area :content, :width=>'700px', :height=>'200px' %>
|
||||
@@ -6,7 +6,7 @@
|
||||
<script type="text/javascript" charset="utf-8">
|
||||
$("div.editable").live("mouseenter mouseleave",
|
||||
function (event) {
|
||||
$(this).next('.edit_link').toggle();
|
||||
$(this).children('.edit_link').toggle();
|
||||
});
|
||||
</script>
|
||||
<% end -%>
|
||||
@@ -7,9 +7,10 @@
|
||||
<%= yield :page_specific_link %>
|
||||
<%= stylesheet_link_tag "easy", "main", "devise", "content", :media => "screen, projection" %>
|
||||
<%= stylesheet_link_tag "easyprint", :media => "print" %>
|
||||
<%= javascript_include_tag :ckeditor %>
|
||||
|
||||
<%= javascript_include_tag "jquery", "jquery-ui", "rails", "easy", :cache => 'all' %>
|
||||
<%= javascript_include_tag "application", :cache => 'all' %>
|
||||
<%= javascript_include_tag :ckeditor %>
|
||||
<%= yield :page_specific_javascript %>
|
||||
<!--[if IE]>
|
||||
<%= stylesheet_link_tag "ie", :media => "screen, projection" %>
|
||||
@@ -28,6 +29,7 @@
|
||||
<li><%= link_to t('admin.user_role'), admin_user_role_models_path %></li>
|
||||
<li><%= link_to t('admin.translation'), admin_translations_path %></li>
|
||||
</ul>
|
||||
<%= render 'layouts/lang_menu' %>
|
||||
</div>
|
||||
|
||||
<div id="content" class="content">
|
||||
|
||||
Reference in new issue
Block a user