Revision: 3756
Author: seba.wagner
Date: Thu Apr 28 05:50:45 2011
Log: [No log message]
http://code.google.com/p/openmeetings/source/detail?r=3756
Modified:
/trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx
/trunk/singlewebapp/WebContent/openmeetings/base/moduleConfiguration.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx Thu Oct
28 07:29:16 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/base/functions.lzx Thu Apr
28 05:50:45 2011
@@ -97,7 +97,7 @@
}
}
}
- return 'error';
+ return "Error Missing ["+labelid+"]";
}
function quicklink(action){
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Fri
Oct 15 06:53:14 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/base/mainMethods.lzx Thu
Apr 28 05:50:45 2011
@@ -485,7 +485,12 @@
new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.interviewRoomModule,roomObj:roomObj});
//new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
- }
+ } else if (roomTypeId==5){
+
+ new
lz.testSetup(canvas,{isDirectLink:true,roomClassName:canvas.customRoomModule,roomObj:roomObj});
+ //new
lz[canvas.eventRoomModule](canvas.main_content._content.inner,{roomobj:roomObj});
+
+ }
}
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/base/moduleConfiguration.lzx
Wed Aug 11 14:49:22 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/base/moduleConfiguration.lzx
Thu Apr 28 05:50:45 2011
@@ -77,6 +77,12 @@
-->
<attribute name="restrictedRoomModule" value="restrictedConferenceRoom"
type="string" />
+<!-- #############################################
+ Custom Room
+ -->
+
+<attribute name="customRoomModule" value="flexibleCustomRoom"
type="string" />
+
<!-- #############################################
Event Room
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Sat Apr 2 02:21:16 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Thu Apr 28 05:50:45 2011
@@ -130,6 +130,8 @@
this.roomClassName = canvas.restrictedRoomModule;
} else if (this.roomType == 4) {
this.roomClassName = canvas.interviewRoomModule;
+ } else if (this.roomType == 5) {
+ this.roomClassName = canvas.customRoomModule;
} else {
if ($debug) Debug.warn("Not known RoomType:
",this.roomType);
}
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Tue Apr 26 02:23:02 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/whiteboard/base/baseDraw.lzx
Thu Apr 28 05:50:45 2011
@@ -340,7 +340,7 @@
this.setAttribute('drawmodus',previousModus);
} else if (modi=='plainConfirm'){
new
lz.confirmationSingle(canvas.main_content._content.inner,{
- labelid:1326,labeliderror:1327,
+ labelid:1326,labeliderror:1340,
refObj:this,showCheckBox:false});
//this.clearAll();
//if ($debug) Debug.write("clearAll and RESET Modus
to",previousModus);
--
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en.
