Merge pull request #707 from capilkey/update-polling-modal

Update polling modal

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

@@ -100,6 +100,12 @@ ToolTip {
   fontFamily: Arial;
 }
 
+.pollResondersLabelStyle {
+	color: #444444;
+	fontFamily: Arial;
+	fontSize: 12;
+}
+
 Button, .logoutButtonStyle, .chatSendButtonStyle, .helpLinkButtonStyle, .cameraDisplaySettingsWindowProfileComboStyle, .cameraDisplaySettingsWindowCameraSelector, .languageSelectorStyle, .testJavaLinkButtonStyle, .recordButtonStyleNormal, .recordButtonStyleStart, .recordButtonStyleStop, .micSettingsWindowHelpButtonStyle {
   textIndent: 0;
   paddingLeft: 10;
@@ -408,7 +414,7 @@ DataGrid {
   icon:   Embed('assets/images/webcam-private-chat.png');
 }
 
-.presentationFileUploadWindowStyle {
+TitleWindow {
   borderColor: #b9babc;
   borderAlpha: 1;
   borderThicknessLeft: 10;
@@ -419,11 +425,8 @@ DataGrid {
   cornerRadius: 5;
   headerHeight: 20;
   backgroundAlpha: 1;
-  headerColors: #b9babc, #b9babc;
-  footerColors: #b9babc, #b9babc;
   backgroundColor: #EFEFEF;
   dropShadowEnabled: true;
-  titleStyleName: "presentationFileUploadWindowTitleStyle";
 }
 
 .presentationFileUploadWindowTitleStyle, .presentationUploadTitleStyle {
@@ -511,42 +514,6 @@ DataGrid {
 	imageSource: Embed(source='assets/images/chromePluginBlocked.png');
 }
 
-.cameraDisplaySettingsWindowStyle {
-  borderColor: #b9babc;
-  borderAlpha: 1;
-  borderThicknessLeft: 10;
-  borderThicknessTop: 0;
-  borderThicknessBottom: 10;
-  borderThicknessRight: 10;
-  roundedBottomCorners: true;
-  cornerRadius: 5;
-  headerHeight: 20;
-  backgroundAlpha: 1;
-  headerColors: #b9babc, #b9babc;
-  footerColors: #b9babc, #b9babc;
-  backgroundColor: #EFEFEF;
-  dropShadowEnabled: true;
-  titleStyleName: "webcamSettingsWindowTitleStyle";
-}
-
-.micSettingsWindowStyle {
-  borderColor: #b9babc;
-  borderAlpha: 1;
-  borderThicknessLeft: 10;
-  borderThicknessTop: 0;
-  borderThicknessBottom: 10;
-  borderThicknessRight: 10;
-  roundedBottomCorners: true;
-  cornerRadius: 5;
-  headerHeight: 20;
-  backgroundAlpha: 1;
-  headerColors: #b9babc, #b9babc;
-  footerColors: #b9babc, #b9babc;
-  backgroundColor: #EFEFEF;
-  dropShadowEnabled: true;
-  titleStyleName: "micSettingsWindowTitleStyle";
-}
-
 .webcamSettingsWindowTitleStyle, .micSettingsWindowTitleStyle {
   fontFamily: Arial;
   fontSize: 20;  
@@ -866,24 +833,6 @@ Alert {
 	fontWeight: bold;    
 }
 
-.lockSettingsWindowStyle {
-	borderColor: #b9babc;
-	borderAlpha: 1;
-	borderThicknessLeft: 10;
-	borderThicknessTop: 0;
-	borderThicknessBottom: 10;
-	borderThicknessRight: 10;
-	roundedBottomCorners: true;
-	cornerRadius: 5;
-	headerHeight: 20;
-	backgroundAlpha: 1;
-	headerColors: #b9babc, #b9babc;
-	footerColors: #b9babc, #b9babc;
-	backgroundColor: #EFEFEF;
-	dropShadowEnabled: true;
-	titleStyleName: "micSettingsWindowTitleStyle";
-}
-
 .lockSettingsWindowTitleStyle {
 	fontFamily: Arial;
 	fontSize: 20;  

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -493,6 +493,9 @@ bbb.shortcutkey.chat.chatbox.debug.function = Temporary debug hotkey
 bbb.polling.startButton.tooltip = Start a poll
 bbb.polling.publishButton.label = Publish
 bbb.polling.closeButton.label = Close
+bbb.polling.pollModal.title = Poll
+bbb.polling.respondersLabel.novotes = No Users Responded
+bbb.polling.respondersLabel.text = {0} Users Responded
 bbb.polling.answer.Y = Yes
 bbb.polling.answer.N = No
 bbb.polling.answer.T = True

bigbluebutton-client/src/org/bigbluebutton/modules/polling/views/PollResultsModal.as

@@ -8,6 +8,10 @@ package org.bigbluebutton.modules.polling.views
 	import mx.containers.HBox;
 	import mx.containers.TitleWindow;
 	import mx.controls.Button;
+	import mx.controls.HRule;
+	import mx.controls.Label;
+	import mx.controls.TextArea;
+	import mx.core.ScrollPolicy;
 	import mx.managers.PopUpManager;
 	
 	import org.bigbluebutton.modules.polling.events.PollVotedEvent;
@@ -21,6 +25,7 @@ package org.bigbluebutton.modules.polling.views
 	public class PollResultsModal extends TitleWindow {
 		private var _voteListener:Listener;
 		
+		private var _respondersLabel:Label;
 		private var _pollGraphic:PollGraphic;
 		private var _publishBtn:Button;
 		private var _closeBtn:Button;
@@ -28,23 +33,33 @@ package org.bigbluebutton.modules.polling.views
 		public function PollResultsModal() {
 			super();
 			
+			styleName = "micSettingsWindowStyle";
 			width = 300;
 			height = 300;
+			setStyle("verticalGap", 15);
 			showCloseButton = false;
 			layout = "vertical";
 			setStyle("horizontalAlign", "center");
 			setStyle("verticalAlign", "middle");
 			
-			var topBox:HBox = new HBox();
+			var modalTitle:TextArea = new TextArea();
-			_publishBtn = new Button();
+			modalTitle.setStyle("borderSkin", null);
-			_publishBtn.label = ResourceUtil.getInstance().getString('bbb.polling.publishButton.label');
+			modalTitle.verticalScrollPolicy = ScrollPolicy.OFF;
-			_publishBtn.addEventListener(MouseEvent.CLICK, handlePublishClick);
+			modalTitle.editable = false;
-			topBox.addChild(_publishBtn);
+			modalTitle.text = ResourceUtil.getInstance().getString('bbb.polling.pollModal.title');
-			_closeBtn = new Button();
+			modalTitle.styleName = "micSettingsWindowTitleStyle";
-			_closeBtn.label = ResourceUtil.getInstance().getString('bbb.polling.closeButton.label');
+			modalTitle.percentWidth = 100;
-			_closeBtn.addEventListener(MouseEvent.CLICK, handleCloseClick);
+			modalTitle.height = 25;
-			topBox.addChild(_closeBtn);
+			addChild(modalTitle);
-			addChild(topBox);
+			
+			var hrule:HRule = new HRule();
+			hrule.percentWidth = 100;
+			addChild(hrule);
+			
+			_respondersLabel = new Label();
+			_respondersLabel.styleName = "pollResondersLabelStyle";
+			_respondersLabel.text = " ";// ResourceUtil.getInstance().getString('bbb.polling.respondersLabel.novotes');
+			addChild(_respondersLabel);
 			
 			_pollGraphic = new PollGraphic();
 			_pollGraphic.data = null;
@@ -52,6 +67,23 @@ package org.bigbluebutton.modules.polling.views
 			_pollGraphic.minWidth = 130;
 			addChild(_pollGraphic);
 			
+			hrule = new HRule();
+			hrule.percentWidth = 100;
+			addChild(hrule);
+			
+			var botBox:HBox = new HBox();
+			botBox.setStyle("gap", 10);
+			
+			_publishBtn = new Button();
+			_publishBtn.label = ResourceUtil.getInstance().getString('bbb.polling.publishButton.label');
+			_publishBtn.addEventListener(MouseEvent.CLICK, handlePublishClick);
+			botBox.addChild(_publishBtn);
+			_closeBtn = new Button();
+			_closeBtn.label = ResourceUtil.getInstance().getString('bbb.polling.closeButton.label');
+			_closeBtn.addEventListener(MouseEvent.CLICK, handleCloseClick);
+			botBox.addChild(_closeBtn);
+			addChild(botBox);
+			
 			_voteListener = new Listener();
 			_voteListener.type = PollVotedEvent.POLL_VOTED;
 			_voteListener.method = handlePollVotedEvent;
@@ -69,7 +101,7 @@ package org.bigbluebutton.modules.polling.views
 			_pollGraphic.height = ((23+10)*_pollGraphic.data.length+10);
 			_pollGraphic.minHeight = ((16+10)*_pollGraphic.data.length+10);
 			
-			height = _pollGraphic.height + 140;
+			height = _pollGraphic.height + 220;
 		}
 		
 		private function handlePollVotedEvent(e:PollVotedEvent):void {
@@ -81,6 +113,7 @@ package org.bigbluebutton.modules.polling.views
 			}
 			
 			_pollGraphic.data = resultData;
+			_respondersLabel.text = ResourceUtil.getInstance().getString('bbb.polling.respondersLabel.text', [e.result.numResponders + "/" + e.result.numRespondents]);
 		}
 		
 		private function handlePublishClick(e:MouseEvent):void {