Some minor aesthetic changes.

bamnet · Aug 6, 2009 · f56a2c0 · f56a2c0
1 parent 8c8ac10
commit f56a2c0
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 54 deletions.
diff --git a/app/views/conversions/edit.html.erb b/app/views/conversions/edit.html.erb
diff --git a/app/views/conversions/index.html.erb b/app/views/conversions/index.html.erb
@@ -1,4 +1,4 @@
-<h1>Listing conversions</h1>
+<h1>Conversion Log</h1>
 
 <table>
   <tr>
@@ -7,24 +7,17 @@
     <th>Start time</th>
     <th>End time</th>
     <th>Status</th>
-    <th>Log</th>
   </tr>
 
 <% @conversions.each do |conversion| %>
   <tr>
-    <td><%=h conversion.video_id %></td>
-    <td><%=h conversion.profile_id %></td>
+    <td><%= conversion.video.nil? ? 'Unknown' : link_to(conversion.video.name, conversion.video) %></td>
+    <td><%= conversion.profile.nil? ? 'Unknown' : link_to(conversion.profile.name, conversion.profile) %></td>
     <td><%=h conversion.start_time %></td>
     <td><%=h conversion.end_time %></td>
     <td><%=h conversion.status %></td>
-    <td><%=h conversion.log %></td>
     <td><%= link_to 'Show', conversion %></td>
-    <td><%= link_to 'Edit', edit_conversion_path(conversion) %></td>
-    <td><%= link_to 'Destroy', conversion, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Delete Log', conversion, :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <% end %>
 </table>
-
-<br />
-
-<%= link_to 'New conversion', new_conversion_path %>
diff --git a/app/views/conversions/show.html.erb b/app/views/conversions/show.html.erb
@@ -25,7 +25,7 @@
 
 <p>
   <b>Log:</b>
-  <%=h @conversion.log %>
+  <code><%=h @conversion.log %></code>
 </p>
 
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -9,7 +9,7 @@
     <title>Bonsai Video</title>
   </head>
   <body>
-    <div class="container showgrid" id="header">
+    <div class="container" id="header">
       <div class="span-24">
           <div class="span-4 header_item"><%= link_to 'Videos', videos_path %></div>
           <div class="span-5 header_item"><%= link_to 'Conversion Log', conversions_path %></div>

diff --git a/app/views/profiles/edit.html.erb b/app/views/profiles/edit.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing profile</h1>
+<h1>Editing conversion profile</h1>
 
 <% form_for(@profile) do |f| %>
   <%= f.error_messages %>

diff --git a/app/views/profiles/index.html.erb b/app/views/profiles/index.html.erb
@@ -1,4 +1,4 @@
-<h1>Listing profiles</h1>
+<h1>Available conversion profiles</h1>
 
 <table>
   <tr>
@@ -14,7 +14,7 @@
     <td><%=h profile.extension %></td>
     <td><%= link_to 'Show', profile %></td>
     <td><%= link_to 'Edit', edit_profile_path(profile) %></td>
-    <td><%= link_to 'Destroy', profile, :confirm => 'Are you sure?', :method => :delete %></td>
+    <td><%= link_to 'Delete', profile, :confirm => 'Are you sure?', :method => :delete %></td>
   </tr>
 <% end %>
 </table>

diff --git a/config/workling.yml b/config/workling.yml
@@ -7,10 +7,10 @@
 # list of server:port, server:port, server:port values to listens_on. 
 #
 production:
-  listens_on: localhost:15151
+  listens_on: localhost:22122
 
 development:
   listens_on: localhost:22122
 
 test:
-  listens_on: localhost:12345
+  listens_on: localhost:22122