Make sytle consistent for popups and buttons.

bigbluebutton-client/branding/default/style/css/V2Theme.css

@@ -378,6 +378,7 @@ mx|Alert {
 	borderColor       : #FFFFFF;
 	backgroundColor   : #FFFFFF;
 	borderAlpha       : 1;
+	backgroundAlpha   : 1;
 	dropShadowEnabled : false;
 	color             : #6C6C6C;
 	titleStyleName    : "alertTitleStyle";
@@ -490,13 +491,6 @@ users|RoomActionsRenderer {
 	paddingBottom   : 20;
 }
 
-.breakoutTipBox {
-	backgroundColor : #CDD4DB;
-	paddingLeft     : 10;
-	paddingRight    : 10;
-	horizontalAlign : center;
-}
-
 .breakoutRoomsBox {
 	paddingTop      : 12;
 	horizontalAlign : center;
@@ -863,6 +857,17 @@ views|BBBSettings {
 	icon : Embed(source="assets/swf/v2_skin.swf", symbol="Icon_Deny");
 }
 
+/*
+//------------------------------
+//  Item InactivityWarningWindow
+//------------------------------
+*/
+
+views|InactivityWarningWindow {
+	fontSize     : 14;
+	headerHeight : 0;
+}
+
 /*
 //------------------------------
 //  Item renderers
@@ -934,7 +939,7 @@ views|LoadingBar {
 */
 
 views|LogoutWindow, views|LoggedOutWindow {
-	headerHeight              : 32;
+	headerHeight              : 0;
 	horizontalAlign           : center;
 	paddingBottom             : 8;
 	paddingLeft               : 8;
@@ -1167,16 +1172,10 @@ flexlib|MDIWindow {
 //------------------------------
 */
 
-.micSettingsWindowHearFromHeadsetLabelStyle, .micSettingsWindowSpeakIntoMicLabelStyle, .permissionSettingsTextStyle, .inactivityWarningTextStyle {
+.micSettingsWindowHearFromHeadsetLabelStyle, .micSettingsWindowSpeakIntoMicLabelStyle, .permissionSettingsTextStyle {
 	fontSize : 14;
 }
 
-.inactivityWarningWindowCancelButtonStyle {
-	color             : #CDD4DB;
-	textRollOverColor : #CDD4DB;
-	textSelectedColor : #CDD4DB;
-}
-
 /*
 //------------------------------
 //  Network Stats
@@ -1435,7 +1434,7 @@ mx|Panel {
 	textDecoration  : underline;
 }
 
-.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle, .lockSettingsHintBoxStyle {
+.presentationUploadFileFormatHintBoxStyle, .audioBroswerHintBoxStyle, .lockSettingsHintBoxStyle, .breakoutTipBox, .pollingTipBox {
 	backgroundColor : #CDD4DB;
 	horizontalAlign : center;
 	paddingTop      : 8;
@@ -1570,6 +1569,11 @@ views|ReconnectionPopup {
 	iconRefresh : Embed(source="assets/swf/refreshing.swf");
 }
 
+.reconnectionTitleWindowStyle {
+	textAlign : center;
+	fontSize  : 16;
+}
+
 /*
 //------------------------------
 //  Scrollbar

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -465,6 +465,7 @@ bbb.toolbar.sharednotes.toolTip = Open Shared Notes
 bbb.toolbar.video.toolTip.start = Share Your Webcam
 bbb.toolbar.video.toolTip.stop = Stop Sharing Your Webcam
 bbb.layout.addButton.label = Add
+bbb.layout.cancelButton.label = Cancel
 bbb.layout.addButton.toolTip = Add the custom layout to the list
 bbb.layout.overwriteLayoutName.title = Overwrite layout
 bbb.layout.overwriteLayoutName.text = Name already in use. Do you want to overwrite?
@@ -475,6 +476,7 @@ bbb.layout.saveButton.toolTip = Save layouts to a file
 bbb.layout.lockButton.toolTip = Lock layout
 bbb.layout.combo.prompt = Apply a layout
 bbb.layout.combo.custom = * Custom layout
+bbb.layout.combo.name = Layout name
 bbb.layout.combo.customName = Custom layout
 bbb.layout.combo.remote = Remote
 bbb.layout.window.name = Layout name
@@ -556,7 +558,7 @@ bbb.notes.saveBtn.toolTip = Save Note
 bbb.sharedNotes.title = Shared notes
 bbb.sharedNotes.quickLink.label = Shared notes Window
 bbb.sharedNotes.createNoteWindow.label = Note name
-bbb.sharedNotes.createNoteWindow.close.tooltip = Close
+bbb.sharedNotes.createNoteWindow.cancel = cancel
 bbb.sharedNotes.createNoteWindow.close.accessibilityName = Close create new note window
 bbb.sharedNotes.typing.single = {0} is typing...
 bbb.sharedNotes.typing.double = {0} and {1} are typing...
@@ -567,6 +569,7 @@ bbb.sharedNotes.save.ioerror = Notes were not saved. Try saving again.
 bbb.sharedNotes.save.htmlLabel = Formatted text (.html)
 bbb.sharedNotes.save.txtLabel = Plain text (.txt)
 bbb.sharedNotes.new.label = Create
+bbb.sharedNotes.new.name = Note name
 bbb.sharedNotes.new.toolTip = Create additional note
 bbb.sharedNotes.limit.label = Notes limit reached
 bbb.sharedNotes.clear.label = Clear this note
@@ -783,6 +786,7 @@ bbb.polling.pollModal.hint = Leave this window open to allow others to respond t
 bbb.polling.pollModal.voteGrid.userHeading = Users
 bbb.polling.pollModal.voteGrid.answerHeading = Responses
 bbb.polling.customChoices.title = Enter Polling Choices
+bbb.polling.customChoices.hint = Enter the polling choices below
 bbb.polling.respondersLabel.novotes = Waiting for responses
 bbb.polling.respondersLabel.text = {0} Users Responded
 bbb.polling.respondersLabel.finished = Done

bigbluebutton-client/src/org/bigbluebutton/main/views/InactivityWarningWindow.mxml

@@ -20,16 +20,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<mx:Panel xmlns:mx="library://ns.adobe.com/flex/mx"
+<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
 		xmlns:fx="http://ns.adobe.com/mxml/2009"
 		xmlns:mate="http://mate.asfusion.com/"
+		xmlns:common="org.bigbluebutton.common.*"
 		verticalScrollPolicy="off"
 		horizontalScrollPolicy="off"
 		horizontalAlign="center"
 		width="500"
-		height="120"
 		styleName="inactivityWarningTextStyle"
-		title="{ResourceUtil.getInstance().getString('bbb.inactivityWarning.title')}"
 		creationComplete="onCreationComplete()">
 
 	<fx:Declarations>
@@ -97,7 +96,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	]]>
 	</fx:Script>
 	<mx:VBox width="100%" height="100%"  paddingBottom="5" paddingLeft="5" paddingRight="5" paddingTop="5" horizontalAlign="center" verticalAlign="middle">
+		
+		<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.inactivityWarning.title')}"
+							  styleName="titleWindowStyle"
+							  width="{this.width - 40}" />
+		
 		<mx:Text id="warningMessage" selectable="false" text="{ResourceUtil.getInstance().getString('bbb.inactivityWarning.message')}" styleName="inactivityWarningTextStyle"/>
-		<mx:Button id="cancelButton" click="cancelButtonClicked()" visible="false" styleName="inactivityWarningWindowCancelButtonStyle"/>
+		<mx:Button id="cancelButton" click="cancelButtonClicked()" visible="false" styleName="mainActionButton"/>
 	</mx:VBox>
-</mx:Panel>
+</mx:TitleWindow>

bigbluebutton-client/src/org/bigbluebutton/main/views/LogoutWindow.mxml

@@ -22,13 +22,14 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
 		  xmlns:fx="http://ns.adobe.com/mxml/2009"
           xmlns:mate="http://mate.asfusion.com/"
+		  xmlns:common="org.bigbluebutton.common.*"
 		  implements="org.bigbluebutton.common.IKeyboardClose"
 		  verticalScrollPolicy="off"
           horizontalScrollPolicy="off"
           showCloseButton="false"
           creationComplete="onCreationComplete()"
-          minWidth="350"
+		  layout="vertical"
-          title="{ResourceUtil.getInstance().getString('bbb.logout.confirm.title')}">
+          minWidth="400">
 
   <fx:Script>
     <![CDATA[
@@ -49,6 +50,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       private function onCreationComplete():void {
         cancelButton.setFocus();
         endMeetingButton.visible = endMeetingButton.includeInLayout = UsersUtil.amIModerator() && !UsersUtil.isBreakout();
+		if (endMeetingButton.visible) {
+			endMeetingButton.styleName = "mainActionButton";
+		} else {
+			confimButton.styleName = "mainActionButton";
+		}
       }
 
       private function endMeetingClickHandler():void {
@@ -74,14 +80,16 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
     ]]>
   </fx:Script>
 
-  <mx:VBox width="100%" height="100%">
+	<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.logout.confirm.title')}"
+						  styleName="titleWindowStyle"
+						  width="{this.width - 40}" />
+	
     <mx:Box width="100%" height="100%" horizontalAlign="center" verticalAlign="middle">
       <mx:Text text="{ResourceUtil.getInstance().getString('bbb.logout.confirm.message')}" />
     </mx:Box>
     <mx:HBox width="100%" horizontalAlign="center">
-      <mx:Button id="confimButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.yes')}" click="confirmButtonClickHandler()" />
+      <mx:Button id="endMeetingButton" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.endMeeting')}" click="endMeetingClickHandler()" />
-      <mx:Button id="cancelButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.no')}" click="cancelButtonClickHandler()" />
+      <mx:Button id="confimButton" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.yes')}" click="confirmButtonClickHandler()" />
-      <mx:Button id="endMeetingButton" height="22" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.endMeeting')}" click="endMeetingClickHandler()" />
+      <mx:Button id="cancelButton" label="{ResourceUtil.getInstance().getString('bbb.logout.confirm.no')}" click="cancelButtonClickHandler()" />
    </mx:HBox>
-  </mx:VBox>
 </mx:TitleWindow>

bigbluebutton-client/src/org/bigbluebutton/main/views/ReconnectionPopup.mxml

@@ -20,14 +20,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 -->
 
-<mx:Panel xmlns:mx="library://ns.adobe.com/flex/mx" 
+<mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:mate="http://mate.asfusion.com/"
 				xmlns:fx="http://ns.adobe.com/mxml/2009"
+				xmlns:common="org.bigbluebutton.common.*"
 				verticalScrollPolicy="off"
 				horizontalScrollPolicy="off"
 				horizontalAlign="center"
-    width="250"
+				layout="absolute"
-    title="{ResourceUtil.getInstance().getString('bbb.connection.failure')}"
+				width="350"
 				creationComplete="onCreationComplete()">
 
   <fx:Script>
@@ -51,7 +52,12 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
       }
     ]]>
   </fx:Script>
-  <mx:HBox width="100%" height="100%" verticalAlign="middle">
+	<mx:VBox width="100%" height="100%" paddingTop="15" paddingLeft="50" paddingRight="50"
+			 horizontalAlign="center" verticalGap="16">
+		<common:AdvancedLabel id="textArea" width="100%"
+							  text="{ResourceUtil.getInstance().getString('bbb.connection.failure')}"
+							  styleName="reconnectionTitleWindowStyle" />
+		  <mx:HBox width="100%" height="100%" verticalAlign="middle" horizontalAlign="center">
 		    <mx:Box
 		        paddingBottom="10"
 		        paddingTop="10"
@@ -63,6 +69,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		        selectable="false"
 		        text="{ResourceUtil.getInstance().getString('bbb.connection.reconnecting')}"
 		        styleName="micSettingsWindowSpeakIntoMicLabelStyle"/>
-    <mx:Label id="lblConnectDots" width="100%" textAlign="left" styleName="micSettingsWindowSpeakIntoMicLabelStyle" text="" />
+		    <mx:Label id="lblConnectDots" textAlign="left" styleName="micSettingsWindowSpeakIntoMicLabelStyle" text="" width="40" />
 		  </mx:HBox>
-</mx:Panel> 
+		</mx:VBox>
+</mx:TitleWindow> 

bigbluebutton-client/src/org/bigbluebutton/main/views/RecordWindow.mxml

@@ -98,7 +98,7 @@
 		
 		<mx:HBox horizontalAlign="center" width="100%">
 			<mx:Button id="yesButton" styleName="mainActionButton" click="yesButton_clickHandler(event)" label="{ResourceUtil.getInstance().getString('bbb.recordWindow.confirm.yes')}" width="120"/>
-			<mx:Button id="noButton" styleName="mainActionButton" click="close()" label="{ResourceUtil.getInstance().getString('bbb.recordWindow.confirm.no')}" width="102"/>
+			<mx:Button id="noButton" click="close()" label="{ResourceUtil.getInstance().getString('bbb.recordWindow.confirm.no')}" width="102"/>
 		</mx:HBox>
 
 		<mx:CheckBox id="clearRecordingsChecbox" label="{ResourceUtil.getInstance().getString('bbb.recordWindow.clearCheckbox.label')}"

bigbluebutton-client/src/org/bigbluebutton/modules/caption/views/TextTab.as

@@ -104,6 +104,7 @@ package org.bigbluebutton.modules.caption.views {
 			claimButton.height = 22; 
 			claimButton.visible = false;
 			claimButton.includeInLayout = false;
+			claimButton.styleName = "mainActionButton";
 			claimButton.tabIndex = startIndex+1;
 			claimButton.addEventListener(MouseEvent.CLICK, onClaimButtonClick);
 			addChild(claimButton);

bigbluebutton-client/src/org/bigbluebutton/modules/layout/views/CustomLayoutNameWindow.mxml

@@ -30,7 +30,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		  layout="absolute"
 		  showCloseButton="false"
           creationComplete="onCreationComplete()"
-          width="280">
+          minWidth="320">
 
 	<fx:Declarations>
 	  <mate:Listener type="{LayoutNameInUseEvent.LAYOUT_NAME_IN_USE_EVENT}" method="handleLayoutNameInUse"/>
@@ -91,11 +91,21 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 	  <common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.layout.window.name')}"
 							styleName="titleWindowStyle"
 							width="180" />
+	  <mx:Form width="100%">
+		  <mx:FormItem label="{ResourceUtil.getInstance().getString('bbb.layout.combo.name')}" width="100%">
 			  <mx:TextInput id="textInput" height="26" maxChars="140" width="100%"
 							text="{ResourceUtil.getInstance().getString('bbb.layout.combo.customName')}"
 							enter="addButton_clickHandler()" />
-	  <mx:Button id="addButton" height="30" width="100%" click="addButton_clickHandler()" enabled="{textInput.text.length > 0}" styleName="mainActionButton"
+		  </mx:FormItem>
+	  </mx:Form>
+	  
+	  <mx:HBox width="100%" horizontalAlign="right" horizontalGap="15">
+	  	  <mx:Button id="addButton" click="addButton_clickHandler()" enabled="{textInput.text.length > 0}" styleName="mainActionButton"
 				 	 label="{ResourceUtil.getInstance().getString('bbb.layout.addButton.label')}" toolTip="{ResourceUtil.getInstance().getString('bbb.layout.addButton.toolTip')}" />
+		  <mx:Button label="{ResourceUtil.getInstance().getString('bbb.layout.cancelButton.label')}"
+					 click="onCancelClicked()"/>
+	  </mx:HBox>
+
   </mx:VBox>
 
   <mx:Button id="closeButton" click="onCancelClicked()" styleName="titleWindowCloseButton"

bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollChoicesModal.mxml

@@ -76,6 +76,11 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 							  text="{ResourceUtil.getInstance().getString('bbb.polling.customChoices.title')}"
 							  styleName="titleWindowStyle" />
 	</mx:Canvas>
+	
+	<mx:Canvas width="100%" styleName="pollingTipBox" verticalScrollPolicy="off" horizontalScrollPolicy="off">
+		<mx:Text horizontalCenter="0" text="{ResourceUtil.getInstance().getString('bbb.polling.customChoices.hint')}"/>
+	</mx:Canvas>
+	
 	<mx:HRule width="100%"/>
 	
 	<mx:VBox width="100%" paddingTop="20" paddingBottom="20" paddingLeft="16" paddingRight="16">

bigbluebutton-client/src/org/bigbluebutton/modules/sharednotes/views/SharedNotesNameWindow.mxml

@@ -23,14 +23,15 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 <mx:TitleWindow xmlns:mx="library://ns.adobe.com/flex/mx"
 				xmlns:fx="http://ns.adobe.com/mxml/2009"
 				xmlns:mate="http://mate.asfusion.com/"
+				xmlns:common="org.bigbluebutton.common.*"
 				implements="org.bigbluebutton.common.IKeyboardClose"
 				verticalScrollPolicy="off"
 				horizontalScrollPolicy="off"
 				horizontalAlign="center"
 				layout="absolute"
+				minWidth="320"
 				creationComplete="onCreationComplete()"
-				keyUp="keyUpHandler(event)"
+				keyUp="keyUpHandler(event)">
-				width="280" xmlns:common="org.bigbluebutton.common.*">
 
 	<fx:Script>
 		<![CDATA[
@@ -85,23 +86,30 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 		<common:AdvancedLabel text="{ResourceUtil.getInstance().getString('bbb.sharedNotes.createNoteWindow.label')}"
 							  styleName="titleWindowStyle"
 							  width="180" />
+		<mx:Form width="100%">
+			<mx:FormItem label="{ResourceUtil.getInstance().getString('bbb.sharedNotes.new.name')}" width="100%">
 				<mx:TextInput id="textInput"
 							  restrict="a-zA-Z0-9 "
 							  maxChars="20"
 							  height="26"
 							  width="100%"
 							  text="{sharedNoteTitle}" />
+			</mx:FormItem>
+		</mx:Form>
+	
+		<mx:HBox width="100%" horizontalAlign="right" horizontalGap="15">
 			<mx:Button id="btnNew"
 					   click="btnNew_clickHandler(event)"
 					   styleName="mainActionButton"
-				   height="30"
-				   width="100%"
 					   label="{ResourceUtil.getInstance().getString('bbb.sharedNotes.new.label')}"
 					   toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.new.toolTip')}" />
+			<mx:Button label="{ResourceUtil.getInstance().getString('bbb.sharedNotes.createNoteWindow.cancel')}"
+					   click="onCancelClicked()"/>
+		</mx:HBox>
 	</mx:VBox>
 	
 	<mx:Button id="closeButton" click="onCancelClicked()" styleName="titleWindowCloseButton"
-			   toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.createNoteWindow.close.tooltip')}"
+			   toolTip="{ResourceUtil.getInstance().getString('bbb.sharedNotes.createNoteWindow.close')}"
 			   top="15" right="10"
 			   accessibilityName="{ResourceUtil.getInstance().getString('bbb.sharedNotes.createNoteWindow.close.accessibilityName')}" />
 

bigbluebutton-client/src/org/bigbluebutton/modules/users/views/BreakoutRoomSettings.mxml

@@ -323,7 +323,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         
         <mx:Tile id="roomsContainer" styleName="roomsContainer" width="100%" height="100%"/>
         
-        <mx:HBox width="100%" horizontalAlign="right" verticalGap="15">
+        <mx:HBox width="100%" horizontalAlign="right" horizontalGap="15">
             <mx:Button id="startButton"
 					   styleName="mainActionButton"
                        click="this.mode == 'create' ? createBreakoutRooms() : inviteUsersToBreakoutRooms()"/>