diff --git a/app/views/landing/_footer_message.html.erb b/app/views/landing/_footer_message.html.erb index 40f7b7f2..ed818a1e 100644 --- a/app/views/landing/_footer_message.html.erb +++ b/app/views/landing/_footer_message.html.erb @@ -1,3 +1,3 @@ diff --git a/app/views/landing/_footer_oauth_append.html.erb b/app/views/landing/_footer_oauth_append.html.erb index 8aa4a36f..2c3f58c7 100644 --- a/app/views/landing/_footer_oauth_append.html.erb +++ b/app/views/landing/_footer_oauth_append.html.erb @@ -10,10 +10,6 @@ <% end %> - <% else %> -
Hello <%= current_user.name %>
-
<%= link_to 'Personal Room', current_user.room_url %>
-
<%= link_to 'Logout', '/logout' %>
<% end %> diff --git a/app/views/landing/meeting.html.erb b/app/views/landing/meeting.html.erb index 09d83a96..532b6b86 100644 --- a/app/views/landing/meeting.html.erb +++ b/app/views/landing/meeting.html.erb @@ -1,6 +1,18 @@
+
+
+
+ <% if !current_user.nil? %> + Hello <%= current_user.name %> + <%= link_to "Logout", "/logout" %> +
<%= link_to 'Personal Room', current_user.room_url %>
+ <% end %> +
+
+
+
<%= render 'landing/join_form' %> diff --git a/app/views/landing/room.html.erb b/app/views/landing/room.html.erb index e20a3125..3a64bfda 100644 --- a/app/views/landing/room.html.erb +++ b/app/views/landing/room.html.erb @@ -5,7 +5,7 @@
<% if admin? %> - <%= current_user.name %> + Hello <%= current_user.name %> <%= link_to "Logout", "/logout" %> <% else %> <%= link_to "Login", "/auth/twitter" %>