4 files changed, 24 insertions, 12 deletions

diff --git a/app/views/assets/edit.html.erb b/app/views/assets/edit.html.erb
index d60db94..f198600 100644
--- a/app/views/assets/edit.html.erb
+++ b/app/views/assets/edit.html.erb
@@ -1,12 +1,24 @@
 <h1>Editing asset</h1>
 
-<% form_for(@asset) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@asset, html: { multipart: true }) do |f| %>
+  <%= form_error_messages(f) %>
+
+  <% if @asset.upload.present? %>
+    <p>
+      <strong>Current file:</strong>
+      <%= @asset.upload.url %>
+      (<%= number_to_human_size(@asset.upload.size) %>)
+    </p>
+  <% end %>
+
+  <p>
+    <label>Replace file:</label><br>
+    <%= f.file_field :upload %>
+  </p>
 
   <p>
     <%= f.submit 'Update' %>
   </p>
 <% end %>
 
-<%= link_to 'Show', @asset %> |
-<%= link_to 'Back', assets_path %>
\ No newline at end of file
+<%= link_to 'Show', @asset %> | <%= link_to 'Back', assets_path %>
diff --git a/app/views/assets/index.html.erb b/app/views/assets/index.html.erb
index fc7c029..51fc486 100644
--- a/app/views/assets/index.html.erb
+++ b/app/views/assets/index.html.erb
@@ -10,12 +10,12 @@
   </tr>
 <% @assets.each do |asset| %>
   <tr>
-    <td><%= image_tag asset.upload.url(:thumb) %></td>
+    <td><%= image_tag asset.upload.url(:thumb), style: "max-width: 100px; max-height: 100px;" %></td>
     <td><%= link_to asset.name, asset.upload.url %></td>
     <td><%= asset.upload.content_type %></td>
     <td><%= link_to 'Show', asset %></td>
     <td><%= link_to 'Edit', edit_asset_path(asset) %></td>
-    <td><%= link_to 'Destroy', asset, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= button_to 'Destroy', asset, method: :delete, form: { data: { confirm: 'Are you sure?' } } %></td>
   </tr>
 <% end %>
-</table>
\ No newline at end of file
+</table>
diff --git a/app/views/assets/new.html.erb b/app/views/assets/new.html.erb
index 366488f..6c1310a 100644
--- a/app/views/assets/new.html.erb
+++ b/app/views/assets/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New asset</h1>
 
-<% form_for(@asset, :html => { :multipart => true }) do |f| %>
-  <%= f.error_messages %>
+<%= form_for(@asset, :html => { :multipart => true }) do |f| %>
+  <%= form_error_messages(f) %>
   
   <p>
     <%= f.label :name %><br />
@@ -14,4 +14,4 @@
   </p>
 <% end %>
 
-<%= link_to 'Back', assets_path %>
\ No newline at end of file
+<%= link_to 'Back', assets_path %>
diff --git a/app/views/assets/show.html.erb b/app/views/assets/show.html.erb
index a64987c..694be5a 100644
--- a/app/views/assets/show.html.erb
+++ b/app/views/assets/show.html.erb
@@ -6,7 +6,7 @@
 <table>
   <tr>
     <td>Thumbnail</td>
-    <td><%= image_tag @asset.upload.url(:medium) %></td>
+    <td><%= image_tag @asset.upload.url(:medium), style: "max-width: 300px; max-height: 300px;" %></td>
   </tr>
   <tr>
     <td>Public Path</td>
@@ -20,4 +20,4 @@
     <td>Size</td>
     <td><%= "#{@asset.upload.size/1024} KB" %></td>
   </tr>
-</table>
\ No newline at end of file
+</table>