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

Removed spacers when possible to make the flash display list lighter.

Browse Source
This commit is contained in:
Ghazi Triki 2014-08-14 21:02:01 +01:00
parent f97dd3f018
commit 89f6411e9b
15 changed files with 82 additions and 169 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bigbluebutton-client/src/org/bigbluebutton/main/views/ChromeChangeMicImage.mxml
View File

@ -78,8 +78,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Image source="@Embed('assets/chrome-reload-page.png')"/>
</mx:HBox>
<mx:HRule width="100%"/>
<mx:Spacer height="10"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18">
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:Text width="100%" text="If no microphone worked, try joining the voice conference using Flash."
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Button id="noButton"

3
bigbluebutton-client/src/org/bigbluebutton/main/views/FirefoxChangeMicImage.mxml
View File

@ -83,8 +83,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Image source="@Embed('assets/ff-show-mic.png')"/>
</mx:HBox>
<mx:HRule width="100%"/>
<mx:Spacer height="10"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18">
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:Text width="100%" text="If no microphone worked, try joining the voice conference using Flash."
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Button id="noButton"

6
bigbluebutton-client/src/org/bigbluebutton/main/views/FlashMicSettings.mxml
View File

@ -297,8 +297,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
</mx:HBox>
<mx:HRule width="100%"/>
<mx:Spacer height="10"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18">
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}"
@ -365,8 +364,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<!-- Play Sound, Join and Cancel buttons -->
<mx:HRule width="100%"/>
<mx:Spacer height="10"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18">
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:Button id="echoTestButton" label="Next"
click="echoTestButtonClickHandler()" styleName="micSettingsWindowPlaySoundButtonStyle"
toolTip="{ResourceUtil.getInstance().getString('bbb.micSettings.playSound.toolTip')}"/>

3
bigbluebutton-client/src/org/bigbluebutton/main/views/LockSettings.mxml
View File

@ -95,8 +95,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
tabIndex="{baseIndex}" width="100%" left="0"/>
<mx:HRule width="100%"/>
<mx:Spacer height="20"/>
<mx:HBox verticalAlign="top" width="100%">
<mx:HBox verticalAlign="top" width="100%" paddingTop="20">
<mx:Label width="70%" styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.feature')}" fontWeight="bold" />
<mx:Label styleName="lockSettingsDefaultLabelStyle" text="{ResourceUtil.getInstance().getString('bbb.lockSettings.enabled')}" fontWeight="bold" />
</mx:HBox>

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

@ -588,8 +588,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<mx:Label
htmlText="{ResourceUtil.getInstance().getString('bbb.mainshell.copyrightLabel2',[appVersion])}"
id="copyrightLabel2"
selectable="false" />
<mx:Spacer width="20"/>
selectable="false" paddingRight="20"/>
<mx:Spacer width="100%" id="spacer" />
<mx:Label
text="[Tunnelling]"

3
bigbluebutton-client/src/org/bigbluebutton/main/views/WebRTCEchoTest.mxml
View File

@ -164,8 +164,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
</mx:HBox>
<mx:HRule width="100%"/>
<mx:Spacer height="10"/>
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18">
<mx:HBox width="100%" horizontalAlign="right" horizontalGap="18" paddingTop="10">
<mx:Text width="100%" text="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestMicPrompt')}"
styleName="micSettingsWindowSpeakIntoMicLabelStyle" />
<mx:Button id="yesButton" label="{ResourceUtil.getInstance().getString('bbb.micSettings.echoTestAudioYes')}"

12
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultBarChartPanel.mxml
View File

@ -39,13 +39,10 @@
]]>
</mx:Script>
<mx:VBox width="100%" height="100%">
<mx:Spacer height="5"/>
<mx:HBox width="100%" height="25" horizontalAlign="center">
<mx:Spacer width="3"/>
<mx:Label text="{_question}" fontSize="12" styleName="micSettingsWindowTitleStyle"/>
<mx:HBox width="100%" height="25" horizontalAlign="center" paddingTop="5">
<mx:Label text="{_question}" fontSize="12" styleName="micSettingsWindowTitleStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:VBox width="100%" height="100%" horizontalAlign="center">
<mx:VBox width="100%" height="100%" horizontalAlign="center" paddingTop="5">
<mx:ColumnChart id="barChart" dataProvider="{_responses}" showDataTips="true" width="100%" height="100%">
<mx:horizontalAxis>
<mx:CategoryAxis dataProvider="{_responses}" categoryField="response" />
@ -55,8 +52,7 @@
</mx:series>
</mx:ColumnChart>
<mx:HBox width="100%" horizontalAlign="center" borderStyle="none">
<mx:Spacer width="5"/>
<mx:Legend dataProvider="{barChart}"/>
<mx:Legend dataProvider="{barChart}" paddingLeft="5"/>
</mx:HBox>
</mx:VBox>
</mx:VBox>

12
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/DisplayResultPieChartPanel.mxml
View File

@ -40,13 +40,10 @@
]]>
</mx:Script>
<mx:VBox width="100%" height="100%">
<mx:Spacer height="5"/>
<mx:HBox width="100%" height="25" horizontalAlign="center">
<mx:Spacer width="3"/>
<mx:Label text="{_question}" fontSize="12" styleName="micSettingsWindowTitleStyle"/>
<mx:HBox width="100%" height="25" horizontalAlign="center" paddingTop="5">
<mx:Label text="{_question}" fontSize="12" styleName="micSettingsWindowTitleStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:VBox width="100%" height="100%" horizontalAlign="center">
<mx:VBox width="100%" height="100%" horizontalAlign="center" paddingTop="5">
<mx:PieChart id="pieChart" dataProvider="{_responses}" showDataTips="true"
width="100%" height="100%">
<mx:series>
@ -55,9 +52,8 @@
</mx:series>
</mx:PieChart>
<mx:HBox width="100%" horizontalAlign="center" borderStyle="none">
<mx:Spacer width="5"/>
<mx:Legend dataProvider="{pieChart}" direction="horizontal" borderStyle="none"
labelPlacement="left" horizontalGap="10" width="100%" />
labelPlacement="left" horizontalGap="10" width="100%" paddingLeft="5"/>
</mx:HBox>
</mx:VBox>

55
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollCreatePanel.mxml
View File

@ -81,62 +81,41 @@
]]>
</mx:Script>
<mx:HBox width="100%" height="25" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label text="Create New Poll" styleName="micSettingsWindowTitleStyle"/>
<mx:Label text="Create New Poll" styleName="micSettingsWindowTitleStyle" paddingLeft="3"/>
</mx:HBox>
<mx:VBox width="90%" height="90%" horizontalAlign="center" borderStyle="solid" borderThickness="1">
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="titleLabel" text="Title" styleName="presentationNamesLabelStyle"/>
<mx:Label id="titleLabel" text="Title" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="25">
<mx:Spacer width="10"/>
<mx:TextInput id="pollTitle" width="100%" text="Type in your title" editable="true" maxChars="250"/>
<mx:HBox width="96%" height="25" paddingTop="5">
<mx:TextInput id="pollTitle" width="100%" text="Type in your title" editable="true" maxChars="250" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="questionLabel" text="Question" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="100%" height="20" horizontalAlign="left" paddingTop="3">
<mx:Label id="questionLabel" text="Question" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="75">
<mx:Spacer width="10"/>
<mx:TextArea id="pollQuestion" width="100%" height="100%" wordWrap="true" text="Type in your questions" editable="true" maxChars="1000"/>
<mx:HBox width="96%" height="75" paddingTop="5">
<mx:TextArea id="pollQuestion" width="100%" height="100%" wordWrap="true" text="Type in your questions" editable="true" maxChars="1000" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="answersLabel" text="Answers" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="100%" height="20" horizontalAlign="left" paddingTop="3">
<mx:Label id="answersLabel" text="Answers" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="10"/>
<mx:Label id="hintAnswersLabel" text="Start every answer with a new line" fontSize="12" styleName="presentationNamesLabelStyle"/>
<mx:Label id="hintAnswersLabel" text="Start every answer with a new line" fontSize="12" styleName="presentationNamesLabelStyle" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="150">
<mx:Spacer width="10"/>
<mx:TextArea id="pollAnswers" width="100%" height="100%" wordWrap="true" text="Answers" maxChars="2000"/>
<mx:HBox width="96%" height="150" paddingTop="5">
<mx:TextArea id="pollAnswers" width="100%" height="100%" wordWrap="true" text="Answers" maxChars="2000" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:CheckBox id="multiple_response"
<mx:CheckBox id="multiple_response" paddingTop="3" paddingBottom="5"
label="{ResourceUtil.getInstance().getString('bbb.polling.createPoll.moreThanOneResponse')}"
tabIndex="{baseIndex+4}"/>
<mx:Spacer height="5"/>
</mx:VBox>
<mx:HBox width="100%" height="35" horizontalAlign="right">
<mx:Button label="Create" styleName="presentationUploadShowButtonStyle" click="createPoll()"/>
<mx:Spacer width="5"/>
<mx:Button label="Cancel" styleName="presentationUploadShowButtonStyle" click="close()"/>
<mx:Spacer width="5"/>
<mx:HBox width="100%" height="35" horizontalAlign="right" paddingBottom="5">
<mx:Button label="Create" styleName="presentationUploadShowButtonStyle" click="createPoll()" paddingRight="5"/>
<mx:Button label="Cancel" styleName="presentationUploadShowButtonStyle" click="close()" paddingRight="5"/>
</mx:HBox>
<mx:Spacer height="5"/>
</mx:Panel>

24
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollMainPanel.mxml
View File

@ -53,40 +53,30 @@
<mx:VBox width="100%" height="50%" borderStyle="solid" borderThickness="1">
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="pollsLabel" text="Select a poll from the list." styleName="presentationNamesLabelStyle"/>
<mx:Label id="pollsLabel" text="Select a poll from the list." styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="150">
<mx:Spacer width="10"/>
<mx:HBox width="96%" height="150" paddingTop="5" paddingBottom="3">
<mx:List id="pollsList" width="100%" height="100%" alternatingItemColors="[#EFEFEF, #FEFEFE]" allowMultipleSelection="false"
itemRenderer="org.bigbluebutton.modules.polling.views.CreatedPollsRenderer"
dragEnabled="false" dataProvider="{_polls}">
dragEnabled="false" dataProvider="{_polls}" paddingLeft="10">
</mx:List>
</mx:HBox>
<mx:Spacer height="3"/>
</mx:VBox>
<mx:Spacer height="5"/>
<mx:HBox width="100%" height="25" horizontalAlign="left">
<mx:HBox width="100%" height="25" horizontalAlign="left" paddingTop="5">
<mx:Label text="Custom Poll" styleName="micSettingsWindowTitleStyle"/>
</mx:HBox>
<mx:VBox width="100%" height="15%" borderStyle="solid" borderThickness="1">
<mx:HBox width="100%" height="25">
<mx:Spacer width="5"/>
<mx:Label id="customPollsLabel" text="Create a custom poll" styleName="presentationNamesLabelStyle"/>
<mx:Label id="customPollsLabel" text="Create a custom poll" styleName="presentationNamesLabelStyle" paddingLeft="5"/>
</mx:HBox>
<mx:HBox width="100%" height="30" horizontalAlign="center">
<mx:HBox width="100%" height="30" horizontalAlign="center" paddingBottom="3">
<mx:Button label="Create Custom Poll" height="25" click="createPoll()"/>
</mx:HBox>
<mx:Spacer height="3"/>
</mx:VBox>
<mx:Spacer height="5"/>
<mx:HBox width="100%" height="35" horizontalAlign="right">
<mx:HBox width="100%" height="35" horizontalAlign="right" paddingTop="5">
<mx:Button label="Close" styleName="presentationUploadShowButtonStyle" click="close()"/>
</mx:HBox>
</mx:VBox>

19
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollResultPanel.mxml
View File

@ -88,27 +88,22 @@
<mx:RadioButton groupName="charttype" id="pieChart" label="Pie Chart" value="piechart" width="100" />
</mx:HBox>
-->
<mx:Spacer id="spacer" height="5"/>
<mx:HBox height="5%" width="100%" horizontalAlign="right">
<mx:Spacer width="5"/>
<mx:Label text="Time remaining:" fontSize="12" styleName="micSettingsWindowTitleStyle" visible="true" />
<mx:Label id="timeRemaining" text="{pollTimeRemaining}" fontSize="12" styleName="micSettingsWindowTitleStyle" visible="true" />
<mx:Spacer width="100%"/>
<mx:Button id="btnStop" label="Stop Polling" visible="{_showStopButton}" click="stop()"/>
<mx:Spacer width="5"/>
<mx:Button id="btnClose" label="Close" click="close()"/>
<mx:Spacer width="5"/>
<mx:HBox id="pollResultBox" height="5%" width="100%" horizontalAlign="right" paddingTop="5">
<mx:Label text="Time remaining:" fontSize="12" styleName="micSettingsWindowTitleStyle" visible="true" paddingLeft="5"/>
<mx:Label id="timeRemaining" text="{pollTimeRemaining}" fontSize="12" styleName="micSettingsWindowTitleStyle" visible="true"/>
<mx:Button id="btnStop" label="Stop Polling" visible="{_showStopButton}" click="stop()" paddingRight="5"/>
<mx:Button id="btnClose" label="Close" click="close()" paddingRight="5"/>
</mx:HBox>
</mx:VBox>
<mx:states>
<mx:State name="PieChart" >
<mx:AddChild relativeTo="{spacer}" position="before" >
<mx:AddChild relativeTo="{pollResultBox}" position="before" >
<poll:DisplayResultPieChartPanel width="100%" height="80%" viewModel="{viewModel}" pollID="{pollID}" horizontalAlign="center"/>
</mx:AddChild>
</mx:State>
<mx:State name="BarChart">
<mx:AddChild relativeTo="{spacer}" position="before">
<mx:AddChild relativeTo="{pollResultBox}" position="before">
<poll:DisplayResultBarChartPanel width="100%" height="80%" viewModel="{viewModel}" pollID="{pollID}" horizontalAlign="center"/>
</mx:AddChild>
</mx:State>

18
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/QuestionRenderer.mxml
View File

@ -90,23 +90,17 @@
</mx:Script>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="questionLabel" text="Question" styleName="presentationNamesLabelStyle"/>
<mx:Label id="questionLabel" text="Question" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="30">
<mx:Spacer width="10"/>
<mx:Label id="questionTextLabel" text="{_question}" fontSize="12" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="96%" height="30" paddingTop="5">
<mx:Label id="questionTextLabel" text="{_question}" fontSize="12" styleName="presentationNamesLabelStyle" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="answersLabel" text="Answers" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="100%" height="20" horizontalAlign="left" paddingTop="3">
<mx:Label id="answersLabel" text="Answers" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:HBox>
<mx:Spacer width="10"/>
<mx:VBox id="answersBox">
<mx:VBox id="answersBox" paddingLeft="10">
<mx:RadioButtonGroup id="rbGroup" itemClick="handleCard(event);"/>
<!-- Placeholder for the responses -->
</mx:VBox>

26
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/TakePollPanel.mxml
View File

@ -79,35 +79,25 @@
]]>
</mx:Script>
<mx:HBox width="100%" height="25" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label text="Take Poll" styleName="micSettingsWindowTitleStyle"/>
<mx:Label text="Take Poll" styleName="micSettingsWindowTitleStyle" paddingLeft="3"/>
</mx:HBox>
<mx:VBox width="90%" height="90%" horizontalAlign="left" borderStyle="solid" borderThickness="1">
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="titleLabel" text="Title" styleName="presentationNamesLabelStyle"/>
<mx:Label id="titleLabel" text="Title" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="25">
<mx:Spacer width="10"/>
<mx:Label id="titleTextLabel" text="{_title}" fontSize="12" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="96%" height="25" paddingTop="5">
<mx:Label id="titleTextLabel" text="{_title}" fontSize="12" styleName="presentationNamesLabelStyle" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<poll:QuestionRenderer viewModel="{viewModel}" pollID="{pollID}" responseCollector="{responseCollector}"/>
<mx:Spacer height="5"/>
<poll:QuestionRenderer viewModel="{viewModel}" pollID="{pollID}" responseCollector="{responseCollector}" paddingTop="3" paddingBottom="5"/>
</mx:VBox>
<mx:HBox width="100%" height="35" horizontalAlign="right">
<mx:Button label="Submit" styleName="presentationUploadShowButtonStyle" click="onSubmit()"/>
<mx:Spacer width="5"/>
<mx:Button label="Don't Submit" styleName="presentationUploadShowButtonStyle" click="close()"/>
<mx:Spacer width="5"/>
<mx:HBox width="100%" height="35" horizontalAlign="right" paddingBottom="5">
<mx:Button label="Submit" styleName="presentationUploadShowButtonStyle" click="onSubmit()" paddingRight="5"/>
<mx:Button label="Don't Submit" styleName="presentationUploadShowButtonStyle" click="close()" paddingRight="5"/>
</mx:HBox>
<mx:Spacer height="5"/>
</mx:Panel>

53
bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/UpdatePollPanel.mxml
View File

@ -133,62 +133,43 @@
]]>
</mx:Script>
<mx:HBox width="100%" height="25" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label text="Update Poll" styleName="micSettingsWindowTitleStyle"/>
<mx:Label text="Update Poll" styleName="micSettingsWindowTitleStyle" paddingLeft="3"/>
</mx:HBox>
<mx:VBox width="90%" height="90%" horizontalAlign="center" borderStyle="solid" borderThickness="1">
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="titleLabel" text="Title" styleName="presentationNamesLabelStyle"/>
<mx:Label id="titleLabel" text="Title" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="25">
<mx:Spacer width="10"/>
<mx:TextInput id="pollTitle" width="100%" text="{_title}" editable="true" maxChars="250"/>
<mx:HBox width="96%" height="25" paddingTop="5">
<mx:TextInput id="pollTitle" width="100%" text="{_title}" editable="true" maxChars="250" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="questionLabel" text="Question" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="100%" height="20" horizontalAlign="left" paddingTop="3">
<mx:Label id="questionLabel" text="Question" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="75">
<mx:Spacer width="10"/>
<mx:TextArea id="pollQuestion" width="100%" height="100%" wordWrap="true" text="{qvo.question}" editable="true" maxChars="1000"/>
<mx:HBox width="96%" height="75" paddingTop="5">
<mx:TextArea id="pollQuestion" width="100%" height="100%" wordWrap="true" text="{qvo.question}" editable="true" maxChars="1000" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="3"/>
<mx:Label id="answersLabel" text="Answers" styleName="presentationNamesLabelStyle"/>
<mx:HBox width="100%" height="20" horizontalAlign="left" paddingLeft="3">
<mx:Label id="answersLabel" text="Answers" styleName="presentationNamesLabelStyle" paddingLeft="3"/>
</mx:HBox>
<mx:HBox width="100%" height="20" horizontalAlign="left">
<mx:Spacer width="10"/>
<mx:Label id="hintAnswersLabel" text="Start every answer with a new line" fontSize="12" styleName="presentationNamesLabelStyle"/>
<mx:Label id="hintAnswersLabel" text="Start every answer with a new line" fontSize="12" styleName="presentationNamesLabelStyle" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="5"/>
<mx:HBox width="96%" height="150">
<mx:Spacer width="10"/>
<mx:TextArea id="pollAnswers" width="100%" height="100%" wordWrap="true" text="{_answersText}" maxChars="2000"/>
<mx:HBox width="96%" height="150" paddingTop="5">
<mx:TextArea id="pollAnswers" width="100%" height="100%" wordWrap="true" text="{_answersText}" maxChars="2000" paddingLeft="10"/>
</mx:HBox>
<mx:Spacer height="3"/>
<mx:CheckBox id="multiple_response" selected="{qvo.multiResponse}"
<mx:CheckBox id="multiple_response" selected="{qvo.multiResponse}" paddingTop="3" paddingBottom="5"
label="{ResourceUtil.getInstance().getString('bbb.polling.createPoll.moreThanOneResponse')}"
tabIndex="{baseIndex+4}"/>
<mx:Spacer height="5"/>
</mx:VBox>
<mx:HBox width="100%" height="35" horizontalAlign="right">
<mx:Button label="Update" styleName="presentationUploadShowButtonStyle" click="onUpdate()"/>
<mx:Spacer width="5"/>
<mx:Button label="Cancel" styleName="presentationUploadShowButtonStyle" click="close()"/>
<mx:Spacer width="5"/>
<mx:HBox width="100%" height="35" horizontalAlign="right" paddingBottom="5">
<mx:Button label="Update" styleName="presentationUploadShowButtonStyle" click="onUpdate()" paddingRight="5"/>
<mx:Button label="Cancel" styleName="presentationUploadShowButtonStyle" click="close()" paddingRight="5"/>
</mx:HBox>
<mx:Spacer height="5"/>
</mx:Panel>

11
bigbluebutton-client/src/org/bigbluebutton/modules/whiteboard/views/WhiteboardToolbar.mxml
View File

@ -348,8 +348,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
<wbBtns:PanZoomButton id="panzoomBtn"
tabIndex="{baseIndex}"
visible="{showWhiteboardToolbar}"/>
<mx:Spacer height="10" visible="{showWhiteboardToolbar}"/>
<wbBtns:ScribbleButton id="scribbleBtn"
<wbBtns:ScribbleButton id="scribbleBtn" paddingLeft="{showWhiteboardToolbar ? 10 : 0}"
tabIndex="{baseIndex+1}"
visible="{showWhiteboardToolbar}"/>
<wbBtns:RectangleButton id="rectangleBtn"
@ -368,15 +367,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
tabIndex="{baseIndex+6}"
visible="{showWhiteboardToolbar}"/>
<mx:Spacer height="5" visible="{showWhiteboardToolbar}"/>
<wbBtns:ClearButton id="clearBtn"
tabIndex="{baseIndex+7}"
visible="{showWhiteboardToolbar}"/>
visible="{showWhiteboardToolbar}"
paddingLeft="{showWhiteboardToolbar ? 5 : 0}"/>
<wbBtns:UndoButton id="undoBtn"
tabIndex="{baseIndex+8}"
visible="{showWhiteboardToolbar}"/>
visible="{showWhiteboardToolbar}"
paddingRight="{showWhiteboardToolbar ? 5 : 0}"/>
<mx:Spacer height="5" visible="{showWhiteboardToolbar}"/>
<!--
Properties that were removed from original color picker: