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

remove refresh on specific pages and change join form

Browse Source
This commit is contained in:
Zachary Chai
2016-11-01 17:04:57 -04:00
parent bef04f0465
commit 7da04d3334
4 changed files with 32 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2,6 +2,10 @@
// They will automatically be included in application.css. // They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/ // You can use Sass (SCSS) here: http://sass-lang.com/
.join-form {
width: 100%;
}
.rooms { .rooms {
.table-wrapper { .table-wrapper {
padding: 40px 50px 10px 50px; padding: 40px 50px 10px 50px;

2
app/controllers/landing_controller.rb
View File

@@ -15,7 +15,7 @@ class LandingController < ApplicationController
end end
def admin? def admin?
@user == current_user @user && @user == current_user
end end
helper_method :admin? helper_method :admin?

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

@@ -7,12 +7,14 @@
</small> </small>
<% end %> <% end %>
<% content_for :footer do %> <% if !@meeting_id %>
<div class="panel-footer"> <% content_for :footer do %>
<div class="text-center"> <div class="panel-footer">
<a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL <div class="text-center">
<a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL
</div>
</div> </div>
</div> <% end %>
<% end %> <% end %>
<div class="page-wrapper meetings"> <div class="page-wrapper meetings">

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

@@ -1,9 +1,23 @@
<div class="input-group input-spacing"> <div class="join-form input-group input-spacing">
<% @current_user = user %> <% if current_user %>
<%= text_field :current_user, :name, class: 'form-control meeting-user-name', placeholder: 'Enter your name' %> <% @current_user = user %>
<span class="input-group-btn"> <%= text_field :current_user, :name, class: 'form-control meeting-user-name', type: 'hidden' %>
<button type="button" class="btn btn-primary meeting-join"> <% else %>
<%= text_field :nil, :nil, class: 'form-control meeting-user-name', placeholder: 'Enter your name' %>
<% end %>
<% if admin? %>
<button type="button" class="btn btn-primary center-block meeting-join">
Start
</button>
<% elsif current_user %>
<button type="button" class="btn btn-primary center-block meeting-join">
Join Join
</button> </button>
</span> <% else %>
<span class="input-group-btn">
<button type="button" class="btn btn-primary meeting-join">
Join
</button>
</span>
<% end %>
</div> </div>