Karavel/fixin.me
0
0
Fork 0
forked from fixin.me/fixin.me
Code Pull Requests Activity

Merging from main master to my repo master. #4

Closed
Karavel wants to merge 53 commits from fixin.me/fixin.me:master into master
pull from: fixin.me/fixin.me:master
merge into: Karavel:master
Conversation 0 Commits 53 Files Changed 50 +8 -6
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 9a02f0b0ae - Show all commits

6
app/views/default/units/_unit.html.erb
View File

@ -5,13 +5,13 @@
<td class="actions"> <td class="actions">
<% if current_user.at_least(:active) && unit.default? %> <% if current_user.at_least(:active) && unit.default? %>
<%= image_button_to t(".import"), "download-outline", import_default_unit_path(unit) %> <%= image_button_to t('.import'), 'download-outline', import_default_unit_path(unit) %>
<% end %> <% end %>
<% if current_user.at_least(:admin) %> <% if current_user.at_least(:admin) %>
<% if !unit.default? %> <% if !unit.default? %>
<%= image_button_to t(".export"), "upload-outline", export_default_unit_path(unit) %> <%= image_button_to t('.export'), 'upload-outline', export_default_unit_path(unit) %>
<% else %> <% else %>
<%= image_button_to t(".delete"), "delete-outline", unit_path(unit), <%= image_button_to t('.delete'), 'delete-outline', unit_path(unit),
method: :delete %> method: :delete %>
<% end %> <% end %>
<% end %> <% end %>

4
app/views/units/_unit.html.erb
View File

@ -14,12 +14,12 @@
<% if current_user.at_least(:active) %> <% if current_user.at_least(:active) %>
<td class="actions"> <td class="actions">
<% if unit.base.nil? %> <% if unit.base.nil? %>
<%= image_link_to t(".add_subunit"), "plus-outline", new_unit_path(unit), <%= image_link_to t('.add_subunit'), 'plus-outline', new_unit_path(unit),
id: dom_id(unit, :add), onclick: 'this.blur();', id: dom_id(unit, :add), onclick: 'this.blur();',
data: {turbo_stream: true} %> data: {turbo_stream: true} %>
<% end %> <% end %>
<%= image_button_to t(".delete_unit"), "delete-outline", unit_path(unit), <%= image_button_to t('.delete_unit'), 'delete-outline', unit_path(unit),
method: :delete %> method: :delete %>
</td> </td>
<% if unit.movable? %> <% if unit.movable? %>

4
config/locales/en.yml
View File

@ -70,7 +70,9 @@ en:
default: default:
units: units:
unit: unit:
delete_default: Delete default delete: Delete
export: Export
import: Import
index: index:
import_all: Import all import_all: Import all
back: Back to units... back: Back to units...