Author: sebawagner
Date: Sun Apr 1 17:03:51 2012
New Revision: 1308158
URL: http://svn.apache.org/viewvc?rev=1308158&view=rev
Log:
OPENMEETINGS-124 add pixellock to make loading bar edges look better
OPENMEETINGS-124 fix menu attribute "enabled"
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx?rev=1308158&r1=1308157&r2=1308158&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/conference/conferenceMenubar.lzx
Sun Apr 1 17:03:51 2012
@@ -248,13 +248,17 @@
<conferencDropDownMenuItem labelid="24"
command="cmd_createPoll"
enabled="${ canvas.ismoderator
}" />
<horizontalDropDownSpacer />
- <conferencDropDownMenuItem labelid="37"
command="cmd_pollResults" />
+ <conferencDropDownMenuItem labelid="37"
command="cmd_pollResults"
+ enabled="true" />
<horizontalDropDownSpacer />
- <conferencDropDownMenuItem labelid="42"
command="cmd_checkPollVoted" />
+ <conferencDropDownMenuItem labelid="42"
command="cmd_checkPollVoted"
+ enabled="true"/>
<horizontalDropDownSpacer />
- <conferencDropDownMenuItem labelid="1447"
command="cmd_showSipDialer" />
+ <conferencDropDownMenuItem labelid="1447"
command="cmd_showSipDialer"
+ enabled="true"/>
<horizontalDropDownSpacer />
- <conferencDropDownMenuItem labelid="1126"
command="cmd_editWhiteboardDefault" />
+ <conferencDropDownMenuItem labelid="1126"
command="cmd_editWhiteboardDefault"
+ enabled="true"/>
</view>
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx?rev=1308158&r1=1308157&r2=1308158&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/conference/popups/autoLoader.lzx
Sun Apr 1 17:03:51 2012
@@ -20,13 +20,19 @@
-->
<library>
-<class name="autoLoader" extends="view" align="center" valign="middle"
- layout="axis:y;spacing:2">
+<class name="autoLoader" extends="view" align="center" valign="middle"
pixellock="true">
<attribute name="maxwidth" value="300" type="number" />
<attribute name="maxsteps" value="22" type="number" />
<attribute name="currentsteps" value="0" type="number" />
+ <!--
+ <handler name="oninit">
+ this.setAttribute("y",Math.round(this.y));
+ this.setAttribute("y",Math.round(this.y));
+ </handler>
+ -->
+
<method name="close">
canvas.main_content.setAttribute('visibility','visible');
canvas._mainbgcontentNavi.setAttribute('visibility','visible');
@@ -46,10 +52,11 @@
<text fontsize="11" name="error" />
<text fontsize="11" name="_src" />
- <view name="loadingbar" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
height="10"
+ <view name="loadingbar" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
height="10" pixellock="true"
x="-5" y="60" width="$once{ parent.maxwidth }" visibility="hidden">
<view x="1" y="1" width="$once{ parent.width-2 }" height="8"
bgcolor="0xFFFFFF"/>
- <view name="_loading" x="1" y="1" width="0" height="8"
bgcolor="$once{ canvas.styleMenuBarBaseColor }"/>
+ <view name="_loading" x="1" y="1" width="0" height="8"
pixellock="true"
+ bgcolor="$once{ canvas.styleMenuBarBaseColor }"/>
</view>
</class>
