noodall-ui 0.1.2 → 0.1.3

data/app/models/asset.rb

@@ -43,10 +43,14 @@ class Asset
     elsif video?
       file.encode(:tiff, { :offset => "#{video_thumbnail_offset}%" }).thumb(*args).url
     else
-      file.thumb(*args).url
+      file.thumb(*args).url(:suffix => ".#{file_ext}")
     end
   end
 
+  def dragonfly_extension_sym
+    file_ext.gsub('jpeg','jpg').to_sym
+  end
+  
   def file_uid
     # Required to rerun the correct object for Dragonfly pending
     return Dragonfly::ActiveRecordExtensions::PendingUID.new if @file_uid == "PENDING"

data/app/views/noodall/admin/assets/_browser.html.erb

@@ -6,11 +6,11 @@
       <div class="file-detail" id="asset-<%= asset.id %>">
         <span class="file-title"><%= h( asset.title ) %></span>
         
-        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70#', :jpg)  ) : asset_icon(asset) %>
+        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70#', asset.dragonfly_extension_sym)  ) : asset_icon(asset) %>
       </div>
       
       <%= link_to 'Show', noodall_admin_asset_path(asset, :readonly => readonly), :class => 'show button', :title => 'View this asset' %>
-      <%= link_to 'Add', asset.url, :class => 'add button', :title => 'Add this asset' %>
+      <%= link_to 'Add me', asset.url, :class => 'add button', :title => 'Add this asset' %>
     </li>
   <% end %>
   </ul>

data/app/views/noodall/admin/assets/_form.html.erb

@@ -45,7 +45,7 @@
 <div id="sub-form">
   <div id="image">
   <% if @asset.image? or @asset.video? %>
-    <%= image_tag( @asset.url('260x', :jpg), :alt => @asset.description, :id => "asset-#{@asset.id}" ) %>
+    <%= image_tag( @asset.url('260x', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ) %>
     <% else -%>
     <%= link_to( @asset.file.name, @asset.url, :title => @asset.description, :id => "asset-#{@asset.id}" ) %>
   <% end -%>

data/app/views/noodall/admin/assets/_show.html.erb

@@ -4,7 +4,7 @@
 
   <div id="image">
   <% if @asset.image? or @asset.video? %>
-    <%= link_to(image_tag( @asset.url('500x400', :jpg), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => ('lightboxVideo' if @asset.video?)) %>
+    <%= link_to(image_tag( @asset.url('500x400', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => ('lightboxVideo' if @asset.video?)) %>
     <% else -%>
     <%= link_to( asset_icon(@asset) ) %>
   <% end -%>

data/app/views/noodall/admin/assets/add.html.erb

@@ -1,8 +1,8 @@
 <% if @asset.image? %>
-<%= link_to image_tag( @asset.url('100x100#', :jpg), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', :jpg), :class => 'lightbox', :title => @asset.title %>
+<%= link_to image_tag( @asset.url('100x100#', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url('800x600', @asset.dragonfly_extension_sym), :class => 'lightbox', :title => @asset.title %>
 <% elsif @asset.video? %>
 <div class="video">
-  <%= link_to image_tag( @asset.url('220x125#', :jpg), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => 'lightboxVideo', :title => @asset.title %>
+  <%= link_to image_tag( @asset.url('220x125#', @asset.dragonfly_extension_sym), :alt => @asset.description, :id => "asset-#{@asset.id}" ), @asset.url, :class => 'lightboxVideo', :title => @asset.title %>
   <strong><%= @asset.title %></strong>
 </div>
 <% else -%>

data/app/views/noodall/admin/assets/index.html.erb

@@ -18,7 +18,7 @@
     <tr id="asset-<%= asset.id %>" class="<%=cycle('odd', 'even')%>">
       <td><%= link_to h( asset.title ), edit_noodall_admin_asset_path(asset), :class => 'edit', :title => 'Edit this asset' %></td>
       <td class="file">
-        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70', :jpg), :alt => "#{truncate(asset.file.name, :length => 80)}")  : link_to( asset_icon(asset) ) %>
+        <%= (asset.image? or asset.video?) ? image_tag( asset.url('70x70', asset.dragonfly_extension_sym), :alt => "#{truncate(asset.file.name, :length => 80)}")  : link_to( asset_icon(asset) ) %>
         <%= link_to 'Show', noodall_admin_asset_path(asset), :class => 'show', :title => 'View this asset' %>
       </td>
       <td><%=h asset.created_at.to_formatted_s(:short_ordinal) %></td>

data/app/views/noodall/admin/nodes/index.html.erb

@@ -59,7 +59,7 @@
       <th>Title</th>
       <th>Type</th>
       <th colspan="2">Arrange</th>
-      <th width="100"># Sub-Section</th>
+      <th width="100">Sub-Section</th>
       <th>Updated</th>
       <th width="45">Show</th>
       <th width="45">Published</th>

data/lib/noodall/ui/version.rb

@@ -1,5 +1,5 @@
 module Noodall
   module UI
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: noodall-ui
 version: !ruby/object:Gem::Version 
-  hash: 31
-  prerelease: 
+  hash: 29
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Steve England
@@ -28,10 +28,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
   name: noodall-core
   prerelease: false
   version_requirements: *id001
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
@@ -44,27 +44,26 @@ dependencies:
         - 0
         - 6
         version: 0.0.6
+  type: :runtime
   name: thoughtbot-sortable_table
   prerelease: false
   version_requirements: *id002
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 1923831917
+        hash: 270495401
         segments: 
         - 3
         - 0
-        - pre
-        - 2
+        - pre2
         version: 3.0.pre2
+  type: :runtime
   name: will_paginate
   prerelease: false
   version_requirements: *id003
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -75,10 +74,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  type: :runtime
   name: dynamic_form
   prerelease: false
   version_requirements: *id004
-  type: :runtime
 - !ruby/object:Gem::Dependency 
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -91,10 +90,10 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  type: :development
   name: bundler
   prerelease: false
   version_requirements: *id005
-  type: :development
 description: Noodall Rails User Interface Engine. Requires Noodall Core
 email: 
 - steve@wearebeef.co.uk
@@ -674,7 +673,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.4.1
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Noodall Rails User Interface