forked from External/greenlight
small fixes
This commit is contained in:
parent
8a613c8a00
commit
fce383d858
|
@ -45,7 +45,8 @@ updateMeetingText = function(meeting){
|
||||||
}
|
}
|
||||||
|
|
||||||
initialPopulate = function(){
|
initialPopulate = function(){
|
||||||
if (window.location.href.includes('preferences')) { return; }
|
// Only populate on room resources.
|
||||||
|
if (!window.location.href.includes('rooms')) { return; }
|
||||||
$.get((window.location.href + '/request').replace('#', ''), function(data){
|
$.get((window.location.href + '/request').replace('#', ''), function(data){
|
||||||
meetings = data['meetings']
|
meetings = data['meetings']
|
||||||
for(var i = 0; i < meetings.length; i++){
|
for(var i = 0; i < meetings.length; i++){
|
||||||
|
|
|
@ -67,7 +67,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
|
||||||
<div class='header'>
|
<div class='header'>
|
||||||
<span class="logo-wrapper pull-left">
|
<span class="logo-wrapper pull-left">
|
||||||
<% if current_user %>
|
<% if current_user %>
|
||||||
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), meeting_room_path('rooms', User.find(current_user).encrypted_id) %>
|
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), meeting_room_path('rooms', User.find(current_user.id).encrypted_id) %>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
|
<%= link_to image_tag("bbb-logo.png", :alt => "BigBlueButton", :class => "logo"), root_path %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
Loading…
Reference in New Issue