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

meetings page changes

This commit is contained in:
Zachary Chai 2016-11-24 11:30:12 -05:00
parent 269ce7915e
commit ded0f9b056
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,7 +17,7 @@
<% end %> <% end %>
<% end %> <% end %>
<div class="page-wrapper meetings" data-id="<%= @meeting_id %>"> <div class="page-wrapper meetings">
<div class="container-fluid"> <div class="container-fluid">
<div class="center-panel-wrapper"> <div class="center-panel-wrapper">

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

@ -1,26 +1,17 @@
<% content_for :title do %> <% content_for :title do %>
<div class="title"> <div class="title">
<%= t('hi_all') %> <h2><%= t('join_session_id', id: @meeting_id) %></h2>
</div> </div>
<small>
<%= t('session_url_explanation') %>
</small>
<% end %>
<% if !@meeting_id %>
<% content_for :footer do %>
<div class="panel-footer">
<div class="text-center">
<%= t('refresh_html') %>
</div>
</div>
<% end %>
<% end %> <% end %>
<% content_for :footer do %> <% content_for :footer do %>
<div class="panel-footer"> <div class="panel-footer">
<div class="text-center"> <div class="text-center">
<% if current_user %>
<%= link_to t('return_to_room'), current_user.room_url %>
<% else %>
<%= link_to t('create_your_session'), root_path %> <%= link_to t('create_your_session'), root_path %>
<% end %>
</div> </div>
</div> </div>
<% end %> <% end %>
@ -31,7 +22,7 @@
<div class="center-panel-wrapper"> <div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %> <%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-conent-size col-xs-12"> <div class="center-block center-panel-conent-size col-xs-12">
<%= render 'shared/meeting_url', hidden: false %> <%= render 'shared/meeting_url', hidden: true %>
<%= render 'shared/join_form' %> <%= render 'shared/join_form' %>
</div> </div>
<% end %> <% end %>

2
config/locales/en-us.yml
View File

@ -45,6 +45,7 @@ en-US:
hi_all: Hi Everyone hi_all: Hi Everyone
join: Join join: Join
join_session: Join the current session join_session: Join the current session
join_session_id: Join %{id}
join_session_user: Join %{name} session join_session_user: Join %{name} session
login: login login: login
logout: logout logout: logout
@ -55,6 +56,7 @@ en-US:
powered_bigbluebutton: Powered by BigBlueButton powered_bigbluebutton: Powered by BigBlueButton
presentation: Presentation presentation: Presentation
refresh_html: <a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL refresh_html: <a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL
return_to_room: Return to your personal room
session_url_explanation: The session will be taking place using the following URL session_url_explanation: The session will be taking place using the following URL
start: Start start: Start
start_new_session: Start a new session start_new_session: Start a new session