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

replace logout with return to personal room

This commit is contained in:
Zachary Chai 2017-02-02 17:09:29 -05:00
parent 40add376b2
commit e2fc9863fe
4 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/assets/stylesheets/landing.scss
View File

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

10
app/views/landing/_rooms_center_panel.html.erb
View File

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

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

@ -30,7 +30,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<% end %> <% end %>
</div> </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"> <div class="table-wrapper">
<table id="recordings" class="table" width="100%"> <table id="recordings" class="table" width="100%">

3
config/locales/en-us.yml
View File

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