Revision: 4092
Author: solomax666
Date: Tue Aug 23 19:38:45 2011
Log: - patch for "Issue 1447: Show a comment for a room"
http://code.google.com/p/openmeetings/source/detail?r=4092
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListDetails.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/meetings/allmeetings.lzx
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListDetails.lzx
Mon Sep 20 07:09:54 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListDetails.lzx
Tue Aug 23 19:38:45 2011
@@ -39,16 +39,19 @@
<attribute name="roomid" value="0" type="number" />
<attribute name="roomname" value="" type="string" />
+ <attribute name="roomcomment" value="" type="string" />
<attribute name="currentusers" value="null" />
- <method name="doinit" args="currentusers,roomid,roomname">
+ <method name="doinit" args="currentusers,roomid,roomname,roomcomment">
<![CDATA[
if ($debug)
Debug.write("doinit",currentusers,roomid,roomname);
this.setAttribute('currentusers',currentusers);
this.setAttribute('roomid',roomid);
this.setAttribute('roomname',roomname);
-
this._roomname.setAttribute('text',canvas.getLabelName(406)+roomname);
+ this.setAttribute('roomcomment',roomcomment);
+
this._roomname.setAttribute('text',canvas.getLabelName(406)+" "+roomname);
+ this._roomcomment.setAttribute('text', roomcomment);
this._users.clearList();
for (var i = 0;i<this.currentusers.length;i++){
var username = this.currentusers[i].firstname + "
"
@@ -144,14 +147,17 @@
<labelText name="l_bdatum" labelid="570" y="40" width="50"
visible="false" />
<customEdittext name="bdatum" y="40" x="75" width="100" text=""
visible="false" />
<customEdittext name="bzeit" x="200" y="40" width="50" regexpType="time"
visible="false" />
-
- <labelText name="l_edatum" labelid="571" y="70" width="50"
visible="false" />
- <customEdittext name="edatum" y="70" x="75" width="100" text=""
visible="false" />
- <customEdittext name="ezeit" x="200" y="70" width="50" regexpType="time"
visible="false" />
-
- <labelText name="user_label" labelid="407" y="110" width="200" />
- <view name="_users" bgcolor="$once{ canvas.basebgcolorizer }" width="300"
y="130"
- height="${ parent.height - 130 }" >
+
+ <labelText name="l_edatum" labelid="571" y="${40 +
parent.l_bdatum.visible ? 30 : 0}" width="50" visible="false" />
+ <customEdittext name="edatum" y="${parent.l_edatum.y}" x="75" width="100"
text="" visible="false" />
+ <customEdittext name="ezeit" x="200" y="${parent.l_edatum.y}" width="50"
regexpType="time" visible="false" />
+
+ <labelText name="_roomcomment" x="75" y="${parent.l_edatum.y +
(parent.l_edatum.visible ? 30 : 0)}" width="100" text=""/>
+ <labelText labelid="270" y="${parent._roomcomment.y}" width="50" />
+
+ <labelText name="user_label" labelid="407" y="${10 +
parent._roomcomment.y + parent._roomcomment.height}" width="200" />
+ <view name="_users" bgcolor="$once{ canvas.basebgcolorizer }" width="300"
y="${30 + parent._roomcomment.y + parent._roomcomment.height}"
+ height="${ parent.height - parent._users.y }" >
<method name="clearList">
for (var eg in this._users._cbtext.subviews)
this._users._cbtext.subviews[eg].destroy();
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Thu Apr 28 05:50:45 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/roomListItem.lzx
Tue Aug 23 19:38:45 2011
@@ -12,6 +12,7 @@
<attribute name="roomid" value="0" type="number" />
<attribute name="starttime" value="" type="string" />
<attribute name="roomname" value="" type="string" />
+ <attribute name="roomcomment" value="" type="string" />
<attribute name="roomClassName" value="conferenceView"
type="string" />
<attribute name="currentusers" value="null" />
@@ -64,7 +65,7 @@
}
if ($debug) Debug.write("onclick", this);
parent.parent.parent.parent.parent._roomlistdetails.doinit(
- this.currentusers, this.roomid,
this.roomname);
+ this.currentusers, this.roomid,
this.roomname, this.roomcomment);
}
</handler>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/meetings/allmeetings.lzx
Sat Apr 2 02:21:54 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/meetings/allmeetings.lzx
Tue Aug 23 19:38:45 2011
@@ -142,7 +142,8 @@
ispublic : true,
roomid : value[eg].rooms_id,
starttime : time,
-
roomname : value[eg].name
+
roomname : value[eg].name,
+
roomcomment : value[eg].comment
});
}
}
@@ -200,7 +201,8 @@
ispublic : false,
roomid : value[eg].room.rooms_id,
starttime : parseDateToStringTime(value[eg].room.starttime),
-
roomname : value[eg].room.name
+
roomname : value[eg].room.name,
+
roomcomment : value[eg].room.comment
});
}
}
--
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.
