HTML5 - Settings : changed to label

bigbluebutton-html5/imports/locales/en.json

@@ -26,24 +26,24 @@
   "app.failedMessage": "Apologies, trouble connecting to the server.",
   "app.connectingMessage": "Connecting...",
   "app.waitingMessage": "Disconnected. Trying to reconnect in {seconds} seconds...",
-  "app.dropdown.optionsLabel": "Options",
-  "app.dropdown.fullscreenLabel": "Make fullscreen",
-  "app.dropdown.settingsLabel": "Open settings",
-  "app.dropdown.leaveSessionLabel": "Logout",
-  "app.dropdown.fullscreenDesc": "Make the settings menu fullscreen",
-  "app.dropdown.settingsDesc": "Change the general settings",
-  "app.dropdown.leaveSessionDesc": "Leave the meeting",
+  "app.navBar.settingsDropdown.optionsLabel": "Options",
+  "app.navBar.settingsDropdown.fullscreenLabel": "Make fullscreen",
+  "app.navBar.settingsDropdown.settingsLabel": "Open settings",
+  "app.navBar.settingsDropdown.leaveSessionLabel": "Logout",
+  "app.navBar.settingsDropdown.fullscreenDesc": "Make the settings menu fullscreen",
+  "app.navBar.settingsDropdown.settingsDesc": "Change the general settings",
+  "app.navBar.settingsDropdown.leaveSessionDesc": "Leave the meeting",
   "app.leaveConfirmation.title": "Leave Session",
   "app.leaveConfirmation.message": "Do you want to leave this meeting?",
   "app.leaveConfirmation.confirmLabel": "Leave",
   "app.leaveConfirmation.confirmDesc": "Logs you out of the meeting",
   "app.leaveConfirmation.dismissLabel": "Cancel",
   "app.leaveConfirmation.dismissDesc": "Closes and rejects the leave confirmation",
-  "app.actions.actionsLabel": "Actions",
-  "app.actions.options.presentationLabel": "Upload a presentation",
-  "app.actions.options.initPollLabel": "Initiate a poll",
-  "app.actions.options.desktopShareLabel": "Share your screen",
-  "app.actions.options.presentationDesc": "Upload your presentation",
-  "app.actions.options.initPollDesc": "Initiate a poll",
-  "app.actions.options.desktopShareDesc": "Share your screen with others"
+  "app.actionsBar.actionsDropdown.actionsLabel": "Actions",
+  "app.actionsBar.actionsDropdown.presentationLabel": "Upload a presentation",
+  "app.actionsBar.actionsDropdown.initPollLabel": "Initiate a poll",
+  "app.actionsBar.actionsDropdown.desktopShareLabel": "Share your screen",
+  "app.actionsBar.actionsDropdown.presentationDesc": "Upload your presentation",
+  "app.actionsBar.actionsDropdown.initPollDesc": "Initiate a poll",
+  "app.actionsBar.actionsDropdown.desktopShareDesc": "Share your screen with others"
 }

bigbluebutton-html5/imports/ui/components/actions-bar/actions-dropdown/component.jsx

@@ -10,31 +10,31 @@ import DropdownListItem from '/imports/ui/components/dropdown/list/item/componen
 
 const intlMessages = defineMessages({
   actionsLabel: {
-    id: 'app.actions.actionsLabel',
-    defaultMessage: 'Actions button',
+    id: 'app.actionsBar.actionsDropdown.actionsLabel',
+    defaultMessage: 'Actions',
   },
   presentationLabel: {
-    id: 'app.actions.options.presentationLabel',
+    id: 'app.actionsBar.actionsDropdown.presentationLabel',
     defaultMessage: 'Upload a presentation',
   },
   initPollLabel: {
-    id: 'app.actions.options.initPollLabel',
+    id: 'app.actionsBar.actionsDropdown.initPollLabel',
     defaultMessage: 'Initiate a poll',
   },
   desktopShareLabel: {
-    id: 'app.actions.options.desktopShareLabel',
+    id: 'app.actionsBar.actionsDropdown.desktopShareLabel',
     defaultMessage: 'Share your screen',
   },
   presentationDesc: {
-    id: 'app.actions.options.presentationDesc',
+    id: 'app.actionsBar.actionsDropdown.presentationDesc',
     defaultMessage: 'Upload your presentation',
   },
   initPollDesc: {
-    id: 'app.actions.options.initPollDesc',
+    id: 'app.actionsBar.actionsDropdown.initPollDesc',
     defaultMessage: 'Initiate a poll',
   },
   desktopShareDesc: {
-    id: 'app.actions.options.desktopShareDesc',
+    id: 'app.actionsBar.actionsDropdown.desktopShareDesc',
     defaultMessage: 'Share your screen with others',
   },
 });
@@ -45,7 +45,7 @@ const polling = () => {console.log('Should initiate a polling');};
 
 const shareScreen = () => {console.log('Should start screen sharing');};
 
-export default class Actions extends Component {
+class ActionsDropdown extends Component {
   constructor(props) {
     super(props);
   }
@@ -56,7 +56,6 @@ export default class Actions extends Component {
       <Dropdown ref="dropdown">
         <DropdownTrigger>
           <Button
-            role="button"
             label={intl.formatMessage(intlMessages.actionsLabel)}
             icon="circle-add"
             color="primary"
@@ -95,4 +94,4 @@ export default class Actions extends Component {
   }
 }
 
-export default injectIntl(Actions);
+export default injectIntl(ActionsDropdown);

bigbluebutton-html5/imports/ui/components/actions-bar/component.jsx

@@ -3,7 +3,7 @@ import styles from './styles.scss';
 
 import Button from '../button/component';
 
-import Actions from './actions-dropdown/component';
+import ActionsDropdown from './actions-dropdown/component';
 
 export default class ActionsBar extends Component {
   constructor(props) {
@@ -17,7 +17,7 @@ export default class ActionsBar extends Component {
     return (
       <div className={styles.actionsbar}>
         <div className={styles.left}>
-          <Actions />
+          <ActionsDropdown />
         </div>
         <div className={styles.center}>
           <Button

bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx

@@ -16,31 +16,31 @@ import DropdownListSeparator from '/imports/ui/components/dropdown/list/separato
 
 const intlMessages = defineMessages({
   optionsLabel: {
-    id: 'app.dropdown.optionsLabel',
+    id: 'app.navBar.settingsDropdown.optionsLabel',
     defaultMessage: 'Options',
   },
   fullscreenLabel: {
-    id: 'app.dropdown.fullscreenLabel',
+    id: 'app.navBar.settingsDropdown.fullscreenLabel',
     defaultMessage: 'Make fullscreen',
   },
   settingsLabel: {
-    id: 'app.dropdown.settingsLabel',
+    id: 'app.navBar.settingsDropdown.settingsLabel',
     defaultMessage: 'Open settings',
   },
   leaveSessionLabel: {
-    id: 'app.dropdown.leaveSessionLabel',
+    id: 'app.navBar.settingsDropdown.leaveSessionLabel',
     defaultMessage: 'Logout',
   },
   fullscreenDesc: {
-    id: 'app.dropdown.fullscreenDesc',
+    id: 'app.navBar.settingsDropdown.fullscreenDesc',
     defaultMessage: 'Make the settings menu fullscreen',
   },
   settingsDesc: {
-    id: 'app.dropdown.settingsDesc',
+    id: 'app.navBar.settingsDropdown.settingsDesc',
     defaultMessage: 'Change the general settings',
   },
   leaveSessionDesc: {
-    id: 'app.dropdown.leaveSessionDesc',
+    id: 'app.navBar.settingsDropdown.leaveSessionDesc',
     defaultMessage: 'Leave the meeting',
   },
 });
@@ -75,7 +75,7 @@ const openSettings = () => showModal(<Settings />);
 
 const openLogoutConfirmation = () => showModal(<LogoutConfirmation />);
 
-export default class SettingsDropdown extends Component {
+class SettingsDropdown extends Component {
   constructor(props) {
     super(props);
   }
@@ -86,7 +86,6 @@ export default class SettingsDropdown extends Component {
       <Dropdown ref="dropdown">
         <DropdownTrigger>
           <Button
-            role="button"
             label={intl.formatMessage(intlMessages.optionsLabel)}
             icon="more"
             ghost={true}