Merge branch 'show-auth-users' of https://github.com/ritzalam/bigbluebutton...

Merge branch 'show-auth-users' of https://github.com/ritzalam/bigbluebutton into ritzalam-show-auth-users

bigbluebutton-client/locale/en_US/bbbResources.properties

@@ -120,8 +120,10 @@ bbb.mainToolbar.recordingLabel.notRecording = Not Recording
 bbb.waitWindow.waitMessage.message = You are a guest, please wait moderator approval.
 bbb.waitWindow.waitMessage.title = Waiting
 bbb.guests.title = Guests
-bbb.guests.message.user.singular = {0} user wants to join this meeting
-bbb.guests.message.user.plural = {0} users want to join this meeting
+bbb.guests.message.auth.singular = {0} authenticated user wants to join this meeting
+bbb.guests.message.auth.plural = {0} authenticated users want to join this meeting
+bbb.guests.message.guest.singular = {0} guest user wants to join this meeting
+bbb.guests.message.guest.plural = {0} guest users want to join this meeting
 bbb.guests.allowBtn.toolTip = Allow
 bbb.guests.denyBtn.toolTip = Deny
 bbb.guests.allowAllAuthenticated.label = Allow all authenticated

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

@@ -57,6 +57,8 @@ $Id: $
       
       [Bindable]
       private var guestUsers:ArrayCollection = new ArrayCollection();
+      [Bindable]
+	  private var authUsers:ArrayCollection = new ArrayCollection();
       
       private var dispatcher:Dispatcher = new Dispatcher();
       
@@ -137,7 +139,7 @@ $Id: $
     <mx:HBox paddingLeft="20" paddingRight="20" horizontalGap="20" 
              width="100%" height="100%">
       <mx:VBox width="200" height="100%">
-        <!--mx:VBox width="100%">
+        <mx:VBox width="100%">
           <mx:Button id="allowAllAuthBtn" styleName="mainActionButton"
                      label="{ResourceUtil.getInstance().getString('bbb.guests.allowAllAuthenticated.label')}"
                      width="100%" 
@@ -148,7 +150,7 @@ $Id: $
                      width="100%" 
                      click="sendResponseToAllGuestsCheckBox(true, GuestPolicy.ALWAYS_ACCEPT)" 
                      toolTip="{allowAllGuestsBtn.label}"/>
-        </mx:VBox-->
+        </mx:VBox>
         <mx:VBox width="100%" paddingTop="20" paddingBottom="20">
           <mx:Button id="allowEveryoneBtn" styleName="mainActionButton"
                      label="{ResourceUtil.getInstance().getString('bbb.guests.allowEveryone.label')}"
@@ -166,7 +168,11 @@ $Id: $
       <mx:VRule height="100%"/>
       
       <mx:VBox width="100%" height="100%">
-        <mx:Label text="{guestUsers.length > 1 ? ResourceUtil.getInstance().getString('bbb.guests.message.user.plural', [String(guestUsers.length)]): ResourceUtil.getInstance().getString('bbb.guests.message.user.singular', [String(guestUsers.length)])}"
+		  <mx:Label text="{authUsers.length > 1 ? ResourceUtil.getInstance().getString('bbb.guests.message.auth.plural', [String(authUsers.length)]): ResourceUtil.getInstance().getString('bbb.guests.message.auth.singular', [String(authUsers.length)])}"
+					width="100%"/>
+		  <mx:List id="authUsersList" styleName="guestListStyle" itemRenderer="org.bigbluebutton.main.views.GuestItemRenderer"
+				   rowCount="4" width="100%" paddingLeft="0" paddingRight="0" dataProvider="{authUsers}" />
+        <mx:Label text="{guestUsers.length > 1 ? ResourceUtil.getInstance().getString('bbb.guests.message.guest.plural', [String(guestUsers.length)]): ResourceUtil.getInstance().getString('bbb.guests.message.guest.singular', [String(guestUsers.length)])}"
                   width="100%"/>
         <mx:List id="guestList" styleName="guestListStyle" itemRenderer="org.bigbluebutton.main.views.GuestItemRenderer"
                  rowCount="4" width="100%" paddingLeft="0" paddingRight="0" dataProvider="{guestUsers}" />