Merge branch 'master' into room-settings

This commit is contained in:
Ahmad Farhat
2020-04-28 13:12:20 -04:00
committed by GitHub
9 changed files with 29 additions and 9 deletions

View File

@ -36,9 +36,9 @@
<td class="text-left">
<% running = room_is_running(room.bbb_id) %>
<% if running %>
<%= t("administrator.rooms.running") %>
<%= t("administrator.rooms.table.running") %>
<% else %>
<%= t("administrator.rooms.not_running") %>
<%= t("administrator.rooms.table.not_running") %>
<% end %>
</td>
<td class="text-center">
@ -48,7 +48,7 @@
</a>
<div class="dropdown-menu dropdown-menu-right">
<%= link_to room_path(room), class: "dropdown-item" do %>
<i class="dropdown-icon far fa-eye"></i> <%= t("administrator.rooms.view") %>
<i class="dropdown-icon far fa-eye"></i> <%= t("administrator.rooms.table.view") %>
<% end %>
<%= button_to start_room_path(room), class: "dropdown-item", "data-disable": "" do %>
<i class="dropdown-icon fas fa-door-open"></i> <%= running ? t("room.join") : t("room.start") %>