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

rework home layout

This commit is contained in:
Zachary Chai 2017-01-24 14:15:20 -05:00
parent 1c54f3cc6f
commit e339dcd5b7
5 changed files with 43 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,7 @@
var joinedMeetings = localStorage.getItem('joinedMeetings');
if (joinedMeetings && joinedMeetings.length > 0) {
joinedMeetings = joinedMeetings.split(',');
$('.center-panel-wrapper .panel-footer').removeClass('hidden');
$('.center-panel-wrapper .previously-joined-wrapper').removeClass('hidden');
for (var i = joinedMeetings.length - 1; i >= 0; i--) {
$('ul.previously-joined').append('<li><a href="/meetings/'+joinedMeetings[i]+'">'+joinedMeetings[i]+'</a></li>');

4
app/assets/stylesheets/shared.scss
View File

@ -70,10 +70,10 @@ body[data-controller=landing][data-action=rooms].app-background {
}
.center-panel {
.center-panel-size {
max-width: 900px
max-width: 1200px
}
.center-panel-content-size {
max-width: 800px;
max-width: 1100px;
}
.input-spacing {

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

@ -15,16 +15,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% content_for :title do %>
<div class="title">
<h2><%= t('create_session') %></h2>
</div>
<% end %>
<% content_for :footer do %>
<div class="panel-footer hidden">
<div class="list-group text-center">
<h4><%= t('previously_joined_meetings') %></h4>
<ul class="previously-joined"></ul>
</div>
<h2><%= t('home_title') %></h2>
</div>
<% end %>
@ -34,9 +25,38 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<div class="center-panel-wrapper">
<%= render layout: 'shared/center_panel' do %>
<div class="center-block center-panel-content-size col-xs-12">
<%= render 'shared/meeting_name_form' %>
<div class="row">
<div class="previously-joined-wrapper hidden">
<div class="list-group text-center">
<h4><%= t('previously_joined_meetings') %></h4>
<ul class="previously-joined"></ul>
</div>
</div>
</div>
<div class="row">
<div class="col-xs-6">
<div class="title-wrapper text-center">
<div class="title">
<h2><%= t('invite') %></h2>
<span><%= t('invite_description') %></span>
</div>
</div>
<%= render 'shared/meeting_url', hidden: false %>
</div>
<div class="col-xs-6">
<div class="title-wrapper text-center">
<div class="title">
<h2><%= t('join_session_id', id: '<meeting-name>') %></h2>
</div>
</div>
<%= render 'shared/join_form' %>
</div>
</div>
</div>
<% end %>
</div>

3
app/views/shared/_meeting_name_form.html.erb Normal file
View File

@ -0,0 +1,3 @@
<div class="meeting-name-form-wrapper">
<input type="text" class="form-control meeting-name" placeholder="<%= t('enter_meeting_name') %>"/>
</div>

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

@ -58,18 +58,21 @@ en-US:
user_waiting_title: A user is waiting
copied: Copied
copy_error: Use Ctrl-c to copy
create_session: Invite others to a meeting
create_your_session: Create your own meeting
date_recorded: Date
duration: Duration (minutes)
end: End
enter_name: Enter your name
enter_meeting_name: Enter a meeting name
greet_user: Welcome, %{name}
greet_guest: Welcome to %{name} Meeting Space
hi_all: Hi Everyone
home_title: Welcome to BigBlueButton
invite: Invite
invite_description: (share this link below to invite others to this meeting)
join: Join
join_session: Join the current meeting
join_session_id: Join %{id}
join_session_id: Join "%{id}"
join_session_user: Join %{name} meeting
logged_in_description_html: You are logged in as %{link}
login: login