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/13 12:08:51 UTC

svn commit: r1325703 - in /incubator/openmeetings/trunk/singlewebapp/WebContent/src: base/components/turnoverlist/ base/components/turnoverlist/resources/ base/components/turnoverlistpaged/ base/components/turnoverlistpaged/resources/ base/contentviews...

Author: sebawagner
Date: Fri Apr 13 10:08:50 2012
New Revision: 1325703

URL: http://svn.apache.org/viewvc?rev=1325703&view=rev
Log:
OPENMEETINGS-161 UI Bugs in private messages
OPENMEETINGS-129 replace icons in private messages with APL compatible

Added:
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.fla   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.swf   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/arrow_undo.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_delete.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_put.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_add.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_delete.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_add.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_delete.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_go.png   (with props)
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_add.png   (with props)
Removed:
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_gripper.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_gripper.swf
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/resources/
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar-add.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar-delete.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder-add.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_inbox.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_new.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_sent_mail.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_yellow.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/mail-closed-add.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/mail-closed-alt-receive.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/mail-closed-alt-send.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/system-undo.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/trash.png
Modified:
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/library.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/privatemessages/privateMessages.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder.png
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx
    incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/usercontacts/editUserContacts.lzx

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/library.lzx Fri Apr 13 10:08:50 2012
@@ -21,7 +21,7 @@
 <library>
     
     <!-- APL Author sebawagner -->
-    <resource name="width_gripper_rsc" src="resources/width_gripper.png" />
+    <resource name="width_gripper_rsc" src="resources/width_change_cursor.swf" />
 
 	<!-- APL Author sebawagner -->
 	<resource name="sort_asc_turnover_rsc" src="resources/sort_asc.png" />

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.fla
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.fla?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.fla
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.swf
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.swf?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/resources/width_change_cursor.swf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlist/turnOverListHeaderItem.lzx Fri Apr 13 10:08:50 2012
@@ -60,9 +60,7 @@
 
 <class name="basicturnoverlistheaderitem" fontsize="9"
        extends="simpleLabelButton" clip="true">
-	<handler name="onclick">
-		this.parent.parent.parent.sendClickedItem.sendEvent(this);
-	</handler>
+	
 </class>
 
 <class name="turnoverlistheaderitem" extends="basicturnoverlistheaderitem" >

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/library.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/library.lzx Fri Apr 13 10:08:50 2012
@@ -20,12 +20,6 @@
 -->
 <library>
     
-    <resource name="transaction_refresh_rsc" src="resources/refresh.png" />
-    <resource name="icon_turnoverlist_left_rsc" src="resources/navigate_left.png" />
-    <resource name="icon_turnoverlist_first_rsc" src="resources/navigate_left2.png" />
-    <resource name="icon_turnoverlist_right_rsc" src="resources/navigate_right.png" />
-    <resource name="icon_turnoverlist_last_rsc" src="resources/navigate_right2.png" />
-    
     <include href="basePagingListItem.lzx" />
     <include href="listPagedContent.lzx" />
 	<include href="turnOverListPaged.lzx" />

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/components/turnoverlistpaged/turnOverListPaged.lzx Fri Apr 13 10:08:50 2012
@@ -74,17 +74,13 @@
                 this._menu._next2.setAttribute('isEnabled',false);
                 this._menu._next1.setAttribute('isEnabled',false);
                 this._menu._pre2.setAttribute('isEnabled',false);
-                
-                this._menu._step.updateItemsListNumber.sendEvent();
             }
         ]]>
     </handler>  
     
     <handler name="onclickedItem" args="obj" >
         <![CDATA[
-            
             this.addToSelection(obj,false); 
-    
         ]]>
     </handler>
     
@@ -373,6 +369,7 @@
     </method>
     
     <method name="addHeaderItemOrdered" args="labelid,width,orderBy,asc,isSelected" >
+    	if ($debug) Debug.write("turnOverListHeaderItemOrdered ",labelid,width,orderBy,asc,isSelected);
         new lz.turnOverListHeaderItemOrdered(this._innerlisthead._inn,{
                 labelid:labelid,width:width,
                 orderBy:orderBy,asc:asc,isSelected:isSelected,

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/base/contentviews/baseContentSaveView.lzx Fri Apr 13 10:08:50 2012
@@ -45,15 +45,26 @@
 
     <view name="_savecontentbar" layout="axis:x;spacing:2;inset:2" x="2" height="28" width="$once{ parent.width }"
         bgcolor="$once{ canvas.getThemeColor('baseMousecolorizer') }">
-        <baseChooseIcon resourceN="filesave_rsc" labelid="144" y="2" 
-        	onclick="this.parent.parent.doSaveEvent()" visible="$once{ parent.parent.saveIsVisible }" />
-        <baseChooseIcon resourceN="edit_add_rsc" labelid="155" y="2" 
-        	onclick="this.parent.parent.doAddEvent()" visible="$once{ parent.parent.addIsVisible }" />  
-        <baseChooseIcon resourceN="reload_rsc" labelid="156" y="2" 
-        	onclick="this.parent.parent.doReloadEvent()" visible="$once{ parent.parent.refreshIsVisible }" />        
-        <baseChooseIcon resourceN="button_cancel_rsc" labelid="157" y="2" 
-        	onclick="this.parent.parent.doDeleteEvent()" visible="$once{ parent.parent.deleteIsVisible }" />
-		<labelText name="_newRecord" visibility="hidden" labelid="344" fgcolor="green" width="150" />        	 	      	
+        
+        <state applied="$once{ parent.parent.saveIsVisible }">
+	        <baseChooseIcon resourceN="filesave_rsc" labelid="144" y="2" 
+	        	onclick="this.parent.parent.doSaveEvent()" />
+        </state>	
+        <state applied="$once{ parent.parent.addIsVisible }">
+        	<baseChooseIcon resourceN="edit_add_rsc" labelid="155" y="2" 
+        		onclick="this.parent.parent.doAddEvent()" />  
+        </state>
+        <state applied="$once{ parent.parent.refreshIsVisible }">
+	        <baseChooseIcon resourceN="reload_rsc" labelid="156" y="2" 
+	        	onclick="this.parent.parent.doReloadEvent()" />
+        </state> 
+        <state applied="$once{ parent.parent.deleteIsVisible }">    
+	        <baseChooseIcon resourceN="button_cancel_rsc" labelid="157" y="2" 
+	        	onclick="this.parent.parent.doDeleteEvent()"  />
+        </state>
+        
+		<labelText name="_newRecord" visibility="hidden" labelid="344" fgcolor="green" width="150" />       
+		 	 	      	
     </view>
     
     <method name="addViewToObserver" args="obj">

Modified: 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=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/dashboard/tabButtonMain.lzx Fri Apr 13 10:08:50 2012
@@ -61,7 +61,7 @@
 	
 	<method name="select">
 		this.selected = true;
-		this._icon.setAttribute("opacity",1);
+		if (this.showIcon) this._icon.setAttribute("opacity",1);
         this._selectedView.setAttribute("visibility","visible");
         this._deselectedView.setAttribute("visibility","hidden");
 		this._bg2.setAttribute("visibility","hidden");
@@ -73,7 +73,7 @@
      
     <method name="deselect">
         this.selected = false;
-        this._icon.setAttribute("opacity",0.5);
+        if (this.showIcon) this._icon.setAttribute("opacity",0.5);
         this._selectedView.setAttribute("visibility","hidden");
         this._deselectedView.setAttribute("visibility","visible");
         this._text.setAttribute("y",8);
@@ -104,8 +104,10 @@
     <view name="_bg2" bgcolor="0xFFFFFF" width="$once{ parent.width-2 }" y="3" x="1"
           height="$once{ parent.height-4 }" opacity="1" visibility="hidden"/>
     
-    <image x="6" y="6" name="_icon" src="$once{ canvas.getThemeImage( parent.currentIconRsc ) }" 
-    				width="20" height="20" stretches="both" visible="$once{ parent.showIcon }" />
+    <state applied="$once{ parent.showIcon }" >
+	    <image x="6" y="6" name="_icon" src="$once{ canvas.getThemeImage( parent.currentIconRsc ) }" 
+    				width="20" height="20" stretches="both" />
+    </state>
                 
     <labelText name="_text" x="$once{ (parent.showIcon) ? 28 : 6 }" fontsize="$once{ parent.textFontSize }" 
     		valign="middle" fgcolor="0xFFFFFF" labelid="$once{ parent.labelid }" />

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/editUserProfile.lzx Fri Apr 13 10:08:50 2012
@@ -36,6 +36,10 @@
 	<handler name="onreload" >
 		this.getUserSelf.doCall();
 	</handler>	
+	
+	<handler name="onconstruct">
+		if ($debug) Debug.write("::editUserProfile::");
+	</handler>
 
     <handler name="oninit">
 		this.getUserSelf.doCall();
@@ -377,11 +381,11 @@
                multiline="true" width="366" visibility="visible"/>  
                  
 	<labelText labelid="1162" width="200" y="390" resize="false" x="410" visibility="visible"/>
-        <customScrollEdittext name="userOffers" y="370" x="530" width="270" 
+        <customScrollEdittext name="userOffers" y="390" x="530" width="270" 
            			 height="100" text="" visibility="visible"/>	
 
 	<labelText labelid="1163" width="200" y="500" resize="false" x="410" visibility="visible"/>
-        <customScrollEdittext name="userSearchs" y="480" x="530" width="270" 
+        <customScrollEdittext name="userSearchs" y="500" x="530" width="270" 
            			 height="100" text="" visibility="visible"/>	
            			 
 </class>

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/library.lzx Fri Apr 13 10:08:50 2012
@@ -20,41 +20,49 @@
 -->
 <library>
 	
+	<!-- APL Author sebawagner -->
 	<resource name="image_loading_placeholder_rsc" 
 			  src="resources/loading_symbol.swf" />
 	
+	<!-- APL Author sebawagner -->
 	<resource name="private_message_select_part_rsc" 
 			  src="resources/select_part.png" />	
-			  
+		
+	<!-- FamFam Icon Set -->
 	<resource name="private_message_send_rsc" 
-			  src="resources/folder_sent_mail.png" />	 
-			  
-	<resource name="private_message_receive_rsc" 
-			  src="resources/mail-closed-alt-receive.png" />	
-			   
+			  src="resources/email_go.png" />	 
+		
+	<!-- FamFam Icon Set -->
 	<resource name="private_message_add_rsc" 
-			  src="resources/mail-closed-add.png" />	
-			  
+			  src="resources/email_add.png" />	
+		
+	<!-- FamFam Icon Set -->	  
 	<resource name="private_message_trash_rsc" 
-			  src="resources/trash.png" />	
+			  src="resources/email_delete.png" />	
 	
+	<!-- FamFam Icon Set -->
 	<resource name="private_message_folder_add_rsc" 
-			  src="resources/folder_new.png" />		
+			  src="resources/folder_add.png" />		
 	
+	<!-- FamFam Icon Set -->	  
 	<resource name="private_message_folder_rsc" 
 			  src="resources/folder.png" />	
-			  
+		
+	<!-- FamFam Icon Set -->	  
 	<resource name="private_message_inbox_rsc" 
-			  src="resources/folder_inbox.png" />	
-			  
+			  src="resources/basket_put.png" />	
+		
+	<!-- FamFam Icon Set -->	  
 	<resource name="user_contact_calendar_add_rsc" 
-              src="resources/calendar-add.png" />  
-			  
+              src="resources/calendar_add.png" />  
+	
+	<!-- FamFam Icon Set -->		  
 	<resource name="user_contact_calendar_delete_rsc" 
-              src="resources/calendar-delete.png" /> 
-              
+              src="resources/calendar_delete.png" /> 
+      
+    <!-- FamFam Icon Set -->	        
     <resource name="user_contact_calendar_system_undo_rsc" 
-              src="resources/system-undo.png" />   
+              src="resources/arrow_undo.png" />   
    
     <include href="privatemessages/" />
     <include href="usercontacts/" />

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=1325703&r1=1325702&r2=1325703&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 Fri Apr 13 10:08:50 2012
@@ -51,7 +51,7 @@
 			<handler name="onclick">
 				parent.parent.newMessage(null);
 			</handler>
-			<view resource="private_message_add_rsc" x="10" ></view>
+			<view resource="private_message_add_rsc" x="10" y="2"></view>
 			<labelTooltip labelid="1208"></labelTooltip>
 		</simpleLabelRoundButton>
 		
@@ -106,30 +106,6 @@
 			<labelText x="20" name="_text" fontstyle="bold" labelid="1224" />
 		</view>
 		
-		<!--
-		<simpleLabelButton labelid="1222" width="142" x="5" height="22">
-			<handler name="onclick">
-				parent.parent._table.getInbox.doCall();
-			</handler>
-			<view resource="private_message_receive_rsc" x="10" ></view>
-		</simpleLabelButton>
-		
-		<simpleLabelButton labelid="1223" width="142" x="5" height="22">
-			<handler name="onclick">
-				parent.parent._table.getSend.doCall();
-			</handler>
-			<view resource="private_message_send_rsc" x="10" ></view>
-		</simpleLabelButton>
-		
-		<simpleLabelButton labelid="1224" width="142" x="5" height="22">
-			<handler name="onclick">
-				//this.setAttribute("enabled",false);
-				parent.parent._table.getTrash.doCall();
-			</handler>
-			<view resource="private_message_trash_rsc" x="10" y="2"></view>
-		</simpleLabelButton>
-		 -->
-		 
 		<view height="1"></view>
 		 
 		<simpleLabelButton name="_addFolder" labelid="1258" width="142" x="5" height="22">
@@ -607,6 +583,18 @@
 			]]>
 		</handler>
 		
+		<handler name="onUpdateOrder" args="itemRef">
+			if (this.isInbox) {
+    			this.getInbox.doCall();
+    		} else if (this.isSend) {
+    			this.getSend.doCall();
+    		} else if (this.isFolder) {
+    			this.getFolder.doCall();
+    		} else if (parent.isTrash) {
+    			this.getTrash.doCall();
+    		}
+		</handler>
+		
 		<!--
 		public Long markReadStatusMail(String SID, Long privateMessageId,
 			Boolean isRead)
@@ -999,7 +987,6 @@
         	</handler>
         </simpleLabelButton>
         
-        
         <simpleLabelButton name="_moveToInbox" labelid="1255" visibility="hidden"
         				   fontstyle="plain" width="120" height="21">
         	<handler name="onclick">
@@ -1123,10 +1110,10 @@
 	    </netRemoteCallHib>		 
 	    
 	    <view name="_privateMessageDetailsBorder2" width="$once{ parent.width }" y="0"
-		  height="1" bgcolor="0x666666" />
+		  height="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" />
 		
 		<view name="_privateMessageDetailsBorder3" width="$once{ parent.width }" y="1"
-		  	height="61" bgcolor="0x666666" opacity="0.1" />
+		  	height="61" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" opacity="0.1" />
 		  	
 		<labelText name="_labelFrom" x="2" labelid="1202" y="2" />
 		<labelText name="from" width="$once{ parent.width-100 }" fontstyle="italic"
@@ -1141,7 +1128,7 @@
 				   x="100" y="42" resize="false" />
 		
 		<view name="_privateMessageDetailsBorder1" width="$once{ parent.width }" y="62"
-		  	height="1" bgcolor="0x666666" />
+		  	height="1" bgcolor="$once{ canvas.getThemeColor('secondBorderColor') }" />
 		  
 		<view name="message" y="64" bgcolor="0xFFFFFF" x="2"
 			  width="$once{ parent.width-4 }" height="${ parent.height-86 }">

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/arrow_undo.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/arrow_undo.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/arrow_undo.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_delete.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_delete.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_delete.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_put.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_put.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/basket_put.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_add.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_add.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_delete.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_delete.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/calendar_delete.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_add.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_add.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_delete.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_delete.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_delete.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_go.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_go.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/email_go.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder.png?rev=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
Binary files - no diff available.

Added: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_add.png
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_add.png?rev=1325703&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/resources/folder_add.png
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

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=1325703&r1=1325702&r2=1325703&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx (original)
+++ incubator/openmeetings/trunk/singlewebapp/WebContent/src/modules/settings/userSettings.lzx Fri Apr 13 10:08:50 2012
@@ -151,19 +151,16 @@
 		
 		<viewUserProfile name="_userProfile" y="40" />
 			
-	    <editUserContacts name="_editUserContacts" visibility="hidden"  y="40" height="$once{ canvas.height - 84 - 40 }">
-	    	
-	    </editUserContacts>
-	    
+	    <editUserContacts name="_editUserContacts" visibility="hidden"  
+	    			y="40" height="$once{ canvas.height - 84 - 40 }" />
+	     
 	    <editUserProfile name="_editUserProfile" visibility="hidden"  y="40" />
 	    
-	    <searchUserProfile name="_searchUserProfile" visibility="hidden" y="40" height="$once{ canvas.height - canvas.naviHeight - 40 }">
-            
-        </searchUserProfile>
-    
+	    <searchUserProfile name="_searchUserProfile" visibility="hidden" 
+	    			y="40" height="$once{ canvas.height - canvas.naviHeight - 40 }" />
+	    			
     </view>
            			      
 </class>
 
-
 </library>

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=1325703&r1=1325702&r2=1325703&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 Fri Apr 13 10:08:50 2012
@@ -26,6 +26,7 @@
 	<attribute name="contactContent" value="null"/>
 	
 	<handler name="onvisible" args="v">
+		if ($debug) Debug.wrote("editUserContacts onvisible",v);
 		if (v) {
 			if (this.contactContent == null) {
 				//We do some tricks to render / to show some of the visible area 
@@ -41,6 +42,9 @@
 	</handler>
 	
 	<method name="initContent" args="tRef">
+		if (this.contactContent != null) {
+			return;
+		}
 		this.contactContent = new lz.editUserContactsContent(this);
 	</method>