RubyGems - comfortable_mexican_sofa - Versions diffs - 1.0.28 → 1.0.29 - Mend

comfortable_mexican_sofa 1.0.28 → 1.0.29

Files changed (26) hide show

data/VERSION CHANGED

	@@ -1 +1 @@
1	- 1.0.28
1	+ 1.0.29

data/app/controllers/cms_admin/pages_controller.rb CHANGED

@@ -1,7 +1,8 @@
 class CmsAdmin::PagesController < CmsAdmin::BaseController
-  before_filter :build_cms_page,  :only => [:new, :create]
-  before_filter :load_cms_page,   :only => [:edit, :update, :destroy]
+  before_filter :build_cms_page,    :only => [:new, :create]
+  before_filter :build_upload_file, :only => [:new, :edit]
+  before_filter :load_cms_page,     :only => [:edit, :update, :destroy]
   def index
     return redirect_to :action => :new if @cms_site.cms_pages.count == 0
@@ -53,6 +54,10 @@ protected
     @cms_page.cms_layout ||= (@cms_page.parent && @cms_page.parent.cms_layout || @cms_site.cms_layouts.first)
   end
+  def build_upload_file
+    @upload = CmsUpload.new
+  end
   def load_cms_page
     @cms_page = @cms_site.cms_pages.find(params[:id])
     @cms_page.cms_layout ||= (@cms_page.parent && @cms_page.parent.cms_layout || @cms_site.cms_layouts.first)

data/app/controllers/cms_admin/uploads_controller.rb CHANGED

@@ -7,12 +7,10 @@ class CmsAdmin::UploadsController < CmsAdmin::BaseController
   end
   def create
-    @cms_upload = @cms_site.cms_uploads.new(:uploaded_file => params[:file])
-    if @cms_upload.save
-      render(:partial => 'cms_admin/uploads/upload', :object => @cms_upload)
-    else
-      render :nothing => true
-    end
+    @cms_upload = @cms_site.cms_uploads.create!(:file => params[:file])
+    render :partial => 'file', :object => @cms_upload
+  rescue ActiveRecord::RecordInvalid
+    render :nothing => true, :status => :bad_request
   end
   def destroy

data/app/models/cms_upload.rb CHANGED

@@ -1,33 +1,13 @@
 class CmsUpload < ActiveRecord::Base
   # -- AR Extensions --------------------------------------------------------
-  has_attached_file :file,
-    :styles => { :thumb => '48x48>' }
-  before_post_process :image?
+  has_attached_file :file
   # -- Relationships --------------------------------------------------------
   belongs_to :cms_site
   # -- Validations ----------------------------------------------------------
-  validates :cms_site_id,
-    :presence   => true
-  validates_attachment_presence :file
-  # -- Instance Methods -----------------------------------------------------
-  def image?
-    !(file_content_type =~ /^image.*/).nil?
-  end
-  def uploaded_file=(data)
-    if data.present?
-      data.content_type = MIME::Types.type_for(data.original_filename).to_s
-      self.file = data
-    end
-  end
-  def icon
-    self.image?? self.file.url(:thumb) : 'TODO'
-  end
+  validates :cms_site_id, :presence => true
+  validates_attachment_presence :file
 end

data/app/views/cms_admin/layouts/_form.html.erb CHANGED

@@ -1,3 +1,7 @@
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/uploads/index' %>
+<% end %>
 <%= form.text_field :label, :label => 'Layout Name', :id => (@cms_layout.new_record?? 'slugify' : nil)%>
 <%= form.text_field :slug, :id => 'slug' %>
 <% if (options = CmsLayout.options_for_select(@cms_site, @cms_layout)).present? %>

data/app/views/cms_admin/pages/_form.html.erb CHANGED

@@ -1,3 +1,7 @@
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/uploads/index' %>
+<% end %>
 <%= form.text_field :label, :id => (@cms_page.new_record?? 'slugify' : nil) %>
 <div class='page_form_extras'>
@@ -16,9 +20,4 @@
   <%= cms_hook :page_form, :object => form %>
 </div>
-<%= render :partial => 'form_blocks' %>
-<% content_for :right_column do %>
-  <h2>Uploads</h2>
-  <%= render :partial => 'cms_admin/uploads/index' %>
-<% end %>
+<%= render :partial => 'form_blocks' %>

data/app/views/cms_admin/snippets/_form.html.erb CHANGED

@@ -1,3 +1,7 @@
+<% content_for :right_column do %>
+  <%= render :partial => 'cms_admin/uploads/index' %>
+<% end %>
 <%= form.text_field :label, :id => (@cms_snippet.new_record?? 'slugify' : nil) %>
 <%= form.text_field :slug, :id => 'slug' %>
 <%= form.text_area :content %>

data/app/views/cms_admin/uploads/_file.html.erb ADDED

@@ -0,0 +1,10 @@
+<div class='file' id='<%= dom_id(file) %>'>
+  <%  file_name = file.file_file_name
+      file_ext  = file.file_file_name.split('.').last
+      if (file_name.size - file_ext.size) > 30
+        file_name = file_name.truncate(30) + file_ext
+      end
+  %>
+  <%= link_to file_name, file.file.url, :target => '_blank' %>
+  <%= link_to span_tag('x'), cms_admin_upload_path(file), :method => :delete, :remote => true, :class => 'delete' %>
+</div>

data/app/views/cms_admin/uploads/_index.html.erb CHANGED

@@ -1,8 +1,10 @@
-<div id='upload_container'>
-  <div id='filelist'></div>
-  <%= link_to 'select files', '#', :id => 'pickfiles', :class => 'button' %>
-</div>
+<h2>File Uploads</h2>
-<div id='uploads_list'>
-  <%= render :partial => 'cms_admin/uploads/upload', :collection => CmsUpload.all %>
+<div id='file_uploads' class='box'>
+  <button id="uploader_button" href="#">Select Files to Upload</button>
+  <div id='uploaded_files'>
+    <% CmsUpload.order('created_at DESC').all.each do |file| %>
+      <%= render :partial => 'cms_admin/uploads/file', :object => file %>
+    <% end %>
+  </div>
 </div>

data/app/views/cms_admin/uploads/destroy.js.erb CHANGED

@@ -1,3 +1,3 @@
-$("#<%= dom_id(@cms_upload) %>").fadeOut('slow', function(){
+$(".file#<%= dom_id(@cms_upload) %>").fadeOut('slow', function(){
   $(this).remove()
 })

data/comfortable_mexican_sofa.gemspec CHANGED

@@ -5,11 +5,11 @@
 Gem::Specification.new do |s|
   s.name = %q{comfortable_mexican_sofa}
-  s.version = "1.0.28"
+  s.version = "1.0.29"
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Oleg Khabarov", "The Working Group Inc"]
-  s.date = %q{2010-11-24}
+  s.date = %q{2010-11-25}
   s.description = %q{}
   s.email = %q{oleg@theworkinggroup.ca}
   s.extra_rdoc_files = [
@@ -56,10 +56,9 @@ Gem::Specification.new do |s|
      "app/views/cms_admin/snippets/edit.html.erb",
      "app/views/cms_admin/snippets/index.html.erb",
      "app/views/cms_admin/snippets/new.html.erb",
+     "app/views/cms_admin/uploads/_file.html.erb",
      "app/views/cms_admin/uploads/_index.html.erb",
-     "app/views/cms_admin/uploads/_upload.html.erb",
      "app/views/cms_admin/uploads/destroy.js.erb",
-     "app/views/cms_admin/uploads/index.html.erb",
      "app/views/layouts/cms_admin.html.erb",
      "comfortable_mexican_sofa.gemspec",
      "config.ru",
@@ -127,6 +126,9 @@ Gem::Specification.new do |s|
      "public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.css",
      "public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.js",
      "public/javascripts/comfortable_mexican_sofa/jquery.js",
+     "public/javascripts/comfortable_mexican_sofa/plupload/plupload.full.min.js",
+     "public/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.min.js",
+     "public/javascripts/comfortable_mexican_sofa/plupload/plupload.min.js",
      "public/javascripts/comfortable_mexican_sofa/rails.js",
      "public/javascripts/comfortable_mexican_sofa/tiny_mce/jquery.tinymce.js",
      "public/javascripts/comfortable_mexican_sofa/tiny_mce/langs/en.js",

data/config/routes.rb CHANGED

@@ -10,7 +10,7 @@ Rails.application.routes.draw do
     resources :sites
     resources :layouts
     resources :snippets
-    resources :uploads
+    resources :uploads, :only => [:create, :destroy]
   end
   scope :controller => :cms_content do

data/lib/comfortable_mexican_sofa/view_methods.rb CHANGED

@@ -47,6 +47,8 @@ ActionView::Helpers::AssetTagHelper.register_javascript_expansion :cms => [
   'comfortable_mexican_sofa/rails',
   'comfortable_mexican_sofa/tiny_mce/tiny_mce',
   'comfortable_mexican_sofa/tiny_mce/jquery.tinymce',
+  'comfortable_mexican_sofa/plupload/plupload.min',
+  'comfortable_mexican_sofa/plupload/plupload.html5.min',
   'comfortable_mexican_sofa/cms'
 ]
 ActionView::Helpers::AssetTagHelper.register_stylesheet_expansion :cms => [

data/public/javascripts/comfortable_mexican_sofa/cms.js CHANGED

@@ -2,59 +2,49 @@ $.CMS = function(){
   var current_path = window.location.pathname;
   $(document).ready(function(){
-    // Slugify
-    $('input#slugify').bind('keyup.cms', function() {
-      $('input#slug').val( $.CMS.slugify( $(this).val() ) );
-    });
-    // Expand/Collapse tree function
-    $('a.tree_toggle').bind('click.cms', function() {
-      $(this).siblings('ul').toggle();
-      $(this).toggleClass('closed');
-      // object_id are set in the helper (check cms_helper.rb)
-      $.ajax({url: [current_path, object_id, 'toggle'].join('/')});
-    });
-    // Show/hide details
-    $('a.details_toggle').bind('click.cms', function() {
-      $(this).parent().siblings('table.details').toggle();
-    });
-    // Sortable trees
-    $('ul.sortable').each(function(){
-      $(this).sortable({  handle: 'div.dragger',
-        update: function() {
-          $.post(current_path + '/reorder', '_method=put&'+$(this).sortable('serialize'));
-        }
-      })
-    });
-    // Load Page Blocks on layout change
-    $('select#cms_page_cms_layout_id').bind('change.cms', function() {
-      $.ajax({
-        url: ['/' + $(this).attr('data-path-prefix'), 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'),
-        data: ({
-          layout_id: $(this).val()
-        }),
-        complete: function(){ $.CMS.enable_rich_text() }
-      })
-    })
+    $.CMS.slugify();
+    $.CMS.tree_methods();
+    $.CMS.load_page_blocks();
     $.CMS.enable_rich_text();
     $.CMS.enable_date_picker();
+    if($('#uploader_button').get(0)) $.CMS.enable_uploader();
-  }); // End $(document).ready()
+  });
   return {
-    slugify: function(str){
-      str = str.replace(/^\s+|\s+$/g, '');
-      var from = "ÀÁÄÂÈÉËÊÌÍÏÎÒÓÖÔÙÚÜÛàáäâèéëêìíïîòóöôùúüûÑñÇç·/_,:;";
-      var to   = "aaaaeeeeiiiioooouuuuaaaaeeeeiiiioooouuuunncc------";
-      for (var i=0, l=from.length ; i<l ; i++) {
-        str = str.replace(new RegExp(from[i], "g"), to[i]);
+    slugify: function(){
+      $('input#slugify').bind('keyup.cms', function() {
+        $('input#slug').val( slugify( $(this).val() ) );
+      });
+      function slugify(str){
+        str = str.replace(/^\s+|\s+$/g, '');
+        var from = "ÀÁÄÂÈÉËÊÌÍÏÎÒÓÖÔÙÚÜÛàáäâèéëêìíïîòóöôùúüûÑñÇç·/_,:;";
+        var to   = "aaaaeeeeiiiioooouuuuaaaaeeeeiiiioooouuuunncc------";
+        for (var i=0, l=from.length ; i<l ; i++) {
+          str = str.replace(new RegExp(from[i], "g"), to[i]);
+        }
+        str = str.replace(/[^a-zA-Z0-9 -]/g, '').replace(/\s+/g, '-').toLowerCase();
+        return str;
       }
-      str = str.replace(/[^a-zA-Z0-9 -]/g, '').replace(/\s+/g, '-').toLowerCase();
-      return str;
+    },
+    // Load Page Blocks on layout change
+    load_page_blocks: function(){
+      $('select#cms_page_cms_layout_id').bind('change.cms', function() {
+        $.ajax({
+          url: ['/' + $(this).attr('data-path-prefix'), 'pages', $(this).attr('data-page-id'), 'form_blocks'].join('/'),
+          data: ({
+            layout_id: $(this).val()
+          }),
+          complete: function(){
+            $.CMS.enable_rich_text();
+            $.CMS.enable_date_picker();
+          }
+        })
+      });
     },
     enable_rich_text: function(){
@@ -66,11 +56,60 @@ $.CMS = function(){
          theme_advanced_buttons3 : "",
          theme_advanced_buttons4 : "",
          theme_advanced_toolbar_location : "top",
-         theme_advanced_toolbar_align : "left"
+         theme_advanced_toolbar_align : "left",
+         theme_advanced_statusbar_location : "bottom",
+         theme_advanced_resizing : true,
+         theme_advanced_resize_horizontal : false
        })
     },
     enable_date_picker: function(){
       $('input[type=datetime]').datepicker();
+    },
+    tree_methods: function(){
+      $('a.tree_toggle').bind('click.cms', function() {
+        $(this).siblings('ul').toggle();
+        $(this).toggleClass('closed');
+        // object_id are set in the helper (check cms_helper.rb)
+        $.ajax({url: [current_path, object_id, 'toggle'].join('/')});
+      });
+      $('ul.sortable').each(function(){
+        $(this).sortable({  handle: 'div.dragger',
+          update: function() {
+            $.post(current_path + '/reorder', '_method=put&'+$(this).sortable('serialize'));
+          }
+        })
+      });
+    },
+    enable_uploader : function(){
+      auth_token = $("meta[name=csrf-token]").attr('content');
+      var uploader = new plupload.Uploader({
+        container:        'file_uploads',
+        browse_button:    'uploader_button',
+        runtimes:         'html5',
+        unique_names:     true,
+        multipart:        true,
+        multipart_params: { authenticity_token: auth_token, format: 'js' },
+        url:              '/cms-admin/uploads'
+      });
+      uploader.init();
+      uploader.bind('FilesAdded', function(up, files) {
+        $.each(files, function(i, file){
+          $('#uploaded_files').prepend(
+            '<div class="file pending" id="' + file.id + '">' + file.name + '</div>'
+          );
+        });
+        uploader.start();
+      });
+      uploader.bind('Error', function(up, err) {
+        alert('File Upload failed')
+      });
+      uploader.bind('FileUploaded', function(up, file, response){
+        $('#' + file.id).replaceWith(response.response);
+      });
     }
   }
 }();

data/public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.css CHANGED

@@ -301,7 +301,7 @@
  *
  * http://docs.jquery.com/UI/Datepicker#theming
  */
-.ui-datepicker { width: 17em; padding: .2em .2em 0; }
+.ui-datepicker { width: 17em; padding: .2em .2em 0; display: none;}
 .ui-datepicker .ui-datepicker-header { position:relative; padding:.2em 0; }
 .ui-datepicker .ui-datepicker-prev, .ui-datepicker .ui-datepicker-next { position:absolute; top: 2px; width: 1.8em; height: 1.8em; }
 .ui-datepicker .ui-datepicker-prev-hover, .ui-datepicker .ui-datepicker-next-hover { top: 1px; }

data/public/javascripts/comfortable_mexican_sofa/plupload/plupload.full.min.js ADDED

@@ -0,0 +1 @@

data/public/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.min.js ADDED

@@ -0,0 +1 @@

data/public/javascripts/comfortable_mexican_sofa/plupload/plupload.min.js ADDED

@@ -0,0 +1 @@

data/public/javascripts/comfortable_mexican_sofa/tiny_mce/themes/advanced/skins/default/content.css CHANGED

@@ -1,4 +1,4 @@
-body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:10px; margin:8px;}
+body, td, pre {color:#000; font-family:Verdana, Arial, Helvetica, sans-serif; font-size:12px; margin:8px;}
 body {background:#FFF;}
 body.mceForceColors {background:#FFF; color:#000;}
 h1 {font-size: 2em}

data/public/stylesheets/comfortable_mexican_sofa/structure.css CHANGED

@@ -7,50 +7,101 @@ html, body {
   height: 100%;
 }
 .left_column {
-  width: 200px;
+  width: 175px;
   float: left;
 }
 .center_column {
-  margin: 0px 200px;
+  margin: 0px 250px 0px 175px;
   min-height: 100%;
   background-color: #ececec;
+  overflow: hidden;
   box-shadow: inset 0px 0px 3px #000;
   -moz-box-shadow: inset 0px 0px 3px #000;
+  -webkit-box-shadow: inset 0px 0px 3px #000;
 }
 .center_column_content {
   padding: 25px;
 }
 .right_column {
-  width: 200px;
+  width: 250px;
   float: right;
 }
 .right_column_content {
-  padding: 25px;
-  width: 150px;
+  padding: 25px 10px;
+  width: 230px;
   position: fixed;
 }
 .left_column_content {
-  padding: 25px 0px 25px 25px;
-  width: 175px;
+  padding: 25px 0px 25px 10px;
+  width: 165px;
   position: fixed;
 }
 .left_column_content a {
   display: block;
   background-color: #fff;
   padding: 0px 10px;
-  margin-bottom: 10px;
-  font: 18px/30px Georgia, serif;
+  margin-bottom: 5px;
+  font: 15px/25px Georgia, serif;
   color: #1C1F22;
-  border-top-left-radius: 5px;
-  border-bottom-left-radius: 5px ;
-  -moz-border-radius-topleft: 5px;
-  -moz-border-radius-bottomleft: 5px;
+  border-top-left-radius: 4px;
+  border-bottom-left-radius: 4px ;
+  -moz-border-radius-topleft: 4px;
+  -moz-border-radius-bottomleft: 4px;
   opacity: 0.8;
 }
 .left_column_content a:hover,
 .left_column_content a.active {
   opacity: 1;
 }
+/* -- Right Column ------------------------------------------------------- */
+.right_column_content h2 {
+  font: 15px/25px Georgia, serif;
+  color: #fff;
+  margin-bottom: 10px;
+}
+.right_column_content .box {
+  background-color: #ececec;
+  padding: 5px;
+  border-radius: 3px;
+  -moz-border-radius: 3px;
+}
+#file_uploads button {
+  width: 100%;
+  margin-bottom: 10px;
+}
+#file_uploads #uploaded_files {
+  max-height: 500px;
+  overflow-y: auto;
+}
+#file_uploads #uploaded_files .file {
+  position: relative;
+  overflow: hidden;
+  font-size: 11px;
+  background-color: #fff;
+  margin-bottom: 2px;
+  opacity: 0.8;
+}
+#file_uploads #uploaded_files .file.pending {
+  opacity: 0.3;
+}
+#file_uploads #uploaded_files .file:hover {
+  opacity: 1;
+}
+#file_uploads #uploaded_files .file:hover a {
+  color: #000;
+}
+#file_uploads #uploaded_files .file a.delete {
+  position: absolute;
+  display: block;
+  right: 0px;
+  top: 0px;
+  height: 13px;
+  width: 13px;
+  font-weight: bold;
+}
+#file_uploads #uploaded_files .file:hover a.delete {
+  color: #9e0b0f;
+}
 /* -- Common Elements ---------------------------------------------------- */
 .flash {

data/public/stylesheets/comfortable_mexican_sofa/typography.css CHANGED

@@ -10,7 +10,6 @@ h1 {
   text-shadow: #fff 1px 1px;
   border-bottom: 2px groove #ccc;
 }
 a {
   text-decoration: none;
   color: #384E66;

data/test/functional/cms_admin/uploads_controller_test.rb CHANGED

@@ -2,11 +2,6 @@ require 'test_helper'
 class CmsAdmin::UploadsControllerTest < ActionController::TestCase
-  def test_index
-    get :index
-    assert_response :success
-  end
   def test_create
     assert_difference 'CmsUpload.count', 1 do
       xhr :post, :create, :file => fixture_file_upload('files/valid_image.jpg')
@@ -17,8 +12,7 @@ class CmsAdmin::UploadsControllerTest < ActionController::TestCase
   def test_create_fails
     assert_no_difference 'CmsUpload.count' do
       xhr :post, :create, :file => nil
-      assert_has_errors_on assigns(:cms_upload), [:file_file_name]
-      assert_response :success
+      assert_response :bad_request
     end
   end

data/test/unit/cms_upload_test.rb CHANGED

@@ -12,20 +12,15 @@ class CmsUploadTest < ActiveSupport::TestCase
   def test_create
     assert_difference 'CmsUpload.count' do
-      upload = cms_sites(:default).cms_uploads.create(
-        :uploaded_file => fixture_file_upload('files/valid_image.jpg')
+      cms_sites(:default).cms_uploads.create(
+        :file => fixture_file_upload('files/valid_image.jpg')
       )
-      assert upload.image?
     end
   end
-  def test_create_fails_on_invalid_file
+  def test_create_failure
     assert_no_difference 'CmsUpload.count' do
-      upload = cms_sites(:default).cms_uploads.create(
-        :file => fixture_file_upload('files/invalid_file.gif', 'image/gif')
-      )
-      assert upload.errors.present?
-      assert_has_errors_on upload, :file
+      cms_sites(:default).cms_uploads.create(:file => '')
     end
   end
 end

metadata CHANGED

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: comfortable_mexican_sofa
 version: !ruby/object:Gem::Version
-  hash: 47
+  hash: 45
   prerelease: false
   segments:
   - 1
   - 0
-  - 28
-  version: 1.0.28
+  - 29
+  version: 1.0.29
 platform: ruby
 authors:
 - Oleg Khabarov
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2010-11-24 00:00:00 -05:00
+date: 2010-11-25 00:00:00 -05:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -116,10 +116,9 @@ files:
 - app/views/cms_admin/snippets/edit.html.erb
 - app/views/cms_admin/snippets/index.html.erb
 - app/views/cms_admin/snippets/new.html.erb
+- app/views/cms_admin/uploads/_file.html.erb
 - app/views/cms_admin/uploads/_index.html.erb
-- app/views/cms_admin/uploads/_upload.html.erb
 - app/views/cms_admin/uploads/destroy.js.erb
-- app/views/cms_admin/uploads/index.html.erb
 - app/views/layouts/cms_admin.html.erb
 - comfortable_mexican_sofa.gemspec
 - config.ru
@@ -187,6 +186,9 @@ files:
 - public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.css
 - public/javascripts/comfortable_mexican_sofa/jquery-ui/jquery-ui.js
 - public/javascripts/comfortable_mexican_sofa/jquery.js
+- public/javascripts/comfortable_mexican_sofa/plupload/plupload.full.min.js
+- public/javascripts/comfortable_mexican_sofa/plupload/plupload.html5.min.js
+- public/javascripts/comfortable_mexican_sofa/plupload/plupload.min.js
 - public/javascripts/comfortable_mexican_sofa/rails.js
 - public/javascripts/comfortable_mexican_sofa/tiny_mce/jquery.tinymce.js
 - public/javascripts/comfortable_mexican_sofa/tiny_mce/langs/en.js

data/app/views/cms_admin/uploads/_upload.html.erb DELETED

@@ -1,11 +0,0 @@
-<div class='upload' id="<%= dom_id(upload) %>">
-  <div class='thumb'>
-    <%= image_tag(upload.icon) %>
-    <%= link_to 'delete', cms_admin_upload_path(upload), :method => :delete, :remote => true %>
-  </div>
-  <div class='name'>
-    <%= link_to upload.file_file_name, upload.file.url, :target => '_blank' %>
-  </div>
-</div>

data/app/views/cms_admin/uploads/index.html.erb DELETED

	@@ -1,2 +0,0 @@
1	- <h1>Uploads</h1>
2	- <%= render :partial => 'index' %>