comparison .svn/pristine/31/319ace742da33939c6f0a3745726645fe20c4534.svn-base @ 1296:038ba2d95de8 redmine-2.2

Fix redmine-2.2 branch update (add missing svn files)

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