trusty-cms 5.0.2 → 5.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 066d3a148afc8e9cf41df8cf74277edf610a1fb0428332ca1430678b1e54b0f2
-  data.tar.gz: 7b6d84f5bb9225b1c9c42b7bf0bf0829c981817faf550a930126fe5651ef0063
+  metadata.gz: 18961c722bc28e643661f536be22bf286898e3c1992cd70dfdaf389828e05991
+  data.tar.gz: 24fcd6e768d804658d6a5be29f3ac9b637caf54610c564021865d592507a6c23
 SHA512:
-  metadata.gz: 87e8b1b1a4fcc3c3a8e83157052a8c95c6673fbdecf9e51f280016f9d61375149410cd14746cffd0c7b809fcdd74459c48595ab59bef5ed5c8989316be241207
-  data.tar.gz: f34ec3a815c86344e92963d7da50ebef35b62505ebd97fc9652b5d8d61b6c9261b453501bdecfca48f88ee099f2910bd1f6370316a558f64eec96f5d31e0d6da
+  metadata.gz: 359cb791d303fd26d99fc07591597ed7696f115a7f01fd9066407713083fd412e63feaebccfcd585dc668b0eabef16a41580c54663ae4e9007fa8eb27cf993a4
+  data.tar.gz: 2edfbce7ddd9b83b912110c2ca94ea985aff8562c2ce5dea59e8aaab2d1d2ef2bee66c91e11a064f5815464255eab0a16bd82127c200a6656b68552388fd781d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (5.0.2)
+    trusty-cms (5.0.6)
       RedCloth (= 4.3.2)
       activestorage-validator
       acts_as_list (>= 0.9.5, < 1.1.0)
@@ -35,62 +35,62 @@ GEM
   remote: https://rubygems.org/
   specs:
     RedCloth (4.3.2)
-    actioncable (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actioncable (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailbox (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (>= 2.7.1)
-    actionmailer (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionmailer (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.1.4.1)
-      actionview (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionpack (6.1.4.4)
+      actionview (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actiontext (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       nokogiri (>= 1.8.5)
-    actionview (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    actionview (6.1.4.4)
+      activesupport (= 6.1.4.4)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activejob (6.1.4.4)
+      activesupport (= 6.1.4.4)
       globalid (>= 0.3.6)
-    activemodel (6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activerecord (6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
-    activestorage (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    activemodel (6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activerecord (6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
+    activestorage (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       marcel (~> 1.0.0)
       mini_mime (>= 1.1.0)
-    activestorage-validator (0.1.4)
+    activestorage-validator (0.1.5)
       rails (>= 5.2.0)
-    activesupport (6.1.4.1)
+    activesupport (6.1.4.4)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -121,7 +121,7 @@ GEM
     coderay (1.1.3)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
-    css_parser (1.10.0)
+    css_parser (1.11.0)
       addressable
     database_cleaner (2.0.1)
       database_cleaner-active_record (~> 2.0.0)
@@ -131,13 +131,13 @@ GEM
     database_cleaner-core (2.0.1)
     delocalize (1.2.0)
       rails (>= 2)
-    devise (4.8.0)
+    devise (4.8.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
-    diff-lcs (1.4.4)
+    diff-lcs (1.5.0)
     docile (1.4.0)
     erubi (1.10.0)
     erubis (2.7.0)
@@ -147,11 +147,11 @@ GEM
     factory_bot_rails (6.2.0)
       factory_bot (~> 6.2.0)
       railties (>= 5.0.0)
-    ffi (1.15.4)
+    ffi (1.15.5)
     file_validators (3.0.0)
       activemodel (>= 3.2)
       mime-types (>= 1.0)
-    globalid (0.5.2)
+    globalid (1.0.0)
       activesupport (>= 5.0)
     haml (5.2.2)
       temple (>= 0.8.0)
@@ -171,7 +171,7 @@ GEM
     httparty (0.20.0)
       mime-types (~> 3.0)
       multi_xml (>= 0.5.2)
-    i18n (1.8.10)
+    i18n (1.9.1)
       concurrent-ruby (~> 1.0)
     image_processing (1.12.1)
       mini_magick (>= 4.9.5, < 5)
@@ -184,10 +184,9 @@ GEM
       multipart-post
     launchy (2.5.0)
       addressable (~> 2.7)
-    libv8-node (15.14.0.1-x86_64-darwin-18)
-    libv8-node (15.14.0.1-x86_64-darwin-20)
-    libv8-node (15.14.0.1-x86_64-linux)
-    loofah (2.12.0)
+    libv8-node (16.10.0.0-x86_64-darwin)
+    libv8-node (16.10.0.0-x86_64-linux)
+    loofah (2.13.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
@@ -198,10 +197,10 @@ GEM
       mime-types-data (~> 3.2015)
     mime-types-data (3.2021.0225)
     mini_magick (4.11.0)
-    mini_mime (1.1.1)
-    mini_racer (0.4.0)
-      libv8-node (~> 15.14.0.0)
-    minitest (5.14.4)
+    mini_mime (1.1.2)
+    mini_racer (0.6.2)
+      libv8-node (~> 16.10.0.0)
+    minitest (5.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
     mysql2 (0.5.3)
@@ -221,28 +220,30 @@ GEM
     pry-byebug (3.9.0)
       byebug (~> 11.0)
       pry (~> 0.13.0)
+    psych (4.0.3)
+      stringio
     public_suffix (4.0.6)
-    racc (1.5.2)
+    racc (1.6.0)
     rack (2.2.3)
     rack-cache (1.13.0)
       rack (>= 0.4)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
     radius (0.7.5)
-    rails (6.1.4.1)
-      actioncable (= 6.1.4.1)
-      actionmailbox (= 6.1.4.1)
-      actionmailer (= 6.1.4.1)
-      actionpack (= 6.1.4.1)
-      actiontext (= 6.1.4.1)
-      actionview (= 6.1.4.1)
-      activejob (= 6.1.4.1)
-      activemodel (= 6.1.4.1)
-      activerecord (= 6.1.4.1)
-      activestorage (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    rails (6.1.4.4)
+      actioncable (= 6.1.4.4)
+      actionmailbox (= 6.1.4.4)
+      actionmailer (= 6.1.4.4)
+      actionpack (= 6.1.4.4)
+      actiontext (= 6.1.4.4)
+      actionview (= 6.1.4.4)
+      activejob (= 6.1.4.4)
+      activemodel (= 6.1.4.4)
+      activerecord (= 6.1.4.4)
+      activestorage (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       bundler (>= 1.15.0)
-      railties (= 6.1.4.1)
+      railties (= 6.1.4.4)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
@@ -251,14 +252,15 @@ GEM
       loofah (~> 2.3)
     rails-observers (0.1.5)
       activemodel (>= 4.0)
-    railties (6.1.4.1)
-      actionpack (= 6.1.4.1)
-      activesupport (= 6.1.4.1)
+    railties (6.1.4.4)
+      actionpack (= 6.1.4.4)
+      activesupport (= 6.1.4.4)
       method_source
       rake (>= 0.13)
       thor (~> 1.0)
     rake (13.0.6)
-    rdoc (6.3.2)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
     regexp_parser (2.1.1)
     responders (3.0.1)
       actionpack (>= 5.0)
@@ -266,18 +268,18 @@ GEM
     roadie (4.0.0)
       css_parser (~> 1.4)
       nokogiri (~> 1.8)
-    roadie-rails (2.2.0)
-      railties (>= 5.1, < 6.2)
+    roadie-rails (2.3.0)
+      railties (>= 5.1, < 7.1)
       roadie (>= 3.1, < 5.0)
-    rspec-core (3.10.1)
+    rspec-core (3.10.2)
       rspec-support (~> 3.10.0)
-    rspec-expectations (3.10.1)
+    rspec-expectations (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-mocks (3.10.2)
+    rspec-mocks (3.10.3)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.10.0)
-    rspec-rails (5.0.2)
+    rspec-rails (5.1.0)
       actionpack (>= 5.2)
       activesupport (>= 5.2)
       railties (>= 5.2)
@@ -285,11 +287,11 @@ GEM
       rspec-expectations (~> 3.10)
       rspec-mocks (~> 3.10)
       rspec-support (~> 3.10)
-    rspec-support (3.10.2)
-    ruby-vips (2.1.3)
+    rspec-support (3.10.3)
+    ruby-vips (2.1.4)
       ffi (~> 1.12)
-    ruby_parser (3.17.0)
-      sexp_processor (~> 4.15, >= 4.15.1)
+    ruby_parser (3.18.1)
+      sexp_processor (~> 4.16)
     sass-rails (6.0.0)
       sassc-rails (~> 2.1, >= 2.1.1)
     sassc (2.4.0)
@@ -300,7 +302,7 @@ GEM
       sprockets (> 3.0)
       sprockets-rails
       tilt
-    sexp_processor (4.15.3)
+    sexp_processor (4.16.0)
     simplecov (0.21.2)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
@@ -310,15 +312,16 @@ GEM
     sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.2)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
+    sprockets-rails (3.4.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
       sprockets (>= 3.0.0)
     stringex (2.8.5)
+    stringio (3.0.1)
     temple (0.8.2)
     terrapin (0.6.0)
       climate_control (>= 0.0.3, < 1.0)
-    thor (1.1.0)
+    thor (1.2.1)
     tilt (2.0.10)
     trustygems (0.2.1)
       rake
@@ -335,7 +338,7 @@ GEM
     will_paginate (3.3.1)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.4.2)
+    zeitwerk (2.5.4)
 
 PLATFORMS
   x86_64-darwin-18
@@ -359,4 +362,4 @@ DEPENDENCIES
   trustygems (~> 0.2.0)
 
 BUNDLED WITH
-   2.2.27
+   2.2.31

data/app/models/asset.rb

@@ -49,20 +49,21 @@ class Asset < ActiveRecord::Base
            to: :asset_type
 
   def thumbnail(style_name = 'original')
-    return asset.url if style_name == 'original'
-    return asset_variant(style_name).processed.url if asset.variable?
+    return asset.url if style_name.to_s == 'original' || asset.key.include?('culturaldistrict')
+    return asset_variant(style_name.to_s).processed.url if asset.variable?
 
-    asset_type.icon(style_name)
+    asset_type.icon(style_name.to_s)
   end
 
+
   def asset_variant(style_name)
-    case style_name.to_s
+    case style_name
     when 'thumbnail'
       asset.variant(gravity: 'Center', resize: '100x100^', crop: '100x100+0+0')
-    when 'normal'
-      asset.variant(gravity: 'Center', resize: '640x640^')
     when 'small'
       asset.variant(gravity: 'Center', resize: '320x320^')
+    when 'normal'
+      asset.variant(gravity: 'Center', resize_to_limit: [asset.metadata[:width], asset.metadata[:height]])
     when 'icon'
       asset.variant(gravity: 'Center', resize: '50x50^')
     end

data/app/models/rails_page.rb

@@ -25,13 +25,4 @@ class RailsPage < Page
       (part(k) || parts.build(name: k.to_s, filter_id: '')).content = v
     end
   end
-
-  alias_method 'tag:old_breadcrumbs', 'tag:breadcrumbs'
-  tag 'breadcrumbs' do |tag|
-    if tag.locals.page.is_a?(RailsPage) && tag.locals.page.breadcrumbs
-      tag.locals.page.breadcrumbs
-    else
-      render_tag('old_breadcrumbs', tag)
-    end
-  end
 end

data/app/models/standard_tags.rb

@@ -466,47 +466,6 @@ module StandardTags
     end
   end
 
-  desc %{
-    Renders a counter value or one of the values given based on a global cycle counter.
-
-    To get a numeric counter just use the tag, or specify a start value with @start@.
-    Use the @reset@ attribute to reset the cycle to the beginning. Using @reset@ on a
-    numbered cycle will begin at 0. Use the @name@  attribute to track multiple cycles;
-    the default is @cycle@.
-
-    *Usage:*
-
-    <pre><code><r:cycle [values="first, second, third"] [reset="true|false"] [name="cycle"] [start="second"] /></code></pre>
-    <pre><code><r:cycle start="3" /></code></pre>
-  }
-  tag 'cycle' do |tag|
-    cycle = (tag.globals.cycle ||= {})
-    if tag.attr['values']
-      values = tag.attr['values'].split(',').collect(&:strip)
-    end
-    start = tag.attr['start']
-    cycle_name = tag.attr['name'] || 'cycle'
-    if values
-      current_index = if start
-                        (cycle[cycle_name] ||= values.index(start))
-                      else
-                        (cycle[cycle_name] ||= 0)
-                      end
-      current_index = 0 if tag.attr['reset'] == 'true'
-      cycle[cycle_name] = (current_index + 1) % values.size
-      values[current_index]
-    else
-      cycle[cycle_name] ||= (start.presence || 0).to_i
-      output = cycle[cycle_name]
-      cycle[cycle_name] += 1
-      if tag.attr['reset'] == 'true'
-        cycle[cycle_name] = 0
-        output = cycle[cycle_name]
-      end
-      output
-    end
-  end
-
   desc %{
     Renders the main content of a page. Use the @part@ attribute to select a specific
     page part. By default the @part@ attribute is set to body. Use the @inherit@
@@ -660,21 +619,9 @@ module StandardTags
 
     *Usage:*
 
-    <pre><code><r:if_ancestor_or_self>...</r:if_ancestor_or_self></code></pre>
+    <pre><code>...</code></pre>
   }
-  tag 'if_ancestor_or_self' do |tag|
-    tag.expand if (tag.globals.page.ancestors + [tag.globals.page]).include?(tag.locals.page)
-  end
-
-  desc %{
-    Renders the contained elements unless the current contextual page is either the actual page or one of its parents.
 
-    This is typically used inside another tag (like &lt;r:children:each&gt;) to add conditional mark-up unless the child element is or descends from the current page.
-
-    *Usage:*
-
-    <pre><code><r:unless_ancestor_or_self>...</r:unless_ancestor_or_self></code></pre>
-  }
   tag 'unless_ancestor_or_self' do |tag|
     tag.expand unless (tag.globals.page.ancestors + [tag.globals.page]).include?(tag.locals.page)
   end
@@ -798,61 +745,6 @@ module StandardTags
     end
   end
 
-  desc %{
-    Renders a link to the page. When used as a single tag it uses the page's title
-    for the link name. When used as a double tag the part in between both tags will
-    be used as the link text. The link tag passes all attributes over to the HTML
-    @a@ tag. This is very useful for passing attributes like the @class@ attribute
-    or @id@ attribute. If the @anchor@ attribute is passed to the tag it will
-    append a pound sign (<code>#</code>) followed by the value of the attribute to
-    the @href@ attribute of the HTML @a@ tag--effectively making an HTML anchor.
-
-    *Usage:*
-
-    <pre><code><r:link [anchor="name"] [other attributes...] /></code></pre>
-
-    or
-
-    <pre><code><r:link [anchor="name"] [other attributes...]>link text here</r:link></code></pre>
-  }
-  tag 'link' do |tag|
-    options = tag.attr.dup
-    anchor = options['anchor'] ? "##{options.delete('anchor')}" : ''
-    attributes = options.inject('') { |s, (k, v)| s << %{#{k.downcase}="#{v}" } }.strip
-    attributes = " #{attributes}" unless attributes.empty?
-    text = tag.double? ? tag.expand : tag.render('title')
-    %{<a href="#{tag.render('path')}#{anchor}"#{attributes}>#{text}</a>}
-  end
-
-  desc %{
-    Renders a trail of breadcrumbs to the current page. The separator attribute
-    specifies the HTML fragment that is inserted between each of the breadcrumbs. By
-    default it is set to @>@. The boolean @nolinks@ attribute can be specified to render
-    breadcrumbs in plain text, without any links (useful when generating title tag).
-    Set the boolean @noself@ attribute to omit the present page (useful in page headers).
-
-    *Usage:*
-
-    <pre><code><r:breadcrumbs [separator="separator_string"] [nolinks="true"] [noself="true"]/></code></pre>
-  }
-  tag 'breadcrumbs' do |tag|
-    page = tag.locals.page
-    nolinks = (tag.attr['nolinks'] == 'true')
-    noself = (tag.attr['noself'] == 'true')
-    breadcrumbs = []
-    breadcrumbs.unshift page.breadcrumb unless noself
-    page.ancestors.each do |ancestor|
-      tag.locals.page = ancestor
-      if nolinks
-        breadcrumbs.unshift tag.render('breadcrumb')
-      else
-        breadcrumbs.unshift %{<a href="#{tag.render('path')}">#{tag.render('breadcrumb')}</a>}
-      end
-    end
-    separator = tag.attr['separator'] || ' &gt; '
-    breadcrumbs.join(separator)
-  end
-
   desc %{
     Inside this tag all page related tags refer to the page found at the @path@ attribute.
     @path@s may be relative or absolute paths.
@@ -1041,97 +933,6 @@ module StandardTags
     tag.expand if tag.locals.last_child
   end
 
-  desc %{
-    Renders the containing elements only if TrustyCms in is development mode.
-
-    *Usage:*
-
-    <pre><code><r:if_dev>...</r:if_dev></code></pre>
-  }
-  tag 'if_dev' do |tag|
-    tag.expand if dev?(tag.globals.page.request)
-  end
-
-  desc %{
-    The opposite of the @if_dev@ tag.
-
-    *Usage:*
-
-    <pre><code><r:unless_dev>...</r:unless_dev></code></pre>
-  }
-  tag 'unless_dev' do |tag|
-    tag.expand unless dev?(tag.globals.page.request)
-  end
-
-  desc %{
-    Prints the page's status as a string.  Optional attribute 'downcase'
-    will cause the status to be all lowercase.
-
-    *Usage:*
-
-    <pre><code><r:status [downcase='true'] /></code></pre>
-  }
-  tag 'status' do |tag|
-    status = tag.globals.page.status.name
-    return status.downcase if tag.attr['downcase']
-
-    status
-  end
-
-  desc %(
-    Renders the content of the field given in the @name@ attribute.
-
-    *Usage:*
-
-    <pre><code><r:field name="Keywords" /></code></pre>
-  )
-  tag 'field' do |tag|
-    required_attr(tag, 'name')
-    tag.locals.page.field(tag.attr['name']).try(:content)
-  end
-
-  desc %(
-    Renders the contained elements if the field given in the @name@ attribute
-    exists. The tag also takes an optional @equals@ or @matches@ attribute;
-    these will expand the tag if the field's content equals or matches the
-    given string or regex.
-
-    *Usage:*
-
-    <pre><code><r:if_field name="author" [equals|matches="John"] [ignore_case="true|false"]>...</r:if_field></code></pre>
-  )
-  tag 'if_field' do |tag|
-    required_attr(tag, 'name')
-    field = tag.locals.page.field(tag.attr['name'])
-    return '' if field.nil?
-
-    tag.expand if if tag.attr['equals'] && (tag.attr['ignore_case'] == 'false') then field.content == tag.attr['equals']
-                  elsif tag.attr['equals'] then field.content.downcase == tag.attr['equals'].downcase
-                  elsif tag.attr['matches'] then field.content =~ build_regexp_for(tag, 'matches')
-                  else field
-    end
-  end
-
-  desc %(
-    The opposite of @if_field@. Renders the contained elements unless the field
-    given in the @name@ attribute exists. The tag also takes an optional
-    @equals@ or @matches@ attribute; these will expand the tag unless the
-    field's content equals or matches the given string or regex.
-
-    *Usage:*
-
-    <pre><code><r:unless_field name="author" [equals|matches="John"] [ignore_case="true|false"]>...</r:unless_field></code></pre>
-  )
-  tag 'unless_field' do |tag|
-    required_attr(tag, 'name')
-    field = tag.locals.page.field(tag.attr['name'])
-    tag.expand unless if field && (tag.attr['equals'] && (tag.attr['ignore_case'] == 'false')) then field.content == tag.attr['equals']
-                      elsif field && tag.attr['equals'] then field.content.downcase == tag.attr['equals'].downcase
-                      elsif field && tag.attr['matches'] then field.content =~ build_regexp_for(tag, 'matches')
-                      else field
-    end
-  end
-
   tag 'site' do |tag|
     tag.expand
   end

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

@@ -1,4 +1,5 @@
 = stylesheet_link_tag 'admin/assets'
+= javascript_include_tag 'admin/custom_file_upload'
 = render_region :top 
 
 - render_region :main do |main|
@@ -19,7 +20,7 @@
               = "#{t("clipped_extension.asset_url")}: #{image_path @asset.asset.url unless @asset.new_record?}"
             %br
             %label.id
-              = "#{t("clipped_extension.asset_id")}: #{@asset.asset.id unless @asset.new_record?}"
+              = "#{t("clipped_extension.asset_id")}: #{@asset.id unless @asset.new_record?}"
           %p.asset
             = image_tag @asset.thumbnail("normal"), :class => 'preview'
 
@@ -28,7 +29,8 @@
         %fieldset.upload
           %label.custom-file-upload.upload
             = t("clipped_extension.replace_file")
-            = f.file_field :asset, :class => "", :style => "width: 100%"
+            = f.file_field :asset, :style => "width: 100%"
+          %span#file-chosen No file chosen
         
         .buttons
           = save_model_button(@asset)