Author: solomax
Date: Wed Aug 13 11:35:29 2014
New Revision: 1617705
URL: http://svn.apache.org/r1617705
Log:
[OPENMEETINGS-1070] demo room is fixed
Removed:
openmeetings/branches/3.0.x/WebContent/src/modules/meetings/
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
openmeetings/branches/3.0.x/WebContent/src/base/moduleConfiguration.lzx
openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx
openmeetings/branches/3.0.x/src/main/webapp/public/config.xml
openmeetings/branches/3.0.x/src/main/webapp/public/config.xsd
Modified: openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx?rev=1617705&r1=1617704&r2=1617705&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/mainMethods.lzx Wed Aug 13
11:35:29 2014
@@ -251,7 +251,6 @@
this.setAttribute('dashboardModuleStartScreen',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleStartScreen/text()'));
this.setAttribute('dashboardModuleCalendar',canvas.myConfigSet.getPointer().xpathQuery('config/dashboardModuleCalendar/text()'));
-
this.setAttribute('conferenceModuleRoomList',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceModuleRoomList/text()'));
this.setAttribute('conferenceRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/conferenceRoomModule/text()'));
this.setAttribute('restrictedRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/restrictedRoomModule/text()'));
this.setAttribute('interviewRoomModule',canvas.myConfigSet.getPointer().xpathQuery('config/interviewRoomModule/text()'));
@@ -503,9 +502,8 @@
} else if (stringSub=='showSipDialer') {
new lz.sipDialer(canvas.main_content._content.inner);
} else if (stringSub=='quit') {
-
- quicklinkAct('conferenceModuleRoomList')
-
+ canvas.thishib.disconnect();
+ canvas.sendViaLocalConnection(canvas.vid_lc_name,
"immediateExitRoom", [true,null]);
} else if( stringSub == "browser_open" ){
var browserPanelWidth = canvas.browserPanelWidth;
var browserPanelHeight = canvas.browserPanelHeight;
Modified:
openmeetings/branches/3.0.x/WebContent/src/base/moduleConfiguration.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/base/moduleConfiguration.lzx?rev=1617705&r1=1617704&r2=1617705&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/base/moduleConfiguration.lzx
(original)
+++ openmeetings/branches/3.0.x/WebContent/src/base/moduleConfiguration.lzx Wed
Aug 13 11:35:29 2014
@@ -34,11 +34,6 @@ these properties can be overwritten by p
<attribute name="moderatorModuleRoom" value="roomModerate" type="string" />
-<!-- Conference Room Modules -->
-
-<attribute name="conferenceModuleRoomList" value="allmeetings" type="string" />
-
-
<!-- #############################################
Conference Room
-->
Modified: openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx?rev=1617705&r1=1617704&r2=1617705&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx (original)
+++ openmeetings/branches/3.0.x/WebContent/src/modules/library.lzx Wed Aug 13
11:35:29 2014
@@ -25,7 +25,6 @@
<include href="settings/" />
<include href="invitation/" />
<include href="dashboard/" />
- <include href="meetings/" />
<include href="sipintegration/" />
</library>
Modified: openmeetings/branches/3.0.x/src/main/webapp/public/config.xml
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/public/config.xml?rev=1617705&r1=1617704&r2=1617705&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/public/config.xml (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/public/config.xml Wed Aug 13
11:35:29 2014
@@ -283,11 +283,6 @@ To disable AEC please specify 0.
<moderatorModuleRoom>roomModerate</moderatorModuleRoom>
-<!-- Conference Room Modules -->
-
-<conferenceModuleRoomList>allmeetings</conferenceModuleRoomList>
-
-
<!-- #############################################
Conference Room
Modified: openmeetings/branches/3.0.x/src/main/webapp/public/config.xsd
URL:
http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/public/config.xsd?rev=1617705&r1=1617704&r2=1617705&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/public/config.xsd (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/public/config.xsd Wed Aug 13
11:35:29 2014
@@ -53,7 +53,6 @@
<xs:element ref="availableCameraResolutions"/>
<xs:element ref="moderatorModuleUser"/>
<xs:element ref="moderatorModuleRoom"/>
- <xs:element ref="conferenceModuleRoomList"/>
<xs:element ref="conferenceRoomModule"/>
<xs:element ref="restrictedRoomModule"/>
<xs:element ref="interviewRoomModule"/>
@@ -146,7 +145,6 @@
</xs:element>
<xs:element name="moderatorModuleUser" type="xs:NCName"/>
<xs:element name="moderatorModuleRoom" type="xs:NCName"/>
- <xs:element name="conferenceModuleRoomList" type="xs:NCName"/>
<xs:element name="conferenceRoomModule" type="xs:NCName"/>
<xs:element name="restrictedRoomModule" type="xs:NCName"/>
<xs:element name="interviewRoomModule" type="xs:NCName"/>
