Mercurial > hg > soundsoftware-site
annotate .svn/pristine/31/319ace742da33939c6f0a3745726645fe20c4534.svn-base @ 1327:287f201c2802 redmine-2.2-integration
Add italic
author | Chris Cannam <chris.cannam@soundsoftware.ac.uk> |
---|---|
date | Wed, 19 Jun 2013 20:56:22 +0100 |
parents | 038ba2d95de8 |
children |
rev | line source |
---|---|
Chris@1296 | 1 <div class="conflict"> |
Chris@1296 | 2 <%= l(:notice_issue_update_conflict) %> |
Chris@1296 | 3 <% if @conflict_journals.present? %> |
Chris@1296 | 4 <div class="conflict-details"> |
Chris@1296 | 5 <% @conflict_journals.sort_by(&:id).each do |journal| %> |
Chris@1296 | 6 <p><%= authoring journal.created_on, journal.user, :label => :label_updated_time_by %></p> |
Chris@1296 | 7 <% if journal.details.any? %> |
Chris@1296 | 8 <ul class="details"> |
Chris@1296 | 9 <% details_to_strings(journal.details).each do |string| %> |
Chris@1296 | 10 <li><%= string %></li> |
Chris@1296 | 11 <% end %> |
Chris@1296 | 12 </ul> |
Chris@1296 | 13 <% end %> |
Chris@1296 | 14 <%= textilizable(journal, :notes) unless journal.notes.blank? %> |
Chris@1296 | 15 <% end %> |
Chris@1296 | 16 </div> |
Chris@1296 | 17 <% end %> |
Chris@1296 | 18 </div> |
Chris@1296 | 19 <p> |
Chris@1296 | 20 <label><%= radio_button_tag 'conflict_resolution', 'overwrite' %> <%= l(:text_issue_conflict_resolution_overwrite) %></label><br /> |
Chris@1296 | 21 <% if @issue.notes.present? %> |
Chris@1296 | 22 <label><%= radio_button_tag 'conflict_resolution', 'add_notes' %> <%= l(:text_issue_conflict_resolution_add_notes) %></label><br /> |
Chris@1296 | 23 <% end %> |
Chris@1296 | 24 <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 | 25 </p> |
Chris@1296 | 26 <p><%= submit_tag l(:button_submit) %></p> |