removed chat colour picker and coloured the welcome message

capilkey · capilkey · commit 1c7a06003b87 · 2013-03-11T13:17:23.000-04:00
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/services/ChatMessageService.as
@@ -93,7 +93,7 @@ package org.bigbluebutton.modules.chat.services
         msg.chatType = ChatConstants.PUBLIC_CHAT;
         msg.fromUserID = SPACE;
         msg.fromUsername = SPACE;
-        msg.fromColor = "0";
+        msg.fromColor = "86187";
         msg.fromLang = "en";
         msg.fromTime = new Date().getTime();
         msg.fromTimezoneOffset = new Date().getTimezoneOffset();
diff --git a/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml b/bigbluebutton-client/src/org/bigbluebutton/modules/chat/views/ChatBox.mxml
@@ -58,7 +58,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
   	<mate:Listener type="{ShortcutEvent.FOCUS_CHAT_INPUT}" method="focusChatInput" />
   	<mate:Listener type="{UserLeftEvent.LEFT}" method="handleUserLeftEvent"/>
   	<mate:Listener type="{ShortcutEvent.FOCUS_CHAT_BOX}" method="focusChatBox" />
-  	<mate:Listener type="{ShortcutEvent.CHANGE_FONT_COLOUR}" method="focusColourPicker" />
+  	<!--mate:Listener type="{ShortcutEvent.CHANGE_FONT_COLOUR}" method="focusColourPicker" /-->
   	<mate:Listener type="{ShortcutEvent.SEND_MESSAGE}" method="remoteSendMessage" />
   	
   	<mate:Listener type="{ShortcutEvent.CHAT_DEBUG}" method="chatDebugInfo" />
@@ -181,9 +181,9 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 				focusManager.setFocus(chatMessagesList);
 			}
 			
-			private function focusColourPicker(e:ShortcutEvent):void{
+			/*private function focusColourPicker(e:ShortcutEvent):void{
 				focusManager.setFocus(cmpColorPicker);
-			}
+			}*/
 			
 			private function remoteSendMessage(e:ShortcutEvent):void{
 				sendMessages();
@@ -520,9 +520,8 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         cm.chatType = ChatConstants.PUBLIC_CHAT;
         cm.fromUserID = UsersUtil.getMyUserID();
         cm.fromUsername = UsersUtil.getMyUsername();
-        cm.fromColor = cmpColorPicker.selectedColor.toString();
+        cm.fromColor = "0" //default the message colour to black now cmpColorPicker.selectedColor.toString();
         cm.fromLang = ChatUtil.getUserLang();
-
         // Get the current UTC time and the timezone for this sender.
         // The receiver will have to convert this to local time.
         var now:Date = new Date();
@@ -541,7 +540,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
         cm.chatType = ChatConstants.PRIVATE_CHAT;
         cm.fromUserID = UsersUtil.getMyUserID();
         cm.fromUsername = UsersUtil.getMyUsername();
-        cm.fromColor = cmpColorPicker.selectedColor.toString();
+        cm.fromColor = "0" //default the message colour to black now cmpColorPicker.selectedColor.toString();
         cm.fromLang = ChatUtil.getUserLang();
         
         // Get the current UTC time and the timezone for this sender.
@@ -596,7 +595,7 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
   
   <mx:HBox id="chatCtrlBar" width="100%" height="50" styleName="chatControlBarStyle" verticalScrollPolicy="off"
            paddingLeft="5" paddingRight="5">		
-    <mx:TextArea id="txtMsgArea" width="100%"  color="{cmpColorPicker.selectedColor}" 
+    <mx:TextArea id="txtMsgArea" width="100%"
                  styleName="chatControlBarTextMsgStyle" 
                  toolTip="{ResourceUtil.getInstance().getString('bbb.accessibility.chat.chatwindow.input')}"
                  tabIndex="{baseIndex+1}"/>
@@ -607,10 +606,10 @@ with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
                  click="sendMessages()"
                  tabIndex="{baseIndex+2}"
                  accessibilityName="{ResourceUtil.getInstance().getString('bbb.chat.sendBtn.name')}"/>  
-      <mx:ColorPicker id="cmpColorPicker" showTextField="false" 
+      <!--mx:ColorPicker id="cmpColorPicker" showTextField="false" 
                  toolTip="{ResourceUtil.getInstance().getString('bbb.chat.cmpColorPicker.toolTip')}" 
                  selectedColor="0x000000" dataProvider="{colorPickerColours}" swatchPanelStyleName="chatColorPickerStyle"
-                 tabIndex="{baseIndex+3}"/>
+                 tabIndex="{baseIndex+3}"/-->
     </mx:VBox>
   </mx:HBox>	
 </mx:VBox>
