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

rewording and consolidating some conditions

Browse Source
This commit is contained in:
Zachary Chai
2017-02-03 14:05:12 -05:00
parent 8719956ba4
commit 4a90de057c
8 changed files with 36 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
app/views/shared/_join_form.html.erb
View File

@ -23,47 +23,35 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% end %>
<!-- if admin means the user is signed in and owns the room -->
<% if admin? %>
<% if @meeting_running %>
<div class="col-sm-6">
<button type="button" class="btn btn-primary meeting-join pull-right">
<%= t('join') %>
</button>
</div>
<div class="col-sm-6">
<button type="button" class="btn btn-danger meeting-end pull-left">
<%= t('end') %>
</button>
</div>
<% else %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('start_meeting') %>
<% if admin? && @meeting_running %>
<div class="col-sm-6">
<button type="button" class="btn btn-primary meeting-join pull-right">
<%= t('join') %>
</button>
<% end %>
</div>
<div class="col-sm-6">
<button type="button" class="btn btn-danger meeting-end pull-left">
<%= t('end') %>
</button>
</div>
<% else %>
<!-- on the page of a room/meeting, the user might have to enter a name -->
<% if on_room_or_meeting_page? %>
<% if current_user %>
<!-- if not admin but signed in don't show name field -->
<% if current_user %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('join') %>
</button>
<!-- if not signed in show field to enter name -->
<% else %>
<%= text_field_tag 'user[name]', '', class: 'form-control meeting-user-name', placeholder: t('enter_name') %>
<span class="input-group-btn">
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('join') %>
</button>
<% else %>
<%= text_field_tag 'user[name]', '', class: 'form-control meeting-user-name', placeholder: t('enter_name') %>
<span class="input-group-btn">
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('join') %>
</button>
</span>
<% end %>
<!-- on the landing page we don't ask for a name, just show the start button -->
<% else %>
<button type="button" class="btn btn-primary center-block meeting-join">
<%= t('start_meeting') %>
</button>
</span>
<% end %>
<% end %>
</div>
</div>