BigBlueButton/bigbluebutton-Github
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:bigbluebutton/bigbluebutton

Browse Source
This commit is contained in:
Jesus Federico 2016-02-09 13:31:45 -08:00
commit 3346a93a72
10 changed files with 64 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

88
bigbluebutton-client/branding/default/style/css/BBBDefault.css
View File

@ -116,9 +116,9 @@ Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle, .cameraD
highlightAlphas: 0.4, 0;
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
themeColor: haloBlue;
fontFamily: Arial;
@ -180,10 +180,10 @@ Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle, .cameraD
DataGrid {
backgroundColor: #e1e2e5;
rollOverColor: #f3f3f3;
textRollOverColor: #5e5f63;
textRollOverColor: #3f3f41;
selectionColor: #e1e2e5;
color: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textSelectedColor: #3f3f41;
dropShadowEnabled: false;
fontFamily: arial;
fontSize: 11;
@ -191,7 +191,7 @@ DataGrid {
}
.mydataGridHeaderStyle {
color: #5e5f63;
color: #3f3f41;
fontFamily: arial;
fontSize: 12;
}
@ -209,9 +209,9 @@ DataGrid {
highlightAlphas: 0.4, 0;
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
themeColor: haloBlue;
fontFamily: Arial;
@ -303,9 +303,9 @@ DataGrid {
highlightAlphas: 0.4, 0;
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
themeColor: haloBlue;
fontFamily: Arial;
@ -363,16 +363,16 @@ DataGrid {
}
.presentationZoomSliderLabelStyle {
color: #5e5f63;
color: #3f3f41;
fontFamily: Arial;
}
.deskshareControlButtonStyle {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 17;
}
@ -380,9 +380,9 @@ DataGrid {
.videoMuteButtonStyle, .videoUnmutedButtonStyle, .videoSwitchPresenterButtonStyle, .videoEjectUserButtonStyle, .videoPrivateChatButtonStyle {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 17;
}
@ -392,8 +392,8 @@ DataGrid {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #ffffff;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 17;
icon: Embed('assets/images/webcam-muted.png');
@ -445,9 +445,9 @@ TitleWindow {
.presentationUploadChooseFileButtonStyle {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
}
@ -455,9 +455,9 @@ TitleWindow {
.presentationUploadCancelButtonStyle {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
}
@ -465,9 +465,9 @@ TitleWindow {
.presentationUploadShowButtonStyle {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
}
@ -475,9 +475,9 @@ TitleWindow {
.presentationUploadDeleteButtonStyle {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
icon: Embed('assets/images/trash.png');
@ -536,9 +536,9 @@ TitleWindow {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
rollOverColor: #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
}
@ -547,9 +547,9 @@ TitleWindow {
fillAlphas: 1, 1, 1, 1;
fillColors: #fefeff, #e1e2e5, #ffffff, #eeeeee;
rollOverColor: #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
icon: Embed('assets/images/headset.png');
@ -559,9 +559,9 @@ TitleWindow {
fillAlphas: 1, 1, 1, 1;
fillColors: #ffffff, #eeeeee, #ffffff, #eeeeee;
rollOverColor: #eeeeee;
color: #5e5f63;
textRollOverColor: #5e5f63;
textSelectedColor: #5e5f63;
color: #3f3f41;
textRollOverColor: #3f3f41;
textSelectedColor: #3f3f41;
borderColor: #b9babc;
cornerRadius: 5;
}
@ -741,7 +741,7 @@ MDIWindow { /*None of the following properties are overridden by the MDIWindow c
}
.mdiWindowTitle {
color: #5e5f63;
color: #3f3f41;
fontFamily: Arial;
fontSize: 12;
fontWeight: bold;

6
bigbluebutton-client/locale/en_US/bbbResources.properties
View File

@ -152,11 +152,7 @@ bbb.users.usersGrid.statusItemRenderer = Status
bbb.users.usersGrid.statusItemRenderer.changePresenter = Click To Make Presenter
bbb.users.usersGrid.statusItemRenderer.presenter = Presenter
bbb.users.usersGrid.statusItemRenderer.moderator = Moderator
bbb.users.usersGrid.statusItemRenderer.raiseHand = Hand Raised
bbb.users.usersGrid.statusItemRenderer.happy = Happy
bbb.users.usersGrid.statusItemRenderer.unhappy = Unhappy
bbb.users.usersGrid.statusItemRenderer.confused = Confused
bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear my status
bbb.users.usersGrid.statusItemRenderer.clearStatus = Clear status
bbb.users.usersGrid.statusItemRenderer.viewer = Viewer
bbb.users.usersGrid.statusItemRenderer.streamIcon.toolTip = Sharing webcam.
bbb.users.usersGrid.statusItemRenderer.presIcon.toolTip = Is Presenter.

4
bigbluebutton-client/resources/prod/BigBlueButton.html
View File

@ -170,7 +170,7 @@
</div>
</div>
</div>
<button id="enterFlash" type="button" class="visually-hidden" onclick="startFlashFocus();" value="Click to focus the client"></button>
<div id="clientReady" aria-atomic="false" aria-live="polite"></div>
<button id="enterFlash" type="button" class="visually-hidden" onclick="startFlashFocus();">Set focus to client</button>
<div id="clientReady" aria-atomic="false" aria-live="polite" class="visually-hidden"></div>
</body>
</html>

20
bigbluebutton-client/resources/prod/lib/bigbluebutton.js
View File

@ -1,23 +1,3 @@
(function($){
$.fn.bigbluebutton = function(options){
$('body').append('<div id="speechArea" style="visibility:hidden"></div>');
function sendSpeechMessage(){
var speech = $('#speechArea');
if (speech.html() !== ""){
document.getElementById('BigBlueButton').sendChatMessage(speech.html());
speech.html("");
}
setTimeout(sendSpeechMessage, 300);
}
sendSpeechMessage();
}
})(jQuery);
$(function () { $.fn.bigbluebutton(); });
$(function () {
setTimeout(function(){
$('#BigBlueButton').focus();

1
bigbluebutton-client/src/org/bigbluebutton/main/model/ShortcutOptions.as
View File

@ -88,7 +88,6 @@ package org.bigbluebutton.main.model
}
if (deskshare){generalResource.push('bbb.shortcutkey.share.desktop');}
if (webcam){generalResource.push('bbb.shortcutkey.share.webcam');}
if (polling){generalResource.push('bbb.shortcutkey.polling.buttonClick');}
generalResource.push('bbb.shortcutkey.shortcutWindow');
generalResource.push('bbb.shortcutkey.logout');

4
bigbluebutton-client/src/org/bigbluebutton/main/views/MainApplicationShell.mxml
View File

@ -269,8 +269,6 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
public function openShortcutHelpWindow(e:Event = null):void{
if (scWindow == null) {
scWindow = new ShortcutHelpWindow();
scWindow.width = 300;
scWindow.height = 300;
}
if (scWindow.minimized)
@ -280,7 +278,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
scWindow.restore();
mdiCanvas.windowManager.add(scWindow);
mdiCanvas.windowManager.absPos(scWindow, mdiCanvas.width/2 - 150, mdiCanvas.height/2 - 150);
mdiCanvas.windowManager.absPos(scWindow, mdiCanvas.width/2 - scWindow.width/2, mdiCanvas.height/2 - scWindow.height/2);
scWindow.focusHead();
}

4
bigbluebutton-client/src/org/bigbluebutton/main/views/ShortcutHelpWindow.mxml Normal file → Executable file
View File

@ -24,6 +24,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
xmlns:mx="http://www.adobe.com/2006/mxml"
xmlns:common="org.bigbluebutton.common.*"
showCloseButton="true"
height="350"
width="430"
initialize="init()"
creationComplete="onCreationComplete()"
xmlns:mate="http://mate.asfusion.com/"
@ -256,7 +258,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:ComboBox>
<mx:DataGrid id="keyList" draggableColumns="false" dataProvider="{shownKeys}" width="100%" height="100%">
<mx:columns>
<mx:DataGridColumn dataField="shortcut" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/>
<mx:DataGridColumn dataField="shortcut" width="150" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.shortcut')}"/>
<mx:DataGridColumn dataField="func" headerText="{ResourceUtil.getInstance().getString('bbb.shortcuthelp.headers.function')}"/>
</mx:columns>
</mx:DataGrid>

10
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/AddChatTabBox.mxml
View File

@ -58,6 +58,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function onCreationComplete():void{
users = UserManager.getInstance().getConference().users;
if (!chatOptions.privateEnabled) {
usersList.includeInLayout = usersList.visible = false;
}
if (fontSizes.indexOf(chatOptions.fontSize) != -1) {
cmbFontSize.selectedItem = chatOptions.fontSize;
changeFontSize(); // have to manually call it because the change event doesn't fire
@ -107,8 +112,13 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
* For the Options tab focus the users list instead of the text area.
**/
public function focusToTextMessageArea():void {
if (usersList.visible) {
usersList.setFocus();
usersList.drawFocus(true);
} else {
cmbFontSize.setFocus();
cmbFontSize.drawFocus(true);
}
}
private function lockSettingsChanged(e:Event):void {

6
bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatView.mxml
View File

@ -91,10 +91,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
openChatBoxFor(PUBLIC_CHAT_USERID, true);
makePublicChatUncloseable();
if (chatOptions.privateEnabled) {
createAddTabBox();
makeAddPrivateChatUncloseable();
}
createAddTabBox();
makeAddPrivateChatUncloseable();
ResourceUtil.getInstance().addEventListener(Event.CHANGE, localeChanged); // Listen for locale changing

2
bigbluebutton-client/src/org/bigbluebutton/modules/users/views/StatusItemRenderer.mxml
View File

@ -132,7 +132,7 @@
emojiBtn.enabled = true;
} else if (data.hasEmojiStatus) {
emojiImg.source = images["emoji_" + data.emojiStatus];
emojiImg.toolTip = ResourceUtil.getInstance().getString('bbb.users.usersGrid.statusItemRenderer.' + data.emojiStatus) + " - " + data.emojiStatusTime.hours + ":" + data.emojiStatusTime.minutes + ":" + data.emojiStatusTime.seconds;
emojiImg.toolTip = ResourceUtil.getInstance().getString('bbb.users.emojiStatus.' + data.emojiStatus) + " - " + data.emojiStatusTime.hours + ":" + data.emojiStatusTime.minutes + ":" + data.emojiStatusTime.seconds;
emojiImg.visible = true;
emojiBtn.visible = false;
emojiBtn.enabled = false;