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

GRN2-202: Create a room in which everyone joins as Moderator (Fixed #628) (#650)

Browse Source 
* Room setting to allow anyone to start a room

* Update sample.env

* merge v2.2.1
This commit is contained in:
shawn-higgins1
2019-07-23 14:54:46 -04:00
committed by Jesus Federico
parent b23f94dfb5
commit d3a9ae32a9
7 changed files with 54 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -40,7 +40,7 @@
placeholder: t("enter_your_name"),
value: "#{@name}",
readonly: !current_user.nil? %>
<%= f.submit t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
<%= f.submit (!@is_running && @anyone_can_start)? t("room.start") : t("room.join"), class: "btn btn-primary btn-sm col-sm-3 form-control join-form" %>
</div>
<% end %>
<% end %>

8
app/views/shared/modals/_create_room_modal.html.erb
View File

@ -68,6 +68,14 @@
</label>
<% end %>
<% if Rails.configuration.room_features.include? "anyone-can-start" %>
<label class="custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
<span class="custom-switch-description"><%= t("modal.room_settings.start")%></span>
<%= f.check_box :anyone_can_start, class: "custom-switch-input", checked: false %>
<span class="custom-switch-indicator float-right"></span>
</label>
<% end %>
<label id="auto-join-label" class="create-only custom-switch pl-0 mt-3 mb-3 w-100 text-left d-inline-block">
<span class="custom-switch-description"><%= t("modal.create_room.auto_join") %></span>
<%= f.check_box :auto_join, class: "custom-switch-input", checked: false %>