committing my stuff
Hesham E
committed Aug 31, 2010
commit ec8253c27b6d2d26c84eef0d85db9cdc73fd5c07
Showing 5
changed files with
16 additions
and 29 deletions
app/controllers/cms_admin/assets_controller.rb
+3
-4
| @@ | @@ -3,14 +3,13 @@ class CmsAdmin::AssetsController < CmsAdmin::BaseController |
| :only => :destroy | |
| def index | |
| - | render :update do |page| |
| - | page << "$('#assets_list').html(\"#{ escape_javascript(render(:partial => 'cms_admin/assets/index')) }\")" |
| - | end |
| end | |
| def create | |
| @cms_asset = CmsAsset.create!(:uploaded_file => params[:file]) | |
| - | render :nothing => true |
| + | render :update do |page| |
| + | page << "$('#assets_list').html(\"#{ escape_javascript(render(:partial => 'cms_admin/assets/index')) }\")" |
| + | end |
| end | |
| def destroy | |
app/controllers/cms_admin/base_controller.rb
+0
-16
| @@ | @@ -1,20 +1,4 @@ |
| class CmsAdmin::BaseController < ApplicationController | |
| - | before_filter :register_asset_expansions |
| - | |
| layout 'cms_admin' | |
| - | protected |
| - | |
| - | def register_asset_expansions |
| - | js_includes = [ 'jquery', 'jquery-ui', 'rails', 'cms', |
| - | 'tiny_mce/jquery.tinymce', 'tiny_mce/tiny_mce', |
| - | 'codemirror/codemirror', 'plupload/plupload.full.min', |
| - | 'rteditor', 'syntax_highlighter', 'uploader' ].collect{|f| ['cms', f].join('/')} |
| - | |
| - | css_includes = ['cms_master', 'jquery-ui'].collect{|f| ['cms', f].join('/')} |
| - | |
| - | ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => js_includes |
| - | ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => css_includes |
| - | end |
| - | |
| end | |
comfortable_mexican_sofa.rb b/lib/comfortable_mexican_sofa.rb
+10
-0
| @@ | @@ -11,3 +11,13 @@ module ComfortableMexicanSofa |
| # TODO | |
| end | |
| + | |
| + | js_includes = [ 'jquery', 'jquery-ui', 'rails', 'cms', |
| + | 'tiny_mce/jquery.tinymce', 'tiny_mce/tiny_mce', |
| + | 'codemirror/codemirror', 'plupload/plupload.full.min', |
| + | 'rteditor', 'syntax_highlighter', 'uploader' ].collect{|f| ['cms', f].join('/')} |
| + | |
| + | css_includes = ['cms_master', 'jquery-ui'].collect{|f| ['cms', f].join('/')} |
| + | |
| + | ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => js_includes |
| + | ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => css_includes |
| \ No newline at end of file | |
public/javascripts/cms/cms.js
+1
-7
| @@ | @@ -28,13 +28,7 @@ $.CMS = function(){ |
| } | |
| }) | |
| }); | |
| - | |
| - | // Show/Hide Advanced |
| - | $('a#more_options').bind('click.cms', function() { |
| - | $(this).text(($(this).text() == 'Show more') ? 'Show less' : 'Show more'); |
| - | $('.advanced').toggle(); |
| - | }) |
| - | |
| + | |
| // Load Page Blocks on layout change | |
| $('select#cms_page_cms_layout_id').bind('change.cms', function() { | |
| $.ajax({url: ['/cms-admin/pages', page_id, 'form_blocks'].join('/'), data: ({ layout_id: $(this).val()})}) | |
public/javascripts/cms/uploader.js
+2
-2
| @@ | @@ -34,8 +34,8 @@ $.CMS.Uploader = function(){ |
| alert(err.file.name+": "+err.message) | |
| }); | |
| - | uploader.bind('FileUploaded', function(up, file){ |
| - | $.get('/cms-admin/assets'); |
| + | uploader.bind('FileUploaded', function(up, file, response){ |
| + | alert(response); |
| $('#'+file.id).fadeOut(4000); | |
| }) | |
| } | |