diff .svn/pristine/6a/6a60898740de505326813cfa3f1724d25fce3f5e.svn-base @ 927:9ee5fd0b9bd3

Merge from cannam_integration

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/.svn/pristine/6a/6a60898740de505326813cfa3f1724d25fce3f5e.svn-base	Fri May 11 16:13:59 2012 +0100
@@ -0,0 +1,8 @@
+<h2><%= link_to l(:label_custom_field_plural), :controller => 'custom_fields', :action => 'index' %>
+  &#187; <%= link_to l(@custom_field.type_name), :controller => 'custom_fields', :action => 'index', :tab => @custom_field.class.name %>
+  &#187; <%=h @custom_field.name %></h2>
+
+<% labelled_tabular_form_for :custom_field, @custom_field, :url => { :action => "edit", :id => @custom_field } do |f| %>
+<%= render :partial => 'form', :locals => { :f => f } %>
+<%= submit_tag l(:button_save) %>
+<% end %>