fixed exchanges
This commit is contained in:
parent
5a957ff435
commit
b3bb179f38
4 changed files with 16 additions and 34 deletions
|
|
@ -13,4 +13,4 @@
|
||||||
<%= ts("Potential match generation progress:") %> <strong><%= @progress %>%</strong>
|
<%= ts("Potential match generation progress:") %> <strong><%= @progress %>%</strong>
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<span class="actions"><%= button_to ts("Cancel Potential Match Generation"), cancel_generate_collection_potential_matches_path(@collection), method: :post %></span>
|
<p class="actions" role="button"><%= link_to ts("Cancel Potential Match Generation"), cancel_generate_collection_potential_matches_path(@collection) %></p>
|
||||||
|
|
|
||||||
|
|
@ -3,26 +3,22 @@
|
||||||
<ul class="actions" role="menu">
|
<ul class="actions" role="menu">
|
||||||
<% if @collection.potential_matches.empty? %>
|
<% if @collection.potential_matches.empty? %>
|
||||||
<li>
|
<li>
|
||||||
<% if !@settings || @settings.no_match_required? %>
|
<% if !@settings || @settings.no_match_required? %>
|
||||||
<%= button_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection),
|
<%= link_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection),
|
||||||
data: { confirm: ts("Your challenge settings don't require any matching. Assignments will be completely random. Is this what you want?") },
|
data: {confirm: ts("Your challenge settings don't require any matching. Assignments will be completely random. Is this what you want?")} %>
|
||||||
method: :post %>
|
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= button_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection), method: :post %>
|
<%= link_to ts("Generate Potential Matches"), generate_collection_potential_matches_path(@collection) %>
|
||||||
<% end %>
|
<% end %>
|
||||||
</li>
|
</li>
|
||||||
<% else %>
|
<% else %>
|
||||||
<li><%= submit_tag ts("Save Assignment Changes") %></li>
|
<li><%= submit_tag ts("Save Assignment Changes") %></li>
|
||||||
<li><%= button_to ts("Regenerate Assignments"), generate_collection_assignments_path(@collection),
|
<li><%= link_to ts("Regenerate Assignments"), generate_collection_assignments_path(@collection),
|
||||||
data: { confirm: ts("Are you sure? This will delete all current assignments.") },
|
data: {confirm: ts("Are you sure? This will delete all current assignments.")} %></li>
|
||||||
method: :post %></li>
|
<li><%= link_to ts("Regenerate All Potential Matches"), generate_collection_potential_matches_path(@collection),
|
||||||
<li><%= button_to ts("Regenerate All Potential Matches"), generate_collection_potential_matches_path(@collection),
|
data: {confirm: ts("Are you sure? This will delete all current assignments and potential matches.")} %></li>
|
||||||
data: { confirm: ts("Are you sure? This will delete all current assignments and potential matches.") },
|
|
||||||
method: :post %></li>
|
|
||||||
<li>
|
<li>
|
||||||
<%= button_to ts("Send Assignments"), send_out_collection_assignments_path(@collection),
|
<%= link_to ts("Send Assignments"), send_out_collection_assignments_path(@collection),
|
||||||
data: { confirm: ts("Are you sure? This will send out the currently saved assignments to all participants!") },
|
data: {confirm: ts("Are you sure? This will send out the currently saved assignments to all participants!")} %></li>
|
||||||
method: :post %></li>
|
|
||||||
<% end %>
|
<% end %>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
||||||
16
app/views/potential_matches/_no_potential_givers.html.erb
Executable file → Normal file
16
app/views/potential_matches/_no_potential_givers.html.erb
Executable file → Normal file
|
|
@ -8,19 +8,9 @@
|
||||||
<ul class="actions" role="menu">
|
<ul class="actions" role="menu">
|
||||||
<li title="<%= ts("email") %>"><%= mailto_link assignment.request_signup.pseud.user, :subject => "[#{h(@collection.title)}] Message from Collection Maintainer" %></li>
|
<li title="<%= ts("email") %>"><%= mailto_link assignment.request_signup.pseud.user, :subject => "[#{h(@collection.title)}] Message from Collection Maintainer" %></li>
|
||||||
<li><%= link_to ts("Edit"), edit_collection_signup_path(@collection, assignment.request_signup) %></li>
|
<li><%= link_to ts("Edit"), edit_collection_signup_path(@collection, assignment.request_signup) %></li>
|
||||||
<li>
|
<li role="button"><%= link_to ts("Regenerate Matches For %{name}", :name => assignment.request_byline), regenerate_for_signup_collection_potential_matches_path(@collection, :signup_id => assignment.request_signup.id) %></li>
|
||||||
<%= button_to ts("Regenerate Matches For %{name}",
|
<li role="button"><%= link_to ts("Delete"),
|
||||||
name: assignment.request_byline),
|
collection_signup_path(@collection, assignment.request_signup), data: {confirm: ts('Are you sure?')}, :method => :delete %></li></ul>
|
||||||
regenerate_for_signup_collection_potential_matches_path(@collection, signup_id: assignment.request_signup.id),
|
|
||||||
method: :post %>
|
|
||||||
</li>
|
|
||||||
<li>
|
|
||||||
<%= link_to ts("Delete"),
|
|
||||||
collection_signup_path(@collection, assignment.request_signup),
|
|
||||||
data: { confirm: ts("Are you sure?") },
|
|
||||||
method: :delete %>
|
|
||||||
</li>
|
|
||||||
</ul>
|
|
||||||
</dd>
|
</dd>
|
||||||
<% end %>
|
<% end %>
|
||||||
</dl>
|
</dl>
|
||||||
|
|
|
||||||
6
app/views/potential_matches/_no_potential_recipients.html.erb
Executable file → Normal file
6
app/views/potential_matches/_no_potential_recipients.html.erb
Executable file → Normal file
|
|
@ -8,11 +8,7 @@
|
||||||
<ul class="actions" role="menu">
|
<ul class="actions" role="menu">
|
||||||
<li title="<%= ts("email") %>"><%= mailto_link assignment.offer_signup.pseud.user, :subject => "[#{h(@collection.title)}] Message from Collection Maintainer" %></li>
|
<li title="<%= ts("email") %>"><%= mailto_link assignment.offer_signup.pseud.user, :subject => "[#{h(@collection.title)}] Message from Collection Maintainer" %></li>
|
||||||
<li><%= link_to ts("Edit"), edit_collection_signup_path(@collection, assignment.offer_signup) %></li>
|
<li><%= link_to ts("Edit"), edit_collection_signup_path(@collection, assignment.offer_signup) %></li>
|
||||||
<li>
|
<li role="button"><%= link_to ts("Regenerate Matches For %{name}", :name => assignment.offer_byline), regenerate_for_signup_collection_potential_matches_path(@collection, :signup_id => assignment.offer_signup.id) %></li>
|
||||||
<%= button_to ts("Regenerate Matches For %{name}", name: assignment.offer_byline),
|
|
||||||
regenerate_for_signup_collection_potential_matches_path(@collection, signup_id: assignment.offer_signup.id),
|
|
||||||
method: :post %>
|
|
||||||
</li>
|
|
||||||
<li role="button"><%= link_to ts("Delete"),
|
<li role="button"><%= link_to ts("Delete"),
|
||||||
collection_signup_path(@collection, assignment.offer_signup), data: {confirm: ts('Are you sure?')}, :method => :delete %></li></ul>
|
collection_signup_path(@collection, assignment.offer_signup), data: {confirm: ts('Are you sure?')}, :method => :delete %></li></ul>
|
||||||
</dd>
|
</dd>
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue