From f8a4a78017f0bb2c62590dee6f06174f95783251 Mon Sep 17 00:00:00 2001
From: Richard Alam <ritzalam@gmail.com>
Date: Wed, 12 Nov 2008 18:30:44 +0000
Subject: [PATCH] Cosmetic changes

git-svn-id: http://bigbluebutton.googlecode.com/svn/trunk@714 af16638f-c34d-0410-8cfa-b39d5352b314
---
 .../bigbluebutton/main/view/MainApplicationShellMediator.as  | 2 +-
 .../org/bigbluebutton/main/view/components/MainToolbar.mxml  | 5 +++--
 .../modules/presentation/view/PresentationWindowMediator.as  | 4 ++--
 .../presentation/view/components/PresentationWindow.mxml     | 2 +-
 .../modules/viewers/view/ViewersWindowMediator.as            | 4 ++--
 .../modules/viewers/view/components/ViewersWindow.mxml       | 2 +-
 6 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as b/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
index 0f3bac553c..a04ce29e2a 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/MainApplicationShellMediator.as
@@ -83,7 +83,7 @@ package org.bigbluebutton.main.view
 					shell.mdiCanvas.windowManager.remove(rwin as MDIWindow);						
 					break;
 				case MainApplicationConstants.USER_LOGGED_IN:
-					shell.toolbar.loggedIn(notification.getBody().username);
+					shell.toolbar.loggedIn(notification.getBody().username, notification.getBody().room, notification.getBody().userrole);
 					break;
 				case MainApplicationConstants.USER_LOGGED_OUT:
 					shell.toolbar.visible = false;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainToolbar.mxml b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainToolbar.mxml
index e51e944b05..56c1a44f28 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainToolbar.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/main/view/components/MainToolbar.mxml
@@ -6,8 +6,8 @@
 			import org.bigbluebutton.main.MainApplicationConstants;
 			import org.bigbluebutton.main.view.MainApplicationShellMediator;
 
-			public function loggedIn(name:String):void{
-				loggedInUserLbl.text = "You are logged in as " + name + ".";
+			public function loggedIn(name:String, room:String, role:String):void{
+				loggedInUserLbl.text = "You are logged in as " + name + " to " + room + " as " + role + ".";
 				this.visible = true;
 			}
 			
@@ -31,6 +31,7 @@
 	<!--<mx:Button id="webcamBtn" label="Open Webcam" visible="true" height="20" toolTip="Click to open webcam"/> -->	
 	<mx:Label id="loggedInUserLbl" text="" visible="true"/>			
 	<mx:Spacer width="100%"/>
+	<mx:LinkButton label="Help" click="navigateToURL(new URLRequest('http://present.carleton.ca/help/index.html'))"/>
 	<mx:Button label="Logout" id="btnLogout" toolTip="Log out" right="10" click="doLogout()"/>		
 	
 </mx:ApplicationControlBar>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/PresentationWindowMediator.as b/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/PresentationWindowMediator.as
index 5825abfdde..08d46d7e0f 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/PresentationWindowMediator.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/PresentationWindowMediator.as
@@ -135,10 +135,10 @@ package org.bigbluebutton.modules.presentation.view
 					break;
 				case PresentModuleConstants.OPEN_PRESENT_WINDOW:
 		   			_presWin.height = 440;
-		   			_presWin.width = 430;
+		   			_presWin.width = 450;
 		   			_presWin.title = PresentationWindow.TITLE;
 		   			_presWin.showCloseButton = false;	
-		   			_presWin.xPosition = 200;
+		   			_presWin.xPosition = 240;
 		   			_presWin.yPosition = 20;
 		   			facade.sendNotification(PresentModuleConstants.ADD_WINDOW, _presWin);		   							
 					break;
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/PresentationWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/PresentationWindow.mxml
index a671fd310d..bb538e8395 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/PresentationWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/presentation/view/components/PresentationWindow.mxml
@@ -62,7 +62,7 @@
 
     <mx:ControlBar width="100%">
     	  <mx:Button id="uploadPres" icon="{uploadIcon}" visible="false" width="20" height="20"
-    	   		toolTip="Upload PDF Document" click="dispatchEvent(new Event(PresentationWindowMediator.OPEN_UPLOAD))"/>    
+    	   		toolTip="Upload PDF document for presentation." click="dispatchEvent(new Event(PresentationWindowMediator.OPEN_UPLOAD))"/>    
     	  <mx:Spacer width="50%"/>	
     	  <mx:Button id="backButton" icon="{backwardIcon}" visible="false" width="20" height="20"
     	   		toolTip="Previous slide." click="dispatchEvent(new Event(PresentationWindowMediator.PREVIOUS_SLIDE))"/>
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/ViewersWindowMediator.as b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/ViewersWindowMediator.as
index bb580a0ddd..bf480df503 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/ViewersWindowMediator.as
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/ViewersWindowMediator.as
@@ -114,8 +114,8 @@ package org.bigbluebutton.modules.viewers.view
 		   		_viewersWindow.height = 220;
 		   		_viewersWindow.title = "Viewers";
 		   		_viewersWindow.showCloseButton = false;
-		   		_viewersWindow.xPosition = 30;
-		   		_viewersWindow.yPosition = 30;
+		   		_viewersWindow.xPosition = 20;
+		   		_viewersWindow.yPosition = 20;
 		   		facade.sendNotification(ViewersModuleConstants.ADD_WINDOW, _viewersWindow); 			
 		}	
 				
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/components/ViewersWindow.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/components/ViewersWindow.mxml
index bc1ba70a9b..eeff57c956 100644
--- a/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/components/ViewersWindow.mxml
+++ b/bigbluebutton-client/src/org/bigbluebutton/modules/viewers/view/components/ViewersWindow.mxml
@@ -64,7 +64,7 @@
     <mx:DataGrid id="viewersGrid" dataProvider="{participants}" editable="false" 
     	dragEnabled="false" itemClick="viewerSelectEvent(event);" width="100%" height="100%">
     	<mx:columns>
-    		<mx:DataGridColumn dataField="role" headerText="Role" dataTipField="Role" editable="false" width="20"
+    		<mx:DataGridColumn dataField="role" headerText="Role" dataTipField="Role" editable="false" width="35"
     			itemRenderer="org.bigbluebutton.modules.viewers.view.components.RoleItemRenderer"/>
     		<mx:DataGridColumn dataField="name" headerText="Name" editable="true" width="100"
     			itemRenderer="org.bigbluebutton.modules.viewers.view.components.NameItemRenderer"/>