HTML5 - fixes merge conflicts bw master and this branch

bigbluebutton-html5/client/stylesheets/bbb-icons.css

@@ -44,15 +44,6 @@
 .icon-bbb_audio_close:before {
   content: "\e901";
 }
-.icon-bbb_applause:before {
-  content: "\e924";
-}
-.icon-bbb_thumbs_down:before {
-  content: "\e92d";
-}
-.icon-bbb_thumbs_up:before {
-  content: "\e92e";
-}
 .icon-bbb-fullscreen:before {
   content: "\e92b";
 }
@@ -125,12 +116,6 @@
 .icon-bbb-undecided:before {
   content: "\e908";
 }
-.icon-bbb-time:before {
-  content: "\e909";
-}
-.icon-bbb-sad:before {
-  content: "\e90a";
-}
 .icon-bbb-right-arrow:before {
   content: "\e90b";
 }
@@ -143,9 +128,6 @@
 .icon-bbb-left-arrow:before {
   content: "\e90e";
 }
-.icon-bbb-happy:before {
-  content: "\e90f";
-}
 .icon-bbb-hand:before {
   content: "\e910";
 }
@@ -188,6 +170,45 @@
 .rotate-quarter {
   transform: rotate(-90deg);
 }
+.icon-bbb-fit-to-screen:before {
+    content: "\e92a";
+}
+.icon-bbb-full-screen:before {
+    content: "\e92b";
+}
+.icon-bbb-logout2:before {
+  content: "\e901";
+}
+.icon-bbb-line-tool:before {
+  content: "\e91d";
+}
+.icon-bbb-circle-tool:before {
+  content: "\e91e";
+}
+.icon-bbb-triangle-tool:before {
+  content: "\e91f";
+}
+.icon-bbb-square-tool:before {
+  content: "\e920";
+}
+.icon-bbb-text-tool:before {
+  content: "\e921";
+}
+.icon-bbb-plus:before {
+  content: "\e922";
+}
+.icon-bbb-fit-to-width:before {
+  content: "\e923";
+}
+.icon-bbb-undo:before {
+  content: "\e925";
+}
+.icon-bbb-pen-tool:before {
+  content: "\e926";
+}
+.icon-bbb-lock:before {
+  content: "\e927";
+}
 
 /* Aliases for emoji status */
 .icon-bbb-away:before {
@@ -199,3 +220,18 @@
 .icon-bbb-neutral:before {
   content: "\e908";
 }
+.icon-bbb-happy:before {
+  content: "\e90f";
+}
+.icon-bbb-sad:before {
+  content: "\e90a";
+}
+.icon-bbb-applause:before {
+  content: "\e924";
+}
+.icon-bbb-thumbsUp:before {
+  content: "\e92e";
+}
+.icon-bbb-thumbsDown:before {
+  content: "\e92d";
+}

bigbluebutton-html5/imports/locales/en.json

@@ -74,6 +74,12 @@
   "app.actionsBar.emojiMenu.happyDesc": "Change your status to happy",
   "app.actionsBar.emojiMenu.clearLabel": "Clear",
   "app.actionsBar.emojiMenu.clearDesc": "Clear your status",
+  "app.actionsBar.emojiMenu.applauseLabel": "Applaud",
+  "app.actionsBar.emojiMenu.applauseDesc": "Change your status to applause",
+  "app.actionsBar.emojiMenu.thumbsupLabel": "Thumbs up",
+  "app.actionsBar.emojiMenu.thumbsupDesc": "Change your status to thumbs up",
+  "app.actionsBar.emojiMenu.thumbsdownLabel": "Thumbs down",
+  "app.actionsBar.emojiMenu.thumbsdownDesc": "Change your status to thumbs down",
   "app.breakoutJoinConfirmation.title": "Join Breakout Room",
   "app.breakoutJoinConfirmation.message": "Do you want to join",
   "app.breakoutJoinConfirmation.confirmLabel": "Join",

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

@@ -55,22 +55,23 @@ class EmojiMenu extends Component {
             />
             <DropdownListItem
               icon="hand"
+              icon="raiseHand"
               label={intl.formatMessage(intlMessages.raiseLabel)}
               description={intl.formatMessage(intlMessages.raiseDesc)}
               onClick={() => actions.setEmojiHandler('raiseHand')}
             />
             <DropdownListItem
               icon="undecided"
+              icon="happy"
+              label={intl.formatMessage(intlMessages.happyLabel)}
+              description={intl.formatMessage(intlMessages.happyDesc)}
+              onClick={() => actions.setEmojiHandler('happy')}
+            />
+            <DropdownListItem
+              icon="neutral"
               label={intl.formatMessage(intlMessages.undecidedLabel)}
               description={intl.formatMessage(intlMessages.undecidedDesc)}
               onClick={() => actions.setEmojiHandler('neutral')}
-
-            />
-            <DropdownListItem
-              icon="confused"
-              label={intl.formatMessage(intlMessages.confusedLabel)}
-              description={intl.formatMessage(intlMessages.confusedDesc)}
-              onClick={() => actions.setEmojiHandler('confused')}
             />
             <DropdownListItem
               icon="sad"
@@ -79,10 +80,34 @@ class EmojiMenu extends Component {
               onClick={() => actions.setEmojiHandler('sad')}
             />
             <DropdownListItem
-              icon="happy"
-              label={intl.formatMessage(intlMessages.happyLabel)}
-              description={intl.formatMessage(intlMessages.happyDesc)}
-              onClick={() => actions.setEmojiHandler('happy')}
+              icon="confused"
+              label={intl.formatMessage(intlMessages.confusedLabel)}
+              description={intl.formatMessage(intlMessages.confusedDesc)}
+              onClick={() => actions.setEmojiHandler('confused')}
+            />
+            <DropdownListItem
+              icon="away"
+              label={intl.formatMessage(intlMessages.awayLabel)}
+              description={intl.formatMessage(intlMessages.awayDesc)}
+              onClick={() => actions.setEmojiHandler('away')}
+            />
+            <DropdownListItem
+              icon="thumbsUp"
+              label={intl.formatMessage(intlMessages.thumbsupLabel)}
+              description={intl.formatMessage(intlMessages.thumbsupDesc)}
+              onClick={() => actions.setEmojiHandler('thumbsUp')}
+            />
+            <DropdownListItem
+              icon="thumbsDown"
+              label={intl.formatMessage(intlMessages.thumbsdownLabel)}
+              description={intl.formatMessage(intlMessages.thumbsdownDesc)}
+              onClick={() => actions.setEmojiHandler('thumbsDown')}
+            />
+            <DropdownListItem
+              icon="applause"
+              label={intl.formatMessage(intlMessages.applauseLabel)}
+              description={intl.formatMessage(intlMessages.applauseDesc)}
+              onClick={() => actions.setEmojiHandler('applause')}
             />
             <DropdownListSeparator/>
             <DropdownListItem
@@ -173,6 +198,36 @@ const intlMessages = defineMessages({
     id: 'app.actionsBar.emojiMenu.clearDesc',
     defaultMessage: 'Clear your status',
   },
+
+  // For applause status
+  applauseLabel: {
+    id: 'app.actionsBar.emojiMenu.applauseLabel',
+    defaultMessage: 'Applause',
+  },
+  applauseDesc: {
+    id: 'app.actionsBar.emojiMenu.applauseDesc',
+    defaultMessage: 'Change your status to applause',
+  },
+
+  // For thumbs up status
+  thumbsupLabel: {
+    id: 'app.actionsBar.emojiMenu.thumbsupLabel',
+    defaultMessage: 'Thumbs up',
+  },
+  thumbsupDesc: {
+    id: 'app.actionsBar.emojiMenu.thumbsupDesc',
+    defaultMessage: 'Change your status to thumbs up',
+  },
+
+  // For thumbs-down status
+  thumbsdownLabel: {
+    id: 'app.actionsBar.emojiMenu.thumbsdownLabel',
+    defaultMessage: 'Thumbs down',
+  },
+  thumbsdownDesc: {
+    id: 'app.actionsBar.emojiMenu.thumbsdownDesc',
+    defaultMessage: 'Change your status to thumbs down',
+  },
 });
 
 EmojiMenu.propTypes = propTypes;