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

Merge pull request #107 from zach-chai/add_logout 

add link to personal room and logout on every landing page
This commit is contained in:
Zachary Chai 2017-02-03 10:22:53 -05:00 committed by GitHub
parent c62424ffb6 fc7d3fd94e
commit b923367e5c
3 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,11 +22,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% content_for :footer do %> <% content_for :footer do %>
<div class="panel-footer"> <div class="panel-footer">
<div class="text-center"> <div class="text-center">
<% if current_user %>
<%= link_to t('return_to_room'), current_user.room_url %>
<% else %>
<%= link_to t('create_your_session'), root_path %> <%= link_to t('create_your_session'), root_path %>
<% end %>
</div> </div>
</div> </div>
<% end %> <% end %>

6
app/views/landing/rooms.html.erb
View File

@ -30,10 +30,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% end %> <% end %>
</div> </div>
<% if !@main_room %> <% unless @main_room && !current_user %>
<div class="row text-center"> <%= render 'shared/signup' %>
<%= link_to(t('return_to_room'), current_user.room_url) %>
</div>
<% end %> <% end %>
<div class="table-wrapper"> <div class="table-wrapper">

12
app/views/shared/_signup.html.erb
View File

@ -1,13 +1,17 @@
<span class="signup"> <span class="signup">
<% if current_user %> <% if current_user %>
<div class="text-center"> <div class="text-center">
<span class=""><%= t('logged_in_description_html', link: link_to(current_user.name, current_user.room_url)) %></span> <% if @main_room %>
<div class=""><%= link_to t('logout'), user_logout_url %></div> <span><%= t('logged_in_description_html', link: link_to(current_user.name, current_user.room_url)) %></span>
<% else %>
<%= link_to(t('return_to_room'), current_user.room_url) %>
<% end %>
<div><%= link_to t('logout'), user_logout_url %></div>
</div> </div>
<% else %> <% else %>
<div class="text-center"> <div class="text-center">
<span class=""><%= t('login_description') %></span> <span><%= t('login_description') %></span>
<div class=""><%= link_to t('login'), '/users/login' %></div> <div><%= link_to t('login'), '/users/login' %></div>
</div> </div>
<% end %> <% end %>
</span> </span>