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

Merge branch 'merge-polling-with-master' into broadcast-layout

Browse Source
This commit is contained in:
Richard Alam 2014-06-06 22:14:32 -07:00
commit 0dd1b37afd
2 changed files with 20 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -526,17 +526,12 @@ bbb.users.settings.unlockAll=Unlock All Users
bbb.users.settings.roomIsLocked=Locked by default
bbb.users.settings.roomIsMuted=Muted by default
bbb.lockSettings.save = Save
bbb.lockSettings.save.tooltip = Save and apply these configurations
bbb.lockSettings.save = Apply
bbb.lockSettings.save.tooltip = Apply lock settings
bbb.lockSettings.cancel = Cancel
bbb.lockSettings.cancel.toolTip = Close this window without saving
bbb.lockSettings.moderatorLocking = Moderator locking
bbb.lockSettings.privateChat.disabled = [Disabled] Private Chat
bbb.lockSettings.publicChat.disabled = [Disabled] Public Chat
bbb.lockSettings.webcam.disabled = [Disabled] Webcam
bbb.lockSettings.microphone.disabled = [Disabled] Microphone
bbb.lockSettings.layout.disabled = [Disabled] Layout
bbb.lockSettings.privateChat = Private Chat
bbb.lockSettings.publicChat = Public Chat
bbb.lockSettings.webcam = Webcam
@ -544,4 +539,4 @@ bbb.lockSettings.microphone = Microphone
bbb.lockSettings.layout = Layout
bbb.lockSettings.title=Lock Settings
bbb.lockSettings.feature=Feature
bbb.lockSettings.enabled=Enabled
bbb.lockSettings.enabled=Locked

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

@ -29,12 +29,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Script>
<![CDATA[
import com.asfusion.mate.events.Dispatcher;
import com.asfusion.mate.events.Dispatcher;
import mx.events.CloseEvent;
import mx.events.FlexEvent;
import mx.managers.PopUpManager;
import mx.managers.PopUpManager;
import org.bigbluebutton.common.Images;
import org.bigbluebutton.core.events.LockControlEvent;
import org.bigbluebutton.core.managers.UserManager;
@ -68,11 +66,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
private function onSaveClicked():void {
var event:LockControlEvent = new LockControlEvent(LockControlEvent.SAVE_LOCK_SETTINGS);
var lockSettings:LockSettingsVO = new LockSettingsVO(!enableWebcam.selected,
!enableMicrophone.selected,
!enablePrivateChat.selected,
!enablePublicChat.selected,
!enableLayout.selected);
var lockSettings:LockSettingsVO = new LockSettingsVO(enableWebcam.selected,
enableMicrophone.selected,
enablePrivateChat.selected,
enablePublicChat.selected,
enableLayout.selected);
event.payload = lockSettings.toMap();
@ -104,46 +102,46 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
</mx:HBox>
<mx:HBox verticalAlign="top" width="100%">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle"
text="{disableCam ? ResourceUtil.getInstance().getString('bbb.lockSettings.webcam.disabled') : ResourceUtil.getInstance().getString('bbb.lockSettings.webcam')}" />
text="{ResourceUtil.getInstance().getString('bbb.lockSettings.webcam')}" />
<mx:HBox width="30%">
<mx:Spacer width="50%" />
<mx:CheckBox id="enableWebcam" selected="{!disableCam}" />
<mx:CheckBox id="enableWebcam" selected="{disableCam}" />
<mx:Spacer width="50%" />
</mx:HBox>
</mx:HBox>
<mx:HBox verticalAlign="top" width="100%">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle"
text="{disableMic ? ResourceUtil.getInstance().getString('bbb.lockSettings.microphone.disabled') : ResourceUtil.getInstance().getString('bbb.lockSettings.microphone')}" />
text="{ResourceUtil.getInstance().getString('bbb.lockSettings.microphone')}" />
<mx:HBox width="30%">
<mx:Spacer width="50%" />
<mx:CheckBox id="enableMicrophone" selected="{!disableMic}"/>
<mx:CheckBox id="enableMicrophone" selected="{disableMic}"/>
<mx:Spacer width="50%" />
</mx:HBox>
</mx:HBox>
<mx:HBox verticalAlign="top" width="100%">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle"
text="{disablePubChat ? ResourceUtil.getInstance().getString('bbb.lockSettings.publicChat.disabled') : ResourceUtil.getInstance().getString('bbb.lockSettings.publicChat')}" />
text="{ResourceUtil.getInstance().getString('bbb.lockSettings.publicChat')}" />
<mx:HBox width="30%">
<mx:Spacer width="50%" />
<mx:CheckBox id="enablePublicChat" selected="{!disablePubChat}"/>
<mx:CheckBox id="enablePublicChat" selected="{disablePubChat}"/>
<mx:Spacer width="50%" />
</mx:HBox>
</mx:HBox>
<mx:HBox verticalAlign="top" width="100%">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle"
text="{disablePrivChat ? ResourceUtil.getInstance().getString('bbb.lockSettings.privateChat.disabled') : ResourceUtil.getInstance().getString('bbb.lockSettings.privateChat')}" />
text="{ResourceUtil.getInstance().getString('bbb.lockSettings.privateChat')}" />
<mx:HBox width="30%">
<mx:Spacer width="50%" />
<mx:CheckBox id="enablePrivateChat" selected="{!disablePrivChat}"/>
<mx:CheckBox id="enablePrivateChat" selected="{disablePrivChat}"/>
<mx:Spacer width="50%" />
</mx:HBox>
</mx:HBox>
<mx:HBox verticalAlign="top" width="100%">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle"
text="{disablePrivChat ? ResourceUtil.getInstance().getString('bbb.lockSettings.layout.disabled') : ResourceUtil.getInstance().getString('bbb.lockSettings.layout')}" />
text="{ResourceUtil.getInstance().getString('bbb.lockSettings.layout')}" />
<mx:HBox width="30%">
<mx:Spacer width="50%" />
<mx:CheckBox id="enableLayout" selected="{!lockedLayout}"/>
<mx:CheckBox id="enableLayout" selected="{lockedLayout}"/>
<mx:Spacer width="50%" />
</mx:HBox>
</mx:HBox>