Chris@1296: <div class="conflict">
Chris@1296:   <%= l(:notice_issue_update_conflict) %> 
Chris@1296:   <% if @conflict_journals.present? %>
Chris@1296:     <div class="conflict-details">
Chris@1296:     <% @conflict_journals.sort_by(&:id).each do |journal| %>
Chris@1296:       <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p>
Chris@1296:       <% if journal.details.any? %>
Chris@1296:       <ul class="details">
Chris@1296:         <% details_to_strings(journal.details).each do |string| %>
Chris@1296:          <li><%= string %></li>
Chris@1296:         <% end %>
Chris@1296:       </ul>
Chris@1296:       <% end %>
Chris@1296:       <%= textilizable(journal, :notes) unless journal.notes.blank? %>
Chris@1296:     <% end %>
Chris@1296:     </div>
Chris@1296:   <% end %>
Chris@1296: </div>
Chris@1296: <p>
Chris@1296:   <label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br />
Chris@1296:   <% if @issue.notes.present? %>
Chris@1296:   <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br />
Chris@1296:   <% end %>
Chris@1296:   <label><%= radio_button_tag 'conflict_resolution', 'cancel' %> <%= l(:text_issue_conflict_resolution_cancel, :link => link_to_issue(@issue, :subject => false)).html_safe %></label>
Chris@1296: </p>
Chris@1296: <p><%= submit_tag l(:button_submit) %></p>