lino.jorzick/greenlight
1
0
Fork 0
forked from External/greenlight
Code Issues Pull Requests Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Josh
2018-06-13 13:27:29 -04:00
parent bc9c2c1232
commit 83642f22c1
8 changed files with 29 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/rooms/join.html.erb
View File

@ -1,5 +1,5 @@
<%= render 'shared/room_event' do %>
<%= form_for room_path, method: :post do |f| %>
<%= form_for room_path(@room), method: :post do |f| %>
<div class="input-group" style="height: 48px;">
<%= f.text_field :join_name,
required: true,

7
app/views/rooms/show.html.erb
View File

@ -37,7 +37,12 @@
<div class="row pt-7 pb-2">
<% if current_user.rooms.length > 1 %>
<% current_user.rooms.each do |room| %>
<div class="col-lg-4 col-md-6 col-sm-12">
<%= link_to current_user.main_room do %>
<%= render "shared/components/room_block", room: current_user.main_room %>
<% end %>
</div>
<% current_user.secondary_rooms.each do |room| %>
<div class="col-lg-4 col-md-6 col-sm-12">
<%= link_to room do %>
<%= render "shared/components/room_block", room: room %>

2
app/views/rooms/wait.html.erb
View File

@ -37,7 +37,7 @@ var request_to_join_meeting = function(){
},
error: function(){
// The meeting is still booting (going slowly), retry shortly.
if(join_attempts < 4){ setTimeout(request_to_join_meeting, 5000); }
if(join_attempts < 4){ setTimeout(request_to_join_meeting, 10000); }
join_attempts++;
}
});