forked from External/greenlight
Relocated code for login/logout in meetings
This commit is contained in:
parent
b6e17b88c7
commit
8d6904e183
|
@ -1,3 +1,3 @@
|
|||
<div id="landing_page_footer_message">
|
||||
<p>Bookmark this page to reuse this meeting URL, or click refresh button to generate a new meeting URL</p>
|
||||
<p>Bookmark this page to reuse this meeting URL<% if @resource == "meetings" %>, or click refresh button to generate a new meeting URL<% end %></p>
|
||||
</div>
|
||||
|
|
|
@ -10,10 +10,6 @@
|
|||
<span class="fa fa-google"></span>
|
||||
<% end %>
|
||||
</div>
|
||||
<% else %>
|
||||
<div>Hello <%= current_user.name %></div>
|
||||
<div><%= link_to 'Personal Room', current_user.room_url %></div>
|
||||
<div><%= link_to 'Logout', '/logout' %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
@ -1,6 +1,18 @@
|
|||
<!-- 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", "/logout" %>
|
||||
<div><%= link_to 'Personal Room', current_user.room_url %></div>
|
||||
<% end %>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="container">
|
||||
<%= render 'landing/join_form' %>
|
||||
|
||||
|
|
|
@ -5,7 +5,7 @@
|
|||
<div class="row">
|
||||
<div class="col-sm-2 col-sm-offset-10">
|
||||
<% if admin? %>
|
||||
<span class="user"><%= current_user.name %></span>
|
||||
<span class="user">Hello <%= current_user.name %></span>
|
||||
<%= link_to "Logout", "/logout" %>
|
||||
<% else %>
|
||||
<%= link_to "Login", "/auth/twitter" %>
|
||||
|
|
Loading…
Reference in New Issue