Update merge.html.erb
This commit is contained in:
parent
d1fe39a441
commit
0392c1a8d7
|
@ -16,8 +16,8 @@ function change_mode(){
|
||||||
document.mode_form.submit()
|
document.mode_form.submit()
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
<nobr>
|
||||||
<form method="get" action='?' name='mode_form'>
|
<form method="get" action='?' name='mode_form'>
|
||||||
<nobr>
|
|
||||||
<%= '嚴格比較模式'+':' %>
|
<%= '嚴格比較模式'+':' %>
|
||||||
<input type='hidden' name='mode' value=''>
|
<input type='hidden' name='mode' value=''>
|
||||||
<% if params['mode']!='simple' %>
|
<% if params['mode']!='simple' %>
|
||||||
|
@ -25,9 +25,9 @@ function change_mode(){
|
||||||
<% else %>
|
<% else %>
|
||||||
<input type="checkbox" onchange='change_mode()'><span>否</span>
|
<input type="checkbox" onchange='change_mode()'><span>否</span>
|
||||||
<% end %>
|
<% end %>
|
||||||
</nobr>
|
|
||||||
</form>
|
</form>
|
||||||
<button type="button" onclick="merge_form.submit()"><%= t('personal_journal.merge') %></button>
|
<button type="button" onclick="merge_form.submit()"><%= t('personal_journal.merge') %></button>
|
||||||
|
</nobr>
|
||||||
<form method="get" action='?' name='merge_form'>
|
<form method="get" action='?' name='merge_form'>
|
||||||
<table class="table main-list">
|
<table class="table main-list">
|
||||||
<thead>
|
<thead>
|
||||||
|
@ -61,7 +61,7 @@ function change_mode(){
|
||||||
</td>
|
</td>
|
||||||
<% if params['mode']=='simple' %>
|
<% if params['mode']=='simple' %>
|
||||||
<td rowspan="<%= len %>">
|
<td rowspan="<%= len %>">
|
||||||
<input type="checkbox" class="checkbox" name="journal_id" value="<%= journals.collect(&:id).join('/') %>">
|
<input type="checkbox" class="checkbox" name="journal_id[]" value="<%= journals.collect(&:id).join('/') %>">
|
||||||
</td>
|
</td>
|
||||||
<% journals.each_with_index do |journal,i| %>
|
<% journals.each_with_index do |journal,i| %>
|
||||||
<td>
|
<td>
|
||||||
|
@ -84,7 +84,7 @@ function change_mode(){
|
||||||
</td>
|
</td>
|
||||||
<% end %>
|
<% end %>
|
||||||
<td rowspan="<%= len1 %>">
|
<td rowspan="<%= len1 %>">
|
||||||
<input type="checkbox" class="checkbox" name="journal_id" value="<%= v.collect(&:id).join('/') %>">
|
<input type="checkbox" class="checkbox" name="journal_id[]" value="<%= v.collect(&:id).join('/') %>">
|
||||||
</td>
|
</td>
|
||||||
<% v.each_with_index do |journal_child,index1| %>
|
<% v.each_with_index do |journal_child,index1| %>
|
||||||
<td>
|
<td>
|
||||||
|
|
Loading…
Reference in New Issue