Merge pull request #15 from jfederico/master

Minor fix to UI
This commit is contained in:
Jesus Federico 2016-10-20 09:57:31 -04:00 committed by GitHub
commit e1ab78ec63
4 changed files with 5 additions and 11 deletions

View File

@ -18,10 +18,14 @@
<!-- Join form -->
<div id="landing_page_join">
<form id="join_form" class="form-inline">
<% if current_user.nil? %>
<div class="form-group">
<label for="join_form_name" class="sr-only">Name</label>
<input id="join_form_name" type="text" class="form-control input" id="name" placeholder="Your name" required>
<input id="join_form_name" type="text" class="form-control input" placeholder="Your name" required>
</div>
<% else %>
<input id="join_form_name" type="hidden" value="<%= current_user.name %>">
<% end %>
<button id="join_form_button" type="button" class="btn btn-success" data-url="<%= bbb_join_path(@resource, @meeting_token) %>">Join</button>
</form>
</div>

View File

@ -1,6 +0,0 @@
<figure class=highlight><pre><figcaption class="text" data-lang="text">
<p>Hi Everyone</p>
<p>The meeting will be at this URL</p>
<p><a id="text_meeting_url" href="<%= resource_url(@resource, @meeting_token) %>"><%= resource_url(@resource, @meeting_token) %></a></p>
<p>Please join!</p>
</figcaption></pre></figure>

View File

@ -20,8 +20,6 @@
<div class="container">
<%= render 'landing/join_form' %>
<%= render 'landing/sharing_text' %>
<%= render 'landing/footer_message' %>
<%= render 'landing/footer_oauth_append' %>

View File

@ -17,8 +17,6 @@
<div class="container">
<%= render 'landing/join_form' %>
<%= render 'landing/sharing_text' %>
<%= render 'landing/footer_message' %>
</div>