Merge pull request #105 from zach-chai/logout_text

replace logout with return to personal room

app/assets/stylesheets/landing.scss

@@ -19,6 +19,7 @@
   margin:auto;
   width: 200px;
   padding: 0;
+  cursor: pointer;
 }
 
 .meetings {

app/views/landing/_rooms_center_panel.html.erb

@@ -18,10 +18,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     <h2>
       <% if admin? && !@meeting_running %>
         <%= t('your_personal_room') %>
-      <% elsif !admin? %>
-        <%= t('join_session_user', name: @user.username) %>
       <% else %>
-        <%= t('join_session') %>
+        <%= t('user_person_room', name: @user.name) %>
       <% end %>
     </h2>
   </div>
@@ -38,8 +36,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         <%= render 'landing/invite_join' %>
       </div>
     <% else %>
-      <%= render 'shared/meeting_url', hidden: true %>
-      <%= render 'shared/join_form' %>
+      <div class="text-center">
+        <div><%= t('are_you', name: @user.name) %></div>
+        <div class=""><%= link_to t('login'), '/users/login' %></div>
+      </div>
     <% end %>
   </div>
 <% end %>

app/views/landing/rooms.html.erb

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

config/locales/en-us.yml

@@ -37,7 +37,7 @@
 
 en-US:
   actions: Actions
-  are_you: Are you %{name}?
+  are_you: Are you %{name} ?
   are_you_sure: Are you sure?
   change_recording_visibility: "Change visibility to:"
   client:
@@ -76,9 +76,7 @@ en-US:
   invite: Invite
   invite_description: (share this link below to invite others to this meeting)
   join: Join
-  join_session: Join the current meeting
   join_session_id: Join %{id}
-  join_session_user: Join %{name} meeting
   logged_in_description_html: You are logged in as %{link}
   login: login
   login_description: Want your own recorded meetings?
@@ -111,6 +109,7 @@ en-US:
   your_personal_room: Your Personal Room
   thumbnails: Thumbnails
   url_copy_explanation: Copy this URL to invite others to the meeting
+  user_person_room: "%{name} personal room"
   video: Video
   visibility: Visibility
   wait_for_mod_msg: Looks like you're the first one here...