Revision: 2577
Author: seba.wagner
Date: Tue Nov 3 11:34:57 2009
Log: Fix Calendar Delete Event and Warning for unsaved Events
Icons in Message boxes
Message Boxes inside bounds
http://code.google.com/p/openmeetings/source/detail?r=2577
Added:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmationSingle.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/resources
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/resources/messagebox_warning.png
Deleted:
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmtionSingle.lzx
Modified:
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/connections/roomClientListItem.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmationBox.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/errorPopup.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/library.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/files/imageListInnerTable.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/cal-data.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/eventselector.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/infopanel.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/lzCalendar.lzx
/trunk/singlewebapp/WebContent/openmeetings/modules/sharing/sharingSession.lzx
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmationSingle.lzx
Tue Nov 3 11:34:57 2009
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="confirmationSingle" extends="labelExplorerBox" labelid="18"
+ docking="true" resizeable="false" closable="true" height="140"
width="300">
+
+ <attribute name="refObj" value="null" />
+
+ <attribute name="showCheckBox" value="true" type="boolean" />
+
+ <attribute name="labeliderror" value="0" type="number" />
+
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <labelText labelid="$once{ parent.labeliderror }" y="24"
+ width="$once{ parent.width - 40 }"
+ multiline="true" resize="false" x="30" />
+
+ <handler name="oninit">
+ <![CDATA[
+
+ //Set Position of Confirmation Box as Close as possible to the
Mouse
+ var x = parent.getMouse("x");
+ var y = parent.getMouse("y");
+ var newx = x - (this.width/2);
+ var newy = y - (this.height/2);
+
+ if ($debug) Debug.write("1",x,y,newx,newy);
+
+ if (newx < 0) {
+ newx = 20;
+ }
+ if (newy < 0) {
+ newy = 20;
+ }
+
+ if (this.width + newx + 20 > parent.width) {
+ newx = parent.width-this.width-20;
+ }
+
+ if (this.height + newy + 20 > parent.height) {
+ newy = parent.height-this.height-20;
+ }
+
+ if ($debug) Debug.write("2",newx,newy);
+
+ this.setAttribute("x",newx);
+ this.setAttribute("y",newy);
+
+ ]]>
+ </handler>
+
+ <labelCheckbox name="holddatainSO" visibility="$once{
(parent.showCheckBox) ? 'visible' : 'hidden' }"
+ labelid="64" x="10" y="$once{ parent.height - 60 }" />
+
+ <simpleLabelButton labelid="61" width="100" x="$once{ parent.width -
105 }" y="$once{ parent.height - 26 }">
+ <handler name="onclick">
+ this.parent.close();
+ </handler>
+ </simpleLabelButton>
+ <simpleLabelButton labelid="60" width="100" x="$once{ parent.width -
210 }" y="$once{ parent.height - 26 }">
+ <handler name="onclick">
+ var t = parent.holddatainSO.getValue();
+ this.parent.close();
+ this.parent.refObj.sendConfirmation(true,t);
+ </handler>
+ </simpleLabelButton>
+</class>
+
+</library>
=======================================
--- /dev/null
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/resources/messagebox_warning.png
Tue Nov 3 11:34:57 2009
Binary file, no diff available.
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmtionSingle.lzx
Tue Oct 27 06:38:19 2009
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<library>
-
-<class name="confirmtionSingle" extends="labelExplorerBox" labelid="18"
- docking="true" resizeable="false" closable="true" height="140"
width="300">
-
- <attribute name="refObj" value="null" />
-
- <attribute name="showCheckBox" value="true" type="boolean" />
-
- <attribute name="labeliderror" value="0" type="number" />
-
- <labelText labelid="$once{ parent.labeliderror }" width="$once{
parent.width - 2 }" x="1"
- y="22" multiline="true" resize="false"/>
-
- <handler name="oninit">
- <![CDATA[
-
- //Set Position of Confirmation Box as Close as possible to the
Mouse
- var x = parent.getMouse("x");
- var y = parent.getMouse("y");
- var newx = x - (this.width/2);
- var newy = y - (this.height/2);
-
- if ($debug) Debug.write("1",x,y,newx,newy);
-
- if (newx < 0) {
- newx = 0;
- }
- if (newx+this.width > parent.width) {
- newx = parent.width - this.width - 20;
- }
-
- if (newy < 0) {
- newy = 0;
- }
-
- if ($debug) Debug.write("2",newx,newy);
-
- this.setAttribute("x",newx);
- this.setAttribute("y",newy);
- ]]>
- </handler>
-
- <labelCheckbox name="holddatainSO" visibility="$once{
(parent.showCheckBox) ? 'visible' : 'hidden' }"
- labelid="64" x="10" y="$once{ parent.height - 60 }" />
-
- <simpleLabelButton labelid="61" width="100" x="$once{ parent.width -
105 }" y="$once{ parent.height - 26 }">
- <handler name="onclick">
- this.parent.close();
- </handler>
- </simpleLabelButton>
- <simpleLabelButton labelid="60" width="100" x="$once{ parent.width -
210 }" y="$once{ parent.height - 26 }">
- <handler name="onclick">
- var t = parent.holddatainSO.getValue();
- this.parent.close();
- this.parent.refObj.sendConfirmation(true,t);
- </handler>
- </simpleLabelButton>
-</class>
-
-</library>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/connections/roomClientListItem.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/admin/connections/roomClientListItem.lzx
Tue Nov 3 11:34:57 2009
@@ -29,7 +29,7 @@
<simpleLabelButton labelid="603" >
<handler name="onclick">
if ($debug) Debug.write("onclick ",this);
- new
lz.confirmtionSingle(canvas.main_content._content.inner,{labelid:604,labeliderror:605,refObj:this,showCheckBox:false});
+ new
lz.confirmationSingle(canvas.main_content._content.inner,{labelid:604,labeliderror:605,refObj:this,showCheckBox:false});
</handler>
<method name="sendConfirmation" args="yesno" >
if ($debug) Debug.write("Kick that User");
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Wed Oct 28 12:50:41 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/conference/conferenceMenubar.lzx
Tue Nov 3 11:34:57 2009
@@ -31,7 +31,7 @@
<simpleLabelButton labelid="789" name="_exitbtn" text_x="32"
width="80" style="itemStyle"
height="28">
<handler name="onclick">
- new
lz.confirmtionSingle(canvas,{refObj:this,labelid:791,
+ new
lz.confirmationSingle(canvas,{refObj:this,labelid:791,
labeliderror:790,showCheckBox:false});
</handler>
<method name="sendConfirmation" args="confirm,bool">
@@ -138,7 +138,7 @@
<simpleLabelButton labelid="789" name="_exitbtn" text_x="32"
width="80" style="itemStyle"
height="28">
<handler name="onclick">
- new
lz.confirmtionSingle(canvas,{refObj:this,labelid:791,
+ new
lz.confirmationSingle(canvas,{refObj:this,labelid:791,
labeliderror:790,showCheckBox:false});
</handler>
<method name="sendConfirmation" args="confirm,bool">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmationBox.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/confirmationBox.lzx
Tue Nov 3 11:34:57 2009
@@ -9,9 +9,12 @@
<attribute name="labeliderror" value="0" type="number" />
<attribute name="doAskAgain" value="true" type="boolean" />
-
- <labelText labelid="$once{ parent.labeliderror }" width="400"
- y="22" multiline="true" resize="false"/>
+
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <labelText labelid="$once{ parent.labeliderror }" y="24"
+ width="$once{ parent.width - 40 }"
+ multiline="true" resize="false" x="30" />
<labelCheckbox name="holddatainSO"
visibility="$once{ (parent.doAskAgain) ? 'visible' :
'hidden' }"
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/errorPopup.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/errorPopup.lzx
Tue Nov 3 11:34:57 2009
@@ -7,7 +7,9 @@
<attribute name="error" value="" type="string" />
- <view y="24" width="318" height="130" x="2" clip="true">
+ <view x="4" resource="warning_icon_rsc" y="24" />
+
+ <view y="24" width="$once{ parent.width - 40 }" height="130" x="30"
clip="true">
<text fontsize="10" fontstyle="bold" text="${
parent.parent.error }"
multiline="true" width="312" selectable="true" />
</view>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/library.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/popups/library.lzx
Tue Nov 3 11:34:57 2009
@@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8" ?>
<library>
+
+ <resource name="warning_icon_rsc"
src="resources/messagebox_warning.png"
/>
<include href="rpcerrorDialog.lzx" />
<include href="loginScreen.lzx" />
@@ -9,7 +11,7 @@
<include href="headerMenu.lzx" />
<include href="confirmationBox.lzx" />
<include href="editWhiteboardDefault.lzx" />
- <include href="confirmtionSingle.lzx" />
+ <include href="confirmationSingle.lzx" />
<include href="autoLoader.lzx" />
<include href="converterPopup.lzx" />
<include href="errorModeratorPopup.lzx" />
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/files/imageListInnerTable.lzx
Mon Oct 12 03:58:23 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/conference/tabcontent/files/imageListInnerTable.lzx
Tue Nov 3 11:34:57 2009
@@ -93,9 +93,9 @@
//this case will never happen
this.loadWmlObject.doCall();
} else if (storedImageDate["askagainclear"]){
- new
lz.confirmtionSingle(canvas.main_content._content.inner,{labelid:210,labeliderror:211,refObj:this});
+ new
lz.confirmationSingle(canvas.main_content._content.inner,{labelid:210,labeliderror:211,refObj:this});
} else {
- new
lz.confirmtionSingle(canvas.main_content._content.inner,{labelid:210,labeliderror:211,refObj:this});
+ new
lz.confirmationSingle(canvas.main_content._content.inner,{labelid:210,labeliderror:211,refObj:this});
}
]]>
</method>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/cal-data.lzx
Mon Nov 2 14:57:37 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/cal-data.lzx
Tue Nov 3 11:34:57 2009
@@ -257,6 +257,7 @@
if ($debug) Debug.write("Add the event ");
+
// Add the event
currenteventDP.setNodeAttribute( "selected" , 'false' );
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/eventselector.lzx
Mon Nov 2 14:57:37 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/eventselector.lzx
Tue Nov 3 11:34:57 2009
@@ -35,6 +35,29 @@
<attribute name="startDate2" value="null" />
<attribute name="endDate2" value="null" />
+
+ <method name="checkSaved">
+ <![CDATA[
+
+ if (this.bar.visible) {
+ if ($debug) Debug.write("checkSaved
",this.datapath);
+
+ var appointementId =
this.datapath.xpathQuery("appointementId/@value");
+
+ if ($debug) Debug.write("appointementId
",appointementId);
+
+ if (Number(appointementId) == 0) {
+ return false;
+ } else {
+ return true;
+ }
+
+ } else {
+ if ($debug) Debug.write("Not visible
eventSelectorbar");
+ return true;
+ }
+ ]]>
+ </method>
<view name="bar" pixellock="false" bgcolor="white" visible="false"
onmousedown="parent.domousedown()"
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/infopanel.lzx
Mon Nov 2 14:57:37 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/infopanel.lzx
Tue Nov 3 11:34:57 2009
@@ -141,6 +141,11 @@
this.arrayMeetingMember =
this.tabs.attendees.getMemberArrayValue();
+ if (this.arrayMeetingMember.length == 0) {
+ new
lz.labelerrorPopup(canvas,{errorlabelid:795});
+ return;
+ }
+
if (this.appointementId == "0" || this.appointementId
== 0) {
if ($debug) Debug.write("ADD");
this.saveAppointment.doCall();
@@ -223,6 +228,22 @@
</handler>
</netRemoteCallHib>
+ <!--
+ public Long deleteAppointment(String SID,Long appointmentId){
+ -->
+ <netRemoteCallHib name="deleteAppointment"
funcname="calendarservice.deleteAppointment"
+ remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId;
</method></netparam>
+ <netparam><method name="getValue">return
Number(parent.parent.appointementId);</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("deleteAppointment
",value);
+ canvas.eventDataMgr.deleteEvent();
+ parent.parent.parent.calgrid.reloadAll();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
+
<!-- VIEWS -->
<view name="summary" width="198" height="83" bgcolor="0xEEF0EB">
<view y="10" name="content" x="10" width="${parent.width -
20}" height="65">
@@ -637,8 +658,23 @@
</handler>
</calButton>
- <calButton label="Delete" x="${parent.width - width - 15}"
y="13"
- onclick="canvas.eventDataMgr.deleteEvent()"/>
+
+
+ <calButton label="Delete" x="${parent.width - width - 15}"
y="13">
+ <handler name="onclick" args="c">
+
+ if (Number(parent.parent.appointementId) == 0) {
+ canvas.eventDataMgr.deleteEvent();
+ } else {
+ new
lz.confirmationSingle(canvas,{refObj:this,labelid:797,
+
showCheckBox:false,labeliderror:796});
+ }
+ </handler>
+ <method name="sendConfirmation" args="refObj,t">
+ parent.parent.deleteAppointment.doCall();
+ </method>
+ </calButton>
+
</view>
<!-- ANIMATORS -->
@@ -688,7 +724,6 @@
this.slideopen1.doStart();
this.slideopen2.doStart();
this.opened = true;
-
</method>
<method name="close" args="v">
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/lzCalendar.lzx
Mon Nov 2 14:57:37 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/lzcalendar/lzCalendar.lzx
Tue Nov 3 11:34:57 2009
@@ -9,10 +9,10 @@
"September","October", "November",
"December" ]'/>
-<class name="lzCalendar" extends="baseContentView" height="640">
+<class name="lzCalendar" extends="baseContentView" height="570">
<handler name="oninit">
- this.setAttribute("height",640);
+ this.setAttribute("height",570);
</handler>
<dateSelector name="_calendar" y="0" x="2">
@@ -92,7 +92,7 @@
width="${parent.width}"/>
</class>
-<class name="lzCalendarContent" extends="view" width="935" height="640">
+<class name="lzCalendarContent" extends="view" width="935" height="570">
<handler name="oninit">
this.toppanel.slideInTopPanel.doStart();
@@ -151,9 +151,15 @@
<calButton label="Add Event" x="$once{ parent.width - 100 }"
y="6">
<handler name="onclick">
- canvas.eventDataMgr.addEvent();
-
parent.parent.parent.cal_interior.infopanel.open();
-
parent.parent.parent.cal_interior.infopanel.setAttribute('dataapply',
false);
+ if (parent.parent.parent.eventselector.checkSaved()) {
+ canvas.eventDataMgr.addEvent();
+
parent.parent.parent.cal_interior.infopanel.open();
+
parent.parent.parent.cal_interior.infopanel.setAttribute('dataapply',
false);
+ } else {
+ //Check Warning
+ if ($debug) Debug.warn("Unsaved Item - Show
warning");
+ new
lz.labelerrorPopup(canvas,{errorlabelid:794});
+ }
</handler>
</calButton>
=======================================
---
/trunk/singlewebapp/WebContent/openmeetings/modules/sharing/sharingSession.lzx
Tue Oct 27 02:28:20 2009
+++
/trunk/singlewebapp/WebContent/openmeetings/modules/sharing/sharingSession.lzx
Tue Nov 3 11:34:57 2009
@@ -215,7 +215,7 @@
if (this.sharerPublicSID == canvas.publicSID) {
this.destroy();
} else {
- new
lz.confirmtionSingle(canvas,{labelid:746,refObj:this,labeliderror:745,showCheckBox:false});
+ new
lz.confirmationSingle(canvas,{labelid:746,refObj:this,labeliderror:745,showCheckBox:false});
}
</method>
--~--~---------~--~----~------------~-------~--~----~
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
-~----------~----~----~----~------~----~------~--~---
