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

redesigned meeting and room page

Browse Source
This commit is contained in:
Zachary Chai
2016-10-25 10:11:36 -04:00
parent 551b64bb59
commit d3ad6980d9
4 changed files with 107 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
app/views/landing/meeting.html.erb
View File

@ -1,28 +1,33 @@
<!-- Body -->
<div class='body'>
<div class="page-wrapper room">
<div class="row">
<div class="col-sm-2 col-sm-offset-10">
<% if !current_user.nil? %>
<span class="user">Hello <%= current_user.name %></span>
<%= link_to "Logout", user_logout_url() %>
<% if current_user.username %>
<div><%= link_to 'Personal Room', current_user.room_url %></div>
<% else %>
<div><%= link_to 'Set Username', edit_user_path(current_user) %></div>
<% end %>
<% end %>
</div>
<% content_for :title do %>
<div class="title">
Hi Everyone
</div>
<small>
The session will be taking place using the following URL
</small>
<% end %>
<% content_for :footer do %>
<div class="panel-footer">
<div class="text-center">
<a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL
</div>
</div>
<% end %>
<div class="container">
<%= render 'landing/join_form' %>
<div class="page-wrapper meeting">
<div class='container-fluid'>
<%= render 'landing/footer_message' %>
<%= render 'shared/title', title: 'Start A New Session' %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<%= render 'shared/meeting_url', hidden: false %>
<%= render 'shared/join_form', user: current_user %>
</div>
<% end %>
<%= render 'landing/footer_oauth_append' %>
</div>
</div>

47
app/views/landing/room.html.erb
View File

@ -1,23 +1,36 @@
<!-- Body -->
<div class='body'>
<% if current_user %>
<% page_title = "Welcome, #{current_user.name.split(' ').first}" %>
<% else %>
<% page_title = "Welcome to #{@user.ownership_name} Meeting Space" %>
<% end %>
<div class="page-wrapper room">
<div class="row">
<div class="col-sm-2 col-sm-offset-10">
<% if admin? %>
<span class="user">Hello <%= current_user.name %></span>
<%= link_to "Logout", user_logout_url() %>
<% content_for :title do %>
<div class="title">
<% if current_user == @user %>
Start a new session
<% elsif current_user && current_user != @user %>
<%= "Join #{@user.ownership_name} session" %>
<% else %>
Join the current session
<% end %>
</div>
<% end %>
<div class="page-wrapper room">
<div class="container-fluid">
<%= render 'shared/title', title: page_title %>
<%= render layout: 'shared/center_panel' do %>
<div class="center-block col-sm-8">
<% if current_user == @user %>
<%= render 'shared/meeting_url', hidden: false %>
<% else %>
<%= link_to "Login", "/auth/#{@user.provider}" %>
<%= render 'shared/meeting_url', hidden: true %>
<% end %>
<%= render 'shared/join_form', user: current_user %>
</div>
</div>
<% end %>
</div>
<div class="container">
<%= render 'landing/join_form' %>
<%= render 'landing/footer_message' %>
</div>
</div>