Author: seba.wagner
Date: Tue Jul 14 07:11:28 2009
New Revision: 2170
Modified:
trunk/openmeetings_lps411/base/components/simplevaluelist/recordValueList.lzx
trunk/openmeetings_lps411/base/components/turnoverlist/turnOverList.lzx
trunk/openmeetings_lps411/base/components/updatecheckbox.lzx
trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminChooseUserWindow.lzx
trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminValueForm.lzx
trunk/openmeetings_lps411/modules/admin/useradmin/userAdminValueForm.lzx
Log:
Tweak Organization Administration and List Views
Modified:
trunk/openmeetings_lps411/base/components/simplevaluelist/recordValueList.lzx
==============================================================================
---
trunk/openmeetings_lps411/base/components/simplevaluelist/recordValueList.lzx
(original)
+++
trunk/openmeetings_lps411/base/components/simplevaluelist/recordValueList.lzx
Tue Jul 14 07:11:28 2009
@@ -14,7 +14,7 @@
this.parent.parent.parent.parent.parent.itemToDelete=this;
this.parent.parent.parent.parent.parent.deleteItem.sendEvent(parent);
</method>
- <view resource="button_cancel_rsc" align="middle"
valign="center" />
+ <view resource="button_cancel_rsc" align="center"
valign="middle" />
<labelTooltip labelid="274" />
</view>
</class>
Modified:
trunk/openmeetings_lps411/base/components/turnoverlist/turnOverList.lzx
==============================================================================
--- trunk/openmeetings_lps411/base/components/turnoverlist/turnOverList.lzx
(original)
+++ trunk/openmeetings_lps411/base/components/turnoverlist/turnOverList.lzx
Tue Jul 14 07:11:28 2009
@@ -1,160 +1,160 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<library>
-
-<!--- private class for turnOverList only. -->
-<class name="innerList" layout="axis:y;spacing:2" />
-
-<!--- common TurnOverList view class. -->
-<class name="turnOverList" extends="view">
-
- <attribute name="start" value="0" type="number" />
- <attribute name="step" value="100" type="number" />
- <attribute name="orderby" value="firstname" type="string" />
- <attribute name="asc" value="true" type="boolean" />
- <attribute name="records" value="0" type="number" />
-
- <event name="oncallnext" />
- <event name="oncallpre" />
- <event name="onclickedItem" /><!-- args="obj" -->
-
- <method name="callfirst">
- this.start = 0;
- this.oncallnext.sendEvent();
- </method>
-
- <method name="calllast">
- this.start = this.records-this.step;
- this.oncallnext.sendEvent();
- </method>
-
- <method name="callnext">
- this._next1.setAttribute('enabled',false);
- this._pre2.setAttribute('enabled',false);
- if (this.records>(this.start+this.step)){
- this.start+=this.step;
- }
- this.oncallnext.sendEvent();
- </method>
-
- <method name="callpre">
- this._next1.setAttribute('enabled',false);
- this._pre2.setAttribute('enabled',false);
- if (this.start>0){
- this.start-=this.step;
- }
- this.oncallpre.sendEvent();
- </method>
-
- <method name="initValues" args="rec">
- <![CDATA[
- this.records = rec;
- if (this.records>(this.start+this.step)){
- this._next1.setAttribute('enabled',true);
- } else {
- this._next1.setAttribute('enabled',false);
- }
- if (this.start>0){
- this._pre2.setAttribute('enabled',true);
- } else {
- this._pre2.setAttribute('enabled',false);
- }
- this._records.setAttribute('text',this.start + ' - '
+(this.start+this.step) + ' ' + canvas.getLabelName(272) + ' ' +
this.records);
- ]]>
- </method>
-
- <method name="addHeaderItem" args="labelid,width" >
- new
lz.turnOverListHeaderItem(this._innerlisthead._inn,{labelid:labelid,width:width,subviewsid:this._innerlisthead._inn.subviews.length});
- </method>
-
- <method name="sendInitialWidthUpdate">
- for (var eg in this._innerlisthead._inn.subviews) {
-
this._innerlisthead._inn.subviews[eg].onwidth.sendEvent(this._innerlisthead._inn.subviews[eg].width);
- }
- </method>
-
- <method name="sendWidthUpdate" args="w,subviewsid" >
- <![CDATA[
- ////Debug.write(w,subviewsid,this._innerlist._inn);
- for (var i=0;i<this._innerlist._inn._inn.subviews.length;i++){
-
this._innerlist._inn._inn.subviews[i].subviews[subviewsid].setAttribute('width',w);
- }
- ]]>
- </method>
-
- <method name="clearList">
- this._innerlist._inn._inn.destroy();
- new lz.innerList(this._innerlist._inn,{name:'_inn'});
- </method>
-
-
-
- <!-- ========= Control area =========-->
-
- <labelText name="_records" x="2" resize="true" />
-
- <!-- 368:goto first -->
- <simpleLabelButtonTooltip name="_pre1" x="$once{ parent.width-196 }"
width="22" height="22"
- enabled="true" onclick="parent.callfirst()" tooltipId="368">
- <view resource="step_back_two_arrow" valign="middle"
align="center" />
- </simpleLabelButtonTooltip>
-
- <!-- 369:goto previous -->
- <simpleLabelButtonTooltip name="_pre2" x="$once{ parent.width-172 }"
width="22" height="22"
- enabled="false" onclick="parent.callpre()" tooltipId="369" >
- <view resource="step_back_arrow" valign="middle" align="center"
/>
- </simpleLabelButtonTooltip>
-
- <!-- combobox to decide the step number -->
- <resetCombobox name="languages" width="100" x="$once{ parent.width-149
}"
- editable="false" height="22" >
- <attribute name="sendEventToReload" value="false"
type="boolean" />
- <textlistitem value="10" text="10" />
- <textlistitem value="25" text="25" />
- <textlistitem value="50" text="50" />
- <textlistitem value="75" text="75" />
- <textlistitem value="100" text="100" />
- <textlistitem value="200" text="200" />
- <handler name="onselect">
- if (this.sendEventToReload){
- parent.setAttribute('step',Number(this.getValue()));
- }
- </handler>
- <handler name="oninit">
- this.selectItem(String(parent.step));
- this.sendEventToReload = true;
- </handler>
- </resetCombobox>
-
- <!-- 370:goto next -->
- <simpleLabelButtonTooltip name="_next1" x="$once{ parent.width-48 }"
width="22" height="22"
- enabled="false" onclick="parent.callnext()" tooltipId="370">
- <view resource="step_fwd_arrow" valign="middle" align="center"
/>
- </simpleLabelButtonTooltip>
-
- <!-- 371:goto last -->
- <simpleLabelButtonTooltip name="_next2" x="$once{ parent.width-24 }"
width="22" height="22"
- enabled="true" onclick="parent.calllast()" tooltipId="371">
- <view resource="step_fwd_two_arrow" valign="middle"
align="center" />
- </simpleLabelButtonTooltip>
-
-
- <!-- ========= List Header area =========-->
-
- <view name="_innerlisthead" height="20" width="$once{ parent.width }"
- y="22" clip="true">
- <view name="_inn" x="${ parent.parent._innerlist._inn.x }"
layout="axis:x;spacing:0" />
- </view>
-
- <!-- ========= List Contents area =========-->
- <view name="_innerlist" height="$once{ parent.height-22 }"
width="$once{
parent.width }"
- y="42" clip="true">
- <view name="_inn" >
- <innerList name="_inn" />
- </view>
- <vscrollbar />
- <hscrollbar />
- </view>
-
-</class>
-
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<!--- private class for turnOverList only. -->
+<class name="innerList" layout="axis:y;spacing:2" />
+
+<!--- common TurnOverList view class. -->
+<class name="turnOverList" extends="view">
+
+ <attribute name="start" value="0" type="number" />
+ <attribute name="step" value="100" type="number" />
+ <attribute name="orderby" value="firstname" type="string" />
+ <attribute name="asc" value="true" type="boolean" />
+ <attribute name="records" value="0" type="number" />
+
+ <event name="oncallnext" />
+ <event name="oncallpre" />
+ <event name="onclickedItem" /><!-- args="obj" -->
+
+ <method name="callfirst">
+ this.start = 0;
+ this.oncallnext.sendEvent();
+ </method>
+
+ <method name="calllast">
+ this.start = this.records-this.step;
+ this.oncallnext.sendEvent();
+ </method>
+
+ <method name="callnext">
+ this._next1.setAttribute('enabled',false);
+ this._pre2.setAttribute('enabled',false);
+ if (this.records>(this.start+this.step)){
+ this.start+=this.step;
+ }
+ this.oncallnext.sendEvent();
+ </method>
+
+ <method name="callpre">
+ this._next1.setAttribute('enabled',false);
+ this._pre2.setAttribute('enabled',false);
+ if (this.start>0){
+ this.start-=this.step;
+ }
+ this.oncallpre.sendEvent();
+ </method>
+
+ <method name="initValues" args="rec">
+ <![CDATA[
+ this.records = rec;
+ if (this.records>(this.start+this.step)){
+ this._next1.setAttribute('enabled',true);
+ } else {
+ this._next1.setAttribute('enabled',false);
+ }
+ if (this.start>0){
+ this._pre2.setAttribute('enabled',true);
+ } else {
+ this._pre2.setAttribute('enabled',false);
+ }
+ this._records.setAttribute('text',this.start + ' - '
+(this.start+this.step) + ' ' + canvas.getLabelName(272) + ' ' +
this.records);
+ ]]>
+ </method>
+
+ <method name="addHeaderItem" args="labelid,width" >
+ new
lz.turnOverListHeaderItem(this._innerlisthead._inn,{labelid:labelid,width:width,subviewsid:this._innerlisthead._inn.subviews.length});
+ </method>
+
+ <method name="sendInitialWidthUpdate">
+ for (var eg in this._innerlisthead._inn.subviews) {
+
this._innerlisthead._inn.subviews[eg].onwidth.sendEvent(this._innerlisthead._inn.subviews[eg].width);
+ }
+ </method>
+
+ <method name="sendWidthUpdate" args="w,subviewsid" >
+ <![CDATA[
+ ////Debug.write(w,subviewsid,this._innerlist._inn);
+ for (var i=0;i<this._innerlist._inn._inn.subviews.length;i++){
+
this._innerlist._inn._inn.subviews[i].subviews[subviewsid].setAttribute('width',w);
+ }
+ ]]>
+ </method>
+
+ <method name="clearList">
+ this._innerlist._inn._inn.destroy();
+ new lz.innerList(this._innerlist._inn,{name:'_inn'});
+ </method>
+
+
+
+ <!-- ========= Control area =========-->
+
+ <labelText name="_records" x="2" resize="true" />
+
+ <!-- 368:goto first -->
+ <simpleLabelButtonTooltip name="_pre1" x="$once{ parent.width-188 }"
width="22" height="22"
+ enabled="true" onclick="parent.callfirst()" tooltipId="368">
+ <view resource="step_back_two_arrow" valign="middle"
align="center" />
+ </simpleLabelButtonTooltip>
+
+ <!-- 369:goto previous -->
+ <simpleLabelButtonTooltip name="_pre2" x="$once{ parent.width-166 }"
width="22" height="22"
+ enabled="false" onclick="parent.callpre()" tooltipId="369" >
+ <view resource="step_back_arrow" valign="middle" align="center"
/>
+ </simpleLabelButtonTooltip>
+
+ <!-- combobox to decide the step number -->
+ <resetCombobox name="languages" width="100" x="$once{ parent.width-144
}"
+ editable="false" height="22" >
+ <attribute name="sendEventToReload" value="false"
type="boolean" />
+ <textlistitem value="10" text="10" />
+ <textlistitem value="25" text="25" />
+ <textlistitem value="50" text="50" />
+ <textlistitem value="75" text="75" />
+ <textlistitem value="100" text="100" />
+ <textlistitem value="200" text="200" />
+ <handler name="onselect">
+ if (this.sendEventToReload){
+ parent.setAttribute('step',Number(this.getValue()));
+ }
+ </handler>
+ <handler name="oninit">
+ this.selectItem(String(parent.step));
+ this.sendEventToReload = true;
+ </handler>
+ </resetCombobox>
+
+ <!-- 370:goto next -->
+ <simpleLabelButtonTooltip name="_next1" x="$once{ parent.width-44 }"
width="22" height="22"
+ enabled="false" onclick="parent.callnext()" tooltipId="370">
+ <view resource="step_fwd_arrow" valign="middle" align="center"
/>
+ </simpleLabelButtonTooltip>
+
+ <!-- 371:goto last -->
+ <simpleLabelButtonTooltip name="_next2" x="$once{ parent.width-22 }"
width="22" height="22"
+ enabled="true" onclick="parent.calllast()" tooltipId="371">
+ <view resource="step_fwd_two_arrow" valign="middle"
align="center" />
+ </simpleLabelButtonTooltip>
+
+
+ <!-- ========= List Header area =========-->
+
+ <view name="_innerlisthead" height="20" width="$once{ parent.width }"
+ y="22" clip="true">
+ <view name="_inn" x="${ parent.parent._innerlist._inn.x }"
layout="axis:x;spacing:0" />
+ </view>
+
+ <!-- ========= List Contents area =========-->
+ <view name="_innerlist" height="$once{ parent.height-22 }"
width="$once{
parent.width }"
+ y="42" clip="true">
+ <view name="_inn" >
+ <innerList name="_inn" />
+ </view>
+ <vscrollbar />
+ <hscrollbar />
+ </view>
+
+</class>
+
+</library>
Modified: trunk/openmeetings_lps411/base/components/updatecheckbox.lzx
==============================================================================
--- trunk/openmeetings_lps411/base/components/updatecheckbox.lzx
(original)
+++ trunk/openmeetings_lps411/base/components/updatecheckbox.lzx Tue Jul
14
07:11:28 2009
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<library>
-
-<class name="updatecheckbox" extends="checkbox" style="componentStyle">
- <attribute name="tvalue" type="boolean" value="false"/>
- <attribute name="sendchange" value="false" type="boolean" />
- <handler name="onblur">
- if (this.parent.sendchange)
this.parent.sendchange(this,tvalue,this.getValue());
- </handler>
-</class>
-
-<class name="labelCheckbox" extends="checkbox" style="componentStyle">
- <attribute name="labelid" type="number" setter="setLabelId(labelid)" />
- <method name="setLabelId" args="_labelid" >
- this.labelid = _labelid;
- this.setAttribute('text',canvas.getLabelName(this.labelid));
- </method>
-</class>
-
-</library>
+<?xml version="1.0" encoding="UTF-8" ?>
+<library>
+
+<class name="updatecheckbox" extends="checkbox" style="componentStyle">
+ <attribute name="tvalue" type="boolean" value="false"/>
+ <attribute name="sendchange" value="false" type="boolean" />
+ <handler name="onblur">
+ if (this.parent.sendchange)
this.parent.sendchange(this,tvalue,this.getValue());
+ </handler>
+</class>
+
+<class name="labelCheckbox" extends="checkbox" style="componentStyle"
fontsize="12" >
+ <attribute name="labelid" type="number" setter="setLabelId(labelid)" />
+ <method name="setLabelId" args="_labelid" >
+ this.labelid = _labelid;
+ this.setAttribute('text',canvas.getLabelName(this.labelid));
+ </method>
+</class>
+
+</library>
Modified:
trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminChooseUserWindow.lzx
==============================================================================
---
trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminChooseUserWindow.lzx
(original)
+++
trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminChooseUserWindow.lzx
Tue Jul 14 07:11:28 2009
@@ -54,27 +54,28 @@
<simpleValueList name="_userlist" y="84" x="120" width="270"
height="100"
multiselect="false" />
- <simpleLabelButton labelid="174" x="180" y="260" width="100">
- <handler name="onclick">
- this.parent.close();
- </handler>
- </simpleLabelButton>
- <simpleLabelButton labelid="175" x="290" y="260" width="100">
- <handler name="onclick">
- <![CDATA[
+ <simpleLabelButton labelid="175" x="180" y="260" width="100">
+ <handler name="onclick">
+ <![CDATA[
this.parent.usersId =
this.parent._userlist._selected.value;
if ($debug) Debug.write(this.parent.usersId);
if ($debug)
Debug.write(this.parent._userlist._selected.value);
if (parent.isOrgUserAddForm) {
- this.parent.addUserToOrganisation.doCall();
+ this.parent.addUserToOrganisation.doCall();
} else {
-
this.parent.refObjectDialog.addUserById(this.parent.usersId);
- parent.close();
+
this.parent.refObjectDialog.addUserById(this.parent.usersId);
+ parent.close();
}
- //
- ]]>
- </handler>
- </simpleLabelButton>
+ //
+ ]]>
+ </handler>
+ </simpleLabelButton>
+
+ <simpleLabelButton labelid="174" x="290" y="260" width="100">
+ <handler name="onclick">
+ this.parent.close();
+ </handler>
+ </simpleLabelButton>
<netRemoteCallHib name="addUserToOrganisation"
remotecontext="$once{ canvas.thishib }"
funcname="organisationservice.addUserToOrganisation" >
@@ -83,7 +84,7 @@
<netparam><method name="getValue"> return
parent.parent.usersId; </method></netparam>
<netparam><method name="getValue"> return '';
</method></netparam>
<handler name="ondata" args="value">
- Debug.write("addUserToOrganisation ",value);
+ if ($debug) Debug.write("addUserToOrganisation ",value);
if (value>0){
this.parent.refObj.onreload.sendEvent();
this.parent.close();
Modified:
trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminValueForm.lzx
==============================================================================
--- trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminValueForm.lzx
(original)
+++ trunk/openmeetings_lps411/modules/admin/orgadmin/orgAdminValueForm.lzx
Tue Jul 14 07:11:28 2009
@@ -114,12 +114,17 @@
<orgUsersRecordValueList name="_userlist" y="130" x="120" width="300"
height="200" />
<baseChooseIcon resourceN="edit_add_rsc" labelid="178" y="100" x="400"
- onclick="this.parent.addOrganisationToUser()" />
+ width="22" height="22"
onclick="this.parent.addOrganisationToUser()" />
<method name="addOrganisationToUser">
- if (this.organisation_id!=0)
+ if (this.organisation_id!=0) {
new
lz.orgAdminChooseUserWindow(canvas.main_content._content.inner,{
refObj:this,organisation_id:this.organisation_id,
isOrgUserAddForm:true});
+ } else {
+ new lz.labelerrorPopup(canvas.main_content._content.inner,{
+ errorlabelid:654
+ })
+ }
</method>
<!--
Modified:
trunk/openmeetings_lps411/modules/admin/useradmin/userAdminValueForm.lzx
==============================================================================
---
trunk/openmeetings_lps411/modules/admin/useradmin/userAdminValueForm.lzx
(original)
+++
trunk/openmeetings_lps411/modules/admin/useradmin/userAdminValueForm.lzx
Tue Jul 14 07:11:28 2009
@@ -30,7 +30,6 @@
this.zip.setAttribute('text','');
this.town.setAttribute('text','');
this.userpass1.setAttribute('text','');
- this.userpass2.setAttribute('text','');
var defaultstate = canvas.getCountryRecord(1);
this.state.addAndSelectItem(defaultstate.name,defaultstate.state_id);
this.adress_comment.setAttribute('text','');
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"OpenMeetings developers" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/openmeetings-dev?hl=en
-~----------~----~----~----~------~----~------~--~---
