Fix merge conflict

[rails.git] / app / views / browse / _relation_details.html.erb

diff --git a/app/views/browse/_relation_details.html.erb b/app/views/browse/_relation_details.html.erb
index 57314817dd7b4d860ff1ac5d2c427212fda2e60f..6e12f7f651bb5a046f28335ecb5d542692cedf58 100644 (file)
--- a/app/views/browse/_relation_details.html.erb
+++ b/app/views/browse/_relation_details.html.erb
@@ -1,31 +1,23 @@
+<div class='browse_details' id="<%= relation_details.version %>">
 <% if relation_details.redacted? %>
-<p><%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %></p>
+  <div class='browse-section'>
+    <%= t 'browse.redacted.message_html', :type => t('browse.redacted.type.relation'), :redaction_link => link_to(t('browse.redacted.redaction', :id => relation_details.redaction.id), relation_details.redaction), :version => relation_details.version %><
+  </div>
 <% else %>
-<table class="browse_details" id="<%= relation_details.version %>">
-
   <%= render :partial => "common_details", :object => relation_details %>
 
   <% unless relation_details.relation_members.empty? %>
-    <tr valign="top">
-      <th><%= t'browse.relation_details.members' %></th>
-      <td>
-        <table cellpadding="0">
-          <%= render :partial => "relation_member", :collection => relation_details.relation_members %>
-        </table>
-      </td>
-    </tr>   
+    <div class='browse-section'>
+      <h4><%= t'browse.relation_details.members' %></h4>
+      <ul><%= render :partial => "relation_member", :collection => relation_details.relation_members %></ul>
+    </div>
   <% end %>
 
   <% unless relation_details.containing_relation_members.empty? %>
-    <tr valign="top">
-      <th><%= t'browse.relation_details.part_of' %></th>
-      <td>
-        <table cellpadding="0">
-          <%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %>
-        </table>
-      </td>
-    </tr>      
+    <div class='browse-section'>
+      <h4><%= t'browse.relation_details.part_of' %></h4>
+      <ul><%= render :partial => "containing_relation", :collection => relation_details.containing_relation_members %></ul>
+    </div>
   <% end %>
-
-</table>
 <% end %>
+</div>