You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by se...@apache.org on 2012/04/08 09:58:41 UTC
svn commit: r1310960 - in
/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules:
lzcalendar/lzCalendar.lzx settings/userSettings.lzx
Author: sebawagner
Date: Sun Apr 8 07:58:41 2012
New Revision: 1310960
URL: http://svn.apache.org/viewvc?rev=1310960&view=rev
Log:
OPENMEETINGS-7 Show timezone Calendar is using in UI
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx
incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx
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=1310960&r1=1310959&r2=1310960&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzcalendar/lzCalendar.lzx Sun Apr 8 07:58:41 2012
@@ -324,6 +324,20 @@
parent.parent.parent._lzCalendarGrid.showMonth();
</handler>
</simpleLabelButton>
+
+ <labelText fgcolor="0x0000FF" y="2">
+ <handler name="oninit">
+ <![CDATA[
+ this.setAttribute("text","<u>"+canvas.jNameTimeZone+"</u>");
+ ]]>
+ </handler>
+ <handler name="onclick">
+ canvas.userSettingsModuleOpt = "editUserProfile";
+ quicklinkAct("userSettingsModule");
+ </handler>
+ </labelText>
+
+
<simplelayout axis="x" spacing="0" />
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx?rev=1310960&r1=1310959&r2=1310960&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx Sun Apr 8 07:58:41 2012
@@ -115,7 +115,9 @@
this.subviews[eg].deselect();
}
- if (canvas.userSettingsModuleOpt == "userProfile") {
+ if (canvas.userSettingsModuleOpt == "editUserProfile") {
+ this._editUserProfile.onclick.sendEvent(null);
+ } else if (canvas.userSettingsModuleOpt == "userProfile") {
this._userProfile.onclick.sendEvent(null);
} else if (canvas.userSettingsModuleOpt == "userSearch") {
this._searchUserProfile.onclick.sendEvent(null);