incubator-openmeetings-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From "seba.wagner@gmail.com" <seba.wag...@gmail.com>
Subject Re: svn commit: r1234063 - in /incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference: flexibleConferenceRoom/ participents/ restricted/
Date Sat, 21 Jan 2012 10:37:29 GMT
Hi Eugen,

please don't forget to add your new params into the System Backup
Import/Export tool,
BackupExport.java
BackupImport.java

So that the export of rooms does include your new params.

Thanks,
Sebastian

2012/1/20  <eschwert@apache.org>:
> Author: eschwert
> Date: Fri Jan 20 18:50:29 2012
> New Revision: 1234063
>
> URL: http://svn.apache.org/viewvc?rev=1234063&view=rev
> Log:
> OPENMEETINGS-20
>
> Modified:
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
>    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/conferenceMicrophonesRoom.lzx
Fri Jan 20 18:50:29 2012
> @@ -109,7 +109,7 @@
>
>     <conferenceRoomSidebar name="_sidePanel" />
>
> -       <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard"
y="0" x="${ parent._sidePanel.width }"
> +       <view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width
}"
>                  width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height)
-
>         ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}" clip="true"
>                  visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleConferenceRoom.lzx
Fri Jan 20 18:50:29 2012
> @@ -115,7 +115,7 @@
>
>     <conferenceRoomSidebar name="_sidePanel" />
>
> -    <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard"
y="0" x="${ parent._sidePanel.width }"
> +    <view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width
}"
>                  width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height)
-
>         ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}" clip="true"
>                  visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/flexibleEventRoom.lzx
Fri Jan 20 18:50:29 2012
> @@ -107,7 +107,7 @@
>
>     <eventRoomSidebar name="_sidePanel" />
>
> -    <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard"
y="0" x="${ parent._sidePanel.width }"
> +    <view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width
}"
>                  width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height)
-
>         ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}" clip="true"
>                  visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedConferenceRoom.lzx
Fri Jan 20 18:50:29 2012
> @@ -103,7 +103,7 @@
>     <restrictedRoomSidebar name="_sidePanel" restricted="true"
>                       listType="eventUserListTableWithNames" />
>
> -    <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard"
y="0" x="${ parent._sidePanel.width }"
> +    <view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width
}"
>                  width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height)
-
>         ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}" clip="true"
>                  visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/flexibleConferenceRoom/restrictedMicrophonesRoom.lzx
Fri Jan 20 18:50:29 2012
> @@ -103,7 +103,7 @@
>     <restrictedRoomSidebar name="_sidePanel" restricted="true"
>                       listType="eventUserListTableWithNames" />
>
> -       <view name="_videoviewcontent_hideWhiteboard" id="_videoviewcontent_hideWhiteboard"
y="0" x="${ parent._sidePanel.width }"
> +       <view name="_videoviewcontent_hideWhiteboard" y="0" x="${ parent._sidePanel.width
}"
>                  width="${canvas.width-parent._sidePanel.width}" height="${canvas.height-(parent._chatPanelStrict.height)
-
>         ((parent._chatPanelStrict.visibility == 'hidden') ? 5:28)}" clip="true"
>                  visibility="${((canvas.currentRoomObj.hideWhiteboard) ? 'visible':'hidden')}">
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/participents/participents.lzx
Fri Jan 20 18:50:29 2012
> @@ -169,7 +169,7 @@
>     <method name="getVideoObjectByPublicSID" args="publicSID">
>         <![CDATA[
>                if(canvas.currentRoomObj.hideWhiteboard){
> -                       var videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +                       var videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>                        //if (this.userNewVideoContainer) {
>                      //  videoContainer = parent.parent._videoviewcontent;
>                    //}
> @@ -321,9 +321,9 @@
>                 this.broadCastViewRef = obj;
>             } else {
>
> -                var videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +                var videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>                 if (this.userNewVideoContainer) {
> -                    videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +                    videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>                 }
>
>                 if ($debug) Debug.warn("videoContainer ",videoContainer);
> @@ -385,9 +385,9 @@
>             if (obj!=null){
>                 return obj;
>             }
> -            var videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +            var videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>             if (this.userNewVideoContainer) {
> -                videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +                videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>             }
>
>             //Get a Free VideoView Slot
>
> Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
> URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx?rev=1234063&r1=1234062&r2=1234063&view=diff
> ==============================================================================
> --- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
(original)
> +++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/restricted/restrictedUserList.lzx
Fri Jan 20 18:50:29 2012
> @@ -194,7 +194,7 @@
>
>                var videoContainer = parent.parent._videoviewcontent;
>             if(canvas.currentRoomObj.hideWhiteboard){
> -               videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +               videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>             }
>
>                //for (var i=0;i<this._videoviewcontent.subviews.length;i++){
> @@ -387,7 +387,7 @@
>                        } else {
>                 var videoContainer = parent.parent._videoviewcontent;
>                 if(canvas.currentRoomObj.hideWhiteboard){
> -                       videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +                       videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>                }
>                 //Get a Free VideoView Slot
>                 var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
> @@ -418,7 +418,7 @@
>
>             var videoContainer = parent.parent._videoviewcontent;
>             if(canvas.currentRoomObj.hideWhiteboard){
> -               videoContainer = _videoviewcontent_hideWhiteboard._inn;
> +               videoContainer = canvas.currentBaseConferenceRoom._videoviewcontent_hideWhiteboard._inn;
>             }
>             //Get a Free VideoView Slot
>             var freePos = videoContainer.getVideoObjectFreePos(40, 100, 100);
>
>



-- 
Sebastian Wagner
http://www.openmeetings.de
http://incubator.apache.org/openmeetings/
http://www.webbase-design.de
http://www.wagner-sebastian.com
seba.wagner@gmail.com

Mime
View raw message