Author: sebawagner
Date: Mon Mar 19 19:10:36 2012
New Revision: 1302601
URL: http://svn.apache.org/viewvc?rev=1302601&view=rev
Log:
OPENMEETINGS-7 - Fixes deleting a calendar event from mini view and edit view,
adds some visual animations
Adds new build target: ant client.only
Removed:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/menuassets.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/test_whiteBoard.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzCalendarGrid.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzViewCalendarEvent.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/baseChooseIconFLVView.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
incubator/openmeetings/trunk/singlewebapp/build.xml
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/config.xml
Mon Mar 19 19:10:36 2012
@@ -81,6 +81,7 @@ of the red5-servlet
<basebgcolorizer>0x669AE6</basebgcolorizer>
<baseMousecolorizer>0x7BA8EA</baseMousecolorizer>
<baseMouseOvercolorizer>0x99BBEE</baseMouseOvercolorizer>
+<styleMenuBarBaseColor>0x669AE6</styleMenuBarBaseColor>
<!--
Name of the Application
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/openmeetings-config.xsd
Mon Mar 19 19:10:36 2012
@@ -14,6 +14,7 @@
<xs:element ref="basebgcolorizer"/>
<xs:element ref="baseMousecolorizer"/>
<xs:element ref="baseMouseOvercolorizer"/>
+ <xs:element ref="styleMenuBarBaseColor"/>
<xs:element ref="currentappname"/>
<xs:element ref="currentappnameurl"/>
<xs:element ref="currentappnamebugurl"/>
@@ -67,6 +68,7 @@
<xs:element name="basebgcolorizer" type="xs:NMTOKEN"/>
<xs:element name="baseMousecolorizer" type="xs:NMTOKEN"/>
<xs:element name="baseMouseOvercolorizer" type="xs:NMTOKEN"/>
+ <xs:element name="styleMenuBarBaseColor" type="xs:NMTOKEN" />
<xs:element name="currentappname" type="xs:string"/>
<xs:element name="currentappnameurl" type="xs:anyURI"/>
<xs:element name="currentappnamebugurl" type="xs:anyURI"/>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/explorer/explorerBox.lzx
Mon Mar 19 19:10:36 2012
@@ -24,19 +24,55 @@
height="400" bgcolor="$once{ canvas.basebgcolorizer }"
onmousedown="this._startDragState(this)"
onmouseup="this._removeDragState(this)" >
+ <attribute name="showWindowEffect" value="false" type="boolean" />
+
+ <attribute name="annimationStartStyle" value="center" type="string" />
+
+ <attribute name="annimationColor" value="$once{ canvas.basebgcolorizer
}" type="string" />
+
+ <event name="animationInited" />
+
<handler name="oninit">
- //if($debug) Debug.write("explorerBox/oninit showWindowEffect?
",canvas.showWindowEffect);
- if (canvas.showWindowEffect=="y"){
- //if($debug) Debug.write("explorerBox/showWindowEffect == YES");
- new
lz.boxInitEffect(parent,{x:this.x+(this.width/2)-50,y:this.y+(this.height/2)-10,zielx:this.x,ziely:this.y,zielwidth:this.width,zielheight:this.height,objRef:this});
- } else {
- this.sendAnniComplete();
- }
+ <![CDATA[
+ //if($debug) Debug.write("explorerBox/oninit showWindowEffect?
",canvas.showWindowEffect);
+ if (canvas.showWindowEffect=="y" || this.showWindowEffect){
+ //if($debug) Debug.write("explorerBox/showWindowEffect
== YES");
+ if (this.annimationStartStyle == "center") {
+ new lz.boxInitEffect(parent,{
+
x:this.x+(this.width/2)-50,
+
y:this.y+(this.height/2)-10,
+ zielx:this.x,
+ ziely:this.y,
+ bgcolor:annimationColor,
+ zielwidth:this.width,
+ zielheight:this.height,
+ objRef:this
+ });
+ } else if (this.annimationStartStyle == "mouse"){
+ new lz.boxInitEffect(parent,{
+ x:parent.getMouse("x"),
+ y:parent.getMouse("y"),
+ width:20,
+ zielx:this.x,
+ ziely:this.y,
+ bgcolor:annimationColor,
+ zielwidth:this.width,
+ zielheight:this.height,
+ objRef:this
+ });
+ } else {
+ if ($debug) Debug.warn("Unkown
annimationStartStyle");
+ }
+ } else {
+ this.sendAnniComplete();
+ }
+ ]]>
</handler>
<method name="sendAnniComplete">
//if($debug) Debug.write("sendAnniComplete");
this.setAttribute('visibility','visible');
+ this.animationInited.sendEvent(null);
this.setShadow();
</method>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/presenter/boxInitEffect.lzx
Mon Mar 19 19:10:36 2012
@@ -21,7 +21,7 @@
<library>
<class name="boxInitEffect" extends="view" width="100" height="20"
- opacity="0.6" bgcolor="$once{ canvas.basebgcolorizer }" >
+ opacity="0.3" bgcolor="$once{ canvas.basebgcolorizer }" >
<attribute name="zielx" value="200" type="number" />
<attribute name="ziely" value="200" type="number" />
@@ -30,13 +30,19 @@
<attribute name="objRef" value="null" />
+ <handler name="oninit">
+ //It seems like you need additionally to start it oninit, the start =
true works
+ //only for the first initialization, sebawagner 19.03.2012
+ this.anm.doStart();
+ </handler>
+
<method name="sendStop">
this.objRef.sendAnniComplete();
this.destroy();
</method>
<animatorgroup name="anm" start="true" process="simultaneous"
- duration="500" onstop="this.parent.sendStop()" >
+ duration="500" onstop="this.parent.sendStop()" >
<animator attribute="x" to="$once{ parent.parent.zielx }" />
<animator attribute="y" to="$once{ parent.parent.ziely }" />
<animator attribute="width" to="$once{ parent.parent.zielwidth }" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainAttributes.lzx
Mon Mar 19 19:10:36 2012
@@ -84,7 +84,8 @@ these properties will be overwritten by
<attribute name="baseMouseOvercolorizer" value="" type="string" />
<attribute name="userbgcolorizer" value="0x3F5B9E" type="string" />
<attribute name="userMousecolorizer" value="0xC4D5E6" type="string" />
-<attribute name="userMouseOvercolorizer" value="0xC4D5E6" type="string" />
+<attribute name="userMouseOvercolorizer" value="0xC4D5E6" type="string" />
+<attribute name="styleMenuBarBaseColor" value="0xFFFFFF" type="string" />
<attribute name="bgColorMenu" value="0xEEF0EB" type="string" />
<attribute name="fontColorHeader" value="0x000000" type="string" />
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/mainMethods.lzx
Mon Mar 19 19:10:36 2012
@@ -118,6 +118,7 @@
this.setAttribute('userbgcolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/basebgcolorizer/text()'));
this.setAttribute('userMousecolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMousecolorizer/text()'));
this.setAttribute('userMouseOvercolorizer',canvas.myConfigSet.getPointer().xpathQuery('config/baseMouseOvercolorizer/text()'));
+
this.setAttribute('styleMenuBarBaseColor',canvas.myConfigSet.getPointer().xpathQuery('config/styleMenuBarBaseColor/text()'));
if (this.baseColorScheme == "lightsteelblue" &&
(this.userbgcolorizer != "0x3F5B9E"
|| this.baseMousecolorizer != "0xC4D5E6"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx
Mon Mar 19 19:10:36 2012
@@ -131,7 +131,7 @@
</class>
-<class name="mainNavi" extends="view" bgcolor="$once{
canvas.baseMousecolorizer }"
+<class name="mainNavi" extends="view" bgcolor="$once{
canvas.styleMenuBarBaseColor }"
width="${ canvas.width }" y="50" >
<attribute name="naviObject" value="null" />
@@ -139,25 +139,9 @@
<attribute name="currentMainmenu" value="null" />
<attribute name="currentSubmenu" value="null" />
-<!-- resource="navibar_rsc" stretches="width" -->
<menubar width="${ parent.width }" height="34" style="menuStyle">
- <!--
- <handler name="oninit">
- this.setShadow();
- </handler>
- <method name="setShadow" >
- <![CDATA[
- if (this.isinited){
- this.normalMC = this.getMCRef();
- this.displacementMap = new flash.filters.DropShadowFilter();
- this.normalMC.filters = [this.displacementMap];
- }
- ]]>
- </method>
- -->
</menubar>
<menubar width="${ parent.width }" height="26" y="34" style="menuStyle">
-
</menubar>
<view name="itemlist" layout="axis:x;spacing:0" id="mainmenuList">
<method name="doAction" args="action">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/main.lzx Mon Mar
19 19:10:36 2012
@@ -45,7 +45,7 @@
<silverstyle name="itemStyle" basecolor="${ canvas.basebgcolorizer }"
textcolor="0xFFFFFF" />
-<style name="menuStyle" basecolor="${ canvas.baseMousecolorizer }"
+<whitestyle name="menuStyle" basecolor="${ canvas.styleMenuBarBaseColor }"
textcolor="0x000000" />
<resource name="currentsplash" src="splash_defaultvalues.swf" />
@@ -172,16 +172,20 @@
width="${ canvas.width }" height="${ canvas.height }"
bgcolor="0xFFFFFF" clickable="true" showhandcursor="false">
<method name="hideContentOnly">
+ this.showLoading.doStart();
this.setAttribute("visibility","visible");
this._text.setAttribute("visibility","hidden");
</method>
<method name="showLoading">
+ this.showLoading.doStart();
this.setAttribute("visibility","visible");
this._text.setAttribute("visibility","visible");
</method>
<method name="hideLoading">
this.setAttribute("visibility","hidden");
</method>
+ <animator name="showLoading" attribute="opacity"
+ from="0" to="0.7" start="false" duration="500" />
<text name="_text" align="right" y="56" fontsize="14"
fgcolor="red">Loading...</text>
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx
(original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/maindebug.lzx Mon
Mar 19 19:10:36 2012
@@ -46,7 +46,7 @@
<silverstyle name="itemStyle" basecolor="${ canvas.basebgcolorizer }"
textcolor="0xFFFFFF" />
-<style name="menuStyle" basecolor="${ canvas.baseMousecolorizer }"
+<whitestyle name="menuStyle" basecolor="${ canvas.styleMenuBarBaseColor }"
textcolor="0x000000" />
<resource name="currentsplash" src="splash_defaultvalues.swf" />
@@ -173,16 +173,20 @@
width="${ canvas.width }" height="${ canvas.height }"
bgcolor="0xFFFFFF" clickable="true" showhandcursor="false">
<method name="hideContentOnly">
+ this.showLoading.doStart();
this.setAttribute("visibility","visible");
this._text.setAttribute("visibility","hidden");
</method>
<method name="showLoading">
+ this.showLoading.doStart();
this.setAttribute("visibility","visible");
this._text.setAttribute("visibility","visible");
</method>
<method name="hideLoading">
this.setAttribute("visibility","hidden");
</method>
+ <animator name="showLoading" attribute="opacity"
+ from="0" to="0.7" start="false" duration="500" />
<text name="_text" align="right" y="56" fontsize="14"
fgcolor="red">Loading...</text>
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/confirmationSingle.lzx
Mon Mar 19 19:10:36 2012
@@ -31,6 +31,8 @@
<attribute name="labeliderror" value="0" type="number" />
+ <attribute name="doCalcPosition" value="true" type="number" />
+
<view x="4" resource="warning_icon_rsc" y="24" />
<labelText labelid="$once{ parent.labeliderror }" y="24"
@@ -40,6 +42,10 @@
<handler name="oninit">
<![CDATA[
+ if (!this.doCalcPosition) {
+ return;
+ }
+
//Set Position of Confirmation Box as Close as possible to the
Mouse
var x = parent.getMouse("x");
var y = parent.getMouse("y");
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx
Mon Mar 19 19:10:36 2012
@@ -42,7 +42,7 @@
<!--- "System" panel on the dashboard -->
<class name="infosPanel" extends="guiPresenter" resizeable="false"
width="500" height="224" closable="true" labelid="374" y="10"><!--
374:System -->
- <view y="20" bgcolor="white" x="1" width="$once{ parent.width-2 }"
+ <view y="20" bgcolor="0xEEF0EB" x="1" width="$once{ parent.width-2 }"
height="$once{ parent.height-21 }" >
<labelText name="_txt" fontstyle="bold" labelid="774" y="0" x="2" />
@@ -80,41 +80,8 @@
</handler>
<labelTooltip labelid="805" />
</simpleLabelButton>
-
-
- <!--
- <view resource="icon_btn_dashboard_1" y="30" x="10" />
-
- <labelText labelid="768" x="10" y="94" fontstyle="bold"
fgcolor="0x14537C" />
-
- <view resource="icon_btn_dashboard_2" y="30" x="114" />
-
- <labelText labelid="771" x="94" y="94" fontstyle="bold"
fgcolor="0x14537C" />
-
- <view resource="icon_btn_dashboard_3" y="30" x="218" />
-
- <labelText labelid="772" x="198" y="94" fontstyle="bold"
fgcolor="0x14537C" />
-
- <view resource="icon_btn_dashboard_4" y="30" x="322" />
-
- <labelText labelid="773" x="322" y="94" multiline="true" width="100"
- fontstyle="bold" fgcolor="0x14537C" />
- -->
</view>
</class>
- <!--
- <labelText fontstyle="bold" y="10" labelid="278" x="10" width="200" />
-
- <view resource="icon_btn_dashboard_1" />
-
-
- <simpleLabelButton width="280" y="40" labelid="279" x="30"
- onclick="quicklink('meetings')" />
-
- <simpleLabelButton width="280" y="70" labelid="280" x="30"
- onclick="quicklink('events')" />
- -->
-
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx
Mon Mar 19 19:10:36 2012
@@ -24,7 +24,7 @@
<class name="profilesPanel" extends="guiPresenter" resizeable="false"
width="${ canvas.width - this.x - 10 }" height="224" y="10"
closable="true" labelid="375" >
- <view y="20" bgcolor="0xFFFFFF" x="1" width="${ parent.width-2 }"
+ <view y="20" bgcolor="0xEEF0EB" x="1" width="${ parent.width-2 }"
height="$once{ parent.height-21 }" clip="true">
<handler name="oninit">
@@ -72,9 +72,6 @@
<image y="20" x="10" name="_userpic" />
<simpleLabelButton y="40" labelid="379" x="150" width="140">
- <!--
- onclick="new
lz.uploadWindow(canvas.main_content._content.inner,{x:300,uploadmodule:'userprofile',isOnlyProfile:true,isdefaultreturn:false,returnObj:this.parent});">
- -->
<handler name="onclick">
<![CDATA[
new
lz.uploadWindowExplorer(canvas.main_content._content.inner,{
@@ -98,19 +95,19 @@
<labelText fontstyle="bold" x="2" y="124" labelid="281" width="200"/>
- <labelText name="homepage" x="2" y="140" width="290" multiline="true" >
+ <labelText name="homepage" x="2" y="140" width="$once{ parent.width - 12
}" multiline="true" >
<attribute name="link" type="string" value="" />
<handler name="onclick">
lz.Browser.loadURL(this.link,"_blank");
</handler>
</labelText>
- <labelText name="mailing" x="2" y="170" width="290" multiline="true" >
+
+ <labelText name="mailing" x="2" y="170" width="$once{ parent.width - 12 }"
multiline="true" >
<attribute name="link" type="string" value="" />
<handler name="onclick">
lz.Browser.loadURL(this.link,"_blank");
</handler>
</labelText>
-
</view>
</class>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/library.lzx
Mon Mar 19 19:10:36 2012
@@ -21,14 +21,18 @@
<library>
<include href="conference/" />
+ <!--
<include href="chat/" />
<include href="settings/" />
<include href="invitation/" />
<include href="lzrecordcontent/" />
+ -->
<include href="dashboard/" />
+ <!--
<include href="meetings/" />
<include href="admin/" />
<include href="sipintegration/" />
+ -->
<include href="lzcalendar/" />
</library>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzCalendarGrid.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzCalendarGrid.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzCalendarGrid.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzCalendarGrid.lzx
Mon Mar 19 19:10:36 2012
@@ -20,8 +20,8 @@
-->
<library>
- <class name="lzCalendarGrid" extends="view" x="204" y="20"
- width="${ parent.width - 204 }"
height="${ parent.height-20 }" >
+ <class name="lzCalendarGrid" extends="view" x="204" y="26"
bgcolor="0xFFFFFF"
+ width="${ parent.width - 204 }"
height="${ parent.height-26 }" >
<attribute name="currentDate" value="null" />
<attribute name="currentWeek" value="0" type="number" />
@@ -174,9 +174,9 @@
height="720">
<view
name="dayBg2" resource="calendar_one_day_hours_index_bg_rsc" stretches="width"
-
width="$once{ parent.width }" ></view>
+
width="${ parent.width }" ></view>
- <view
datapath="appointments" bgcolor="0xA59CFC" width="$once{ parent.width }"
height="60">
+ <view
datapath="appointments" bgcolor="0xA59CFC" width="${ parent.width }"
height="60">
<handler name="ondata" args="d">
<![CDATA[
if (classroot.reRenderLock) {
@@ -313,9 +313,9 @@
height="720">
<view
name="dayBg2" resource="calendar_day_bg_rsc" stretches="width"
-
width="$once{ parent.width }" ></view>
+
width="${ parent.width }" ></view>
- <view
datapath="appointments" bgcolor="0xA59CFC" width="$once{ parent.width }"
height="60">
+ <view
datapath="appointments" bgcolor="0xA59CFC" width="${ parent.width }"
height="60">
<handler name="ondata" args="d">
<![CDATA[
if (classroot.reRenderLock) {
@@ -410,10 +410,9 @@
height="${ parent.height -1 }">
<text name="_title" />
-
- <view width="$once{
parent.width }" y="18">
- <view
datapath="appointments" bgcolor="0xA59CFC" width="$once{ parent.width }">
+ <view width="${
parent.width }" y="18">
+ <view
datapath="appointments" bgcolor="0xA59CFC" width="${ parent.width }">
<handler name="onclick" >
var appointmentId = this.datapath.xpathQuery('appointmentId/text()');
if ($debug) Debug.write("click ",appointmentId);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzEditCalendarEvent.lzx
Mon Mar 19 19:10:36 2012
@@ -22,7 +22,8 @@
<class name="lzEditCalendarEvent" extends="labelExplorerBox"
labelid="815" allowDragging="true"
x="$once{ parent.width/2 - 300 }" y="100" docking="false"
resizeable="false"
- closable="true" width="600" height="550">
+ closable="true" width="600" height="550"
+ showWindowEffect="true" annimationStartStyle="mouse">
<attribute name="reminderTypeId" value="0" type="number" />
@@ -36,8 +37,16 @@
<dataset name="eventDS" />
<attribute name="updateObj" value="null" />
-
+
+ <attribute name="appointmentId" value="0" type="number" />
+
+ <attribute name="isConnectedEvent" value="false" type="boolean"
/>
+
<handler name="oninit">
+
this.getAppointmentReminderTypList.setData(this.remindertypes.data);
+ </handler>
+
+ <handler name="animationInited">
<![CDATA[
canvas._loadingAll.hideContentOnly();
@@ -61,11 +70,17 @@
if ($debug) Debug.write("this.dataElement
",this.dataElement);
-
this.getAppointmentReminderTypList.setData(this.remindertypes.data);
-
this.eventDS.setAttribute("data", this.dataElement.childNodes);
+
+ this.appointmentId =
this.eventDS.getPointer().xpathQuery('appointmentId/text()');
if ($debug) Debug.write("this.eventDS ",this.eventDS);
+ if ($debug) Debug.write("this.appointmentId
",this.appointmentId);
+
+ if (this.appointmentId == 0) {
+ this._saveEvent.setAttribute("x",this._deleteEvent.x);
+ this._deleteEvent.setAttribute("visibility","hidden");
+ }
lz.Focus.setFocus(this._title, false);
]]>
@@ -183,6 +198,20 @@
]]>
</handler>
</netRemoteCallHib>
+
+ <netRemoteCallHib name="deleteAppointment"
funcname="calendarservice.deleteAppointment"
+ remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId; </method></netparam>
+ <netparam><method name="getValue">return
parent.parent.appointmentId;</method></netparam>
+ <netparam><method name="getValue">return
hib.userlang;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("deleteAppointment
",value);
+ parent.lzCalendarRef.reload();
+ parent.close();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<labelText name="_titleLabel" x="4" y="24" labelid="572"
fontstyle="bold" />
@@ -396,8 +425,8 @@
datapath="local:classroot.eventDS:/comment"
text="$path{'text()'}"
width="$once{ parent.width-110 }" height="124"
/>
- <simpleLabelButton labelid="813" width="100" x="$once{
parent.width-315 }"
- y="$once{ parent.height-24 }" >
+ <simpleLabelButton name="_saveEvent" labelid="813" width="100"
+ x="$once{ parent.width-315 }" y="$once{
parent.height-24 }" >
<handler name="onclick">
//new lz.labelerrorPopup(canvas,{errorlabelid:1278});
//return;
@@ -406,27 +435,27 @@
</handler>
</simpleLabelButton>
- <simpleLabelButton labelid="814" width="100" x="$once{
parent.width-210 }"
- y="$once{ parent.height-24 }"
- onclick="this.parent.closeAndRemove();">
+ <simpleLabelButton name="_deleteEvent" labelid="814"
width="100"
+ x="$once{ parent.width-210 }" y="$once{ parent.height-24 }" >
<handler name="onclick">
if (canvas.contactUser != 0) {
new
lz.labelerrorPopup(canvas,{errorlabelid:1278});
return;
}
- if (Number(parent.parent.appointementId) == 0) {
- canvas.eventDataMgr.deleteEvent();
- } else if (parent.parent.isConnectedEvent) {
+ if (parent.isConnectedEvent) {
new
lz.confirmationSingle(canvas,{refObj:this,labelid:1281,
labeliderror:1280,showCheckBox:false});
} else {
- new
lz.confirmationSingle(canvas,{refObj:this,labelid:797,
-
showCheckBox:false,labeliderror:796});
+ new lz.confirmationSingle(parent.parent,{
+
refObj:this,labelid:797,
+
showCheckBox:false,
+ labeliderror:796
+ });
}
</handler>
<method name="sendConfirmation" args="refObj,t">
- parent.parent.deleteAppointment.doCall();
+ parent.deleteAppointment.doCall();
</method>
</simpleLabelButton>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzViewCalendarEvent.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzViewCalendarEvent.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzViewCalendarEvent.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/compontents/lzViewCalendarEvent.lzx
Mon Mar 19 19:10:36 2012
@@ -20,7 +20,8 @@
-->
<library>
- <class name="lzViewCalendarEvent" extends="view" bgcolor="0xBBBBBB"
width="300" height="120" focusable="true">
+ <class name="lzViewCalendarEvent" extends="view" bgcolor="0xBBBBBB"
clickable="true"
+ showhandcursor="false"
width="300" height="120" focusable="true">
<attribute name="dataElement" value="null" />
@@ -30,6 +31,8 @@
<attribute name="refCalendarEventView" value="null" />
+ <attribute name="appointmentId" value="0" type="number" />
+
<handler name="oninit">
<![CDATA[
//this._content._title.setAttribute("fgcolor",this.refCalendarEventView.bgcolor);
@@ -49,8 +52,11 @@
this.setAttribute("y",y_canvas-this.height-12);
this.eventDS.setAttribute("data", this.dataElement.childNodes);
+
+ this.appointmentId =
this.eventDS.getPointer().xpathQuery('appointmentId/text()');
if ($debug) Debug.write("this.eventDS ",this.eventDS);
+ if ($debug) Debug.write("this.appointmentId
",this.appointmentId);
lz.Focus.setFocus(this);
this.setShadow();
@@ -65,6 +71,20 @@
normalMC.filters = [displacementMap];
]]>
</method>
+
+ <netRemoteCallHib name="deleteAppointment"
funcname="calendarservice.deleteAppointment"
+ remotecontext="$once{
canvas.thishib }" >
+ <netparam><method name="getValue">return
canvas.sessionId; </method></netparam>
+ <netparam><method name="getValue">return
parent.parent.appointmentId;</method></netparam>
+ <netparam><method name="getValue">return
hib.userlang;</method></netparam>
+ <handler name="ondata" args="value">
+ <![CDATA[
+ if ($debug) Debug.write("deleteAppointment
",value);
+ parent.lzCalendarRef.reload();
+ parent.close();
+ ]]>
+ </handler>
+ </netRemoteCallHib>
<method name="close">
if ($debug) Debug.write("CLOSE lzViewCalendarEvent");
@@ -140,16 +160,22 @@
new
lz.labelerrorPopup(canvas,{errorlabelid:1285});
}
</handler>
- <method name="sendConfirmation" args="refObj,t">
- parent.parent.deleteAppointment.doCall();
- </method>
</simpleLabelButton>
<simpleLabelButton labelid="814" width="100" x="5"
y="$once{ parent.height-24 }" >
<handler name="onclick">
//check if event is from other user
- new
lz.confirmationSingle(canvas,{refObj:this,labelid:797,
-
showCheckBox:false,labeliderror:796});
+ new lz.confirmationSingle(parent.parent,{
+ x:0,y:0,
+
width:parent.parent.width,
+
height:parent.parent.height+16,
+
refObj:this,labelid:797,
+
showCheckBox:false,
+
labeliderror:796,
+
doCalcPosition:false,
+ docking:false,
+
allowDragging:false
+ });
</handler>
<method name="sendConfirmation" args="refObj,t">
parent.parent.deleteAppointment.doCall();
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
Mon Mar 19 19:10:36 2012
@@ -20,6 +20,7 @@
-->
<library>
+<style name="calendarButtonStyle" basecolor="0xFF3300" textcolor="0xFFFFFF" />
<class name="lzCalendar" extends="baseContentView"
height="${ canvas.height-canvas.naviHeight }"
width="${ canvas.width }">
@@ -76,17 +77,14 @@
if (this.currentDate == null) {
tRelaodDataSet = true;
}
-
if ($debug) Debug.write("loadAppointments ",dayIndex,
weekIndex, tDate);
-
this.currentDate = tDate;
+
this._lzCalendarTobBar.statusInfo.currentDate.setAttribute("text",parseDateToStringTime(this.currentDate));
this._lzCalendarGrid.checkAndShow(tDate,dayIndex,weekIndex);
if (tRelaodDataSet) {
this.loadCalendarData();
}
-
-
]]>
</method>
@@ -185,7 +183,8 @@
<dataset name="getAppointmentReminderTypList" type="http" />
<!-- 176 pixels is the width of the mini calendar -->
- <simpleLabelButton labelid="1444" height="24" width="176" x="12" y="10"
>
+ <simpleLabelButton labelid="1444" height="24"
+ width="176" x="12" y="10" style="calendarButtonStyle">
<handler name="onclick">
parent.editCalendarEvent(null);
</handler>
@@ -235,24 +234,40 @@
<userContactsCalendar name="_userContacts" y="340" x="4" height="${
parent.height - 344 }" width="186" />
- <view name="_lzCalendarTobBar" width="${ parent.width - 204 }" x="204"
height="20">
+ <view name="_lzCalendarTobBar" width="${ parent.width - 204 }" x="204"
height="40">
+
+ <view name="statusInfo" align="right" y="2">
+
+ <labelText name="currentDate" fontsize="12"
resize="true" fontstyle="bold" />
+
+ <simplelayout axis="x" spacing="0" />
+ </view>
- <view name="buttons" align="right">
+ <view name="buttons" align="left" y="2">
- <simpleLabelButton labelid="799" height="20" >
+ <simpleLabelButton name="_showDay" labelid="799"
height="22" >
<handler name="onclick">
+ parent._showWeek.setAttribute("enabled",true);
+ parent._showMonth.setAttribute("enabled",true);
+ this.setAttribute("enabled",false);
parent.parent.parent._lzCalendarGrid.showDay();
</handler>
</simpleLabelButton>
- <simpleLabelButton labelid="800" height="20" >
+ <simpleLabelButton name="_showWeek" labelid="800"
height="22" >
<handler name="onclick">
+ parent._showDay.setAttribute("enabled",true);
+ parent._showMonth.setAttribute("enabled",true);
+ this.setAttribute("enabled",false);
parent.parent.parent._lzCalendarGrid.showWeek();
</handler>
</simpleLabelButton>
- <simpleLabelButton labelid="801" height="20" >
+ <simpleLabelButton name="_showMonth" labelid="801"
height="22" enabled="false">
<handler name="onclick">
+ parent._showDay.setAttribute("enabled",true);
+ parent._showWeek.setAttribute("enabled",true);
+ this.setAttribute("enabled",false);
parent.parent.parent._lzCalendarGrid.showMonth();
</handler>
</simpleLabelButton>
@@ -262,7 +277,7 @@
</view>
- <lzCalendarGrid name="_lzCalendarGrid"
+ <lzCalendarGrid name="_lzCalendarGrid"
datapath="local:classroot.getAppointmentsByWeekCalendar:/">
<handler name="oncalendarEvent" args="sel">
parent.viewCalendarEvent(sel.datapath.data.cloneNode(true),sel);
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/baseChooseIconFLVView.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/baseChooseIconFLVView.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/baseChooseIconFLVView.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/baseChooseIconFLVView.lzx
Mon Mar 19 19:10:36 2012
@@ -21,7 +21,7 @@
<library>
<class name="baseChooseIconFLVView" extends="view" width="24" height="24"
- bgcolor="$once{ canvas.basebgcolorizer }" >
+ bgcolor="0xE0E0E0" >
<attribute name="resourceN" value="" type="string" />
<attribute name="isselected" value="false" type="boolean" />
@@ -34,7 +34,7 @@
</handler>
<handler name="onmouseover">
- this._bg.setAttribute("bgcolor",canvas.baseMousecolorizer);
+ this._bg.setAttribute("bgcolor",0xE0E0E0);
</handler>
<handler name="onmouseout">
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx
Mon Mar 19 19:10:36 2012
@@ -290,28 +290,20 @@
<!--
Borders
- -->
+
<view name="_bg1" bgcolor="$once{ canvas.basebgcolorizer }" width="$once{
parent.width-10 }"
x="0" y="0" height="${ parent.height }" />
+
+
<view name="_bg2" bgcolor="0xFFFFFF" x="1" y="0" width="$once{
parent.width - 12 }"
height="${ parent.height - 1 - parent._recordingsInfo.height }" />
-
- <!--
- <view name="_border1a" x="0" y="0" width="1"
- height="14" bgcolor="$once{ canvas.basebgcolorizer }" />
- <view name="_border1b" x="${ parent.width-1 }" y="0" width="1"
- height="14" bgcolor="$once{ canvas.basebgcolorizer }" />
- -->
+ -->
<view name="_border2" x="0" y="19" width="$once{ parent.width-10 }"
- height="1" bgcolor="$once{ canvas.basebgcolorizer }" />
+ height="1" bgcolor="0xE0E0E0" />
- <!--
- File Tree Content Tabbar
- -->
-
<view name="_fileBar" layout="axis:x" x="0" y="0">
<baseChooseIconFLVView labelid="703" height="20" width="19"
resourceN="file_explorer_add_folder_rsc" >
@@ -327,7 +319,7 @@
parent.parent.getFLVExplorerByRoom.doCall();
</handler>
</baseChooseIconFLVView>
- <view bgcolor="$once{ canvas.basebgcolorizer }" height="20" width="1"
/>
+ <view bgcolor="0xE0E0E0" height="20" width="1" />
</view>
<!--
@@ -356,14 +348,14 @@
this.onmouseout.sendEvent();
</handler>
</baseChooseIconFLVView>
- <view bgcolor="$once{ canvas.basebgcolorizer }" height="20" width="1"
/>
+ <view bgcolor="0xE0E0E0" height="20" width="1" />
</view>
<!--
File Tree Content
-->
- <view name="_filearea" x="1" y="20" clip="true"
+ <view name="_filearea" x="1" y="20" clip="true" bgcolor="0xFFFFFF"
height="${ parent.height - 21 - parent._recordingsInfo.height - 40
}"
width="$once{ parent.width - 12 }">
@@ -398,7 +390,7 @@
textInset="30" closeable="true" isopen="true"
closedHeight="32"
width="$once{ parent.width - 12 }" height="180">
- <view name="content" y="34" bgcolor="0xEFEFEF"
+ <view name="content" y="34"
width="$once{ parent.width }" height="$once{ parent.height - 34
}">
<attribute name="recordingName" value="" type="string" />
Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1302601&r1=1302600&r2=1302601&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Mon Mar 19 19:10:36 2012
@@ -378,6 +378,8 @@
</path>
</signjar>
</target>
+
+ <target name="client.only"
depends="compile.laszlo.main.as3,compile.laszlo.main" />
<target name="client.debug.only"
depends="compile.laszlo.main.debug.as3,compile.laszlo.main.debug" />
