Revision: 4585
Author: seba.wagner
Date: Fri Nov 18 02:08:05 2011
Log: enable old calendar implementation for testing
http://code.google.com/p/openmeetings/source/detail?r=4585
Added:
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee/addAttendee.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee/addExternalAttendee.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee/library.lzx
Modified:
/trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml
/trunk/singlewebapp/WebContent/languages/deutsch.xml
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/calendar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/day.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/event.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/eventselector.lzx
/trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/openmeetings/config.xml
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee/addAttendee.lzx
Fri Nov 18 02:08:05 2011
@@ -0,0 +1,206 @@
+<library>
+
+<class name="addAttendee" extends="labelExplorerBox" labelid="574"
+ closable="true" width="500" x="$once{ parent.width/2-this.width/2 + 10
}"
+ y="110" height="310" >
+
+ <attribute name="isSuperModerator" value="false" type="boolean"/>
+
+ <!-- resizeable="false" -->
+ <attribute name="refObj" value="null"/>
+
+ <method name="chooseAndClose">
+ <![CDATA[
+
+ if (this._turnoverlist._selected == null) {
+ new
lz.labelerrorPopup(canvas,{errorlabelid:811});
+ return;
+ }
+
+ var jNameTimeZone = canvas.jNameTimeZone;
+
+ if (this._turnoverlist._selected.omTimeZone != null) {
+ jNameTimeZone =
this._turnoverlist._selected.omTimeZone.jname;
+ }
+
+ this.refObj.addListItem(
+ this._turnoverlist._selected.userId,
+ this._turnoverlist._selected.firstname,
+ this._turnoverlist._selected.lastname,
+ this._turnoverlist._selected.email,
+ 0,
+ jNameTimeZone
+ );
+
+
+ this.close();
+ ]]>
+ </method>
+
+ <view name="_search" layout="axis:x;spacing:2;inset:4" y="24" x="0">
+
+ <labelText width="70" resize="false" labelid="809" />
+
+ <inputtextbox name="_criteria" width="220" height="20">
+ <handler name="onkeyup" args="key">
+ <![CDATA[
+ // 13 is return
+ if (key==13) {
+
parent.parent._turnoverlist.getAllUserBySearchRange.doCall();
+ }
+ ]]>
+ </handler>
+ </inputtextbox>
+
+ <simpleLabelButton labelid="628" width="200" >
+ <handler name="onclick">
+ //parent.parent.getUserContactsBySearchByList.doCall();
+
parent.parent._turnoverlist.getAllUserBySearchRange.doCall();
+ </handler>
+ </simpleLabelButton >
+
+
+ </view>
+
+
+ <turnOverList name="_turnoverlist" width="${ parent.width - 4 }"
+ height="$once{ (parent.isSuperModerator) ?
parent.height-144 : parent.height-94 }" x="2" y="46"
+ orderby="u.lastname" step="50" asc="false" bgcolor="0xFFFFFF">
+
+ <handler name="oninit">
+ this.addHeaderItemOrdered(146,70,"u.user_id",false,false);
//labelid,width,orderBy,asc,isSelected
+
this.addHeaderItemOrdered(148,136,"u.firstname",false,false);
+
this.addHeaderItemOrdered(149,136,"u.lastname",false,true);
+
this.addHeaderItemOrdered(137,138,"u.adresses.email",false,false);
+ this.getAllUserBySearchRange.doCall();
+ </handler>
+
+ <handler name="onUpdateOrder" args="refObj">
+ this.getAllUserBySearchRange.doCall();
+ </handler>
+
+ <handler name="oncallnext" >
+ this.getAllUserBySearchRange.doCall();
+ </handler>
+
+ <handler name="oncallpre" >
+ this.getAllUserBySearchRange.doCall();
+ </handler>
+
+ <handler name="onclickedItem" args="obj">
+ if ($debug) Debug.write("onclickedItem",obj,obj.obj);
+ </handler>
+
+ <handler name="ondblclickedItem" args="obj">
+ if ($debug) Debug.write("ondblclickedItem",obj,obj.obj);
+ parent.chooseAndClose();
+ </handler>
+
+ <!--
+ Get all users by range and parse result List into View
+ -->
+ <netRemoteCallHib name="getAllUserBySearchRange"
funcname="userservice.getAllUserBySearchRange"
+ remotecontext="$once{ canvas.thishib }" >
+
+ <netparam><method name="getValue">return
canvas.sessionId;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.parent._search._criteria.getText();</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.start;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.step;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.orderby;</method></netparam>
+ <netparam><method name="getValue">return
parent.parent.asc;</method></netparam>
+
+ <handler name="ondata" args="valueList">
+ <![CDATA[
+ if ($debug)
Debug.write("getAllUserBySearchRange ",valueList);
+
+ this.parent.initValues(valueList.records);
+ this.parent.renderContent(valueList.result);
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
+ <method name="renderContent" args="records">
+ <![CDATA[
+ this.clearList();
+ for (var i=0;i<records.length;i++){
+ new
lz.attendeItemListItem(this._innerlist._inn._inn,{
+ obj:records[i],
+
userId:records[i].user_id,
+
login:records[i].login,
+
email:records[i].adresses.email,
+
firstname:records[i].firstname,
+
lastname:records[i].lastname,
+
omTimeZone:records[i].omTimeZone
+ });
+ }
+ this.sendInitialWidthUpdate();
+ ]]>
+ </method>
+
+ </turnOverList>
+
+ <view resource="messagebox_info_rsc" x="10"
+ y="$once{ parent.height-96 }"
+ visibility="$once{
(!parent.isSuperModerator) ? 'hidden' : 'visible' }" />
+
+ <labelText labelid="824" x="34" y="$once{ parent.height-94 }"
multiline="true"
+ visibility="$once{
(!parent.isSuperModerator) ? 'hidden' : 'visible' }"
+ width="$once{ parent.width-60 }" />
+
+ <labelCheckbox x="4" y="$once{ parent.height-63 }"
+ visibility="$once{
(!parent.isSuperModerator) ? 'hidden' : 'visible' }"
+ fontsize="11" name="_savelogindata" labelid="825" />
+
+ <simpleLabelButton labelid="629" visibility="$once{
(parent.isSuperModerator) ? 'hidden' : 'visible' }"
+ width="240" x="4" y="$once{ parent.height - 24 }">
+ <handler name="onclick">
+ <![CDATA[
+ //parent.parent.getUserContactsBySearchByList.doCall();
+ //parent.parent.getAllUserBySearchRange.doCall();
+ new lz.addExternalAttendee(parent.parent, {
+ refObj:parent.refObj,
+ x:parent.x+parent.width/2,
+ y:parent.y+40
+ });
+ ]]>
+ </handler>
+ </simpleLabelButton >
+
+ <simpleLabelButton labelid="810" x="$once{ parent.width - 250 }"
+ y="$once{ parent.height - 24 }" width="120">
+ <handler name="onclick">
+ //parent.parent.parent.delTermin.doCall();
+ parent.chooseAndClose();
+ </handler>
+ </simpleLabelButton>
+
+
+ <simpleLabelButton labelid="697" x="$once{ parent.width - 125 }"
+ y="$once{ parent.height - 24 }" width="120">
+ <handler name="onclick">
+ //parent.parent.parent.delTermin.doCall();
+ parent.close();
+ </handler>
+ </simpleLabelButton>
+
+
+
+</class>
+
+<class name="attendeItemListItem" extends="baseContentListItem">
+
+ <attribute name="userId" value="0" type="number" />
+ <attribute name="login" value="" type="string" />
+ <attribute name="firstname" value="" type="string" />
+ <attribute name="lastname" value="" type="string" />
+ <attribute name="email" value="" type="string" />
+ <attribute name="omTimeZone" value="null" />
+
+ <turnOverTextItem text="$once{ parent.userId }" width="60" />
+ <turnOverTextItem text="$once{ parent.firstname }" width="100" />
+ <turnOverTextItem text="$once{ parent.lastname }" width="132" />
+ <turnOverTextItem text="$once{ parent.email }" width="132" />
+
+</class>
+
+</library>
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee/addExternalAttendee.lzx
Fri Nov 18 02:08:05 2011
@@ -0,0 +1,59 @@
+<library>
+
+<class name="addExternalAttendee" extends="labelExplorerBox" width="420"
height="240"
+ closable="true" labelid="629" >
+
+ <attribute name="refObj" value="null"/>
+
+ <handler name="oninit">
+ this._timeZone.selectItem(canvas.jNameTimeZone);
+ </handler>
+
+ <labelText labelid="630" y="24" x="2" />
+ <customEdittext name="vorname" x="120" width="270" y="24" />
+
+ <labelText labelid="631" y="54" x="2" />
+ <customEdittext name="nachname" x="120" width="270" y="54" />
+
+ <labelText labelid="632" y="84" x="2" />
+ <customEdittext name="email" x="120" width="270" y="84" />
+
+ <labelText labelid="1143" width="200" y="114" x="2" />
+ <resetCombobox name="_timeZone" editable="false" y="114" width="270"
x="120"
+ fontsize="11" style="componentStyle">
+ <attribute name="selectionActive" value="false" type="boolean"/>
+ <labeldTextListItem datapath="timeZoneSet:/item"
text="$path{ 'frontEndLabel/text()' }"
+ value="$path{ 'jname/text()' }" />
+ </resetCombobox>
+
+ <simpleLabelButton name="_ok" labelid="333" x="$once{ parent.width-220
}"
+ width="100" y="$once{ parent.height - 30
}" >
+ <handler name="onclick">
+ parent.refObj.addListItem(
+ 0,
+ parent.vorname["text"],
+ parent.nachname["text"],
+ parent.email["text"],
+ 0,
+ parent._timeZone.getValue()
+ );
+ //if ($debug) Debug.write("_innerlist: ",
parent.parent.parent.refObj.terminObjRef._liste._innerlist);
+ parent.vorname="";
+ parent.nachname="";
+ parent.email="";
+ parent.close();
+ //parent.parent.parent.refObj.close();
+ //if ($debug) Debug.write("userId
search: ",parent.parent.parent.userId);
+ </handler>
+ </simpleLabelButton>
+
+ <simpleLabelButton name="_cancel" labelid="25" x="$once{
parent.width-110 }"
+ width="100" y="$once{ parent.height - 30
}">
+ <handler name="onclick">
+ parent.close();
+ </handler>
+ </simpleLabelButton>
+
+</class>
+
+</library>
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/attendee/library.lzx
Fri Nov 18 02:08:05 2011
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+ <include href="addAttendee.lzx"/>
+ <include href="addExternalAttendee.lzx" />
+
+</library>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Thu Nov
17 07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch (studIP).xml Fri Nov
18 02:08:05 2011
@@ -2398,7 +2398,7 @@
<value>Warnung</value>
</string>
<string id="798" name="calendar">
- <value>Neuer Event</value>
+ <value>Neues Event</value>
</string>
<string id="799" name="calendar">
<value>Tag</value>
=======================================
--- /trunk/singlewebapp/WebContent/languages/deutsch.xml Thu Nov 17
07:53:53 2011
+++ /trunk/singlewebapp/WebContent/languages/deutsch.xml Fri Nov 18
02:08:05 2011
@@ -2398,7 +2398,7 @@
<value>Warnung</value>
</string>
<string id="798" name="calendar">
- <value>Neuer Event</value>
+ <value>Neues Event</value>
</string>
<string id="799" name="calendar">
<value>Tag</value>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/calendar.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/calendar.lzx
Fri Nov 18 02:08:05 2011
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<library>
-<class name="calendar" extends="view" >
+<class name="calendar" extends="baseContentView" >
<attribute name="detailsInited" value="false" type="boolean"/>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/library.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/calendar/library.lzx
Fri Nov 18 02:08:05 2011
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+ <include href="attendee/" />"
<include href="weekview/"/>
<include href="monthview/"/>
<include href="dayview/"/>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/modules/library.lzx Wed Jan
27 09:17:03 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/modules/library.lzx Fri Nov
18 02:08:05 2011
@@ -18,17 +18,18 @@
<include href="recording/" />
<include href="admin/" />
- <!--
+
+ <!-- -->
<include href="calendar/" />
- -->
+
<include href="sharing/" />
<include href="screenSharer2/" />
<include href="sipintegration/" />
- <!-- -->
+ <!--
<include href="lzcalendar/" />
-
+ -->
</library>
=======================================
--- /trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/day.lzx
Thu Sep 2 07:56:03 2010
+++ /trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/day.lzx
Fri Nov 18 02:08:05 2011
@@ -152,6 +152,10 @@
ondata="this.showData.apply()">
<!-- no harm in calling apply on a state that's
already
been applied -->
+
+ <handler name="ony" args="y">
+ if ($debug) Debug.write("ony ",y);
+ </handler>
<state name="showData" applied="false">
<calendar_event name="events" pixellock="true">
@@ -168,9 +172,16 @@
</view>
<state applied="${classroot.opened}">
- <scrollbar visible="${scrollable}"/>
+ <scrollbar visible="${scrollable}">
+ <handler name="oninit" >
+ if ($debug) Debug.write("oninit
scrollbar ",this.scrolltarget,this);
+ </handler>
+ </scrollbar>
</state>
<view name="scrollview" visible="false">
+
+
+
<state name="scrollState" applied="false"
onapply="parent.bringToFront()">
</state>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/event.lzx
Sun Apr 24 13:13:01 2011
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/event.lzx
Fri Nov 18 02:08:05 2011
@@ -50,6 +50,7 @@
// This is the only way that an event becomes the current
event,
// which in turn selects the event selector bar
this.selected = sel;
+ if ($debug) Debug.write("setSel ",sel);
if (this.selected){
//if ($debug) Debug.write("setSel
ITEM :: ",parent.parent.parent.parent.parent.parent.parent);
parent.parent.parent.parent.parent.parent.parent.eventselector.setSelectedEvent(
this ,this.mouseIsDown );
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/eventselector.lzx
Sun Oct 24 09:23:05 2010
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/eventselector.lzx
Fri Nov 18 02:08:05 2011
@@ -132,7 +132,7 @@
<!-- METHODS -->
<handler name="oninit">
- //Debug.write("ONINIT: this =" + this);
+ if ($debug) Debug.write("ONINIT: this =" , this);
this.mdel = new LzDelegate(this,"trackmouse");
this.clipdel = new LzDelegate(this,"checkClip");
this.hidedel = new LzDelegate(this,"checkHide");
@@ -164,7 +164,7 @@
</method>
<method name="setSelectedEvent" args="e , sdrag "><![CDATA[
- //Debug.write( 'setSelectedEvent ' , e );
+ if ($debug) Debug.write( 'setSelectedEvent ' , e , sdrag );
if ( e == this['followview'] ){
if ( sdrag && !this.dragging ){
this.domousedown();
=======================================
--- /trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/openmeetings/config.xml
Mon Nov 14 11:16:16 2011
+++ /trunk/singlewebapp/red5-1.0.0-RC1/red5/webapps/openmeetings/config.xml
Fri Nov 18 02:08:05 2011
@@ -250,7 +250,7 @@
<dashboardModuleStartScreen>mainDashboard</dashboardModuleStartScreen>
-<dashboardModuleCalendar>lzCalendar</dashboardModuleCalendar>
+<dashboardModuleCalendar>calendar</dashboardModuleCalendar>
<!-- Conference Room Modules -->
--
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.
