trusty-clipped-extension 2.0.2.pre.beta → 2.0.3.pre.beta

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTg2YjAwZThjYjFiNGFlY2IwMWY3YmYwOWQwZmYwMWQ5MGU3YWFlMw==
-  data.tar.gz: !binary |-
-    ZWM4NzY0MWFkYWNjZTlmMzJjMDNkY2M5ZGFmYmQyYmQ5ZTM5NmM1OA==
+SHA1:
+  metadata.gz: c24b980e60b557340856569014e94388fea91ce8
+  data.tar.gz: 3b507ddf8f6ef2dc9d055b4bd80283fcc8b14144
 SHA512:
-  metadata.gz: !binary |-
-    NWYzNWVhNGU4YTMzM2E2YjJjYzQ0ZmZmNjYwMTdhZTJkMzNjNGY5ZWMzMjBl
-    Nzc4MTQxZGEyMzAwNGE4YTk2NTQxOGZjNmU2YTdhYTU5ZTc2NDUxNWM5MTNk
-    NDc5MmIyZmJiZjYwMTkwZDFjNjNjNjVmZGUxNDRiZmE3ZDZmNGY=
-  data.tar.gz: !binary |-
-    ODVlYmE2MTE2MmQ1MzBiYTk5MDUzNmE3MWRiMTdjZTVkYWNjMDgxY2UzOTk5
-    OTgxZWFmODNmNzljN2U0MWEwMDRlNjIyZWEwMmNjOTgzNDZhMDY1Y2E3YjBl
-    ODA4ZDJkNDAxZmU2YjAxOTE0YmJiMTg0YWNiMzNiZjllMGQwODA=
+  metadata.gz: 658648393ef70d2e43631a98f5479d1531a64469532547a3b3a766fb872e78c216e28288953e2157e2615353c7cdb12cac39a00bcc55d8fb40daffefc0f41f13
+  data.tar.gz: bcc110831ef7c4105a6358aa79c22584c6155b41a0bb40a4bc190d3be8c1c7d3f1df5364d5f18ec3890a20f0e85d7fa312ace981a557b2519db4dd9a9126d02e

data/Gemfile

@@ -1,5 +1,49 @@
 source 'https://rubygems.org'
 
-gem 'trustygems', '~> 0.1.0'
+# This is the minimum of dependency required to run
+# the trusty-cms instance generator, which is (normally)
+# the only time the trusty gem functions as an
+# application. The instance has its own Gemfile, which
+# requires radiant and therefore pulls in every
+# dependency mentioned in radiant.gemspec.
+
+gem 'trustygems', '~> 0.2.0'
 
 gemspec
+
+# When trusty is installed as a gem you can run all of
+# its tests and specs from an instance. If you're working
+# on trusty itself and you want to run specs from the
+# radiant root directory, uncomment the lines below and
+# run `bundle install`.
+
+# gemspec
+# gem "compass-rails", "~> 1.0.3"
+
+# gem "radiant-archive-extension",             "~> 1.0.7"
+# gem "radiant-clipped-extension",             "~> 1.1.0"
+# gem "radiant-debug-extension",               "~> 1.0.2"
+# gem "radiant-exporter-extension",            "~> 1.1.0"
+# gem "radiant-markdown_filter-extension",     "~> 1.0.2"
+# gem "radiant-sheets-extension",              "~> 1.1.0.alpha"
+# gem "radiant-snippets-extension",            "~> 1.1.0.alpha"
+# gem "radiant-site_templates-extension",      "~> 1.0.4"
+# gem "radiant-smarty_pants_filter-extension", "~> 1.0.2"
+# gem "radiant-textile_filter-extension",      "~> 1.0.4"
+
+
+group :development, :test do
+  gem "compass-rails",   "~> 2.0.1"
+  gem 'thin',             '~> 1.6.2'
+  gem 'pry',              '~> 0.10.0'
+  gem 'capybara',         '~> 2.3.0'
+  gem 'rspec-rails',      '~> 3.0.0'
+  gem 'launchy',          '~> 2.4.2'
+  gem 'database_cleaner', '~> 1.3.0'
+  gem 'poltergeist',      '~> 1.5.1'
+  gem "ckeditor",        "~> 4.1.0"
+  gem 'factory_girl_rails', '~> 4.5.0'
+  gem 'rails-observers'
+  gem "protected_attributes"
+  gem "pry-byebug"
+end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    trusty-clipped-extension (2.0.1.pre.beta)
-      acts_as_list (= 0.4.0)
+    trusty-clipped-extension (2.0.3.pre.beta)
+      acts_as_list (~> 0.4.0)
       cocaine (~> 0.5)
       paperclip (~> 4.2)
       trusty-cms (~> 2.0.0.pre.beta)
@@ -51,16 +51,28 @@ GEM
       activerecord (>= 3.0)
     acts_as_tree (2.2.0)
       activerecord (>= 3.0.0)
-    arel (6.0.2)
+    addressable (2.3.8)
+    arel (6.0.3)
     builder (3.2.2)
+    byebug (5.0.0)
+      columnize (= 0.9.0)
+    capybara (2.3.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
     chunky_png (1.3.4)
-    ckeditor (4.1.2)
+    ckeditor (4.1.3)
       cocaine
       orm_adapter (~> 0.5.0)
     climate_control (0.0.3)
       activesupport (>= 3.0)
+    cliver (0.3.2)
     cocaine (0.5.7)
       climate_control (>= 0.0.3, < 1.0)
+    coderay (1.1.0)
+    columnize (0.9.0)
     compass (1.0.3)
       chunky_png (~> 1.2)
       compass-core (~> 1.0.2)
@@ -77,14 +89,23 @@ GEM
       compass (~> 1.0.0)
       sass-rails (<= 5.0.1)
       sprockets (< 2.13)
+    daemons (1.2.3)
+    database_cleaner (1.3.0)
     delocalize (0.4.0)
       rails (>= 3.0)
+    diff-lcs (1.2.5)
     erubis (2.7.0)
+    eventmachine (1.0.8)
     execjs (2.5.2)
+    factory_girl (4.5.0)
+      activesupport (>= 3.0.0)
+    factory_girl_rails (4.5.0)
+      factory_girl (~> 4.5.0)
+      railties (>= 3.0.0)
     ffi (1.9.10)
-    globalid (0.3.5)
+    globalid (0.3.6)
       activesupport (>= 4.1.0)
-    haml (4.0.6)
+    haml (4.0.7)
       tilt
     haml-rails (0.9.0)
       actionpack (>= 4.0.1)
@@ -104,15 +125,18 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.8.3)
+    launchy (2.4.3)
+      addressable (~> 2.3)
     libv8 (3.16.14.11)
     loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
+    method_source (0.8.2)
     mime-types (2.6.1)
     mimemagic (0.3.0)
     mini_portile (0.6.2)
-    minitest (5.7.0)
+    minitest (5.8.0)
     multi_json (1.11.2)
     mysql (2.9.1)
     nokogiri (1.6.6.2)
@@ -124,8 +148,20 @@ GEM
       cocaine (~> 0.5.5)
       mime-types
       mimemagic (= 0.3.0)
+    poltergeist (1.5.1)
+      capybara (~> 2.1)
+      cliver (~> 0.3.1)
+      multi_json (~> 1.0)
+      websocket-driver (>= 0.2.0)
     protected_attributes (1.0.9)
       activemodel (>= 4.0.1, < 5.0)
+    pry (0.10.1)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.2.0)
+      byebug (~> 5.0)
+      pry (~> 0.10)
     rack (1.6.4)
     rack-cache (1.2)
       rack (>= 0.4)
@@ -151,6 +187,8 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
+    rails-observers (0.1.2)
+      activemodel (~> 4.0)
     railties (4.2.3)
       actionpack (= 4.2.3)
       activesupport (= 4.2.3)
@@ -163,7 +201,23 @@ GEM
     rdoc (3.12.2)
       json (~> 1.4)
     ref (2.0.0)
-    ruby_parser (3.7.0)
+    rspec-core (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.4)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.4)
+      rspec-support (~> 3.0.0)
+    rspec-rails (3.0.2)
+      actionpack (>= 3.0)
+      activesupport (>= 3.0)
+      railties (>= 3.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.4)
+    ruby_parser (3.7.1)
       sexp_processor (~> 4.1)
     sass (3.4.16)
     sass-rails (5.0.1)
@@ -173,6 +227,7 @@ GEM
       sprockets-rails (>= 2.0, < 4.0)
       tilt (~> 1.1)
     sexp_processor (4.6.0)
+    slop (3.6.0)
     sprockets (2.12.4)
       hike (~> 1.2)
       multi_json (~> 1.0)
@@ -186,10 +241,14 @@ GEM
     therubyracer (0.12.2)
       libv8 (~> 3.16.14.0)
       ref
+    thin (1.6.3)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0)
+      rack (~> 1.0)
     thor (0.19.1)
     thread_safe (0.3.5)
     tilt (1.4.1)
-    trusty-cms (2.0.9.pre.beta)
+    trusty-cms (2.0.10.pre.beta)
       RedCloth (~> 4.2)
       acts_as_tree (~> 2.1)
       bundler (~> 1.7)
@@ -213,7 +272,7 @@ GEM
       tzinfo (~> 1.2)
       uglifier (~> 2.6)
       will_paginate (~> 3.0)
-    trustygems (0.1.0)
+    trustygems (0.2.1)
       rake
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
@@ -221,11 +280,29 @@ GEM
       execjs (>= 0.3.0)
       json (>= 1.8.0)
     uuidtools (2.1.5)
+    websocket-driver (0.6.2)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     will_paginate (3.0.7)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
+  capybara (~> 2.3.0)
+  ckeditor (~> 4.1.0)
+  compass-rails (~> 2.0.1)
+  database_cleaner (~> 1.3.0)
+  factory_girl_rails (~> 4.5.0)
+  launchy (~> 2.4.2)
+  poltergeist (~> 1.5.1)
+  protected_attributes
+  pry (~> 0.10.0)
+  pry-byebug
+  rails-observers
+  rspec-rails (~> 3.0.0)
+  thin (~> 1.6.2)
   trusty-clipped-extension!
-  trustygems (~> 0.1.0)
+  trustygems (~> 0.2.0)

data/Rakefile

@@ -1,112 +1,28 @@
+#!/usr/bin/env rake
+# Add your own tasks in files placed in lib/tasks ending in .rake,
+# for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
+
+# require File.expand_path('../config/application', __FILE__)
+# STDOUT.sync = true
+# TrustyCms::Application.load_tasks
+
+require 'pry'
+require 'byebug'
 require 'trustygems'
 
-# # Determine where the RSpec plugin is by loading the boot
-# unless defined? TRUSTY_CMS_ROOT
-#   ENV["RAILS_ENV"] = "test"
-#   case
-#   when ENV["RADIANT_ENV_FILE"]
-#     require File.dirname(ENV["RADIANT_ENV_FILE"]) + "/boot"
-#   when File.dirname(__FILE__) =~ %r{vendor/radiant/vendor/extensions}
-#     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../../")}/config/boot"
-#   else
-#     require "#{File.expand_path(File.dirname(__FILE__) + "/../../../")}/config/boot"
-#   end
-# end
-#
-# require 'rake'
-# require 'rdoc/task'
-# require 'rake/testtask'
-# require 'trustygems'
-#
-# rspec_base = File.expand_path(TRUSTY_CMS_ROOT + '/vendor/plugins/rspec/lib')
-# $LOAD_PATH.unshift(rspec_base) if File.exist?(rspec_base)
-# require 'spec/rake/spectask'
-# require 'cucumber'
-# require 'cucumber/rake/task'
-#
-# # Cleanup the RADIANT_ROOT constant so specs will load the environment
-# Object.send(:remove_const, :TRUSTY_CMS_ROOT)
-#
-# extension_root = File.expand_path(File.dirname(__FILE__))
-#
-# task :default => [:spec, :features]
-# task :stats => "spec:statsetup"
-#
-# desc "Run all specs in spec directory"
-# Spec::Rake::SpecTask.new(:spec) do |t|
-#   t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-#   t.spec_files = FileList['spec/**/*_spec.rb']
-# end
-#
-# task :features => 'spec:integration'
-#
-# namespace :spec do
-#   desc "Run all specs in spec directory with RCov"
-#   Spec::Rake::SpecTask.new(:rcov) do |t|
-#     t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-#     t.spec_files = FileList['spec/**/*_spec.rb']
-#     t.rcov = true
-#     t.rcov_opts = ['--exclude', 'spec', '--rails']
-#   end
-#
-#   desc "Print Specdoc for all specs"
-#   Spec::Rake::SpecTask.new(:doc) do |t|
-#     t.spec_opts = ["--format", "specdoc", "--dry-run"]
-#     t.spec_files = FileList['spec/**/*_spec.rb']
-#   end
-#
-#   [:models, :controllers, :views, :helpers].each do |sub|
-#     desc "Run the specs under spec/#{sub}"
-#     Spec::Rake::SpecTask.new(sub) do |t|
-#       t.spec_opts = ['--options', "\"#{extension_root}/spec/spec.opts\""]
-#       t.spec_files = FileList["spec/#{sub}/**/*_spec.rb"]
-#     end
-#   end
-#
-#   desc "Run the Cucumber features"
-#   Cucumber::Rake::Task.new(:integration) do |t|
-#     t.fork = true
-#     t.cucumber_opts = ['--format', (ENV['CUCUMBER_FORMAT'] || 'pretty')]
-#     # t.feature_pattern = "#{extension_root}/features/**/*.feature"
-#     t.profile = "default"
-#   end
-#
-#   # Setup specs for stats
-#   task :statsetup do
-#     require 'code_statistics'
-#     ::STATS_DIRECTORIES << %w(Model\ specs spec/models)
-#     ::STATS_DIRECTORIES << %w(View\ specs spec/views)
-#     ::STATS_DIRECTORIES << %w(Controller\ specs spec/controllers)
-#     ::STATS_DIRECTORIES << %w(Helper\ specs spec/views)
-#     ::CodeStatistics::TEST_TYPES << "Model specs"
-#     ::CodeStatistics::TEST_TYPES << "View specs"
-#     ::CodeStatistics::TEST_TYPES << "Controller specs"
-#     ::CodeStatistics::TEST_TYPES << "Helper specs"
-#     ::STATS_DIRECTORIES.delete_if {|a| a[0] =~ /test/}
-#   end
-#
-#   namespace :db do
-#     namespace :fixtures do
-#       desc "Load fixtures (from spec/fixtures) into the current environment's database.  Load specific fixtures using FIXTURES=x,y"
-#       task :load => :environment do
-#         require 'active_record/fixtures'
-#         ActiveRecord::Base.establish_connection(Rails.env.to_sym)
-#         (ENV['FIXTURES'] ? ENV['FIXTURES'].split(/,/) : Dir.glob(File.join(Rails.root, 'spec', 'fixtures', '*.{yml,csv}'))).each do |fixture_file|
-#           Fixtures.create_fixtures('spec/fixtures', File.basename(fixture_file, '.*'))
-#         end
-#       end
-#     end
-#   end
-# end
-#
-# desc 'Generate documentation for the clipped extension.'
-# RDoc::Task.new(:rdoc) do |rdoc|
-#   rdoc.rdoc_dir = 'rdoc'
-#   rdoc.title    = 'ClippedExtension'
-#   rdoc.options << '--line-numbers' << '--inline-source'
-#   rdoc.rdoc_files.include('README')
-#   rdoc.rdoc_files.include('lib/**/*.rb')
-# end
-#
-# # Load any custom rakefiles for extension
-# Dir[File.dirname(__FILE__) + '/tasks/*.rake'].sort.each { |f| require f }
+#!/usr/bin/env rake
+begin
+  require 'bundler/setup'
+rescue LoadError
+  puts 'You must `gem install bundler` and `bundle install` to run rake tasks'
+end
+APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+load 'rails/tasks/engine.rake'
+Bundler::GemHelper.install_tasks
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+require 'rspec/core'
+require 'rspec/core/rake_task'
+desc "Run all specs in spec directory (excluding plugin specs)"
+RSpec::Core::RakeTask.new(:spec => 'app:db:test:prepare')
+task :default => :spec
+#TrustyCms::Application.load_tasks

data/app/assets/javascripts/admin/assets.js

@@ -1,6 +1,6 @@
 Assets = {
   attachEvents: function() {
-    $('a.attach_asset').click(function(e){
+    $('a.attach_asset').off('click').click(function(e){
       e.preventDefault();
       var link = $(this);
       var container = link.parents('li.asset');
@@ -16,13 +16,13 @@ Assets = {
       });
     });
 
-    $('a.detach_asset').click(function(e){
+    $('a.detach_asset').off('click').click(function(e){
       e.preventDefault();
       var link = $(this);
       Assets.removeFromList(link.parents('li.asset'));
     });
 
-    $('a.insert_asset').click(function(e){
+    $('a.insert_asset').off('click').click(function(e){
       e.preventDefault();
       var part_name = $("a.tab.here").children('span').html();
       if (part_name.indexOf(' ')) part_name = part_name.replace(' ', '-');
@@ -39,7 +39,7 @@ Assets = {
 
     });
 
-    $(".pagination a").click(function(e){
+    $(".pagination a").off('click').click(function(e){
       e.preventDefault();
       $.ajax({
         method: 'get',

data/app/assets/stylesheets/admin/assets.sass

@@ -85,7 +85,7 @@ p.asset
     li.asset
       display: block
       float: left
-      margin: 8px 0 0 8px
+      margin: 1em
       width: 110px
       height: 110px
       position: relative
@@ -152,7 +152,6 @@ p.asset
             opacity: 0.2
 
 #attachment_list.assets
-  background: #7e7e7e
   +border-bottom-radius
   margin: -1em 0.5em 1em 0.5em
   overflow-y: hidden
@@ -160,7 +159,6 @@ p.asset
   ul.empty
     display: none
   p.note
-    font-size: 80%
     margin: 0
     padding: 8px
     clear: left
@@ -195,7 +193,7 @@ p.asset
     width: 100%
     height: 3em
     padding: 0.5em 0
-    span, a
+    span, a, em
       display: block
       float: left
       padding: 0.25em

data/app/controllers/admin/assets_controller.rb

@@ -22,7 +22,9 @@ class Admin::AssetsController < Admin::ResourceController
         @page = Page.find_by_id(params[:page_id])
         render :partial => 'asset_table', :locals => {:with_pagination => true}
       }
-      format.html { render }
+      format.html {
+        render
+      }
     end
   end
   

data/app/views/admin/assets/_asset_table.html.haml

@@ -28,3 +28,4 @@
             
   - if with_pagination && assets.respond_to?(:total_pages) && assets.total_pages > 1
     = pagination_for(assets, pagination_parameters.merge(:depaginate => false, :param_name => 'p', :params => {:controller => 'admin/assets', :action => 'index', :id => nil, :format => 'js', :page_id => (page && page.id), :pp => assets.per_page }))
+x

data/app/views/admin/assets/_form.html.haml

@@ -1,10 +1,10 @@
 = render_region :form_top
 - render_region :form do |form|
   - form.edit_title do
-    %p.title
+    %fieldset.title
       %label{ :for => "asset_title" }
         = t("clipped_extension.title")
-      = f.text_field :title, :class => 'textbox', :maxlength => 100 
+      = f.text_field :title, :class => 'textbox', :maxlength => 100
   - form.edit_metadata do
     .drawer
       .drawer_contents#attributes
@@ -14,7 +14,7 @@
               %label{ :for => "asset_caption" }
                 = t("clipped_extension.caption")
             %td.field
-              = f.text_field :caption, :class => 'textbox', :maxlength => 255 
+              = f.text_field :caption, :class => 'textbox', :maxlength => 255
           = render_region :extended_metadata, :locals => {:f => f}
       .drawer_handle
         %a.toggle.more{:href=>'#attributes', :rel=>"toggle[attributes]"}

data/app/views/admin/assets/_page_assets.html.haml

@@ -5,7 +5,7 @@
   %li
     %p.note
       = t("clipped_extension.no_attached_assets")
-    
+
 %script{ :type => "text/javascript" }
   Asset.MakeDraggables();
 

data/app/views/admin/assets/edit.html.haml

@@ -11,7 +11,7 @@
         = render :partial => "form", :locals => { :f => f }
         
         %div.content
-          %p
+          %fieldset
             %label.filename
               = "#{t("clipped_extension.filename")}: #{@asset.asset_file_name unless @asset.new_record?}"
           %p.asset
@@ -20,7 +20,7 @@
 
           = updated_stamp @asset
         
-        %p.upload
+        %fieldset.upload
           %label.upload
             = t("clipped_extension.replace_file")
           = f.file_field :asset, :class => "", :style => "width: 100%"
@@ -33,7 +33,7 @@
   
   - main.edit_regenerate do
     - if current_user.admin? or current_user.designer?
-      %p= t("clipped_extension.regenerate_thumbnails")
+      %fieldset= t("clipped_extension.regenerate_thumbnails")
       
       - form_tag refresh_admin_asset_path(@asset), :method => :put do
         %p.asset_buttons

data/app/views/admin/assets/index.html.haml

@@ -6,11 +6,10 @@
 
 .outset
   #assets_table.assets
-    = render :partial => 'asset_table', :locals => { :assets => @assets }
-  %p{:style => 'clear: both; height: 2em'}  
+    = render :partial => 'asset_table', :locals => { assets: @assets, with_pagination: true }
+  %p{style: 'clear: both; height: 2em'}  
   
 - render_region :bottom do |bottom|
   #actions
-    = pagination_for @assets, :depaginate => false
     %ul
       %li= link_to((image('upload') + ' ' + t('clipped_extension.upload_asset')), new_admin_asset_path)

data/app/views/admin/assets/new.html.haml

@@ -4,21 +4,21 @@
 - render_region :main do |main|
   - main.edit_header do
     %h1= t("clipped_extension.new_asset")
-  
-  - main.edit_form do  
-    - form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
-      
-      = render :partial => "form", :locals => { :f => f }
-      
-      %p
-        %label= t("clipped_extension.choose_file")
-        = f.file_field :asset, :style => "width: 100%", :multiple => true
-      
-      .buttons
-        = save_model_button(@asset)
-        = save_model_and_continue_editing_button(@asset)
-        = t("or")
-        = link_to t("cancel"), admin_assets_path
-  
-  - main.edit_regenerate do
-     
+
+    - main.edit_form do
+      - form_for :asset, :url => admin_assets_path, :html => { :method => "post", :multipart => true } do |f|
+
+        = render :partial => "form", :locals => { :f => f }
+
+        %fieldset
+          %label= t("clipped_extension.choose_file")
+          = f.file_field :asset, :style => "width: 100%", :multiple => true
+
+        .buttons
+          = save_model_button(@asset)
+          = save_model_and_continue_editing_button(@asset)
+          = t("or")
+          = link_to t("cancel"), admin_assets_path
+
+    - main.edit_regenerate do
+       

data/app/views/admin/assets/remove.html.haml

@@ -1,7 +1,7 @@
 = stylesheet_link_tag 'admin/assets'
 
 %h1= t("clipped_extension.remove_asset")
-%p= t("clipped_extension.confirm_remove_asset")
+%p.warning= t("clipped_extension.confirm_remove_asset")
 
 %table.index#assets{:cellpadding => "0", :cellspacing => "0", :border => "0"}
   %tbody

data/app/views/admin/pages/_assets.html.haml

@@ -1,11 +1,13 @@
 = stylesheet_link_tag 'admin/assets'
 = javascript_include_tag 'admin/assets_admin'
-
-#attachment_list.assets
-  %ul#attachment_fields{:class => @page.page_attachments.empty? ? 'empty' : ''}
-    = render :partial => 'admin/page_attachments/attachment', :collection => @page.page_attachments
+#content.fieldset
+  #attachment_list.assets
+    %ul#attachment_fields{:class => @page.page_attachments.empty? ? 'empty' : ''}
+      = render :partial => 'admin/page_attachments/attachment', :collection => @page.page_attachments
   %p.note
-    = link_to t('clipped_extension.assets'), '#attach_asset', :class => '', :id => "attach_assets"
+    = link_to "path/to/page.html" '#attach_asset', :class => 'button', :id => 'attach_assets' do
+      %i.fa.fa-image
+      = t('clipped_extension.assets')
     %span.message
       - if @page.page_attachments.empty?
         = t('clipped_extension.no_attached_assets')