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

4
app/assets/javascripts/landing.js
View File

@ -168,7 +168,7 @@
Meeting.getInstance().setMeetingId(newId);
$(".page-wrapper.meetings").data('id', newId);
$('.meeting-url').val(Meeting.getInstance().getURL());
$('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
$('.join-meeting-title').text('"'+newId+'"');
if (newId === '') {
$('.invite-join-wrapper').addClass('hidden');
} else {
@ -190,7 +190,7 @@
var newId = $(this).val();
Meeting.getInstance().setMeetingId(newId);
$('.meeting-url').val(Meeting.getInstance().getURL());
$('.join-meeting-title').html(I18n.join_title.replace(/%{id}/, newId));
$('.join-meeting-title').text('"'+newId+'"');
if (newId === '') {
$('.invite-join-wrapper').addClass('hidden');
} else {

4
app/views/landing/_invite_join.html.erb
View File

@ -1,4 +1,4 @@
<div class="invite-join-wrapper hidden">
<div class="row invite-join-wrapper hidden">
<div class="col-xs-6">
<%= render 'shared/title', title: t('invite') do %>
<span><%= t('invite_description') %></span>
@ -9,7 +9,7 @@
<div class="col-xs-6">
<%= render 'shared/title', title: t('join'), title_class: 'join-meeting-title' %>
<button type="button" class="btn btn-primary center-block meeting-start">
<%= t('start_meeting') %>
<%= t('start_join') %>
</button>
</div>
</div>

2
app/views/landing/_previously_joined.html.erb
View File

@ -1,6 +1,6 @@
<div class="previously-joined-wrapper hidden">
<div class="list-group text-center">
<h4><%= t('previously_joined_meetings') %></h4>
<h4><%= t('previous_meetings') %></h4>
<ul class="previously-joined"></ul>
</div>
</div>

2
app/views/landing/_rooms_center_panel.html.erb
View File

@ -17,7 +17,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class="title">
<h2>
<% if admin? && !@meeting_running %>
<%= t('your_personal_room') %>
<%= t('admin_room_title', user: @user.name) %>
<% else %>
<%= t('user_person_room', name: @user.name) %>
<% end %>

2
app/views/landing/_rooms_meetings_center_panel.html.erb
View File

@ -16,7 +16,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% content_for :title do %>
<div class="title">
<h2>
<%= t('join_session_id', id: @meeting_id) %>
<%= "\"#{@meeting_id}\"" %>
</h2>
</div>
<% end %>

2
app/views/landing/meetings.html.erb
View File

@ -15,7 +15,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% content_for :title do %>
<div class="title">
<h2><%= t('join_session_id', id: @meeting_id) %></h2>
<h2><%= "\"#{@meeting_id}\"" %></h2>
</div>
<% end %>

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>