diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx index 6f3ff8f7d5..fec55ce8c4 100755 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx @@ -75,12 +75,12 @@ class NavBar extends Component { ghost={true} circle={true} hideLabel={true} - label={'Toggle User-List'} + label={'User-List Toggle'} icon={'user'} className={cx(toggleBtnClasses)} /> -
+
{this.renderPresentationTitle()}
From c510921509909bd8ca837f604dcbc17a3b04bab0 Mon Sep 17 00:00:00 2001 From: KDSBrowne Date: Wed, 15 Mar 2017 08:36:42 -0700 Subject: [PATCH 048/374] remove DropdownListSeparator --- .../imports/ui/components/actions-bar/emoji-menu/component.jsx | 2 -- bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx | 1 - .../ui/components/nav-bar/settings-dropdown/component.jsx | 1 - .../ui/components/user-list/user-list-item/component.jsx | 2 -- 4 files changed, 6 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx index 3af018f7cf..f06f6e2af1 100755 --- a/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/actions-bar/emoji-menu/component.jsx @@ -7,7 +7,6 @@ import DropdownTrigger from '/imports/ui/components/dropdown/trigger/component'; import DropdownContent from '/imports/ui/components/dropdown/content/component'; import DropdownList from '/imports/ui/components/dropdown/list/component'; import DropdownListItem from '/imports/ui/components/dropdown/list/item/component'; -import DropdownListSeparator from '/imports/ui/components/dropdown/list/separator/component'; const propTypes = { // Emoji status of the current user @@ -101,7 +100,6 @@ class EmojiMenu extends Component { description={intl.formatMessage(intlMessages.applauseDesc)} onClick={() => actions.setEmojiHandler('applause')} /> - - ), - (), ].concat(actions) } From cafe64c0de03e7c236198706713fa37cea852d01 Mon Sep 17 00:00:00 2001 From: KDSBrowne Date: Wed, 15 Mar 2017 08:43:59 -0700 Subject: [PATCH 049/374] add aria-expanded to user-list button --- .../imports/ui/components/nav-bar/component.jsx | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx index 59375d2363..282c97385d 100755 --- a/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/nav-bar/component.jsx @@ -50,6 +50,9 @@ class NavBar extends Component { } handleToggleUserList() { + let x = document.getElementById("UserListBtn").getAttribute("aria-expanded"); + let isExpanded = (x == "true") ? "false" : "true"; + document.getElementById("UserListBtn").setAttribute("aria-expanded", isExpanded); this.props.toggleUserList(); } @@ -77,6 +80,8 @@ class NavBar extends Component { label={'User-List Toggle'} icon={'user'} className={cx(toggleBtnClasses)} + aria-expanded="false" + id="UserListBtn" />
From 8be9f4ee26c57084cb293f2d21c32d0251e3fd0d Mon Sep 17 00:00:00 2001 From: KDSBrowne Date: Wed, 15 Mar 2017 08:53:12 -0700 Subject: [PATCH 050/374] add label and role to close chat link --- .../imports/ui/components/chat/component.jsx | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/bigbluebutton-html5/imports/ui/components/chat/component.jsx b/bigbluebutton-html5/imports/ui/components/chat/component.jsx index dd56c01987..55d1448c50 100755 --- a/bigbluebutton-html5/imports/ui/components/chat/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/chat/component.jsx @@ -26,11 +26,17 @@ export default class Chat extends Component { actions, } = this.props; + let closeChatLabel = "close " + title; + return (
- - {title} + + {title}
Date: Mon, 20 Mar 2017 15:00:04 -0300 Subject: [PATCH 051/374] Merge conflicts --- .../imports/ui/components/settings/service.js | 3 ++ .../imports/ui/services/settings/index.js | 39 +++++++++++++++++++ .../private/config/public/app.yaml | 27 +++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 bigbluebutton-html5/imports/ui/services/settings/index.js diff --git a/bigbluebutton-html5/imports/ui/components/settings/service.js b/bigbluebutton-html5/imports/ui/components/settings/service.js index 8b701b0c9a..546acc2a6b 100644 --- a/bigbluebutton-html5/imports/ui/components/settings/service.js +++ b/bigbluebutton-html5/imports/ui/components/settings/service.js @@ -3,6 +3,7 @@ import Users from '/imports/api/users'; import Captions from '/imports/api/captions'; import Auth from '/imports/ui/services/auth'; import _ from 'lodash'; +import Settings from '/imports/ui/services/settings'; const updateSettings = (obj) => { Object.keys(obj).forEach(k => Storage.setItem(`settings_${k}`, obj[k])); @@ -35,6 +36,8 @@ const getUserRoles = () => { }; const setDefaultSettings = () => { + console.log(Settings); + const defaultSettings = { application: { chatAudioNotifications: false, diff --git a/bigbluebutton-html5/imports/ui/services/settings/index.js b/bigbluebutton-html5/imports/ui/services/settings/index.js new file mode 100644 index 0000000000..1406bb15f7 --- /dev/null +++ b/bigbluebutton-html5/imports/ui/services/settings/index.js @@ -0,0 +1,39 @@ +import Storage from '/imports/ui/services/storage/session'; +import _ from 'underscore'; + +const SettingsCollection = new Mongo.Collection(null); + +class Settings { + constructor() { + console.log('constructor 4Head'); + const defaultSettings = Meteor.settings.public.app.defaultSettings; + + const savedSettings = { + application: this.getSettingsFor('application'), + audio: this.getSettingsFor('audio'), + video: this.getSettingsFor('video'), + cc: this.getSettingsFor('cc'), + participants: this.getSettingsFor('participants'), + }; + + Object.keys(defaultSettings).forEach(key => { + this[key] = _.extend(defaultSettings[key], savedSettings[key]); + }); + } + + // get achalaboy(key) { + // return SettingsCollection.findOne({ key }).properties; + // } + + // set setalaboy(key, object) { + // SettingsCollection.upsert({ key }, object); + // } + + getSettingsFor(key) { + const setting = Storage.getItem(`settings_${key}`); + return setting; + }; +} + +const SettingsSingleton = new Settings(); +export default SettingsSingleton; diff --git a/bigbluebutton-html5/private/config/public/app.yaml b/bigbluebutton-html5/private/config/public/app.yaml index 8625663d06..4bd5c47d79 100755 --- a/bigbluebutton-html5/private/config/public/app.yaml +++ b/bigbluebutton-html5/private/config/public/app.yaml @@ -25,3 +25,30 @@ app: basename: '/html5client' defaultLocale: 'en' + #default settings for session storage + defaultSettings: + application: + chatAudioNotifications: false + chatPushNotifications: false + fontSize: "16px" + audio: + inputDeviceId: undefined + outputDeviceId: undefined + video: + viewParticipantsWebcams: true + cc: + backgroundColor: "#FFFFFF" + fontColor: "#000000" + closedCaptions: false + fontFamily: "Calibri" + fontSize: '16px' + locale: undefined + takeOwnership: false + participants: + muteAll: false + lockAll: false + lockAll: false + microphone: false + publicChat: false + privateChat: false + layout: false From a2e0029c65f188f596fd8eb20be16620ea510dc9 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 23 Mar 2017 08:53:04 -0400 Subject: [PATCH 052/374] drop Audio tab from settings --- .../ui/components/settings/component.jsx | 13 --- .../ui/components/settings/container.jsx | 1 - .../settings/submenus/audio/component.jsx | 101 ------------------ .../settings/submenus/audio/container.jsx | 17 --- .../components/settings/submenus/styles.scss | 4 - .../settings/submenus/video/component.jsx | 2 +- 6 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 bigbluebutton-html5/imports/ui/components/settings/submenus/audio/component.jsx delete mode 100644 bigbluebutton-html5/imports/ui/components/settings/submenus/audio/container.jsx diff --git a/bigbluebutton-html5/imports/ui/components/settings/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/component.jsx index 51aa3e4c5f..59b6230468 100644 --- a/bigbluebutton-html5/imports/ui/components/settings/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/settings/component.jsx @@ -3,7 +3,6 @@ import Modal from '/imports/ui/components/modal/component'; import { Tab, Tabs, TabList, TabPanel } from 'react-tabs'; import ClosedCaptions from '/imports/ui/components/settings/submenus/closed-captions/component'; -import Audio from '/imports/ui/components/settings/submenus/audio/component'; import Application from '/imports/ui/components/settings/submenus/application/container'; import Participants from '/imports/ui/components/settings/submenus/participants/component'; import Video from '/imports/ui/components/settings/submenus/video/component'; @@ -18,7 +17,6 @@ export default class Settings extends Component { constructor(props) { super(props); - const audio = props.audio; const video = props.video; const application = props.application; const cc = props.cc; @@ -26,14 +24,12 @@ export default class Settings extends Component { this.state = { current: { - audio, video, application, cc, participants, }, saved: { - audio: _.clone(audio), video: _.clone(video), application: _.clone(application), cc: _.clone(cc), @@ -103,10 +99,6 @@ export default class Settings extends Component { Application - - - Audio - Video @@ -128,11 +120,6 @@ export default class Settings extends Component { settings={this.state.current.application} /> - -
- ); - } -}; diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/audio/container.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/audio/container.jsx deleted file mode 100644 index af91c3b19c..0000000000 --- a/bigbluebutton-html5/imports/ui/components/settings/submenus/audio/container.jsx +++ /dev/null @@ -1,17 +0,0 @@ -import React, { Component, PropTypes } from 'react'; -import { createContainer } from 'meteor/react-meteor-data'; -import Audio from './component'; - -class AudioContainer extends Component { - render() { - return ( - - ); - } -} - -export default createContainer(() => { - return {}; -}, AudioContainer); diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss b/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss index ded8814078..0b7df87b8f 100644 --- a/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss +++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/styles.scss @@ -62,10 +62,6 @@ height: 1.75rem; } -.audioMeter { - width: 100%; -} - .pullContentRight { display: flex; justify-content: flex-end; diff --git a/bigbluebutton-html5/imports/ui/components/settings/submenus/video/component.jsx b/bigbluebutton-html5/imports/ui/components/settings/submenus/video/component.jsx index 63e818506d..1c7c28292b 100644 --- a/bigbluebutton-html5/imports/ui/components/settings/submenus/video/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/settings/submenus/video/component.jsx @@ -5,7 +5,7 @@ import styles from '../styles.scss'; import Toggle from '/imports/ui/components/switch/component'; import cx from 'classnames'; -export default class AudioMenu extends BaseMenu { +export default class VideoMenu extends BaseMenu { constructor(props) { super(props); From d585e2f88270690f82d01bcbfd7d28120e541023 Mon Sep 17 00:00:00 2001 From: Anton Georgiev Date: Thu, 23 Mar 2017 09:19:44 -0400 Subject: [PATCH 053/374] moved audio-test component under audio/ --- .../audio-modal/audio-settings/component.jsx | 2 +- .../audio-modal/join-audio/component.jsx | 2 +- .../audio-modal/listen-only/component.jsx | 2 +- .../{ => audio}/audio-test/component.jsx | 56 +++++++++---------- .../{ => audio}/audio-test/container.jsx | 53 +++++++++--------- .../imports/ui/components/audio/styles.scss | 9 +++ .../ui/components/settings/styles.scss | 8 --- 7 files changed, 66 insertions(+), 66 deletions(-) rename bigbluebutton-html5/imports/ui/components/{ => audio}/audio-test/component.jsx (58%) rename bigbluebutton-html5/imports/ui/components/{ => audio}/audio-test/container.jsx (90%) create mode 100644 bigbluebutton-html5/imports/ui/components/audio/styles.scss diff --git a/bigbluebutton-html5/imports/ui/components/audio-modal/audio-settings/component.jsx b/bigbluebutton-html5/imports/ui/components/audio-modal/audio-settings/component.jsx index 367fa6cf8f..27a0946633 100755 --- a/bigbluebutton-html5/imports/ui/components/audio-modal/audio-settings/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio-modal/audio-settings/component.jsx @@ -7,7 +7,7 @@ import styles from '../styles.scss'; import DeviceSelector from '/imports/ui/components/audio/device-selector/component'; import AudioStreamVolume from '/imports/ui/components/audio/audio-stream-volume/component'; import EnterAudioContainer from '/imports/ui/components/enter-audio/container'; -import AudioTestContainer from '/imports/ui/components/audio-test/container'; +import AudioTestContainer from '/imports/ui/components/audio/audio-test/container'; import cx from 'classnames'; class AudioSettings extends React.Component { diff --git a/bigbluebutton-html5/imports/ui/components/audio-modal/join-audio/component.jsx b/bigbluebutton-html5/imports/ui/components/audio-modal/join-audio/component.jsx index 0016bb361a..4f20c146b6 100755 --- a/bigbluebutton-html5/imports/ui/components/audio-modal/join-audio/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio-modal/join-audio/component.jsx @@ -13,7 +13,7 @@ const intlMessages = defineMessages({ }, closeLabel: { id: 'app.audioModal.closeLabel', - } + }, }); class JoinAudio extends React.Component { diff --git a/bigbluebutton-html5/imports/ui/components/audio-modal/listen-only/component.jsx b/bigbluebutton-html5/imports/ui/components/audio-modal/listen-only/component.jsx index 1808373e68..332b570e15 100755 --- a/bigbluebutton-html5/imports/ui/components/audio-modal/listen-only/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio-modal/listen-only/component.jsx @@ -5,7 +5,7 @@ import { clearModal } from '/imports/ui/components/app/service'; import styles from '../styles.scss'; import DeviceSelector from '/imports/ui/components/audio/device-selector/component'; -import AudioTestContainer from '/imports/ui/components/audio-test/container'; +import AudioTestContainer from '/imports/ui/components/audio/audio-test/container'; import EnterAudioContainer from '/imports/ui/components/enter-audio/container'; const intlMessages = defineMessages({ diff --git a/bigbluebutton-html5/imports/ui/components/audio-test/component.jsx b/bigbluebutton-html5/imports/ui/components/audio/audio-test/component.jsx similarity index 58% rename from bigbluebutton-html5/imports/ui/components/audio-test/component.jsx rename to bigbluebutton-html5/imports/ui/components/audio/audio-test/component.jsx index 5ba9931610..2f9507a267 100755 --- a/bigbluebutton-html5/imports/ui/components/audio-test/component.jsx +++ b/bigbluebutton-html5/imports/ui/components/audio/audio-test/component.jsx @@ -1,34 +1,34 @@ import React from 'react'; import Button from '/imports/ui/components/button/component'; -import styles from '../settings/styles.scss'; +import styles from '../styles.scss'; import { defineMessages, injectIntl } from 'react-intl'; class AudioTest extends React.Component { constructor(props) { - super(props); - } - - render() { - const { - intl, - } = this.props; - - return ( -
- {modal} - +