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/03/29 20:18:21 UTC
svn commit: r1307026 [2/2] - in /incubator/openmeetings/trunk/singlewebapp:
WebContent/languages/ WebContent/openmeetings/ WebContent/src/base/
WebContent/src/base/navi/ WebContent/src/base/navi/resources/
WebContent/src/modules/admin/confadmin/ WebCon...
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=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/mainNavi.lzx Thu Mar 29 18:18:17 2012
@@ -20,59 +20,136 @@
-->
<library>
-<class name="subitemsListContainter" extends="view" visibility="hidden"
- layout="axis:x;spacing:0" />
-
<class name="textBoxSubBlank" extends="text" text="$once{ parent.text }"
fgcolor="0x000000" fontstyle="bold"
fontsize="14" y="6" x="10" />
-<class name="subitemsListItem" extends="view" height="26"
- width="${ this._ctext.width+20 }" >
+
+<class name="dropDownMenuListItem" extends="view" height="36">
<attribute name="action" value="" type="string" />
<attribute name="isopen" value="false" type="boolean" />
<attribute name="isleaf" value="false" type="boolean" />
<attribute name="list" value="null" />
- <attribute name="textvalue" value="null" />
+ <attribute name="textvalue" value="" type="string" />
<attribute name="selected" value="false" type="boolean" />
+ <attribute name="textToolTip" value="" type="string" />
+
+ <attribute name="isSpacer" value="false" type="boolean" />
<handler name="onmouseover">
- if (!this.selected){
- this._bg.setAttribute("visibility","visible");
- }
+ this._bg.setAttribute("visibility","visible");
</handler>
+
<handler name="onmouseout">
- if (!this.selected){
- this._bg.setAttribute("visibility","hidden");
- }
- </handler>
-
- <method name="resetItem">
- this.selected = false;
this._bg.setAttribute("visibility","hidden");
- this._ctext.setAttribute("fgcolor",0x000000);
- </method>
-
- <view name="_bg" visibility="hidden" width="${ parent.width-1 }" y="3"
- bgcolor="0xFFFFFF" opacity="0.4" height="23" />
- <view width="1" height="8" y="11" bgcolor="0x000000" x="${ parent.width-1 }" />
- <textBoxSubBlank name="_ctext" fontsize="11"/>
+ </handler>
+ <view name="_bg" visibility="hidden" width="${ parent.width-2 }" y="0" x="1"
+ bgcolor="0xFFFFFF" opacity="0.5" height="36" />
+
+ <text text="$once{ parent.text }" name="_ctext" fontstyle="bold" fgcolor="0x666666"
+ fontsize="14" y="2" x="10" />
+
+ <text text="$once{ parent.textToolTip }" name="_ctextTooltip" fontstyle="plain" fgcolor="0x666666"
+ fontsize="10" y="20" x="10" />
+
<handler name="onclick">
- this._bg.setAttribute("visibility","visible");
- this._ctext.setAttribute("fgcolor",0xFFFFFF);
- if (this.isleaf) loadContent(this,null,null);
- this.selected=true;
- parent.parent.parent.setSubItem(this);
+ loadContent(this,null,null);
+ parent.parent.close();
</handler>
+</class>
+
+<class name="horizontalDropDownSpacer" x="4" height="1" bgcolor="0xCCCCCC">
+ <attribute name="isSpacer" value="true" type="boolean" />
+</class>
+
+<class name="dropDownMenuList" extends="view" bgcolor="0xCCCCCC"
+ height="${ this._content.height+2 }" width="${ this._content.width+2 }">
+
+ <attribute name="list" value="null" />
+
+ <attribute name="btnRef" value="null" />
+
+ <!--- @keywords private -->
+ <method name="passModeEvent" args="eventStr,view" >
+ <![CDATA[
+ if ( eventStr == "onmousedown" ){
+ if ( view != null ) {
+ if ( !view.childOf(this) ) {
+ this.close();
+ }
+ } else {
+ this.close();
+ }
+ }
+ if (view && view.childOf(this)) {
+ if (view[ eventStr ]) {
+ view[ eventStr ].sendEvent( view );
+ }
+ return false;
+ }
+ return true;
+ ]]>
+ </method>
+ <handler name="oninit">
+ lz.ModeManager.makeModal(this);
+ </handler>
+
+ <method name="close">
+ this.btnRef.setAttribute("selected",false);
+ lz.ModeManager.release(this);
+ this.destroy();
+ </method>
+
+ <handler name="oninit">
+ <![CDATA[
+ for (var i=0;i<this.list.length;i++) {
+ if (i!=0) {
+ new lz.horizontalDropDownSpacer(this._content);
+ }
+ new lz.dropDownMenuListItem(this._content,{
+ textvalue:this.list[i].name,
+ list:this.list[i].subnavi,
+ text:this.list[i].label.value,
+ isopen:this.list[i].isopen,
+ isleaf:this.list[i].isleaf,
+ action:this.list[i].action,
+ textToolTip:list[i].tooltip.value
+ });
+ }
+
+ //the second round goes through the list of items, as
+ //now the maxwidth is detected we adjust the rest to it
+ var maxWidth = 0;
+ for (var i=0;i<this._content.subviews.length;i++) {
+ if (this._content.subviews[i].width > maxWidth) {
+ maxWidth = this._content.subviews[i].width;
+ }
+ }
+ //add a little bit of spacing at the end
+ maxWidth += 10;
+
+ for (var i=0;i<this._content.subviews.length;i++) {
+ if (this._content.subviews[i].isSpacer) {
+ this._content.subviews[i].setAttribute("width",maxWidth-8);
+ } else {
+ this._content.subviews[i].setAttribute("width",maxWidth);
+ }
+ }
+ ]]>
+ </handler>
+
+ <view name="_content" x="1" y="1"
+ layout="axis:y;spacing:1" bgcolor="0xEFEFEF" />
+
</class>
<class name="mainMenuMeetingsItem" extends="view" height="34"
- width="${ this._ctext.width+20 }" >
+ width="${ this._ctext.width+36 }" >
<attribute name="action" value="" type="string" />
@@ -94,150 +171,103 @@
this.bgc.setAttribute('visibility','hidden');
}
</handler>
-
-<!--resource="mainnavi_rsc"-->
- <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="31" y="1"
- stretches="width" visibility="hidden" name="bgc"/>
- <view width="1" height="10" y="13" bgcolor="0x666666" x="${ parent.width-1 }" />
- <text text="$once{ parent.text }" name="_ctext" fontstyle="bold"
- fontsize="14" y="6" x="10" />
-
-
- <handler name="oninit">
- <![CDATA[
- if ($debug) Debug.write(this.list,list.length);
- if (list!=null && list.length!=0){
- this._menuRef = new lz.subitemsListContainter(this.parent.parent.subitemlist)
- for (var i=0;i<this.list.length;i++) {
- new lz.subitemsListItem(this._menuRef,{textvalue:this.list[i].name,list:this.list[i].subnavi,text:this.list[i].label.value,isopen:this.list[i].isopen,isleaf:this.list[i].isleaf,action:this.list[i].action});
- }
- }
- ]]>
+
+ <handler name="onselected" args="tSelect">
+ this.selected = tSelect;
+ if (tSelect) {
+ this._icon_down.setAttribute("frame",2);
+ this.bga.setAttribute("visibility","visible");
+ this._ctext.setAttribute("fgcolor",0x000088);
+ } else {
+ this._icon_down.setAttribute("frame",1);
+ this.bgc.setAttribute("visibility","hidden");
+ this.bga.setAttribute("visibility","hidden");
+ this._ctext.setAttribute("fgcolor",0xFFFFFF);
+ }
</handler>
+
+ <view width="${ parent.width-1 }" bgcolor="0xFFFFFF" opacity="0.4" height="32" y="1"
+ visibility="hidden" name="bgc"/>
+
+ <view width="${ parent.width-1 }" bgcolor="0xEFEFEF" height="34"
+ visibility="hidden" name="bga">
+ <view width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ </view>
+
+ <view name="_icon_down" x="${ parent.width-20 }" y="10"
+ resource="bullet_arrow_down_rsc" frame="1" />
+
+ <view width="1" height="${ parent.height }" y="0" bgcolor="0xEEEEEE" x="${ parent.width-1 }" />
+ <text text="$once{ parent.text }" name="_ctext" fontstyle="plain" fgcolor="0xFFFFFF"
+ fontsize="14" y="6" x="10" />
<handler name="onclick">
- this.selected = true;
- this.parent.parent.sendOpenMenu(this._menuRef,this);
- this.bgc.setAttribute('visibility','visible');
- this._ctext.setAttribute("fgcolor",0xFFFFFF);
- if ($debug) Debug.write("onclick",this);
- if (this.isleaf) loadContent(this,null,null);
- else this._menuRef.subviews[0].onclick.sendEvent();
+ new lz.dropDownMenuList(canvas,{
+ x:this.getAttributeRelative("x",canvas),
+ y:this.getAttributeRelative("y",canvas)+this.height,
+ btnRef:this,
+ list:this.list
+ });
+ this.parent.parent.sendOpenMenu(this);
</handler>
-
<labelTooltip text="$once{ parent.textToolTip }" multiline="true" />
</class>
-
<class name="mainNavi" extends="view" bgcolor="$once{ canvas.styleMenuBarBaseColor }"
width="${ canvas.width }" y="50" >
<attribute name="naviObject" value="null" />
- <attribute name="currentmenu" value="null" />
- <attribute name="currentMainmenu" value="null" />
- <attribute name="currentSubmenu" value="null" />
-
- <menubar width="${ parent.width }" height="34" style="menuStyle">
- </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">
- <![CDATA[
- for (var i=0;i<this.subviews.length;i++) {
-
- if ($debug) Debug.write("this.subviews[i] ",this.subviews[i].action);
-
- if (this.subviews[i].action == action) {
- this.subviews[i].onclick.sendEvent();
- return true;
- }
- }
-
- for (var j=0;j<parent.subitemlist.subviews.length;j++) {
-
- var container = parent.subitemlist.subviews[j];
-
- for (var k=0;k<container.subviews.length;k++) {
-
- if ($debug) Debug.write("ontainer.subviews[i] ",container.subviews[k].action);
-
- if (container.subviews[k].action == action) {
- container.subviews[k].onclick.sendEvent();
- return true;
- }
- }
- }
- ]]>
- </method>
- </view>
- <view name="subitemlist" y="32" />
-
- <method name="sendOpenMenu" args="menuref,obj">
- <![CDATA[
- if (this.currentmenu!=null) {
- this.currentmenu.setAttribute('visibility','hidden');
- }
- if (this.currentMainmenu!=null && this.currentMainmenu!=obj) {
- if ($debug) Debug.write("New MainMenuItem",obj);
- this.currentMainmenu.bgc.setAttribute('visibility','hidden');
- this.currentMainmenu._ctext.setAttribute("fgcolor",0x000000);
- this.currentMainmenu.selected = false;
- } else {
- obj.bgc.setAttribute('visibility','visible');
- }
- this.currentMainmenu = obj;
- this.currentmenu = menuref;
- this.currentmenu.setAttribute('visibility','visible');
- ]]>
- </method>
-
- <method name="setSubItem" args="obj">
- <![CDATA[
- if (this.currentSubmenu!=null && this.currentSubmenu!=obj) this.currentSubmenu.resetItem();
- this.currentSubmenu=obj;
- ]]>
+
+ <attribute name="selected" value="null" />
+
+ <method name="sendOpenMenu" args="menuref">
+ if (this.selected != null) {
+ this.selected.setAttribute("selected",false);
+ }
+ this.selected = menuref;
+ this.selected.setAttribute("selected",true);
</method>
-
+
<!---
Initialize Menu
-->
- <handler name="oninit">
- <![CDATA[
- var value = this.naviObject;
- for (var i=0;i<value.length;i++){
- var t1 = new lz.mainMenuMeetingsItem(this.itemlist,{
- textvalue:value[i].name,list:value[i].mainnavi,
- isleaf:value[i].isleaf,
- text:value[i].label.value,
- textToolTip:value[i].tooltip.value,
- action:value[i].action
- });
-
- if (canvas.cuser == "") {
- if (i==0) t1.onclick.sendEvent();
- }
-
- //Debug.write("t1: ",t1);
- }
- //Debug.write("this: ",this);
-
- if (canvas.cuser != "") {
- if (canvas.cuserStatus == "yes") {
- this.changeUserContactByHash.pending = true;
- this.changeUserContactByHash.doCall();
- } else if (canvas.cuserStatus == "no") {
- this.changeUserContactByHash.pending = false;
- this.changeUserContactByHash.doCall();
- } else {
- canvas.userSettingsModuleOpt = "contactMessages";
- quicklinkAct("userSettingsModule");
- }
- }
- ]]>
- </handler>
+ <handler name="oninit">
+ <![CDATA[
+ var value = this.naviObject;
+ for (var i=0;i<value.length;i++){
+ var t1 = new lz.mainMenuMeetingsItem(this.itemlist,{
+ textvalue:value[i].name,
+ list:value[i].mainnavi,
+ isleaf:value[i].isleaf,
+ text:value[i].label.value,
+ textToolTip:value[i].tooltip.value,
+ action:value[i].action
+ });
+
+ if (canvas.cuser == "") {
+ if (i==0) {
+ quicklinkAct(value[i].mainnavi[0].action);
+ }
+ }
+ }
+
+ if (canvas.cuser != "") {
+ if (canvas.cuserStatus == "yes") {
+ this.changeUserContactByHash.pending = true;
+ this.changeUserContactByHash.doCall();
+ } else if (canvas.cuserStatus == "no") {
+ this.changeUserContactByHash.pending = false;
+ this.changeUserContactByHash.doCall();
+ } else {
+ canvas.userSettingsModuleOpt = "contactMessages";
+ quicklinkAct("userSettingsModule");
+ }
+ }
+
+ ]]>
+ </handler>
<!--
public Object changeUserContactByHash(String SID, String hash, Boolean status)
@@ -265,7 +295,9 @@
]]>
</handler>
</netRemoteCallHib>
-
+
+ <view name="itemlist" layout="axis:x;spacing:0" />
+
</class>
</library>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/resources/bullet_arrow_down.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/resources/bullet_arrow_down.png?rev=1307026&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/resources/bullet_arrow_down.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/resources/bullet_arrow_down_dark.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/resources/bullet_arrow_down_dark.png?rev=1307026&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/navi/resources/bullet_arrow_down_dark.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/confadmin/confAdmin.lzx Thu Mar 29 18:18:17 2012
@@ -23,7 +23,7 @@
<!--- Configuration module for ADMIN -->
<class name="confAdmin" extends="baseContentView">
- <turnOverList name="_turnoverlist" width="410" height="${ canvas.height - 110 }" x="2" y="0"
+ <turnOverList name="_turnoverlist" width="410" height="${ canvas.height - canvas.naviHeight }" x="2" y="0"
orderby="configuration_id" step="50" asc="true">
<handler name="oninit">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/connections/roomClient.lzx Thu Mar 29 18:18:17 2012
@@ -30,7 +30,7 @@
_mainScrollBar.setAttribute("visibility","visible");
</handler>
- <turnOverList name="_turnoverlist" width="780" height="${ canvas.height - 110 }"
+ <turnOverList name="_turnoverlist" width="780" height="${ canvas.height - canvas.naviHeight }"
x="2" y="0" orderby="room_id" step="50" asc="true">
<handler name="oninit">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/languageseditor/languagesEditor.lzx Thu Mar 29 18:18:17 2012
@@ -120,7 +120,7 @@
<labelTooltip multiline="true" labelid="389" />
</simpleLabelButton>
- <turnOverList name="_turnoverlist" width="460" height="${ canvas.height - 170 }" x="2" y="60"
+ <turnOverList name="_turnoverlist" width="460" height="${ canvas.height - canvas.naviHeight-60 }" x="2" y="60"
orderby="fieldvalues_id" step="25" asc="true">
<attribute name="language_id" value="0" type="number" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/ldap/ldapAdmin.lzx Thu Mar 29 18:18:17 2012
@@ -36,7 +36,7 @@
<!--- Organization administration module for ADMIN.-->
<class name="ldapAdmin" extends="baseContentView">
- <turnOverList name="_turnoverlist" width="420" height="${ canvas.height - 110 }" x="2" y="0"
+ <turnOverList name="_turnoverlist" width="420" height="${ canvas.height - canvas.naviHeight }" x="2" y="0"
orderby="ldapConfigId" step="50" asc="true">
<handler name="oninit">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdmin.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/orgadmin/orgAdmin.lzx Thu Mar 29 18:18:17 2012
@@ -23,7 +23,7 @@
<!--- Organization administration module for ADMIN.-->
<class name="orgAdmin" extends="baseContentView">
- <turnOverList name="_turnoverlist" width="320" height="${ canvas.height - 110 }" x="2" y="0"
+ <turnOverList name="_turnoverlist" width="320" height="${ canvas.height - canvas.naviHeight }" x="2" y="0"
orderby="organisation_id" step="50" asc="true">
<handler name="oninit">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/roomadmin/roomAdmin.lzx Thu Mar 29 18:18:17 2012
@@ -33,7 +33,7 @@
</handler>
</simpleLabelButton>
- <turnOverList name="_turnoverlist" width="400" height="${ canvas.height - 140 }" x="2" y="30"
+ <turnOverList name="_turnoverlist" width="400" height="${ canvas.height - canvas.naviHeight - 30 }" x="2" y="30"
orderby="c.rooms_id" step="50" asc="true">
<handler name="oninit">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/admin/useradmin/userAdmin.lzx Thu Mar 29 18:18:17 2012
@@ -33,7 +33,7 @@
</handler>
</simpleLabelButton>
- <turnOverList name="_turnoverlist" width="440" height="${ canvas.height - 140 }" x="2" y="30"
+ <turnOverList name="_turnoverlist" width="440" height="${ canvas.height - canvas.naviHeight - 30 }" x="2" y="30"
orderby="user_id" step="50" asc="true">
<handler name="oninit">
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=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/infosPanel.lzx Thu Mar 29 18:18:17 2012
@@ -62,16 +62,16 @@
width="$once{ parent.width-210 }" />
<simpleLabelButton labelid="788" width="196" x="$once{ parent.width-200 }"
- y="$once{ parent.height-60 }" height="24"
+ y="$once{ parent.height-80 }" height="24"
onclick="this.parent.storeSettings();">
<handler name="onclick">
- quicklink('meetings');
+ quicklink('conferenceModuleRoomList');
</handler>
<labelTooltip labelid="769" />
</simpleLabelButton>
<simpleLabelButton labelid="291" width="196" x="$once{ parent.width-200 }"
- y="$once{ parent.height-34 }" height="24"
+ y="$once{ parent.height-54 }" height="24"
onclick="this.parent.storeSettings();">
<handler name="onclick">
quicklink('dashboardModuleCalendar');
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/library.lzx Thu Mar 29 18:18:17 2012
@@ -30,6 +30,7 @@
<resource name="icon_btn_rooms_conference" src="resources/network-transmit-receive2.png" />
<resource name="icon_btn_rss_conference" src="resources/rss_small.png" />
+ <include href="tabButtonMain.lzx" />
<include href="infosPanel.lzx" />
<include href="profilesPanel.lzx" />
<include href="rssPanel.lzx" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/mainDashboard.lzx Thu Mar 29 18:18:17 2012
@@ -151,7 +151,7 @@
<infosPanel x="520" />
<view name="_bottomArea" y="240" x="0"
- width="${ canvas.width }" height="${ canvas.height-350 }" visibility="hidden">
+ width="${ canvas.width }" height="${ canvas.height-240-84 }" visibility="hidden">
<attribute name="refObjItem" value="null" />
@@ -175,51 +175,38 @@
this._boxes.feed1.setAttribute("visibility","visible");
}
-
this.refObjItem.select();
</method>
- <view width="${ parent.width }" x="0" y="1" height="$once{ parent._tabbar.height }"
- stretches="both" resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.basebgcolorizer,90);
- ]]>
- </handler>
- <method name="setTintRGB" args="color, brightness">
- <![CDATA[
- if (color != "" && color != null){
-
- if (brightness == null) { brightness = 0; }
- var rgb = color;
- var red=(rgb >> 16) & 0xFF;
- var green=(rgb >> 8) & 0xFF;
- var blue=rgb & 0xFF;
-
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
- </view>
-
- <view name="_tabbar" x="0" y="1" width="${ parent.width }" height="30"
- layout="axis:x;spacing:2">
-
- <conferenceRoomSidebarTabButton name="myRoomsTabButton" height="$once{ parent.height }"
- currentIconRsc="icon_btn_rooms_conference" labelid="1305" width="${ (parent.width-4)/3 }"
- />
+ <view name="borderBarTop" y="0"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+
+ <view name="_tabbar" x="0" y="1" width="${ parent.width }" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+ </handler>
+
+ <tabButtonMain name="myRoomsTabButton" height="$once{ parent.height }"
+ currentIconRsc="icon_btn_rooms_conference" labelid="1305" width="${ (parent.width-4)/3 }" />
- <conferenceRoomSidebarTabButton name="chatTabButton" width="${ (parent.width-4)/3 }" height="$once{ parent.height }"
+ <tabButtonMain name="chatTabButton" width="${ (parent.width-4)/3 }" height="$once{ parent.height }"
currentIconRsc="icon_btn_chat_dashboard" labelid="443" />
- <conferenceRoomSidebarTabButton name="rssFeed1TabButton" width="${ (parent.width-4)/3 }" height="$once{ parent.height }"
+ <tabButtonMain name="rssFeed1TabButton" width="${ (parent.width-4)/3 }" height="$once{ parent.height }"
currentIconRsc="icon_btn_rss_conference" labelid="277" />
- </view>
+ </view>
+
+
- <view name="_boxes" height="${ parent.height-35 }" width="${ parent.width }" y="35">
+ <view name="_boxes" height="${ parent.height-40 }" width="${ parent.width }" y="40">
<view name="myMeetings" height="${ parent.height }" width="${ parent.width }" visibility="hidden" >
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=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/profilesPanel.lzx Thu Mar 29 18:18:17 2012
@@ -80,40 +80,45 @@
+'&moduleName=userprofile&parentPath=&room_id='
+'&sid='+canvas.sessionId;
if($debug) Debug.write("dashboard/downloadurl ",downloadurl);
- parent._imageProfile._userpic.setAttribute('src',downloadurl);
+ parent._userpic.setAttribute('src',downloadurl);
]]>
</handler>
</netRemoteCallHib>
- <view y="2" x="4" name="_imageProfile" width="120" height="120">
- <image name="_userpic" >
+ <view y="2" x="4" name="_imageProfileBG1" width="128" height="128"
+ bgcolor="0xFFFFFF" opacity="0.5" >
+ </view>
- <handler name="onload" args="d">
- <![CDATA[
- if (this.height > 116) {
- //If bigger then containter then scale it
- var width = this.width/(this.height/116);
- this.setAttribute('height',116);
- this.setAttribute('width',width);
- }
- if (this.width > 116) {
- //If bigger then containter then scale it
- var height = this.height/(this.width/116);
- this.setAttribute('height',height);
- this.setAttribute('width',116);
- }
- if($debug) Debug.write("onload ",this.height,this.width,d.height,d.width);
-
- //makes sure bottom area is updated
- //this._changeSize.setAttribute('y',this.height-20);
- //this._changeSize.setAttribute('width',this.width);
- ]]>
- </handler>
-
- </image>
+ <image name="_userpic" y="2" x="4" >
+
+ <handler name="onload" args="d">
+ <![CDATA[
+ if (this.height > 116) {
+ //If bigger then containter then scale it
+ var width = this.width/(this.height/116);
+ this.setAttribute('height',116);
+ this.setAttribute('width',width);
+ }
+ if (this.width > 116) {
+ //If bigger then containter then scale it
+ var height = this.height/(this.width/116);
+ this.setAttribute('height',height);
+ this.setAttribute('width',116);
+ }
+ if($debug) Debug.write("onload ",this.height,this.width,d.height,d.width);
+
+ //makes sure bottom area is updated
+ //this._changeSize.setAttribute('y',this.height-20);
+ //this._changeSize.setAttribute('width',this.width);
+ ]]>
+ </handler>
+
+ </image>
+
+ <view y="2" x="4" name="_imageProfileBG2" width="128" height="128" >
- <view name="_changeSize" height="48" width="128" y="80" bgcolor="0xFFFFFF" opacity="0.5">
- <labelText labelid="379" align="center" bgcolor="0xFFFFFF"/>
+ <view name="_changeSize" height="48" width="128" y="80" bgcolor="0xFFFFFF" opacity="0.6">
+ <labelText labelid="379" align="center" />
<handler name="onclick">
<![CDATA[
new lz.uploadWindowExplorer(canvas.main_content._content.inner,{
@@ -131,6 +136,7 @@
</view>
</view>
+
<labelText name="_username" fontstyle="bold" y="2" labelid="376" x="140" />
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/rssPanel.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/rssPanel.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/rssPanel.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/rssPanel.lzx Thu Mar 29 18:18:17 2012
@@ -80,10 +80,6 @@
<class name="rssPanel" extends="guiPresenter"
width="400" height="380" closable="true" labelid="277"
resizeable="false">
- <!--
- <simpleLabelButton y="40" labelid="279" x="30"
- onclick="quicklink('meetings')" />
- -->
<rssBox name="feed" />
</class>
Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx?rev=1307026&view=auto
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx (added)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx Thu Mar 29 18:18:17 2012
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<library>
+
+<class name="tabButtonMain" extends="view"
+ width="$once{ (parent.width-2)/2 }" height="36" y="2">
+
+ <attribute name="labelid" value="0" type="number" />
+
+ <attribute name="selected" value="false" type="boolean" />
+
+ <attribute name="textFontSize" value="14" type="number" />
+
+ <attribute name="currentIconRsc" value="" type="string"/>
+
+ <attribute name="showIcon" value="true" type="boolean" />
+
+ <handler name="oninit">
+ if (this.selected) {
+ parent.parent.doSelection(this);
+ }
+ </handler>
+
+ <handler name="onclick">
+ parent.parent.doSelection(this);
+ </handler>
+
+ <handler name="onmouseover">
+ if (!this.selected) {
+ this._bg2.setAttribute("visibility","visible");
+ }
+ </handler>
+
+ <handler name="onmouseout">
+ if (!this.selected) {
+ this._bg2.setAttribute("visibility","hidden");
+ }
+ </handler>
+
+ <method name="select">
+ this.selected = true;
+ this._icon.setAttribute("opacity",1);
+ this._selectedView.setAttribute("visibility","visible");
+ this._deselectedView.setAttribute("visibility","hidden");
+ this._bg2.setAttribute("visibility","hidden");
+ this._text.setAttribute("fontstyle","bold");
+ this._text.setAttribute("y",6);
+ this._icon.setAttribute("y",8);
+ this._text.setAttribute("fgcolor","0x666666");
+ </method>
+
+ <method name="deselect">
+ this.selected = false;
+ this._icon.setAttribute("opacity",0.5);
+ this._selectedView.setAttribute("visibility","hidden");
+ this._deselectedView.setAttribute("visibility","visible");
+ this._text.setAttribute("y",8);
+ this._icon.setAttribute("y",10);
+ this._text.setAttribute("fontstyle","plain");
+ this._text.setAttribute("fgcolor","0xBBBBBB");
+ </method>
+
+ <view name="_selectedView" bgcolor="0xEFEFEF" width="$once{ parent.width }"
+ height="$once{ parent.height }" visibility="visible">
+ <view name="borderRight" width="1" x="0"
+ bgcolor="0xCCCCCC" height="$once{ parent.height }" />
+ <view name="borderTop" width="$once{ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view name="borderLeft" width="1" x="$once{ parent.width-1 }"
+ bgcolor="0xCCCCCC" height="$once{ parent.height }" />
+ </view>
+
+ <view name="_deselectedView" bgcolor="0xFAFAFA"
+ width="$once{ parent.width }" y="2"
+ height="$once{ parent.height-3 }" visibility="visible">
+ <view name="borderRight" width="1" x="0"
+ bgcolor="0xCCCCCC" height="$once{ parent.height }" />
+ <view name="borderTop" width="$once{ parent.width }" bgcolor="0xCCCCCC" height="1" />
+ <view name="borderLeft" width="1" x="$once{ parent.width-1 }"
+ bgcolor="0xCCCCCC" height="$once{ parent.height }" />
+ </view>
+
+ <view name="_bg2" bgcolor="0xFFFFFF" width="$once{ parent.width-2 }" y="3" x="1"
+ height="$once{ parent.height-4 }" opacity="1" visibility="hidden"/>
+
+ <view x="6" y="8" name="_icon" resource="$once{ parent.currentIconRsc }"
+ width="20" height="20" stretches="both" visible="$once{ parent.showIcon }" />
+
+ <labelText name="_text" x="$once{ (parent.showIcon) ? 28 : 6 }" fontsize="$once{ parent.textFontSize }"
+ valign="middle" fgcolor="0xFFFFFF" labelid="$once{ parent.labelid }" />
+
+</class>
+
+</library>
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=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/lzrecordcontent/lzRecordNavigation.lzx Thu Mar 29 18:18:17 2012
@@ -24,7 +24,7 @@
View for recorded contents list.
When you select 'Recordings' on the top menu, this class shows the list.
-->
-<class name="lzRecordNavigation" extends="view" width="280" height="${ canvas.height-110 }">
+<class name="lzRecordNavigation" extends="view" width="280" height="${ canvas.height-canvas.naviHeight }">
<attribute name="isOpen" value="true" type="boolean"/>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/meetings/allmeetings.lzx Thu Mar 29 18:18:17 2012
@@ -20,7 +20,7 @@
-->
<library>
-<class name="allmeetings" extends="baseContentView" height="${ canvas.height-110 }">
+<class name="allmeetings" extends="baseContentView" height="${ canvas.height-canvas.naviHeight }">
<attribute name="finishedTabsQuantity" type="number" value="0"/>
<attribute name="clickedButton" value="null"/>
@@ -71,45 +71,29 @@
this.refObjItem.select();
</method>
- <!-- label: meeting room
- <labelText fontstyle="bold" y="10" labelid="128" resize="true" width="200" />
- -->
- <view width="${ canvas.width }">
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
+
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+
+ <view name="_tabbar" width="${ canvas.width }" y="1" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+ this.publicTabButton.select();
+ </handler>
- <view width="${ parent.width }" height="$once{ parent.height }"
- stretches="both" resource="presenter_thumb_rsc" >
- <handler name="oninit">
- <![CDATA[
- this.setTintRGB(canvas.basebgcolorizer,90);
- ]]>
- </handler>
- <method name="setTintRGB" args="color, brightness">
- <![CDATA[
- if (color != "" && color != null){
-
- if (brightness == null) { brightness = 0; }
- var rgb = color;
- var red=(rgb >> 16) & 0xFF;
- var green=(rgb >> 8) & 0xFF;
- var blue=rgb & 0xFF;
-
- this.setColorTransform( { ra : red, ga : green, ba : blue,
- rb : 0, gb : 0, bb : 0 } );
-
- }
- ]]>
- </method>
- </view>
-
- <conferenceRoomSidebarTabButton name="publicTabButton" selected="true"
+ <tabButtonMain name="publicTabButton" selected="true" height="$once{ parent.height }"
currentIconRsc="icon_btn_rooms_conference" x="0" labelid="777" width="${ (parent.width-6)/3 }"/>
- <conferenceRoomSidebarTabButton name="privateTabButton" width="${ (parent.width-6)/3 }"
- x="$once{ ((parent.width)/3)+2 }" currentIconRsc="icon_btn_rooms_conference" labelid="779" />
+ <tabButtonMain name="privateTabButton" width="${ (parent.width-6)/3 }" height="$once{ parent.height }"
+ currentIconRsc="icon_btn_rooms_conference" labelid="779" />
- <conferenceRoomSidebarTabButton name="myTabButton" width="${ (parent.width-6)/3 }"
- x="$once{ (((parent.width)/3)*2)+4 }" currentIconRsc="icon_btn_rooms_conference" labelid="781" />
-
+ <tabButtonMain name="myTabButton" width="${ (parent.width-6)/3 }" height="$once{ parent.height }"
+ currentIconRsc="icon_btn_rooms_conference" labelid="781" />
</view>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx Thu Mar 29 18:18:17 2012
@@ -246,7 +246,7 @@
<view height="$once{ parent.height }" width="1" x="154"
- bgcolor="$once{ canvas.basebgcolorizer }"></view>
+ bgcolor="0xCCCCCC"></view>
<labelText name="_labelPrivateMessages" x="160" labelid="1206" fontstyle="bold" />
@@ -1123,7 +1123,7 @@
</netRemoteCallHib>
<view name="_privateMessageDetailsBorder2" width="$once{ parent.width }" y="0"
- height="1" bgcolor="$once{ canvas.basebgcolorizer }" />
+ height="1" bgcolor="0x666666" />
<view name="_privateMessageDetailsBorder3" width="$once{ parent.width }" y="1"
height="61" bgcolor="0x666666" opacity="0.1" />
@@ -1141,7 +1141,7 @@
x="100" y="42" resize="false" />
<view name="_privateMessageDetailsBorder1" width="$once{ parent.width }" y="62"
- height="1" bgcolor="$once{ canvas.basebgcolorizer }" />
+ height="1" bgcolor="0x666666" />
<view name="message" y="64" bgcolor="0xFFFFFF" x="2"
width="$once{ parent.width-4 }" height="${ parent.height-86 }">
@@ -1154,7 +1154,7 @@
y="${ parent.height-22 }" width="$once{ parent.width }">
<view name="_privateMessageDetailsBorder2" width="$once{ parent.width }" y="0"
- height="1" bgcolor="$once{ canvas.basebgcolorizer }" />
+ height="1" bgcolor="0x666666" />
<!-- label: cancel -->
<simpleLabelButton labelid="1303" x="$once{ parent.width-130 }" width="120" y="2">
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/searchuserprofile/searchUserProfile.lzx Thu Mar 29 18:18:17 2012
@@ -72,7 +72,7 @@
</script>
<!--- modules:dashboard -->
-<class name="searchUserProfile" extends="view" y="24" height="$once{ canvas.height - 140 }">
+<class name="searchUserProfile" extends="view" >
<method name="search">
<![CDATA[
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=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx Thu Mar 29 18:18:17 2012
@@ -81,21 +81,7 @@
<class name="userSettings" extends="baseContentView">
<handler name="oninit">
- //this.getRssFeeds.doCall();
-
- //if ($debug) Debug.write("userSettings -1- ################################ ");
- //if ($debug) Debug.write("userSettings -1- ",canvas.userSettingsModuleOpt);
- //if ($debug) Debug.write("userSettings -1- ################################ ");
-
_mainScrollBar.setAttribute("visibility","hidden");
- if (canvas.userSettingsModuleOpt == "userProfile") {
- this._menu._editUserProfile.onclick.sendEvent(null);
- } else if (canvas.userSettingsModuleOpt == "userSearch") {
- this._menu._searchUserProfile.onclick.sendEvent(null);
- this._content._searchUserProfile.searchByUpdate();
- } else {
- this._menu._editUserContacts.onclick.sendEvent(null);
- }
</handler>
<handler name="ontabcontentleave">
@@ -104,45 +90,52 @@
_mainScrollBar.setAttribute("visibility","visible");
</handler>
- <attribute name="currentSelected" value="null" />
-
- <method name="setSubItem" args="refObj">
- if (this.currentSelected != null) {
- this.currentSelected.resetItem();
- }
-
+ <view name="_tabbarBg" width="${ parent.width }" height="32" y="1" bgcolor="0xFAFAFA" />
+
+ <view name="borderBarBottom" y="34"
+ width="${ parent.width }" bgcolor="0xCCCCCC" height="1" />
+
+ <attribute name="refObjItem" value="null" />
+
+ <method name="doSelection" args="objRef">
+ if (this.refObjItem != null) {
+ this.refObjItem.deselect();
+ }
+ this.refObjItem = objRef;
this._content.hideAll();
+ this._content[objRef.name].setAttribute("visibility","visible");
+ this.refObjItem.select();
+ </method>
+
+ <view name="_tabbar" width="${ canvas.width }" y="1" height="32"
+ layout="axis:x;spacing:2;inset:2" >
+
+ <handler name="oninit">
+ for (var eg in this.subviews) {
+ this.subviews[eg].deselect();
+ }
+
+ if (canvas.userSettingsModuleOpt == "userProfile") {
+ this._userProfile.onclick.sendEvent(null);
+ } else if (canvas.userSettingsModuleOpt == "userSearch") {
+ this._searchUserProfile.onclick.sendEvent(null);
+ parent._content._searchUserProfile.searchByUpdate();
+ } else {
+ this._editUserContacts.onclick.sendEvent(null);
+ }
+ </handler>
- this.currentSelected = refObj;
-
- this._content[refObj.name].setAttribute("visibility","visible");
-
- </method>
-
- <menubar height="24" width="$once{ canvas.width }" />
-
- <view name="_menu" x="1">
-
- <simplelayout axis="x" spacing="0" />
-
- <!-- -->
- <menuListItemUserProfile name="_userProfile" labelid="1170" labelLabelid="1173">
- </menuListItemUserProfile>
-
- <menuListItemUserProfile name="_editUserContacts" labelid="1188" labelLabelid="1197" >
- </menuListItemUserProfile>
-
-
- <menuListItemUserProfile name="_editUserProfile" labelid="1171" labelLabelid="1174">
- <!--
- <handler name="oninit">
- this.onclick.sendEvent(null);
- </handler>
- -->
- </menuListItemUserProfile>
+ <tabButtonMain name="_userProfile" selected="true" height="$once{ parent.height }"
+ x="0" labelid="1170" width="${ (parent.width-10)/4 }" showIcon="false" />
+
+ <tabButtonMain name="_editUserContacts" selected="true" height="$once{ parent.height }"
+ x="0" labelid="1188" width="${ (parent.width-10)/4 }" showIcon="false" />
- <!---->
- <menuListItemUserProfile name="_searchUserProfile" labelid="1172" labelLabelid="1175" />
+ <tabButtonMain name="_editUserProfile" width="${ (parent.width-10)/4 }" height="$once{ parent.height }"
+ labelid="1171" showIcon="false" />
+
+ <tabButtonMain name="_searchUserProfile" width="${ (parent.width-10)/4 }" height="$once{ parent.height }"
+ labelid="1172" showIcon="false" />
</view>
@@ -154,15 +147,15 @@
}
</method>
- <viewUserProfile name="_userProfile" y="24" />
+ <viewUserProfile name="_userProfile" y="40" />
- <editUserContacts name="_editUserContacts" visibility="hidden">
+ <editUserContacts name="_editUserContacts" visibility="hidden" y="40" height="$once{ canvas.height - 84 - 40 }">
</editUserContacts>
- <editUserProfile name="_editUserProfile" visibility="hidden" y="24" />
+ <editUserProfile name="_editUserProfile" visibility="hidden" y="40" />
- <searchUserProfile name="_searchUserProfile" visibility="hidden">
+ <searchUserProfile name="_searchUserProfile" visibility="hidden" y="40" height="$once{ canvas.height - canvas.naviHeight - 40 }">
</searchUserProfile>
Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx Thu Mar 29 18:18:17 2012
@@ -21,14 +21,16 @@
<library>
<include href="userContacts.lzx" />
-<class name="editUserContacts" extends="view" y="24" height="$once{ canvas.height - 134 }">
+<class name="editUserContacts" extends="view">
<attribute name="contactContent" value="null"/>
<handler name="onvisible" args="v">
if (v) {
if (this.contactContent == null) {
- this.contactContent = new lz.editUserContactsContent(this);
+ //We do some tricks to render / to show some of the visible area
+ //even if the UI is not yet completely rendered
+ lz.Timer.addTimer( new LzDelegate( this, "initContent" ), 250 );
}
} else {
if (this.contactContent != null) {
@@ -38,21 +40,28 @@
}
</handler>
+ <method name="initContent" args="tRef">
+ this.contactContent = new lz.editUserContactsContent(this);
+ </method>
</class>
<class name="editUserContactsContent" extends="view" height="$once{ parent.height }">
+ <handler name="oninit">
+ //We do some tricks to render / to show some of the visible area
+ //even if the UI is not yet completely rendered
+ lz.Timer.addTimer( new LzDelegate( this, "initContent" ), 250 );
+ </handler>
- <privateMessages name="_privateMessages" x="0" y="0" />
+ <method name="initContent" args="tRef">
+ new lz.userContacts(this,{name:'_userContacts'});
+ </method>
+ <privateMessages name="_privateMessages" x="0" y="0" />
<view height="$once{ parent.height }" width="1" x="$once{ canvas.width-276 }"
- bgcolor="$once{ canvas.basebgcolorizer }"></view>
-
-
- <userContacts name="_userContacts" />
-
+ bgcolor="0xCCCCCC"></view>
</class>
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/data/basic/Navimanagement.java Thu Mar 29 18:18:17 2012
@@ -127,7 +127,8 @@ public class Navimanagement {
public void addMainStructure(String action, int naviorder,
long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
- String name, long global_id, String deleted) {
+ String name, long global_id, String deleted,
+ Long tooltip_fieldvalues_id) {
try {
Navimain ng = new Navimain();
ng.setAction(action);
@@ -142,6 +143,7 @@ public class Navimanagement {
ng.setDeleted(deleted);
ng.setGlobal_id(global_id);
ng.setStarttime(new Date());
+ ng.setTooltip_fieldvalues_id(tooltip_fieldvalues_id);
em.merge(ng);
@@ -150,28 +152,4 @@ public class Navimanagement {
}
}
- public void addSubStructure(String action, int naviorder,
- long fieldvalues_id, boolean isleaf, boolean isopen, long level_id,
- String name, long main_id) {
- try {
- Navisub ng = new Navisub();
- ng.setAction(action);
- ng.setComment("");
- ng.setIcon("");
- ng.setNaviorder(naviorder);
- ng.setFieldvalues_id(fieldvalues_id);
- ng.setIsleaf(isleaf);
- ng.setIsopen(isopen);
- ng.setLevel_id(level_id);
- ng.setName(name);
- ng.setDeleted("false");
- ng.setMain_id(main_id);
- ng.setStarttime(new Date());
-
- em.merge(ng);
-
- } catch (Exception ex2) {
- log.error("addSubStructure", ex2);
- }
- }
}
Modified: incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java?rev=1307026&r1=1307025&r2=1307026&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/org/openmeetings/app/installation/ImportInitvalues.java Thu Mar 29 18:18:17 2012
@@ -102,9 +102,9 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("home", 1, 124, false, true, 1,
"home", "false", 582L);
navimanagement.addMainStructure("dashboardModuleStartScreen", 1, 290,
- true, false, 1, "Dashboard Module", 1, "false");
+ true, false, 1, "Dashboard Module", 1, "false", 1450L);
navimanagement.addMainStructure("dashboardModuleCalendar", 2, 291,
- true, false, 1, "Module Calendar", 1, "false");
+ true, false, 1, "Module Calendar", 1, "false", 1451L);
/*
* ######################## Recording Menu Points - disabled by default
@@ -113,7 +113,7 @@ public class ImportInitvalues {
navimanagement.addGlobalStructure("record", 2, 395, false, true, 1,
"record", "false", 583L);
navimanagement.addMainStructure("recordModule", 1, 395, true, false, 1,
- "Module Recording Player", 2, "false");
+ "Module Recording Player", 2, "false", 1452L);
/*
* String action, int naviorder, long fieldvalues_id, boolean isleaf,
@@ -129,7 +129,7 @@ public class ImportInitvalues {
navimanagement.addMainStructure("conferenceModuleRoomList", 1, 792,
true, false, 1, "List of Conference Rooms Main Navi", 3,
- "false");
+ "false", 1453L);
/*
* ######################## Event Menu Points
@@ -139,7 +139,7 @@ public class ImportInitvalues {
"List of Event Rooms Global Navi", "true", 585L);
navimanagement.addMainStructure("eventModuleRoomList", 1, 3, true,
- false, 1, "List of Event Rooms Main Navi", 4, "false");
+ false, 1, "List of Event Rooms Main Navi", 4, "false", null);
/*
* ######################## Moderation Menu Points - disabled by default
@@ -148,10 +148,10 @@ public class ImportInitvalues {
"Moderation Menu", "true", 660L);
navimanagement.addMainStructure("moderatorModuleUser", 1, 650, true,
- false, 1, "Moderate Users", 5, "false");
+ false, 1, "Moderate Users", 5, "false", null);
navimanagement.addMainStructure("moderatorModuleRoom", 1, 651, true,
- false, 1, "Moderate Rooms", 5, "false");
+ false, 1, "Moderate Rooms", 5, "false", null);
/*
* ######################## Administration Menu Points
@@ -161,28 +161,30 @@ public class ImportInitvalues {
"Administration Menu", "false", 586L);
navimanagement.addMainStructure("adminModuleUser", 14, 125, true,
- false, 2, "Administration of Users", 6, "false");
+ false, 2, "Administration of Users", 6, "false", 1454L);
navimanagement.addMainStructure("adminModuleConnections", 15, 597,
- true, false, 3, "Aministration of Connections", 6, "false");
+ true, false, 3, "Aministration of Connections", 6, "false",
+ 1455L);
navimanagement.addMainStructure("adminModuleOrg", 16, 127, true, false,
- 3, "Administration of Organizations", 6, "false");
+ 3, "Administration of Organizations", 6, "false", 1456L);
navimanagement.addMainStructure("adminModuleRoom", 17, 186, true,
- false, 3, "Administration of Rooms", 6, "false");
+ false, 3, "Administration of Rooms", 6, "false", 1457L);
navimanagement.addMainStructure("adminModuleConfiguration", 18, 263,
- true, false, 3, "Administration of Configuration", 6, "false");
+ true, false, 3, "Administration of Configuration", 6, "false",
+ 1458L);
navimanagement.addMainStructure("adminModuleLanguages", 19, 348, true,
- false, 3, "Administration of Languages", 6, "false");
+ false, 3, "Administration of Languages", 6, "false", 1459L);
navimanagement.addMainStructure("adminModuleLDAP", 20, 1103, true,
- false, 3, "Administration of LDAP Configs", 6, "false");
+ false, 3, "Administration of LDAP Configs", 6, "false", 1460L);
navimanagement.addMainStructure("adminModuleBackup", 21, 367, true,
- false, 3, "Administration of Backups", 6, "false");
+ false, 3, "Administration of Backups", 6, "false", 1461L);
errorManagement.addErrorType(new Long(1), new Long(322));
errorManagement.addErrorType(new Long(2), new Long(323));