Skip to content

Commit

Permalink
MDL-74638 mod_bigbluebutton: Multiple fixes to room layout
Browse files Browse the repository at this point in the history
* In preparation for the guest access trigger button, move the join session
button to the right
* Fix id in the templates to be more consistent
* Fix issue with room refreshing process so it replaces the node instead of node content.
  • Loading branch information
laurentdavid committed Nov 9, 2022
1 parent 5877ae3 commit 7de01c9
Show file tree
Hide file tree
Showing 7 changed files with 79 additions and 64 deletions.
2 changes: 1 addition & 1 deletion mod/bigbluebuttonbn/amd/build/roomupdater.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mod/bigbluebuttonbn/amd/build/roomupdater.min.js.map

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions mod/bigbluebuttonbn/amd/src/roomupdater.js
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ const poll = () => {
* @returns {Promise}
*/
export const updateRoom = (updatecache = false) => {
const bbbRoomViewElement = document.getElementById('bbb-room-view');
const bbbRoomViewElement = document.getElementById('bigbluebuttonbn-room-view');
const bbbId = bbbRoomViewElement.dataset.bbbId;
const groupId = bbbRoomViewElement.dataset.groupId;
return getMeetingInfo(bbbId, groupId, updatecache)
Expand All @@ -96,7 +96,7 @@ export const updateRoom = (updatecache = false) => {
data.haspresentations = !!(data.presentations && data.presentations.length);
return Templates.renderForPromise('mod_bigbluebuttonbn/room_view', data);
})
.then(({html, js}) => Templates.replaceNodeContents(bbbRoomViewElement, html, js))
.then(({html, js}) => Templates.replaceNode(bbbRoomViewElement, html, js))
.then(() => true)
.catch((ex) => {
displayException(ex);
Expand Down
1 change: 1 addition & 0 deletions mod/bigbluebuttonbn/classes/external/meeting_info.php
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,7 @@ public static function execute_returns(): external_single_structure {
'cmid' => new external_value(PARAM_INT, 'CM id'),
'userlimit' => new external_value(PARAM_INT, 'User limit'),
'bigbluebuttonbnid' => new external_value(PARAM_RAW, 'bigbluebuttonbn instance id'),
'groupid' => new external_value(PARAM_INT, 'bigbluebuttonbn group id', VALUE_DEFAULT, 0),
'meetingid' => new external_value(PARAM_RAW, 'Meeting id'),
'openingtime' => new external_value(PARAM_INT, 'Opening time', VALUE_OPTIONAL),
'closingtime' => new external_value(PARAM_INT, 'Closing time', VALUE_OPTIONAL),
Expand Down
14 changes: 7 additions & 7 deletions mod/bigbluebuttonbn/lang/en/bigbluebuttonbn.php
Original file line number Diff line number Diff line change
Expand Up @@ -443,18 +443,18 @@
$string['view_recording_select_course'] = 'Select a course first in the drop down menu';


$string['view_message_session_started_at'] = 'This session started at';
$string['view_message_session_started_at'] = 'Session started at';
$string['view_message_session_running_for'] = 'This session has been running for';
$string['view_message_hour'] = 'hour';
$string['view_message_hours'] = 'hours';
$string['view_message_minute'] = 'minute';
$string['view_message_minutes'] = 'minutes';
$string['view_message_moderator'] = 'moderator';
$string['view_message_moderators'] = 'moderators';
$string['view_message_viewer'] = 'viewer';
$string['view_message_viewers'] = 'viewers';
$string['view_message_user'] = 'user';
$string['view_message_users'] = 'users';
$string['view_message_moderator'] = 'Moderator';
$string['view_message_moderators'] = 'Moderators';
$string['view_message_viewer'] = 'Viewer';
$string['view_message_viewers'] = 'Viewers';
$string['view_message_user'] = 'User';
$string['view_message_users'] = 'Users';
$string['view_message_has_joined'] = 'has joined';
$string['view_message_have_joined'] = 'have joined';
$string['view_message_session_no_users'] = 'There are no users in this session';
Expand Down
2 changes: 1 addition & 1 deletion mod/bigbluebuttonbn/templates/end_session_button.mustache
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
}} data-action="end"{{!
}} data-bbb-id="{{bigbluebuttonbnid}}"{{!
}} data-group-id="{{groupid}}"{{!
}} class="btn btn-secondary bbb-btn-action"{{!
}} class="btn btn-outline-dark bbb-btn-action m-1"{{!
}}>
{{#str}}view_conference_action_end, mod_bigbluebuttonbn{{/str}}
</a>
Expand Down
Loading

0 comments on commit 7de01c9

Please sign in to comment.