You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/03/31 15:17:22 UTC

svn commit: r1307797 - in /incubator/openmeetings/trunk/singlewebapp/WebContent: openmeetings/ src/base/ src/base/navi/ src/modules/conference/conference/ swf10/base/components/explorer/resources/

Author: sebawagner
Date: Sat Mar 31 13:17:22 2012
New Revision: 1307797

URL: http://svn.apache.org/viewvc?rev=1307797&view=rev
Log:
Fixes OPENMEETINGS-116 Menu bar shortcuts do not work
Update OPENMEETINGS-117 Refactor Conference Coloring and Layout => menu bar fixed

Removed:
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/cancel.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/explorbar_close_dn.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/explorbar_close_dn.swf
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/explorbar_close_mo.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/explorbar_close_mo.swf
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/explorbar_close_no.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/explorbar_close_no.swf
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/presenter_thumb.swf
Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1307797&r1=1307796&r2=1307797&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml Sat Mar 31 13:17:22 2012
@@ -78,9 +78,9 @@ of the red5-servlet
 <!--
 	These colors are the main colors and style the whole application
  -->
-<basebgcolorizer>0xA7ABCF</basebgcolorizer>
-<baseMousecolorizer>0xA7ABCF</baseMousecolorizer>
-<baseMouseOvercolorizer>0xA7ABCF</baseMouseOvercolorizer>
+<basebgcolorizer>0xBDC0DB</basebgcolorizer>
+<baseMousecolorizer>0xBDC0DB</baseMousecolorizer>
+<baseMouseOvercolorizer>0xBDC0DB</baseMouseOvercolorizer>
 <styleMenuBarBaseColor>0x000088</styleMenuBarBaseColor>
     
 <!--

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1307797&r1=1307796&r2=1307797&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx Sat Mar 31 13:17:22 2012
@@ -22,63 +22,84 @@
 <!-- methods for main.lzx -->
 
 <library>
-    
-    <class name="confmenucommand" extends="command">
-        <method name="reInit">
-            
-            if($debug) Debug.write("reInit");
-            
-            if(canvas.isrtl == 'true'){
-                if($debug) Debug.write("reInit : resetting key");
-            
-                this.setAttribute('key', '');
-            }
-            
-            if($debug) Debug.write("reInit : not rtl");
-            
-            
-        </method>
+
+	<class name="baseconfmenucommand" extends="command" >
+    	<attribute name="enabled" value="true" type="boolean" />
     </class>
     
-    <confmenucommand id="cmd_applyforMod" onselect="canvas.doActionmenu('applyForMod')" />
-    <confmenucommand id="cmd_createPoll" onselect="canvas.doActionmenu('createPoll')" key="['ALT','Shift','P']"/> 
-    <confmenucommand id="cmd_pollResults" onselect="canvas.doActionmenu('pollResults')" key="['ALT','Shift','R']"/> 
-    <confmenucommand id="cmd_checkPollVoted" onselect="canvas.doActionmenu('checkPollVoted')" key="['ALT','Shift','V']"/> 
-    <confmenucommand id="cmd_importFile" onselect="canvas.doActionmenu('importFile')" key="['ALT','Shift','I']"/> 
-    <confmenucommand id="cmd_editCamMicSettings" onselect="canvas.doActionmenu('editCamMicSettings')" key="['ALT','Shift','1']"/> 
-    <confmenucommand id="cmd_editBoardSettings" onselect="canvas.doActionmenu('editBoardSettings')" key="['ALT','Shift','2']"/>   
-    <confmenucommand id="cmd_quit" onselect="canvas.doActionmenu('quit')" key="['ALT','Shift','E']"/>
-    <confmenucommand id="cmd_showSipDialer" onselect="canvas.doActionmenu('showSipDialer')" key="['ALT','Shift','D']" />
-    
-    <confmenucommand id="cmd_applyforMod_nokey" onselect="canvas.doActionmenu('applyForMod')" />
-    <confmenucommand id="cmd_createPoll_nokey" onselect="canvas.doActionmenu('createPoll')" /> 
-    <confmenucommand id="cmd_pollResults_nokey" onselect="canvas.doActionmenu('pollResults')" /> 
-    <confmenucommand id="cmd_checkPollVoted_nokey" onselect="canvas.doActionmenu('checkPollVoted')" /> 
-    <confmenucommand id="cmd_importFile_nokey" onselect="canvas.doActionmenu('importFile')" /> 
-    <confmenucommand id="cmd_editCamMicSettings_nokey" onselect="canvas.doActionmenu('editCamMicSettings')"/> 
-    <confmenucommand id="cmd_editBoardSettings_nokey" onselect="canvas.doActionmenu('editBoardSettings')" />   
-    <confmenucommand id="cmd_quit_nokey" onselect="canvas.doActionmenu('quit')" />
-    <confmenucommand id="cmd_showSipDialer_nokey" onselect="canvas.doActionmenu('showSipDialer')" />
-    
-    <!--
-    <command id="cmd_browser_open" onselect="canvas.doActionmenu('browser_open')" key="['ALT','Shift','B']"/>   
-    <command id="cmd_browser_close" onselect="canvas.doActionmenu('browser_close')" key="['ALT','Shift','b']"/> 
-     -->
-     
-    <confmenucommand id="cmd_invitation" onselect="canvas.doAction('invitation')" /> 
-    
-    <confmenucommand id="cmd_editWhiteboardDefault" onselect="canvas.doActionmenu('editWhiteboardDefault')" key="['ALT','Shift','9']"/> 
-    
-    
-    <confmenucommand id="cmd_coBrowser" onselect="canvas.doActionmenu('browser_open')" key="['ALT','Shift','B']"/> 
-    <confmenucommand id="cmd_coBrowser_nokey" onselect="canvas.doActionmenu('browser_open')" /> 
+    <class name="confmenucommand" extends="baseconfmenucommand" >
+    	<attribute name="actionCommand" value="" type="string" />
+    	<handler name="onselect" args="sel">
+    		if (!this.enabled) {
+    			return;
+    		}
+    		canvas.doActionmenu(this.actionCommand);
+    	</handler>
+    </class>
+        
+    <baseconfmenucommand id="cmd_shareDesktop" key="['control','d']" >
+    	<handler name="onselect" args="sel">
+    		if (!this.enabled) {
+    			return;
+    		}
+    		canvas._mymod.checkSharerSession.doCall();
+    	</handler>
+    </baseconfmenucommand>
+    
+    <confmenucommand id="cmd_applyforMod" key="['control','1']" actionCommand="applyForMod" />
+    
+    <confmenucommand id="cmd_applyforWhiteBoard" key="['control','2']">
+    	<handler name="onselect" args="tSel">
+    		if (!this.enabled) {
+    			return;
+    		}
+    		if ($debug) Debug.write("cmd_applyforWhiteBoard onselect",tSel);
+    		//Ask for Right to Draw on Whiteboard
+			var tDate = new Date();
+			canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",tDate.getTime());
+    	</handler>
+    </confmenucommand>
+    
+    <baseconfmenucommand id="cmd_applyforAV" key="['control','3']">
+    	<handler name="onselect" args="tSel">
+    		if (!this.enabled) {
+    			return;
+    		}
+    		if ($debug) Debug.write("cmd_applyforAV onselect",canvas.ismoderator,tSel);
+    		if (canvas.ismoderator) {
+				//Do directly send confirmation to share Audio/Video to SELF! so that all users get
+				//the notification and the broadcasting Bit is set for this User
+				canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator = canvas.publicSID;
+				canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
+				canvas.thishib.setBroadCastingFlag.doCall();
+			} else {
+				//Apply for Right to Share Audio/Video
+				var tDate = new Date();
+				canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",tDate.getTime());
+			}
+    	</handler>
+    </baseconfmenucommand>
+    
+    <confmenucommand id="cmd_createPoll" key="['control','6']" actionCommand="createPoll" />
+    <confmenucommand id="cmd_pollResults" key="['control','7']" actionCommand="pollResults" />
+    <confmenucommand id="cmd_checkPollVoted" key="['control','8']" actionCommand="checkPollVoted" />
+    <confmenucommand id="cmd_importFile" key="['control','f']" actionCommand="importFile" />
+    <confmenucommand id="cmd_editCamMicSettings" actionCommand="editCamMicSettings" key="['control','m']"/> 
+    <confmenucommand id="cmd_quit" actionCommand="quit" key="['control','q']"/>
+    <confmenucommand id="cmd_showSipDialer" actionCommand="showSipDialer" key="['control','0']" />
+    
+    <confmenucommand id="cmd_invitation" actionCommand="invitation" key="['control','4']" /> 
+    <confmenucommand id="cmd_editWhiteboardDefault" actionCommand="editWhiteboardDefault" key="['control','9']"/> 
+    <confmenucommand id="cmd_coBrowser" actionCommand="browser_open" key="['control','b']"/> 
    
+    <!--  
+    	There is no image export at the moment
     <confmenucommand id="cmd_exportFilePNG" onselect="canvas.doWhiteboardActionmenu('exportFilePNG')" />
     <confmenucommand id="cmd_exportFileJPG" onselect="canvas.doWhiteboardActionmenu('exportFileJPG')" />
     <confmenucommand id="cmd_exportFilePDF" onselect="canvas.doWhiteboardActionmenu('exportFilePDF')" />
     <confmenucommand id="cmd_exportFileSVG" onselect="canvas.doWhiteboardActionmenu('exportFileSVG')" />
     <confmenucommand id="cmd_exportFileTIF" onselect="canvas.doWhiteboardActionmenu('exportFileTIF')" />
-    
+     -->
     
     <attribute name="colorArray" value="null" />
     
@@ -373,15 +394,16 @@
         }
     </method>
 
-    <!-- you can delete this comment. It was just memo.
-            Mar 24 2008 onokeiji@gmail.com
-         moved from modules/conference/conference/conferenceMenubar.lzx
-    -->
+	<!---
+		Actions connected to the shortcuts
+	 -->
     <method name="doActionmenu" args="stringSub">
         <![CDATA[
             if($debug) Debug.write("doActionmenu: ",stringSub);
             if (canvas._conferencemenu.visibility == 'visible'){
-                if (stringSub=='editWhiteboardDefault') {
+            	 if (stringSub == "invitation") {
+			        new lz.inviteMainWindow(canvas.main_content._content.inner);
+			    } else if (stringSub=='editWhiteboardDefault') {
                     new lz.editWhiteboardDefault(canvas.main_content._content.inner);
                 } else if (stringSub=='createPoll') {
                     new lz.createPollWin(canvas.main_content._content.inner);
@@ -406,8 +428,6 @@
                     canvas._videocontainer._videoviewcontent.changeDevice();
                 } else if (stringSub=='showSipDialer') {
                     new lz.sipDialer(canvas.main_content._content.inner);
-                } else if (stringSub=='editBoardSettings') {
-                    new lz.editWhiteboardDefault(canvas.main_content._content.inner);
                 } else if (stringSub=='quit') {
                     
                     quicklink('conferenceModuleRoomList')
@@ -420,9 +440,7 @@
                     if ($debug) Debug.write( "is browser[browserPanelWidth] ? ", browserPanelWidth );
                     if ($debug) Debug.write( "is browser[browserPanelHeight] ? ", browserPanelHeight );
 
-                //ブラウザ�インスタンスを確�����れ�開�。��れ�作��る
                     if( !canvas.conferenceBrowserIsinited ){
-                        if ($debug) Debug.write( "if this" );
                         new lz.conferenceBrowser( canvas.main_content._content.inner,{
                                                          name:'conferenceBrowser',y:30,
                                                          width:canvas.width-220, 
@@ -430,15 +448,14 @@
                                                          width:browserPanelWidth, 
                                                          height:browserPanelHeight
                                                      });
-                    } else{Debug.write( "else this" );
+                    } else{
                     with( canvas.main_content._content.inner ){
                             conferenceBrowser.htmlviewer.setVisible( true );
                             conferenceBrowser.setVisible( true );
                     }
                 }
              } else if( stringSub == "browser_close" ){
-                // 開���るブラウザをアニメーション�移動�る hieght=0  
-                Debug.write( "is browser[close] ? ", canvas.main_content._content.inner.conferenceBrowser );
+                if ($debug) Debug.write( "is browser[close] ? ", canvas.main_content._content.inner.conferenceBrowser );
                 with( canvas.main_content._content.inner ){
                     if( conferenceBrowser  != undefined ){
                             conferenceBrowser.htmlviewer.setVisible( false );
@@ -762,15 +779,6 @@
 	</method>
 	 
 	<!---
-		Load the invitation window
-	 -->
-	<method name="doAction" args="action">
-	    if (action == "invitation") {
-	        new lz.inviteMainWindow(canvas.main_content._content.inner);
-	    }
-	</method>
-	
-	<!---
 		Sets the flags isAllowedToDraw, isAllowedToScreenShare, isAllowedToRemoteControl 
 		and broadcasts the three rights to SWF10 container
 	 -->

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx?rev=1307797&r1=1307796&r2=1307797&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx Sat Mar 31 13:17:22 2012
@@ -25,7 +25,7 @@
         fontsize="14" y="6" x="10" />
 
 
-<class name="dropDownMenuListItem" extends="view" height="36">
+<class name="baseDropDownMenuListItem" extends="view" height="36">
 
     <attribute name="action" value="" type="string" />
 
@@ -37,7 +37,8 @@
     <attribute name="textToolTip" value="" type="string" />
     
     <attribute name="isSpacer" value="false" type="boolean" />
-
+    <attribute name="text" value="" type="string" />
+    
     <handler name="onmouseover">
         this._bg.setAttribute("visibility","visible");
     </handler>
@@ -55,6 +56,10 @@
     <text text="$once{ parent.textToolTip }" name="_ctextTooltip" fontstyle="plain" fgcolor="0x666666"
         	fontsize="10" y="20" x="10" />	
    
+</class>
+
+<class name="dropDownMenuListItem" extends="baseDropDownMenuListItem" >
+
     <handler name="onclick">
         loadContent(this,null,null);
         parent.parent.close();
@@ -66,13 +71,16 @@
 	<attribute name="isSpacer" value="true" type="boolean" />
 </class>
 
-<class name="dropDownMenuList" extends="view" bgcolor="0xCCCCCC"
-		height="${ this._content.height+2 }" width="${ this._content.width+2 }">
+<class name="baseDropDownMenuList" extends="view" bgcolor="0xCCCCCC">
 		
 	<attribute name="list" value="null" />
 	
 	<attribute name="btnRef" value="null" />
 	
+	<handler name="oninit">
+		lz.ModeManager.makeModal(this);
+	</handler>
+	
 	<!--- @keywords private -->
     <method name="passModeEvent" args="eventStr,view" > 
         <![CDATA[
@@ -95,33 +103,14 @@
        ]]> 
     </method>  
     
-    <handler name="oninit">
-    	lz.ModeManager.makeModal(this);
-    </handler>
-	
 	<method name="close">
 		this.btnRef.setAttribute("selected",false);
 		lz.ModeManager.release(this);
 		this.destroy();
 	</method>
 	
-	<handler name="oninit">
+	<method name="fixWidth">
 		<![CDATA[
-			for (var i=0;i<this.list.length;i++) {
-				if (i!=0) {
-					new lz.horizontalDropDownSpacer(this._content);
-				}
-                new lz.dropDownMenuListItem(this._content,{
-                			textvalue:this.list[i].name,
-                			list:this.list[i].subnavi,
-                			text:this.list[i].label.value,
-                			isopen:this.list[i].isopen,
-                			isleaf:this.list[i].isleaf,
-                			action:this.list[i].action,
-                			textToolTip:list[i].tooltip.value
-               			});
-            }
-            
             //the second round goes through the list of items, as 
             //now the maxwidth is detected we adjust the rest to it
             var maxWidth = 0;
@@ -141,6 +130,35 @@
             	}
             }
 		]]>
+	</method>
+
+</class>
+
+<class name="dropDownMenuList" extends="baseDropDownMenuList"
+		height="${ this._content.height+2 }" width="${ this._content.width+2 }">
+		
+	<handler name="oninit">
+		<![CDATA[
+			if (this.list == null) {
+				return;
+			}
+			for (var i=0;i<this.list.length;i++) {
+				if (i!=0) {
+					new lz.horizontalDropDownSpacer(this._content);
+				}
+                new lz.dropDownMenuListItem(this._content,{
+                			textvalue:this.list[i].name,
+                			list:this.list[i].subnavi,
+                			text:this.list[i].label.value,
+                			isopen:this.list[i].isopen,
+                			isleaf:this.list[i].isleaf,
+                			action:this.list[i].action,
+                			textToolTip:list[i].tooltip.value
+               			});
+            }
+            
+            this.fixWidth();
+		]]>
 	</handler>	
 	
 	<view name="_content" x="1" y="1" 
@@ -148,11 +166,11 @@
 		
 </class>
 
-<class name="mainMenuMeetingsItem" extends="view" height="34"
+<class name="baseMenuMeetingsItem" extends="view" height="34"
     width="${ this._ctext.width+36 }" >
 
     <attribute name="action" value="" type="string" />
-
+	<attribute name="text" value="" type="string" />
     <attribute name="textToolTip" value="" type="string" />
     <attribute name="_menuRef" value="null" />
     <attribute name="isopen" value="false" type="boolean" />
@@ -160,7 +178,12 @@
     <attribute name="list" value="null" />
     <attribute name="textvalue" value="null" />
     <attribute name="selected" value="false" type="boolean" />
-
+    
+    <attribute name="text_y_inset" value="6" type="number" />
+    <attribute name="text_fontsize" value="14" type="number" />
+    
+    <attribute name="down_y_inset" value="10" type="number" />
+    
     <handler name="onmouseover">
         if (!this.selected){
             this.bgc.setAttribute('visibility','visible');
@@ -186,20 +209,26 @@
     	}
     </handler>
     
-    <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="32" y="1"
+    <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1"
         visibility="hidden" name="bgc"/>
         
-    <view width="${ parent.width-1 }" bgcolor="0xEFEFEF" height="34" 
+    <view width="${ parent.width-1 }" bgcolor="0xEFEFEF" height="$once{ parent.height }" 
         visibility="hidden" name="bga">
         <view width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
     </view>
     
-    <view name="_icon_down" x="${ parent.width-20 }" y="10" 
+    <view name="_icon_down" x="${ parent.width-20 }" y="$once{ parent.down_y_inset }" 
     			resource="bullet_arrow_down_rsc" frame="1" />  
     
     <view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" />
     <text text="$once{ parent.text }" name="_ctext" fontstyle="plain" fgcolor="0xFFFFFF"
-        	fontsize="14" y="6" x="10" />
+        	fontsize="$once{ parent.text_fontsize }" y="$once{ parent.text_y_inset }" x="10" />
+
+    <labelTooltip name="_textToolTip" text="$once{ parent.textToolTip }" multiline="false" />
+    
+</class>
+
+<class name="mainMenuMeetingsItem" extends="baseMenuMeetingsItem" >
 
     <handler name="onclick">
     	new lz.dropDownMenuList(canvas,{
@@ -211,8 +240,6 @@
         this.parent.parent.sendOpenMenu(this);
     </handler>
 
-    <labelTooltip text="$once{ parent.textToolTip }" multiline="true" />
-    
 </class>
 
 <class name="mainNavi" extends="view" bgcolor="$once{ canvas.styleMenuBarBaseColor }" 

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1307797&r1=1307796&r2=1307797&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx Sat Mar 31 13:17:22 2012
@@ -20,369 +20,249 @@
 -->
 <library>
 
-	<!-- private class for conferenceMenubar class submenuItems -->
-	<class name="_labelMenuItem" extends="menuitem" text=""
-		style="componentStyle">
-		<text id="menuText" text="" align="right" />
-		<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
+	<class name="restrictedConferenceMenubar" extends="conferenceMenubar" viewType="restricted" />
 
-		<method name="setLabelId" args="_labelid">
-			this.labelid = _labelid;
-			if(canvas.isrtl == 'true'){
-				menuText.setText(canvas.getLabelName(this.labelid));
-				this.setAttribute('text','');
-			}
-			else{
-			    this.setAttribute('text',canvas.getLabelName(this.labelid));
-			}
-		</method>
-	</class>
-
-	<!-- private class for conferenceMenubar class -->
-	<class name="_labelMenu" extends="menu" text="labelmenulabelmenulabelmenu">
-		<attribute name="labelid" type="number" setter="setLabelId(labelid)" />
-		<method name="setLabelId" args="_labelid">
-			this.labelid = _labelid;
-			this.setAttribute('text',canvas.getLabelName(this.labelid));
-		</method>
-	</class>
-
-	<!--- Menu for public/private conference and audience room. This class shows
-		exit, moderator, file, setteings and poll menu. Those menu items are connected
-		to each command that has been declared in base/mainMethods.lzx. May 24 2008
-		commented by onokeiji@gmail.com -->
-	<class name="conferenceMenubar" extends="menubar" height="28"
-		style="itemStyle">
-
-		<simpleLabelButton labelid="789" name="_exitbtn"
-			text_x="32" width="80" style="itemStyle" height="28">
-			<handler name="onclick">
-                canvas._videocontainer._videoviewcontent.exitRoom();
-                canvas.videoComp_lc.exitRoom = function(confirm) {
-                    if ($debug) Debug.write("confirm exitRoom:", confirm);
-                    if (confirm) {
-                        canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
-                        if (canvas.appointmentNotificationPopUp != null) {
-                            canvas.appointmentNotificationPopUp.destroy();
-                        }
-                        canvas.doActionmenu('quit');
-                    }
-                }
-			</handler>
-			<view resource="exit_btn_rsc" y="2" x="4" />
-			<labelTooltip labelid="309" />
-		</simpleLabelButton>
-
-		<!-- file menu -->
-		<_labelMenu labelid="245" width="250">
-			<handler name="oninit">
-	                <![CDATA[
-	                    if (canvas.isinitRoomDirect || canvas.remoteUserLogin || canvas.secureRemoteUserLogin) {
-	                    	if ($debug) Debug.write("this mbarcontent ",this);
-	                    	if (canvas.destroyExitButton) {
-	                            parent._exitbtn.destroy();
-	                    	}
-	                    }
-
-	                    if(canvas.isrtl == 'true'){
-	                    	if ($debug) Debug.write("onInit : Setting nokey");
-	                    	lblImport.setCommand(cmd_importFile_nokey);
-	                    }
-	                ]]>
-			</handler>
-			<_labelMenuItem id="lblImport" labelid="15"
-				command="cmd_importFile" enabled="${ canvas.ismoderator }" />
-			<!-- <menuseparator/> <_labelMenuItem labelid="561" command="cmd_exportFilePNG"
-				/> <_labelMenuItem labelid="562" command="cmd_exportFileJPG" /> <_labelMenuItem
-				labelid="563" command="cmd_exportFilePDF" /> <_labelMenuItem labelid="560"
-				command="cmd_exportFileSVG" /> <_labelMenuItem labelid="564" command="cmd_exportFileTIF"
-				/> <menuseparator/> <_labelMenuItem name="_exitItem" labelid="309" command="cmd_quit"
-				value="quit" /> -->
-		</_labelMenu>
-
-		<_labelMenu labelid="635" width="250" name="_actions">
-
-			<handler name="oninit">
-	                <![CDATA[
-
-	                    if(canvas.isrtl == 'true'){
-	                    	if ($debug) Debug.write("onInit : Setting nokey");
-	                    	lblCamMic.setCommand(cmd_editCamMicSettings_nokey);
-	                    	lblBoard.setCommand(cmd_editBoardSettings_nokey);
-	                    	lblPoll.setCommand(cmd_createPoll_nokey);
-	                    	lblPollResult.setCommand(cmd_pollResults_nokey);
-	                    	lblPollVote.setCommand(cmd_checkPollVoted_nokey);
-	                    	lblShowSipDialer.setCommand(cmd_showSipDialer_nokey);
-	                    }
-	                    //hideActionsMenu
-	                    if(canvas.currentRoomObj.hideActionsMenu){	                    	
-	                    	parent.mbarcontent.subviews[2].setAttribute("visible", false);
-	                    }
-	                    
-	                ]]>
-			</handler>
-			<!-- <_labelMenuItem labelid="1097" enabled="${ canvas.ismoderator }"> 
-				<handler name="onselect" args="sel"> canvas.thishib.closeRoom.room_id = hib.currentroomid; 
-				canvas.thishib.closeRoom.isClosed = true; canvas.thishib.closeRoom.doCall(); 
-				</handler> </_labelMenuItem> <menuseparator/> -->
-			<_labelMenuItem labelid="213" command="cmd_invitation" />
-			<menuseparator />
-			<_labelMenuItem labelid="239" enabled="${ canvas.ismoderator }">
-				<handler name="onselect" args="sel">
-					if ($debug) Debug.write("checkSharerSession.doCall");
-					canvas._mymod.checkSharerSession.doCall();
-				</handler>
-			</_labelMenuItem>
-			<menuseparator />
-			<!-- <_labelMenuItem labelid="749" command="cmd_coBrowser" enabled="${
-				canvas.ismoderator }" /> <menuseparator/> -->
-			<_labelMenuItem id="lblCamMic" labelid="306"
-				command="cmd_editCamMicSettings" />
-			<_labelMenuItem id="lblBoard" labelid="307"
-				command="cmd_editBoardSettings" />
-			<menuseparator />
-			<_labelMenuItem labelid="784" enabled="${ !canvas.ismoderator }">
-				<handler name="onselect" args="sel">
-					//Apply for Moderation
-					canvas.thishib.applyForModeration.doCall();
-				</handler>
-			</_labelMenuItem>
-			<_labelMenuItem labelid="785" enabled="${ !canvas.ismoderator }">
-				<handler name="onselect" args="sel">
-					//Ask for Right to Draw on Whiteboard
-					var tDate = new Date();
-					canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",tDate.getTime());
-				</handler>
-			</_labelMenuItem>
-			<_labelMenuItem labelid="786" enabled="${ !canvas.ismoderator }">
-				<handler name="onselect" args="sel">
-					if (canvas.ismoderator) {
-						//Do directly send confirmation to share Audio/Video to SELF! so that all users get
-						//the notification and the broadcasting Bit is set for this User
-						canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator =
-						canvas.publicSID;
-						canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
-						canvas.thishib.setBroadCastingFlag.doCall();
-					} else {
-						//Apply for Right to Share Audio/Video
-						var tDate = new Date();
-						canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",tDate.getTime());
+	<class name="interviewConferenceMenubar" extends="conferenceMenubar" viewType="interview"/>
+	
+	<class name="conferenceMenubar" extends="view" height="28" width="${ canvas.width }" 
+						bgcolor="$once{ canvas.styleMenuBarBaseColor }" >
+						
+		<attribute name="viewType" value="conference" type="string" />
+						
+	    <attribute name="selected" value="null" />
+    
+	    <method name="sendOpenMenu" args="menuref">
+	    	if (this.selected != null) {
+	    		this.selected.setAttribute("selected",false);
+	    	}
+	    	this.selected = menuref;
+	    	this.selected.setAttribute("selected",true);
+	    </method>
+			
+		<view name="itemlist" layout="axis:x;spacing:0" >
+			
+			<conferenceExitButton name="_exitbtn" 
+				text_y_inset="4" text_fontsize="14" down_y_inset="8" height="28" />
+				
+			<baseMenuMeetingsItem text="$once{ canvas.getLabelName(245) }" 
+						text_y_inset="4" text_fontsize="14" down_y_inset="8"
+						textToolTip="" height="28"
+						visible="${ (classroot.viewType=='conference') ? true : ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"
+						>
+				<handler name="onclick">
+			    	new lz.conferenceMenuFiles(canvas,{
+			    				x:this.getAttributeRelative("x",canvas),
+			    				y:this.getAttributeRelative("y",canvas)+this.height,
+			    				btnRef:this,
+			    				list:this.list
+			    			});
+			        this.parent.parent.sendOpenMenu(this);
+			    </handler>
+			</baseMenuMeetingsItem>
+			
+			<baseMenuMeetingsItem text="$once{ canvas.getLabelName(635) }" 
+						text_y_inset="4" text_fontsize="14" down_y_inset="8"
+						textToolTip="" height="28"
+						visible="${ (classroot.viewType=='conference') ? true : ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }"
+						>
+				<handler name="oninit">
+					if(canvas.currentRoomObj.hideActionsMenu){	      
+						this.setAttribute.setAttribute("visibility", "hidden");
 					}
-				</handler>
-			</_labelMenuItem>
-			<menuseparator />
-			<_labelMenuItem width="250" id="lblPoll" labelid="24"
-				command="cmd_createPoll" enabled="${ canvas.ismoderator }" />
-			<_labelMenuItem width="250" id="lblPollResult"
-				labelid="37" command="cmd_pollResults" /><!-- enabled="${ canvas.ismoderator }"  -->
-			<_labelMenuItem width="250" id="lblPollVote" labelid="42"
-				command="cmd_checkPollVoted" />
-			<menuseparator />
-            <_labelMenuItem width="250" id="lblShowSipDialer" labelid="1447"
-				command="cmd_showSipDialer" />
-            <menuseparator />
-			<_labelMenuItem width="250" labelid="1126"
-				command="cmd_editWhiteboardDefault" />
-		</_labelMenu>
-
-		<!-- exit room <_labelMenu labelid="308" width="250"> </_labelMenu> <_labelMenu
-			labelid="301" width="250"> <_labelMenuItem id="lblMod" labelid="302" command="cmd_applyforMod"
-			/> </_labelMenu> <_labelMenu labelid="305" width="250"> <_labelMenuItem labelid="306"
-			command="cmd_editCamMicSettings" /> <_labelMenuItem labelid="307" command="cmd_editBoardSettings"
-			/> </_labelMenu> <_labelMenu labelid="303" width="250"> </_labelMenu> -->
-
-	</class>
-
-	<class name="restrictedConferenceMenubar" extends="menubar"
-		height="28" style="itemStyle">
-
-		<handler name="oninit">
-            <![CDATA[
-                if (canvas.isinitRoomDirect || canvas.remoteUserLogin || canvas.secureRemoteUserLogin) {
-                    if ($debug) Debug.write("this mbarcontent ",this);
-                    if (canvas.destroyExitButton) {
-                        _exitbtn.destroy();
-                    }
-                }
+				</handler>		
+				<handler name="onclick">
+			    	new lz.conferenceMenuActions(canvas,{
+			    				x:this.getAttributeRelative("x",canvas),
+			    				y:this.getAttributeRelative("y",canvas)+this.height,
+			    				btnRef:this
+			    			});
+			        this.parent.parent.sendOpenMenu(this);
+			    </handler>
+			</baseMenuMeetingsItem>
+			
+		</view>
+	
+	</class> 
+	
+	<class name="conferenceExitButton" extends="view" height="34" width="${ this._ctext.width+36 }" >
+	
+	    <attribute name="text_y_inset" value="6" type="number" />
+	    <attribute name="text_fontsize" value="14" type="number" />
+	    
+	    <attribute name="down_y_inset" value="10" type="number" />
+	    
+	    <handler name="onmouseover">
+            this.bgc.setAttribute('visibility','visible');
+	    </handler>
+	    <handler name="onmouseout">
+            this.bgc.setAttribute('visibility','hidden');
+	    </handler>
+	    
+	    <handler name="oninit">
+			<![CDATA[
+				if (canvas.isinitRoomDirect || canvas.remoteUserLogin || canvas.secureRemoteUserLogin) {
+	            	if ($debug) Debug.write("this mbarcontent ",this);
+	            	if (canvas.destroyExitButton) {
+	                    this.destroy();
+	            	}
+	            }
             ]]>
 		</handler>
-
-		<simpleLabelButton labelid="789" name="_exitbtn"
-			text_x="32" width="80" style="itemStyle" height="28">
-			<handler name="onclick">
-                canvas._videocontainer._videoviewcontent.exitRoom();
-                canvas.videoComp_lc.exitRoom = function(confirm) {
-                    if ($debug) Debug.write("confirm exitRoom:", confirm);
-                    if (confirm) {
-                        canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
-                        if (canvas.appointmentNotificationPopUp != null) {
-                            canvas.appointmentNotificationPopUp.destroy();
-                        }
-                        canvas.doActionmenu('quit');
+		<handler name="onclick">
+            canvas._videocontainer._videoviewcontent.exitRoom();
+            canvas.videoComp_lc.exitRoom = function(confirm) {
+                if ($debug) Debug.write("confirm exitRoom:", confirm);
+                if (confirm) {
+                    canvas.currentBaseConferenceRoom._screenSharingAdapter.closeAllScreenSharings();
+                    if (canvas.appointmentNotificationPopUp != null) {
+                        canvas.appointmentNotificationPopUp.destroy();
                     }
+                    canvas.doActionmenu('quit');
                 }
-			</handler>
-			<view resource="exit_btn_rsc" y="2" x="4" />
-			<labelTooltip labelid="309" />
-		</simpleLabelButton>
-
-		<menubar x="80" style="itemStyle" height="28"
-			visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }">
-
-			<!-- file menu -->
-			<_labelMenu labelid="245" width="250">
-				<_labelMenuItem labelid="15" command="cmd_importFile"
-					enabled="${ canvas.ismoderator }" />
-				<!-- <menuseparator/> <_labelMenuItem labelid="561" command="cmd_exportFilePNG" 
-					enabled="${ canvas.ismoderator }" /> <_labelMenuItem labelid="562" command="cmd_exportFileJPG" 
-					enabled="${ canvas.ismoderator }" /> <_labelMenuItem labelid="563" command="cmd_exportFilePDF" 
-					enabled="${ canvas.ismoderator }" /> <_labelMenuItem labelid="560" command="cmd_exportFileSVG" 
-					enabled="${ canvas.ismoderator }" /> <_labelMenuItem labelid="564" command="cmd_exportFileTIF" 
-					enabled="${ canvas.ismoderator }" /> <menuseparator/> <_labelMenuItem name="_exitItem" 
-					labelid="309" command="cmd_quit" value="quit" /> -->
-			</_labelMenu>
-
-			<_labelMenu labelid="635" width="250">
-				<handler name="oninit">
-					//hideActionsMenu
-					if(canvas.currentRoomObj.hideActionsMenu){	                    	
-	                    parent.mbarcontent.subviews[1].setAttribute("visible", false);
-	                }
-				</handler>
-				<!-- <_labelMenuItem labelid="1097" enabled="${ canvas.ismoderator }"> 
-					<handler name="onselect" args="sel"> canvas.thishib.closeRoom.room_id = hib.currentroomid; 
-					canvas.thishib.closeRoom.isClosed = true; canvas.thishib.closeRoom.doCall(); 
-					</handler> </_labelMenuItem> <menuseparator/> -->
-				<_labelMenuItem labelid="213" command="cmd_invitation"
-					enabled="${ canvas.ismoderator }" />
-				<menuseparator />
-				<_labelMenuItem labelid="239" enabled="${ canvas.ismoderator }">
-					<handler name="onselect" args="sel">
-						canvas._conferencemenu._moderationPanel.checkSharerSession.doCall();
-					</handler>
-				</_labelMenuItem>
-				<menuseparator />
-				<!-- <_labelMenuItem labelid="749" command="cmd_coBrowser" enabled="${
-					canvas.ismoderator }" /> <menuseparator/> -->
-				<_labelMenuItem labelid="306" command="cmd_editCamMicSettings"
-					enabled="${ canvas.ismoderator }" />
-				<_labelMenuItem labelid="307" command="cmd_editBoardSettings"
-					enabled="${ canvas.ismoderator }" />
-				<menuseparator />
-				<_labelMenuItem labelid="302" command="cmd_applyforMod"
-					enabled="${ canvas.ismoderator }" />
-				<_labelMenuItem labelid="785" enabled="${ !canvas.ismoderator }">
-					<handler name="onselect" args="sel">
-						//Ask for Right to Draw on Whiteboard
-						var tDate = new Date();
-						canvas.thishib.sendMessageWithClient.sendMessage("applyForWhiteboard",tDate.getTime());
-					</handler>
-				</_labelMenuItem>
-				<_labelMenuItem labelid="786" enabled="${ !canvas.ismoderator }">
-					<handler name="onselect" args="sel">
-						if (canvas.ismoderator) {
-							//Do directly send confirmation to share Audio/Video to SELF! so that all users get
-							//the notification and the broadcasting Bit is set for this User
-							canvas.thishib.setBroadCastingFlag.publicSIDOfNewModerator =
-							canvas.publicSID;
-							canvas.thishib.setBroadCastingFlag.isAllowedToBroadCastAV = true;
-							canvas.thishib.setBroadCastingFlag.doCall();
-						} else {
-							//Apply for Right to Share Audio/Video
-							var tDate = new Date();
-							canvas.thishib.sendMessageWithClient.sendMessage("applyForAV",tDate.getTime());
-						}
-					</handler>
-				</_labelMenuItem>
-				<menuseparator />
-				<_labelMenuItem width="250" labelid="24" command="cmd_createPoll"
-					enabled="${ canvas.ismoderator }" />
-				<_labelMenuItem width="250" labelid="37" command="cmd_pollResults"
-					 /> <!-- enabled="${ canvas.ismoderator }" -->
-				<_labelMenuItem width="250" labelid="42"
-					command="cmd_checkPollVoted" />
-				<menuseparator />
-				<_labelMenuItem width="250" labelid="1126"
-					command="cmd_editWhiteboardDefault" />
-			</_labelMenu>
-
-		</menubar>
-
+            }
+		</handler>
+	    
+	    <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="$once{ parent.height - 2}" y="1"
+	        visibility="hidden" name="bgc"/>
+	        
+	    <view resource="exit_btn_rsc" y="4" x="4" />
+	    
+	    <view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" />
+	    
+	    <labelText labelid="789" name="_ctext" fontstyle="plain" fgcolor="0xFFFFFF"
+	        	fontsize="$once{ parent.text_fontsize }" y="$once{ parent.text_y_inset }" x="30" />
+	
+	    <labelTooltip name="_textToolTip" labelid="309" multiline="false" />
+	    
 	</class>
-
-	<class name="interviewConferenceMenubar" extends="menubar"
-		height="28" style="itemStyle">
-
+	
+	
+	
+	<class name="conferencDropDownMenuItem" extends="view" height="36">
+	
+		<attribute name="isSpacer" value="false" type="boolean" />
+	
+		<attribute name="enabled" type="boolean" setter="this.setEnabled(enabled)" />
+		
+		<method name="setEnabled" args="e">
+			this.enabled = e;
+			if (this.enabled) {
+				this._ctext.setAttribute("fgcolor",0x666666);
+				this._ctextTooltip.setAttribute("fgcolor",0x666666);
+			} else {
+				this._ctext.setAttribute("fgcolor",0xBBBBBB);
+				this._ctextTooltip.setAttribute("fgcolor",0xBBBBBB);
+			}
+			if (this.command) {
+				this.command.enabled = this.enabled;
+			}
+		</method>
+		
+		<attribute name="labelid" type="number"
+                   setter="this.setLabelId( labelid )"   when="once" />
+                   
+		<method name="setLabelId" args="id" >
+            this.labelid = id;
+            if ( this.labelid ) {
+                this._ctext.setAttribute('text', canvas.getLabelName(this.labelid));
+            }
+        </method>
+		
+		<attribute name="command" type="expression"
+                   setter="this.setCommand( command )"   when="once" />
+		
+		<method name="setCommand" args="cmd" >
+            this.command = cmd;
+            if ( this.command ) {
+                this._ctextTooltip.setAttribute('text', command.keysToString());
+            }
+        </method>
+        
+        <handler name="onclick">
+        	if (!this.enabled) {
+        		return;
+        	}
+        	this.command.execute(null);
+        	parent.parent.close();
+        </handler>
+        
+        <handler name="onmouseover">
+	        this._bg.setAttribute("visibility","visible");
+	    </handler>
+	    
+	    <handler name="onmouseout">
+	        this._bg.setAttribute("visibility","hidden");
+	    </handler>
+	
+	    <view name="_bg" visibility="hidden" width="${ parent.width-2 }" y="0" x="1"
+	          bgcolor="0xFFFFFF" opacity="0.5" height="36" />
+	    
+	    <text name="_ctext" fontstyle="bold" fgcolor="0x666666"
+	        	fontsize="14" y="2" x="10" />
+	        	
+	    <text name="_ctextTooltip" fontstyle="plain" fgcolor="0x666666"
+	        	fontsize="10" y="20" x="10" />	
+		
+	</class> 
+	
+	<class name="conferenceMenuFiles" extends="baseDropDownMenuList"
+			height="${ this._content.height+2 }" width="${ this._content.width+2 }">
+			
+		<view name="_content" x="1" y="1" 
+			layout="axis:y;spacing:1" bgcolor="0xEFEFEF" >
+			
+			<conferencDropDownMenuItem labelid="213" command="cmd_importFile"
+						enabled="${ canvas.ismoderator }" />
+			
+		</view>
+		
+	</class>
+	
+	<class name="conferenceMenuActions" extends="baseDropDownMenuList"
+			height="${ this._content.height+2 }" width="${ this._content.width+2 }">
+			
 		<handler name="oninit">
-            <![CDATA[
-                if (canvas.isinitRoomDirect || canvas.remoteUserLogin || canvas.secureRemoteUserLogin) {
-                    if ($debug) Debug.write("this mbarcontent ",this);
-                    if (canvas.destroyExitButton) {
-                        _exitbtn.destroy();
-                    }
-                }
-            ]]>
+	        this.fixWidth();
 		</handler>
+			
+		<view name="_content" x="1" y="1" 
+			layout="axis:y;spacing:1" bgcolor="0xEFEFEF" >
+			
+			<conferencDropDownMenuItem labelid="213" command="cmd_invitation" 
+						enabled="${ canvas.ismoderator }" />
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="239" command="cmd_shareDesktop" 
+						enabled="${ canvas.ismoderator }" />			
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="306" command="cmd_editCamMicSettings" />			
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="784" command="cmd_applyforMod"
+						enabled="${ !canvas.ismoderator }" />	
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="785" command="cmd_applyforWhiteBoard"
+						enabled="${ !canvas.ismoderator }" />	
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="786" command="cmd_applyforAV"
+						enabled="${ !canvas.ismoderator }" />				
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="24" command="cmd_createPoll" 
+						enabled="${ canvas.ismoderator }" />
+			<horizontalDropDownSpacer />			
+			<conferencDropDownMenuItem labelid="37" command="cmd_pollResults" />
+			<horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="42" command="cmd_checkPollVoted" />
+			<horizontalDropDownSpacer />
+            <conferencDropDownMenuItem labelid="1447" command="cmd_showSipDialer" />
+            <horizontalDropDownSpacer />
+			<conferencDropDownMenuItem labelid="1126" command="cmd_editWhiteboardDefault" />
+				
+		</view>
+		
+	</class>
+	
 
-		<simpleLabelButton labelid="789" name="_exitbtn"
-			text_x="32" width="80" style="itemStyle" height="28">
-			<handler name="onclick">
-                canvas._videocontainer._videoviewcontent.exitRoom();
-                canvas.videoComp_lc.exitRoom = function(confirm) {
-                    if ($debug) Debug.write("confirm exitRoom:", confirm);
-                    if (confirm) {
-                        canvas.doActionmenu('quit');
-                    }
-                }
-			</handler>
-			<view resource="exit_btn_rsc" y="2" x="4" />
-			<labelTooltip labelid="309" />
-		</simpleLabelButton>
-
-		<menubar x="80" style="itemStyle" height="28"
-			visible="${ ((canvas.ismoderator) ? true : ((canvas.isAllowedToDraw) ? true : false )) }">
-
-			<_labelMenu labelid="635" width="250">
-				<handler name="oninit">
-					//hideActionsMenu
-					if(canvas.currentRoomObj.hideActionsMenu){						                  	
-		                   parent.mbarcontent.subviews[0].setAttribute("visible", false);
-		             }
-	             </handler>
-				<!-- <_labelMenuItem labelid="1097" enabled="${ canvas.ismoderator }"> 
-					<handler name="onselect" args="sel"> canvas.thishib.closeRoom.room_id = hib.currentroomid; 
-					canvas.thishib.closeRoom.isClosed = true; canvas.thishib.closeRoom.doCall(); 
-					</handler> </_labelMenuItem> <menuseparator/> -->
-				<_labelMenuItem labelid="213" command="cmd_invitation"
-					enabled="${ canvas.ismoderator }" />
-				<menuseparator />
-				<_labelMenuItem labelid="239" enabled="${ canvas.ismoderator }">
-					<handler name="onselect" args="sel">
-						canvas._conferencemenu._moderationPanel.checkSharerSession.doCall();
-					</handler>
-				</_labelMenuItem>
-				<menuseparator />
-				<!-- <_labelMenuItem labelid="749" command="cmd_coBrowser" enabled="${
-					canvas.ismoderator }" /> <menuseparator/> -->
-				<_labelMenuItem labelid="306" command="cmd_editCamMicSettings"
-					enabled="${ canvas.ismoderator }" />
-				<_labelMenuItem labelid="307" command="cmd_editBoardSettings"
-					enabled="${ canvas.ismoderator }" />
-				<menuseparator />
-				<_labelMenuItem labelid="302" command="cmd_applyforMod"
-					enabled="${ canvas.ismoderator }" />
-				<menuseparator />
-				<_labelMenuItem width="250" labelid="24" command="cmd_createPoll"
-					enabled="${ canvas.ismoderator }" />
-				<_labelMenuItem width="250" labelid="37" command="cmd_pollResults"
-					 /><!-- enabled="${ canvas.ismoderator }" -->
-				<_labelMenuItem width="250" labelid="42"
-					command="cmd_checkPollVoted" />
-			</_labelMenu>
-
-		</menubar>
 
-	</class>
+	
 
 
 </library>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx?rev=1307797&r1=1307796&r2=1307797&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/swf10/base/components/explorer/resources/library.lzx Sat Mar 31 13:17:22 2012
@@ -1,18 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <library>
 
-<resource src="presenter_thumb.swf" name="presenter_thumb_rsc" />
-
 <resource src="explorerbar.png" name="explorer_thumb_rsc" />
 
-<resource src="cancel.png" name="close_explorer_window_new_rsc" />
-
-<resource name="explorer_button_rsc" >
-	<frame src="explorbar_close_no.png" />
-	<frame src="explorbar_close_mo.png" />
-	<frame src="explorbar_close_dn.png" />
-</resource>
-
 <resource name="explorer_button_min_rsc" >
 	<frame src="explorbar_minimize_no.png" />
 	<frame src="explorbar_minimize_mo.png" />
@@ -39,6 +29,4 @@
 
 <resource name="explorer_resizemouse_rsc" src="resizemouse.png" />
 
-
-
 </library>