You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2007/10/26 02:00:37 UTC

svn commit: r588404 - in /portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget: PageEditor.js PageEditor.src.js

Author: smilek
Date: Thu Oct 25 17:00:37 2007
New Revision: 588404

URL: http://svn.apache.org/viewvc?rev=588404&view=rev
Log:
broke postCreate into several methods in order to support deferred calls - in slow browsers (e.g. IE6), the PageEditor loads slowly and the loading indicator will not update in IE6/IE7 unless we break the loading operation up this way

Modified:
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.js
    portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.src.js

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.js?rev=588404&r1=588403&r2=588404&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.js (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.js Thu Oct 25 17:00:37 2007
@@ -14,7 +14,7 @@
 dojo.require("jetspeed.widget.LayoutEditPane");
 jetspeed.widget.PageEditor=function(){
 };
-dojo.widget.defineWidget("jetspeed.widget.PageEditor",dojo.widget.HtmlWidget,{deletePortletDialog:null,deletePortletDialogBg:null,deletePortletDialogFg:null,deleteLayoutDialog:null,deleteLayoutDialogBg:null,deleteLayoutDialogFg:null,columnSizeDialog:null,columnSizeDialogBg:null,columnSizeDialogFg:null,detail:null,editorInitiatedFromDesktop:false,isContainer:true,widgetsInTemplate:true,dbOn:djConfig.isDebug,styleBase:"pageEditorPaneContainer",styleBaseAdd:(jetspeed.UAie?"pageEditorPaneContainerIE":"pageEditorPaneContainerNotIE"),styleDetail:"pageEditorDetailContainer",styleDetailAdd:(jetspeed.UAie?"pageEditorDetailContainerIE":"pageEditorDetailContainerNotIE"),postMixInProperties:function(_1,_2,_3){
+dojo.widget.defineWidget("jetspeed.widget.PageEditor",dojo.widget.HtmlWidget,{deletePortletDialog:null,deletePortletDialogBg:null,deletePortletDialogFg:null,deleteLayoutDialog:null,deleteLayoutDialogBg:null,deleteLayoutDialogFg:null,columnSizeDialog:null,columnSizeDialogBg:null,columnSizeDialogFg:null,detail:null,editorInitiatedFromDesktop:false,isContainer:true,widgetsInTemplate:true,loadTimeDistribute:jetspeed.UAie,dbOn:djConfig.isDebug,styleBase:"pageEditorPaneContainer",styleBaseAdd:(jetspeed.UAie?"pageEditorPaneContainerIE":"pageEditorPaneContainerNotIE"),styleDetail:"pageEditorDetailContainer",styleDetailAdd:(jetspeed.UAie?"pageEditorDetailContainerIE":"pageEditorDetailContainerNotIE"),postMixInProperties:function(_1,_2,_3){
 var _4=jetspeed;
 _4.widget.PageEditor.superclass.postMixInProperties.apply(this,arguments);
 this.layoutImagesRoot=_4.prefs.getLayoutRootUrl()+"/images/desktop/";
@@ -23,134 +23,179 @@
 this.templateCssPath=new dojo.uri.Uri(_4.url.basePortalDesktopUrl()+"/javascript/jetspeed/widget/PageEditor.css");
 this.templatePath=new dojo.uri.Uri(_4.url.basePortalDesktopUrl()+"/javascript/jetspeed/widget/PageEditor.html");
 },fillInTemplate:function(_5,_6){
-var _7=dojo;
-var _8=this;
-this.deletePortletDialog=_7.widget.createWidget("dialog",{widgetsInTemplate:true,deletePortletConfirmed:function(){
+var _7=jetspeed;
+var _8=dojo;
+var _9=this;
+this.deletePortletDialog=_8.widget.createWidget("dialog",{widgetsInTemplate:true,deletePortletConfirmed:function(){
 this.hide();
-_8.deletePortletConfirmed(this.portletEntityId);
+_9.deletePortletConfirmed(this.portletEntityId);
 }},this.deletePortletDialog);
 this.deletePortletDialog.setCloseControl(this.deletePortletDialog.deletePortletCancel.domNode);
-this.deleteLayoutDialog=_7.widget.createWidget("dialog",{widgetsInTemplate:true,deleteLayoutConfirmed:function(){
+this.deleteLayoutDialog=_8.widget.createWidget("dialog",{widgetsInTemplate:true,deleteLayoutConfirmed:function(){
 this.hide();
-_8.deleteLayoutConfirmed(this.portletEntityId);
+_9.deleteLayoutConfirmed(this.portletEntityId);
 }},this.deleteLayoutDialog);
 this.deleteLayoutDialog.setCloseControl(this.deleteLayoutDialog.deleteLayoutCancel.domNode);
-var _9={};
-_9.widgetsInTemplate=true;
-_9.columnSizeConfirmed=function(){
-var _a=0;
-var _b=new Array();
+var _a={};
+_a.widgetsInTemplate=true;
+_a.columnSizeConfirmed=function(){
+var _b=0;
+var _c=new Array();
 for(var i=0;i<this.columnCount;i++){
-var _d=this["spinner"+i];
-var _e=new Number(_d.getValue());
-_b.push(_e);
-_a+=_e;
+var _e=this["spinner"+i];
+var _f=new Number(_e.getValue());
+_c.push(_f);
+_b+=_f;
 }
-if(_a>100){
+if(_b>100){
 alert("Sum of column sizes cannot exceed 100.");
 }else{
 this.hide();
-_8.columnSizeConfirmed(this.layoutId,_b);
+_9.columnSizeConfirmed(this.layoutId,_c);
 }
 };
-this.columnSizeDialog=_7.widget.createWidget("dialog",_9,this.columnSizeDialog);
+this.columnSizeDialog=_8.widget.createWidget("dialog",_a,this.columnSizeDialog);
 this.columnSizeDialog.setCloseControl(this.columnSizeDialog.columnSizeCancel.domNode);
-jetspeed.widget.PageEditor.superclass.fillInTemplate.call(this);
-},postCreate:function(_f,_10,_11){
+_7.widget.PageEditor.superclass.fillInTemplate.call(this);
+},postCreate:function(_10,_11,_12){
 this.editPageInitiate();
 },editPageInitiate:function(){
-var _12=null;
+var _13=null;
 if(this.editorInitiatedFromDesktop){
-_12=new jetspeed.widget.EditPageGetThemesContentManager(this,false,false,true,true,true);
+_13=new jetspeed.widget.EditPageGetThemesContentManager(this,false,false,true,true,true);
 }else{
-_12=new jetspeed.widget.EditPageGetThemesContentManager(this,true,true,true,false,false);
+_13=new jetspeed.widget.EditPageGetThemesContentManager(this,true,true,true,false,false);
 }
-_12.getContent();
+_13.getContent();
 },editPageBuild:function(){
-var _13=jetspeed;
-var _14=_13.page;
-var _15=dojo;
-var _16=this.layoutImagesRoot;
-var _17=this.labels;
-var _18=this.dialogLabels;
-var _19=new Array();
-var _1a=new Array();
-var _1b=_15.widget.createWidget("jetspeed:PageEditPane",{layoutDecoratorDefinitions:_14.themeDefinitions.pageDecorations,portletDecoratorDefinitions:_14.themeDefinitions.portletDecorations,layoutImagesRoot:_16,labels:_17,dialogLabels:_18});
+var _14=jetspeed;
+var _15=_14.page;
+var _16=dojo;
+this.pageEditorWidgets=new Array();
+this.layoutEditPaneWidgets=new Array();
+var _17=_16.widget.createWidget("jetspeed:PageEditPane",{layoutDecoratorDefinitions:_15.themeDefinitions.pageDecorations,portletDecoratorDefinitions:_15.themeDefinitions.portletDecorations,layoutImagesRoot:this.layoutImagesRoot,labels:this.labels,dialogLabels:this.dialogLabels});
+_17.pageEditorWidget=this;
+_17.domNode.style.display="none";
+_16.dom.insertAfter(_17.domNode,this.domNode);
+this.pageEditorWidgets.push(_17);
+this.pageEditPaneWidget=_17;
+if(!this.loadTimeDistribute){
+_14.url.loadingIndicatorStep(_14);
+this._buildRootPane();
+}else{
+_16.lang.setTimeout(this,this._buildRootPane,10);
+_14.url.loadingIndicatorStep(_14);
+}
+},_buildRootPane:function(){
+var _18=jetspeed;
+var _19=_18.page;
+var _1a=dojo;
+var _1b=_1a.widget.createWidget("jetspeed:LayoutEditPane",{widgetId:"layoutEdit_root",layoutId:_19.rootFragmentId,isRootLayout:true,layoutDefinitions:_19.themeDefinitions.layouts,layoutImagesRoot:this.layoutImagesRoot,labels:this.labels,dialogLabels:this.dialogLabels});
 _1b.pageEditorWidget=this;
-_15.dom.insertAfter(_1b.domNode,this.domNode);
-_19.push(_1b);
-var _1c=_15.widget.createWidget("jetspeed:LayoutEditPane",{widgetId:"layoutEdit_root",layoutId:_14.rootFragmentId,isRootLayout:true,layoutDefinitions:_14.themeDefinitions.layouts,layoutImagesRoot:_16,labels:_17,dialogLabels:_18});
-_1c.pageEditorWidget=this;
-_15.dom.insertAfter(_1c.domNode,_1b.domNode);
-_19.push(_1c);
-_1a.push(_1c);
-if(_13.prefs.windowTiling){
-var doc=document;
-var _1e=_14.layoutInfo.columnLayoutHeader;
-var col,_20;
-for(var i=0;i<_14.columns.length;i++){
-col=_14.columns[i];
+_1b.domNode.style.display="none";
+_1a.dom.insertAfter(_1b.domNode,this.pageEditPaneWidget.domNode);
+this.pageEditorWidgets.push(_1b);
+this.layoutEditPaneWidgets.push(_1b);
+this._buildNextColI=0;
+this._buildColLen=(_18.prefs.windowTiling?_19.columns.length:0);
+if(!this.loadTimeDistribute){
+_18.url.loadingIndicatorStep(_18);
+this._buildNextPane();
+}else{
+_1a.lang.setTimeout(this,this._buildNextPane,10);
+_18.url.loadingIndicatorStep(_18);
+}
+},_buildNextPane:function(){
+var _1c=jetspeed;
+var _1d=_1c.page;
+var _1e=dojo;
+var i=this._buildNextColI;
+var _20=this._buildColLen;
+if(i<_20){
+var col,_22=null;
+while(i<_20&&_22==null){
+col=_1d.columns[i];
 if(col.layoutHeader){
-_20=_15.widget.createWidget("jetspeed:LayoutEditPane",{widgetId:"layoutEdit_"+i,layoutColumn:col,layoutId:col.layoutId,layoutInfo:_1e,layoutDefinitions:_14.themeDefinitions.layouts,layoutImagesRoot:_16,labels:_17,dialogLabels:_18});
-_20.pageEditorWidget=this;
+_22=_1e.widget.createWidget("jetspeed:LayoutEditPane",{widgetId:"layoutEdit_"+i,layoutColumn:col,layoutId:col.layoutId,layoutInfo:_1d.layoutInfo.columnLayoutHeader,layoutDefinitions:_1d.themeDefinitions.layouts,layoutImagesRoot:this.layoutImagesRoot,labels:this.labels,dialogLabels:this.dialogLabels});
+_22.pageEditorWidget=this;
+_22.domNode.style.display="none";
 if(col.domNode.firstChild!=null){
-col.domNode.insertBefore(_20.domNode,col.domNode.firstChild);
+col.domNode.insertBefore(_22.domNode,col.domNode.firstChild);
 }else{
-col.domNode.appendChild(_20.domNode);
+col.domNode.appendChild(_22.domNode);
+}
+_22.initializeDrag();
+this.pageEditorWidgets.push(_22);
+this.layoutEditPaneWidgets.push(_22);
 }
-_20.initializeDrag();
-_19.push(_20);
-_1a.push(_20);
+i++;
 }
 }
-if(_13.UAie){
-this.bgIframe=new _13.widget.BackgroundIframe(this.domNode,"ieLayoutBackgroundIFrame",_15);
+if(i<_20){
+this._buildNextColI=i;
+if(!this.loadTimeDistribute){
+_1c.url.loadingIndicatorStep(_1c);
+this._buildNextPane();
+}else{
+_1e.lang.setTimeout(this,this._buildNextPane,10);
+_1c.url.loadingIndicatorStep(_1c);
+}
+}else{
+if(_1c.UAie){
+this.bgIframe=new _1c.widget.BackgroundIframe(this.domNode,"ieLayoutBackgroundIFrame",_1e);
+}
+var _23=this.pageEditorWidgets;
+if(_23!=null){
+for(var i=0;i<_23.length;i++){
+_23[i].domNode.style.display="block";
 }
 }
-this.pageEditorWidgets=_19;
-this.layoutEditPaneWidgets=_1a;
 this.editPageSyncPortletActions();
-_13.url.loadingIndicatorHide();
-if(_13.UAie6){
-_14.displayAllPWins();
+_1c.url.loadingIndicatorHide();
+if(_1c.UAie6){
+_1d.displayAllPWins();
+}
 }
 },editPageSyncPortletActions:function(){
-var _22=jetspeed.page.getPortletArray();
-if(_22!=null){
-for(var i=0;i<_22.length;i++){
-_22[i].syncActions();
+var _24=jetspeed.page.getPortletArray();
+if(_24!=null){
+for(var i=0;i<_24.length;i++){
+_24[i].syncActions();
 }
 }
 },editPageHide:function(){
-var _24=this.pageEditorWidgets;
-if(_24!=null){
-for(var i=0;i<_24.length;i++){
-_24[i].hide();
+var _26=this.pageEditorWidgets;
+if(_26!=null){
+for(var i=0;i<_26.length;i++){
+_26[i].hide();
 }
 }
 this.hide();
 this.editPageSyncPortletActions();
 },editPageShow:function(){
-var _26=jetspeed;
-var _27=this.pageEditorWidgets;
-if(_27!=null){
-for(var i=0;i<_27.length;i++){
-_27[i].editModeRedisplay();
+var _28=jetspeed;
+var _29=this.pageEditorWidgets;
+if(_29!=null){
+for(var i=0;i<_29.length;i++){
+_29[i].editModeRedisplay();
 }
 }
 this.show();
 this.editPageSyncPortletActions();
-if(_26.UAie6){
-_26.page.displayAllPWins();
+if(_28.UAie6){
+_28.page.displayAllPWins();
 }
 },editPageDestroy:function(){
-var _29=this.pageEditorWidgets;
-if(_29!=null){
-for(var i=0;i<_29.length;i++){
-_29[i].destroy();
-_29[i]=null;
+var _2b=this.pageEditorWidgets;
+if(_2b!=null){
+for(var i=0;i<_2b.length;i++){
+_2b[i].destroy();
+_2b[i]=null;
 }
 }
+this.pageEditorWidgets=null;
+this.layoutEditPaneWidgets=null;
+this.pageEditPaneWidget=null;
 if(this.deletePortletDialog!=null){
 this.deletePortletDialog.destroy();
 }
@@ -161,270 +206,270 @@
 this.columnSizeDialog.destroy();
 }
 this.destroy();
-},deletePortlet:function(_2b,_2c){
-this.deletePortletDialog.portletEntityId=_2b;
-this.deletePortletDialog.portletTitle=_2c;
-this.deletePortletTitle.innerHTML=_2c;
+},deletePortlet:function(_2d,_2e){
+this.deletePortletDialog.portletEntityId=_2d;
+this.deletePortletDialog.portletTitle=_2e;
+this.deletePortletTitle.innerHTML=_2e;
 this._openDialog(this.deletePortletDialog);
-},deletePortletConfirmed:function(_2d){
-var _2e=new jetspeed.widget.RemovePortletContentManager(_2d,this);
-_2e.getContent();
-},deleteLayout:function(_2f){
-this.deleteLayoutDialog.layoutId=_2f;
-this.deleteLayoutDialog.layoutTitle=_2f;
-this.deleteLayoutTitle.innerHTML=_2f;
+},deletePortletConfirmed:function(_2f){
+var _30=new jetspeed.widget.RemovePortletContentManager(_2f,this);
+_30.getContent();
+},deleteLayout:function(_31){
+this.deleteLayoutDialog.layoutId=_31;
+this.deleteLayoutDialog.layoutTitle=_31;
+this.deleteLayoutTitle.innerHTML=_31;
 this._openDialog(this.deleteLayoutDialog);
 },deleteLayoutConfirmed:function(){
-var _30=new jetspeed.widget.RemoveLayoutContentManager(this.deleteLayoutDialog.layoutId,this);
-_30.getContent();
-},openColumnSizesEditor:function(_31){
-var _32=null;
-if(_31!=null){
-_32=jetspeed.page.layouts[_31];
-}
-if(_32!=null&&_32.columnSizes!=null&&_32.columnSizes.length>0){
-var _33=5;
-var _34=0;
-for(var i=0;i<_33;i++){
-var _36=this.columnSizeDialog["spinner"+i];
-var _37=this["spinner"+i+"Field"];
-if(i<_32.columnSizes.length){
-_36.setValue(_32.columnSizes[i]);
-_37.style.display="block";
-_36.show();
-_34++;
+var _32=new jetspeed.widget.RemoveLayoutContentManager(this.deleteLayoutDialog.layoutId,this);
+_32.getContent();
+},openColumnSizesEditor:function(_33){
+var _34=null;
+if(_33!=null){
+_34=jetspeed.page.layouts[_33];
+}
+if(_34!=null&&_34.columnSizes!=null&&_34.columnSizes.length>0){
+var _35=5;
+var _36=0;
+for(var i=0;i<_35;i++){
+var _38=this.columnSizeDialog["spinner"+i];
+var _39=this["spinner"+i+"Field"];
+if(i<_34.columnSizes.length){
+_38.setValue(_34.columnSizes[i]);
+_39.style.display="block";
+_38.show();
+_36++;
 }else{
-_37.style.display="none";
-_36.hide();
+_39.style.display="none";
+_38.hide();
 }
 }
-this.columnSizeDialog.layoutId=_31;
-this.columnSizeDialog.columnCount=_34;
+this.columnSizeDialog.layoutId=_33;
+this.columnSizeDialog.columnCount=_36;
 this._openDialog(this.columnSizeDialog);
 }
-},columnSizeConfirmed:function(_38,_39){
-if(_38!=null&&_39!=null&&_39.length>0){
-var _3a=jetspeed.page.layouts[_38];
-var _3b=null;
-if(_3a!=null){
-_3b=_3a.name;
-}
-if(_3b!=null){
-var _3c="";
-for(var i=0;i<_39.length;i++){
+},columnSizeConfirmed:function(_3a,_3b){
+if(_3a!=null&&_3b!=null&&_3b.length>0){
+var _3c=jetspeed.page.layouts[_3a];
+var _3d=null;
+if(_3c!=null){
+_3d=_3c.name;
+}
+if(_3d!=null){
+var _3e="";
+for(var i=0;i<_3b.length;i++){
 if(i>0){
-_3c+=",";
+_3e+=",";
 }
-_3c+=_39[i]+"%";
+_3e+=_3b[i]+"%";
 }
-var _3e=new jetspeed.widget.UpdateFragmentContentManager(_38,_3b,_3c,this);
-_3e.getContent();
+var _40=new jetspeed.widget.UpdateFragmentContentManager(_3a,_3d,_3e,this);
+_40.getContent();
 }
 }
 },refreshPage:function(){
 dojo.lang.setTimeout(this,this._doRefreshPage,10);
 },_doRefreshPage:function(){
-var _3f=jetspeed.page.getPageUrl();
-_3f=jetspeed.url.addQueryParameter(_3f,jetspeed.id.PG_ED_PARAM,"true",true);
-window.location.href=_3f.toString();
+var _41=jetspeed.page.getPageUrl();
+_41=jetspeed.url.addQueryParameter(_41,jetspeed.id.PG_ED_PARAM,"true",true);
+window.location.href=_41.toString();
 },editMoveModeExit:function(){
-var _40=jetspeed;
-var _41=_40.UAie6;
-if(_41){
-_40.page.displayAllPWins(true);
-}
-var _42;
-var _43=[];
-var _44=_40.page.getPWins();
-for(var i=0;i<_44.length;i++){
-_42=_44[i];
-_42.restoreFromMinimizeWindowTemporarily();
-if(_41&&_42.posStatic){
-var _46=_42.domNode.parentNode;
-var _47=false;
-for(var j=0;j<_43.length;j++){
-if(_43[j]==_46){
-_47=true;
+var _42=jetspeed;
+var _43=_42.UAie6;
+if(_43){
+_42.page.displayAllPWins(true);
+}
+var _44;
+var _45=[];
+var _46=_42.page.getPWins();
+for(var i=0;i<_46.length;i++){
+_44=_46[i];
+_44.restoreFromMinimizeWindowTemporarily();
+if(_43&&_44.posStatic){
+var _48=_44.domNode.parentNode;
+var _49=false;
+for(var j=0;j<_45.length;j++){
+if(_45[j]==_48){
+_49=true;
 break;
 }
 }
-if(!_47){
-_43.push(_46);
+if(!_49){
+_45.push(_48);
 }
 }
 }
-var _49=this.layoutEditPaneWidgets;
-if(_49!=null){
-for(var i=0;i<_49.length;i++){
-_49[i]._disableMoveMode();
+var _4b=this.layoutEditPaneWidgets;
+if(_4b!=null){
+for(var i=0;i<_4b.length;i++){
+_4b[i]._disableMoveMode();
 }
 }
-_40.widget.showAllPortletWindows();
-if(_41){
-_40.page.displayAllPWins();
-if(_43.length>0){
-var _4a=new jetspeed.widget.IE6ZappedContentRestorer(_43);
-dojo.lang.setTimeout(_4a,_4a.showNext,20);
+_42.widget.showAllPortletWindows();
+if(_43){
+_42.page.displayAllPWins();
+if(_45.length>0){
+var _4c=new jetspeed.widget.IE6ZappedContentRestorer(_45);
+dojo.lang.setTimeout(_4c,_4c.showNext,20);
 }
 }
 },editMoveModeStart:function(){
-var _4b=jetspeed;
-var _4c=false;
-if(_4b.UAie6){
-_4b.page.displayAllPWins(true);
+var _4d=jetspeed;
+var _4e=false;
+if(_4d.UAie6){
+_4d.page.displayAllPWins(true);
 }
-var _4d=[];
-var _4e=[];
+var _4f=[];
+var _50=[];
 if(this.dbOn){
-var _4f=_4b.debugWindow();
-if(_4f&&(!_4c||!_4f.posStatic||_4b.debug.dragWindow)){
-_4d.push(_4f);
-_4e.push(_4f.widgetId);
-}
-}
-if(!_4c){
-var _50;
-var _51=_4b.page.getPWins();
-for(var i=0;i<_51.length;i++){
-_50=_51[i];
-if(_50.posStatic){
-_4d.push(_50);
-_4e.push(_50.widgetId);
-_50.minimizeWindowTemporarily();
-}
+var _51=_4d.debugWindow();
+if(_51&&(!_4e||!_51.posStatic||_4d.debug.dragWindow)){
+_4f.push(_51);
+_50.push(_51.widgetId);
 }
 }
-_4b.widget.hideAllPortletWindows(_4e);
-var _53=this.layoutEditPaneWidgets;
-if(_53!=null){
+if(!_4e){
+var _52;
+var _53=_4d.page.getPWins();
 for(var i=0;i<_53.length;i++){
-_53[i]._enableMoveMode();
+_52=_53[i];
+if(_52.posStatic){
+_4f.push(_52);
+_50.push(_52.widgetId);
+_52.minimizeWindowTemporarily();
+}
+}
 }
+_4d.widget.hideAllPortletWindows(_50);
+var _55=this.layoutEditPaneWidgets;
+if(_55!=null){
+for(var i=0;i<_55.length;i++){
+_55[i]._enableMoveMode();
 }
-if(_4b.UAie6){
+}
+if(_4d.UAie6){
 setTimeout(function(){
-_4b.page.displayAllPWins(false,_4d);
+_4d.page.displayAllPWins(false,_4f);
 },20);
 }
 },onBrowserWindowResize:function(){
-var _54=this.deletePortletDialog;
-var _55=this.deleteLayoutDialog;
-var _56=this.columnSizeDialog;
-if(_54&&_54.isShowing()){
-_54.domNode.style.display="none";
-_54.domNode.style.display="block";
-}
-if(_55&&_55.isShowing()){
-_55.domNode.style.display="none";
-_55.domNode.style.display="block";
-}
+var _56=this.deletePortletDialog;
+var _57=this.deleteLayoutDialog;
+var _58=this.columnSizeDialog;
 if(_56&&_56.isShowing()){
 _56.domNode.style.display="none";
 _56.domNode.style.display="block";
 }
-var _57=this.pageEditorWidgets;
-if(_57!=null){
-for(var i=0;i<_57.length;i++){
-_57[i].onBrowserWindowResize();
-}
-}
-},_openDialog:function(_59){
-var _5a=jetspeed.UAmoz;
-if(_5a){
-_59.domNode.style.position="fixed";
-if(!_59._fixedIPtBug){
-var _5b=_59;
-_5b.placeModalDialog=function(){
-var _5c=dojo.html.getScroll().offset;
-var _5d=dojo.html.getViewport();
+if(_57&&_57.isShowing()){
+_57.domNode.style.display="none";
+_57.domNode.style.display="block";
+}
+if(_58&&_58.isShowing()){
+_58.domNode.style.display="none";
+_58.domNode.style.display="block";
+}
+var _59=this.pageEditorWidgets;
+if(_59!=null){
+for(var i=0;i<_59.length;i++){
+_59[i].onBrowserWindowResize();
+}
+}
+},_openDialog:function(_5b){
+var _5c=jetspeed.UAmoz;
+if(_5c){
+_5b.domNode.style.position="fixed";
+if(!_5b._fixedIPtBug){
+var _5d=_5b;
+_5d.placeModalDialog=function(){
+var _5e=dojo.html.getScroll().offset;
+var _5f=dojo.html.getViewport();
 var mb;
-if(_5b.isShowing()){
-mb=dojo.html.getMarginBox(_5b.domNode);
+if(_5d.isShowing()){
+mb=dojo.html.getMarginBox(_5d.domNode);
 }else{
-dojo.html.setVisibility(_5b.domNode,false);
-dojo.html.show(_5b.domNode);
-mb=dojo.html.getMarginBox(_5b.domNode);
-dojo.html.hide(_5b.domNode);
-dojo.html.setVisibility(_5b.domNode,true);
-}
-var x=(_5d.width-mb.width)/2;
-var y=(_5d.height-mb.height)/2;
-with(_5b.domNode.style){
+dojo.html.setVisibility(_5d.domNode,false);
+dojo.html.show(_5d.domNode);
+mb=dojo.html.getMarginBox(_5d.domNode);
+dojo.html.hide(_5d.domNode);
+dojo.html.setVisibility(_5d.domNode,true);
+}
+var x=(_5f.width-mb.width)/2;
+var y=(_5f.height-mb.height)/2;
+with(_5d.domNode.style){
 left=x+"px";
 top=y+"px";
 }
 };
-_5b._fixedIPtBug=true;
+_5d._fixedIPtBug=true;
 }
 }
-_59.show();
+_5b.show();
 }});
-jetspeed.widget.EditPageGetThemesContentManager=function(_61,_62,_63,_64,_65,_66){
-this.pageEditorWidget=_61;
-var _67=new Array();
-if(_62){
-_67.push(["pageDecorations"]);
-}
-if(_63){
-_67.push(["portletDecorations"]);
-}
+jetspeed.widget.EditPageGetThemesContentManager=function(_63,_64,_65,_66,_67,_68){
+this.pageEditorWidget=_63;
+var _69=new Array();
 if(_64){
-_67.push(["layouts"]);
+_69.push(["pageDecorations"]);
 }
 if(_65){
-_67.push(["desktopPageDecorations","pageDecorations"]);
+_69.push(["portletDecorations"]);
 }
 if(_66){
-_67.push(["desktopPortletDecorations","portletDecorations"]);
+_69.push(["layouts"]);
+}
+if(_67){
+_69.push(["desktopPageDecorations","pageDecorations"]);
+}
+if(_68){
+_69.push(["desktopPortletDecorations","portletDecorations"]);
 }
-this.getThemeTypes=_67;
+this.getThemeTypes=_69;
 this.getThemeTypeNextIndex=0;
 };
 jetspeed.widget.EditPageGetThemesContentManager.prototype={getContent:function(){
 if(this.getThemeTypes!=null&&this.getThemeTypes.length>this.getThemeTypeNextIndex){
-var _68="?action=getthemes&type="+this.getThemeTypes[this.getThemeTypeNextIndex][0]+"&format=json";
-var _69=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_68;
-var _6a=new jetspeed.om.Id("getthemes",{});
-var _6b={};
-_6b.url=_69;
-_6b.mimetype="text/json";
-jetspeed.url.retrieveContent(_6b,this,_6a,jetspeed.debugContentDumpIds);
+var _6a="?action=getthemes&type="+this.getThemeTypes[this.getThemeTypeNextIndex][0]+"&format=json";
+var _6b=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_6a;
+var _6c=new jetspeed.om.Id("getthemes",{});
+var _6d={};
+_6d.url=_6b;
+_6d.mimetype="text/json";
+jetspeed.url.retrieveContent(_6d,this,_6c,jetspeed.debugContentDumpIds);
 }else{
 this.pageEditorWidget.editPageBuild();
 }
-},notifySuccess:function(_6c,_6d,_6e){
+},notifySuccess:function(_6e,_6f,_70){
 if(jetspeed.page.themeDefinitions==null){
 jetspeed.page.themeDefinitions={};
 }
-var _6f=((this.getThemeTypes[this.getThemeTypeNextIndex].length>1)?this.getThemeTypes[this.getThemeTypeNextIndex][1]:this.getThemeTypes[this.getThemeTypeNextIndex][0]);
-jetspeed.page.themeDefinitions[_6f]=_6c;
+var _71=((this.getThemeTypes[this.getThemeTypeNextIndex].length>1)?this.getThemeTypes[this.getThemeTypeNextIndex][1]:this.getThemeTypes[this.getThemeTypeNextIndex][0]);
+jetspeed.page.themeDefinitions[_71]=_6e;
 this.getThemeTypeNextIndex++;
 this.getContent();
-},notifyFailure:function(_70,_71,_72,_73){
-dojo.raise("EditPageGetThemesContentManager notifyFailure url: "+_72+" type: "+_70+jetspeed.formatError(_71));
+},notifyFailure:function(_72,_73,_74,_75){
+dojo.raise("EditPageGetThemesContentManager notifyFailure url: "+_74+" type: "+_72+jetspeed.formatError(_73));
 }};
-jetspeed.widget.RemovePageContentManager=function(_74){
-this.pageEditorWidget=_74;
+jetspeed.widget.RemovePageContentManager=function(_76){
+this.pageEditorWidget=_76;
 };
 jetspeed.widget.RemovePageContentManager.prototype={getContent:function(){
-var _75="?action=updatepage&method=remove";
-var _76=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_75;
-var _77=new jetspeed.om.Id("updatepage-remove-page",{});
-var _78={};
-_78.url=_76;
-_78.mimetype="text/xml";
-jetspeed.url.retrieveContent(_78,this,_77,jetspeed.debugContentDumpIds);
-},notifySuccess:function(_79,_7a,_7b){
-if(jetspeed.url.checkAjaxApiResponse(_7a,_79,true,"updatepage-remove-page")){
-var _7c=jetspeed.page.makePageUrl("/");
-_7c+="?"+jetspeed.id.PG_ED_PARAM+"=true";
-window.location.href=_7c;
+var _77="?action=updatepage&method=remove";
+var _78=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_77;
+var _79=new jetspeed.om.Id("updatepage-remove-page",{});
+var _7a={};
+_7a.url=_78;
+_7a.mimetype="text/xml";
+jetspeed.url.retrieveContent(_7a,this,_79,jetspeed.debugContentDumpIds);
+},notifySuccess:function(_7b,_7c,_7d){
+if(jetspeed.url.checkAjaxApiResponse(_7c,_7b,true,"updatepage-remove-page")){
+var _7e=jetspeed.page.makePageUrl("/");
+_7e+="?"+jetspeed.id.PG_ED_PARAM+"=true";
+window.location.href=_7e;
 }
-},notifyFailure:function(_7d,_7e,_7f,_80){
-dojo.raise("RemovePageContentManager notifyFailure url: "+_7f+" type: "+_7d+jetspeed.formatError(_7e));
+},notifyFailure:function(_7f,_80,_81,_82){
+dojo.raise("RemovePageContentManager notifyFailure url: "+_81+" type: "+_7f+jetspeed.formatError(_80));
 }};
-jetspeed.widget.IE6ZappedContentRestorer=function(_81){
-this.colNodes=_81;
+jetspeed.widget.IE6ZappedContentRestorer=function(_83){
+this.colNodes=_83;
 this.nextColNodeIndex=0;
 };
 jetspeed.widget.IE6ZappedContentRestorer.prototype={showNext:function(){
@@ -439,200 +484,200 @@
 dojo.lang.setTimeout(this,this.showNext,20);
 }
 }};
-jetspeed.widget.AddPageContentManager=function(_82,_83,_84,_85,_86,_87,_88){
-this.pageRealPath=_82;
-this.pagePath=_83;
-this.pageName=_84;
-if(_85==null){
+jetspeed.widget.AddPageContentManager=function(_84,_85,_86,_87,_88,_89,_8a){
+this.pageRealPath=_84;
+this.pagePath=_85;
+this.pageName=_86;
+if(_87==null){
 if(jetspeed.page.themeDefinitions!=null&&jetspeed.page.themeDefinitions.layouts!=null&&jetspeed.page.themeDefinitions.layouts.length>0&&jetspeed.page.themeDefinitions.layouts[0]!=null&&jetspeed.page.themeDefinitions.layouts[0].length==2){
-_85=jetspeed.page.themeDefinitions.layouts[0][1];
+_87=jetspeed.page.themeDefinitions.layouts[0][1];
 }
 }
-this.layoutName=_85;
-this.pageTitle=_86;
-this.pageShortTitle=_87;
-this.pageEditorWidget=_88;
+this.layoutName=_87;
+this.pageTitle=_88;
+this.pageShortTitle=_89;
+this.pageEditorWidget=_8a;
 };
 jetspeed.widget.AddPageContentManager.prototype={getContent:function(){
 if(this.pageRealPath!=null&&this.pageName!=null){
-var _89="?action=updatepage&method=add&path="+escape(this.pageRealPath)+"&name="+escape(this.pageName);
+var _8b="?action=updatepage&method=add&path="+escape(this.pageRealPath)+"&name="+escape(this.pageName);
 if(this.layoutName!=null){
-_89+="&defaultLayout="+escape(this.layoutName);
+_8b+="&defaultLayout="+escape(this.layoutName);
 }
 if(this.pageTitle!=null){
-_89+="&title="+escape(this.pageTitle);
+_8b+="&title="+escape(this.pageTitle);
 }
 if(this.pageShortTitle!=null){
-_89+="&short-title="+escape(this.pageShortTitle);
+_8b+="&short-title="+escape(this.pageShortTitle);
 }
-var _8a=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_89;
-var _8b=new jetspeed.om.Id("updatepage-add-page",{});
-var _8c={};
-_8c.url=_8a;
-_8c.mimetype="text/xml";
-jetspeed.url.retrieveContent(_8c,this,_8b,jetspeed.debugContentDumpIds);
-}
-},notifySuccess:function(_8d,_8e,_8f){
-if(jetspeed.url.checkAjaxApiResponse(_8e,_8d,true,"updatepage-add-page")){
-var _90=jetspeed.page.makePageUrl(this.pagePath);
-if(!dojo.string.endsWith(_90,".psml",true)){
-_90+=".psml";
+var _8c=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_8b;
+var _8d=new jetspeed.om.Id("updatepage-add-page",{});
+var _8e={};
+_8e.url=_8c;
+_8e.mimetype="text/xml";
+jetspeed.url.retrieveContent(_8e,this,_8d,jetspeed.debugContentDumpIds);
+}
+},notifySuccess:function(_8f,_90,_91){
+if(jetspeed.url.checkAjaxApiResponse(_90,_8f,true,"updatepage-add-page")){
+var _92=jetspeed.page.makePageUrl(this.pagePath);
+if(!dojo.string.endsWith(_92,".psml",true)){
+_92+=".psml";
 }
-_90+="?"+jetspeed.id.PG_ED_PARAM+"=true";
-window.location.href=_90;
+_92+="?"+jetspeed.id.PG_ED_PARAM+"=true";
+window.location.href=_92;
 }
-},notifyFailure:function(_91,_92,_93,_94){
-dojo.raise("AddPageContentManager notifyFailure url: "+_93+" type: "+_91+jetspeed.formatError(_92));
+},notifyFailure:function(_93,_94,_95,_96){
+dojo.raise("AddPageContentManager notifyFailure url: "+_95+" type: "+_93+jetspeed.formatError(_94));
 }};
-jetspeed.widget.MoveLayoutContentManager=function(_95,_96,_97,row,_99){
-this.layoutId=_95;
-this.moveToLayoutId=_96;
-this.column=_97;
+jetspeed.widget.MoveLayoutContentManager=function(_97,_98,_99,row,_9b){
+this.layoutId=_97;
+this.moveToLayoutId=_98;
+this.column=_99;
 this.row=row;
-this.pageEditorWidget=_99;
+this.pageEditorWidget=_9b;
 };
 jetspeed.widget.MoveLayoutContentManager.prototype={getContent:function(){
 if(this.layoutId!=null&&this.moveToLayoutId!=null){
-var _9a="?action=moveabs&id="+this.layoutId+"&layoutid="+this.moveToLayoutId;
+var _9c="?action=moveabs&id="+this.layoutId+"&layoutid="+this.moveToLayoutId;
 if(this.column!=null){
-_9a+="&col="+this.column;
+_9c+="&col="+this.column;
 }
 if(this.row!=null){
-_9a+="&row="+this.row;
+_9c+="&row="+this.row;
 }
-var _9b=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_9a;
-var _9c=new jetspeed.om.Id("moveabs-layout",this.layoutId);
-var _9d={};
-_9d.url=_9b;
-_9d.mimetype="text/xml";
-jetspeed.url.retrieveContent(_9d,this,_9c,jetspeed.debugContentDumpIds);
+var _9d=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_9c;
+var _9e=new jetspeed.om.Id("moveabs-layout",this.layoutId);
+var _9f={};
+_9f.url=_9d;
+_9f.mimetype="text/xml";
+jetspeed.url.retrieveContent(_9f,this,_9e,jetspeed.debugContentDumpIds);
 }
-},notifySuccess:function(_9e,_9f,_a0){
-if(jetspeed.url.checkAjaxApiResponse(_9f,_9e,true,"moveabs-layout")){
+},notifySuccess:function(_a0,_a1,_a2){
+if(jetspeed.url.checkAjaxApiResponse(_a1,_a0,true,"moveabs-layout")){
 }
-},notifyFailure:function(_a1,_a2,_a3,_a4){
-dojo.raise("MoveLayoutContentManager notifyFailure url: "+_a3+" type: "+_a1+jetspeed.formatError(_a2));
+},notifyFailure:function(_a3,_a4,_a5,_a6){
+dojo.raise("MoveLayoutContentManager notifyFailure url: "+_a5+" type: "+_a3+jetspeed.formatError(_a4));
 }};
-jetspeed.widget.UpdateFragmentContentManager=function(_a5,_a6,_a7,_a8){
-this.layoutId=_a5;
-this.layoutName=_a6;
-this.layoutSizes=_a7;
-this.pageEditorWidget=_a8;
+jetspeed.widget.UpdateFragmentContentManager=function(_a7,_a8,_a9,_aa){
+this.layoutId=_a7;
+this.layoutName=_a8;
+this.layoutSizes=_a9;
+this.pageEditorWidget=_aa;
 };
 jetspeed.widget.UpdateFragmentContentManager.prototype={getContent:function(){
 if(this.layoutId!=null){
-var _a9="?action=updatepage&method=update-fragment&id="+this.layoutId;
+var _ab="?action=updatepage&method=update-fragment&id="+this.layoutId;
 if(this.layoutName!=null){
-_a9+="&layout="+escape(this.layoutName);
+_ab+="&layout="+escape(this.layoutName);
 }
 if(this.layoutSizes!=null){
-_a9+="&sizes="+escape(this.layoutSizes);
+_ab+="&sizes="+escape(this.layoutSizes);
 }
-var _aa=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_a9;
-var _ab=new jetspeed.om.Id("updatepage-update-fragment",{});
-var _ac={};
-_ac.url=_aa;
-_ac.mimetype="text/xml";
-jetspeed.url.retrieveContent(_ac,this,_ab,jetspeed.debugContentDumpIds);
+var _ac=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_ab;
+var _ad=new jetspeed.om.Id("updatepage-update-fragment",{});
+var _ae={};
+_ae.url=_ac;
+_ae.mimetype="text/xml";
+jetspeed.url.retrieveContent(_ae,this,_ad,jetspeed.debugContentDumpIds);
 }
-},notifySuccess:function(_ad,_ae,_af){
-if(jetspeed.url.checkAjaxApiResponse(_ae,_ad,true,"updatepage-update-fragment")){
+},notifySuccess:function(_af,_b0,_b1){
+if(jetspeed.url.checkAjaxApiResponse(_b0,_af,true,"updatepage-update-fragment")){
 this.pageEditorWidget.refreshPage();
 }
-},notifyFailure:function(_b0,_b1,_b2,_b3){
-dojo.raise("UpdateFragmentContentManager notifyFailure url: "+_b2+" type: "+_b0+jetspeed.formatError(_b1));
+},notifyFailure:function(_b2,_b3,_b4,_b5){
+dojo.raise("UpdateFragmentContentManager notifyFailure url: "+_b4+" type: "+_b2+jetspeed.formatError(_b3));
 }};
-jetspeed.widget.UpdatePageInfoContentManager=function(_b4,_b5,_b6){
-this.refreshPage=((_b6.editorInitiatedFromDesktop)?true:false);
-this.layoutDecorator=_b4;
-this.portletDecorator=_b5;
-this.pageEditorWidget=_b6;
+jetspeed.widget.UpdatePageInfoContentManager=function(_b6,_b7,_b8){
+this.refreshPage=((_b8.editorInitiatedFromDesktop)?true:false);
+this.layoutDecorator=_b6;
+this.portletDecorator=_b7;
+this.pageEditorWidget=_b8;
 };
 jetspeed.widget.UpdatePageInfoContentManager.prototype={getContent:function(){
-var _b7="?action=updatepage&method=info";
+var _b9="?action=updatepage&method=info";
 if(this.layoutDecorator!=null){
-_b7+="&layout-decorator="+escape(this.layoutDecorator);
+_b9+="&layout-decorator="+escape(this.layoutDecorator);
 }
 if(this.portletDecorator!=null){
-_b7+="&portlet-decorator="+escape(this.portletDecorator);
+_b9+="&portlet-decorator="+escape(this.portletDecorator);
 }
-var _b8=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_b7;
-var _b9=new jetspeed.om.Id("updatepage-info",{});
-var _ba={};
-_ba.url=_b8;
-_ba.mimetype="text/xml";
-jetspeed.url.retrieveContent(_ba,this,_b9,jetspeed.debugContentDumpIds);
-},notifySuccess:function(_bb,_bc,_bd){
-if(jetspeed.url.checkAjaxApiResponse(_bc,_bb,true,"updatepage-info")){
+var _ba=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_b9;
+var _bb=new jetspeed.om.Id("updatepage-info",{});
+var _bc={};
+_bc.url=_ba;
+_bc.mimetype="text/xml";
+jetspeed.url.retrieveContent(_bc,this,_bb,jetspeed.debugContentDumpIds);
+},notifySuccess:function(_bd,_be,_bf){
+if(jetspeed.url.checkAjaxApiResponse(_be,_bd,true,"updatepage-info")){
 if(this.refreshPage){
 this.pageEditorWidget.refreshPage();
 }
 }
-},notifyFailure:function(_be,_bf,_c0,_c1){
-dojo.raise("UpdatePageInfoContentManager notifyFailure url: "+_c0+" type: "+_be+jetspeed.formatError(_bf));
+},notifyFailure:function(_c0,_c1,_c2,_c3){
+dojo.raise("UpdatePageInfoContentManager notifyFailure url: "+_c2+" type: "+_c0+jetspeed.formatError(_c1));
 }};
-jetspeed.widget.RemovePortletContentManager=function(_c2,_c3){
-this.portletEntityId=_c2;
-this.pageEditorWidget=_c3;
+jetspeed.widget.RemovePortletContentManager=function(_c4,_c5){
+this.portletEntityId=_c4;
+this.pageEditorWidget=_c5;
 };
 jetspeed.widget.RemovePortletContentManager.prototype={getContent:function(){
 if(this.portletEntityId!=null){
-var _c4="?action=remove&id="+this.portletEntityId;
-var _c5=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_c4;
-var _c6=new jetspeed.om.Id("removeportlet",{});
-var _c7={};
-_c7.url=_c5;
-_c7.mimetype="text/xml";
-jetspeed.url.retrieveContent(_c7,this,_c6,jetspeed.debugContentDumpIds);
+var _c6="?action=remove&id="+this.portletEntityId;
+var _c7=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_c6;
+var _c8=new jetspeed.om.Id("removeportlet",{});
+var _c9={};
+_c9.url=_c7;
+_c9.mimetype="text/xml";
+jetspeed.url.retrieveContent(_c9,this,_c8,jetspeed.debugContentDumpIds);
 }
-},notifySuccess:function(_c8,_c9,_ca){
-if(jetspeed.url.checkAjaxApiResponse(_c9,_c8,true,"removeportlet")){
+},notifySuccess:function(_ca,_cb,_cc){
+if(jetspeed.url.checkAjaxApiResponse(_cb,_ca,true,"removeportlet")){
 this.pageEditorWidget.refreshPage();
 }
-},notifyFailure:function(_cb,_cc,_cd,_ce){
-dojo.raise("RemovePortletContentManager notifyFailure url: "+_cd+" type: "+_cb+jetspeed.formatError(_cc));
+},notifyFailure:function(_cd,_ce,_cf,_d0){
+dojo.raise("RemovePortletContentManager notifyFailure url: "+_cf+" type: "+_cd+jetspeed.formatError(_ce));
 }};
-jetspeed.widget.RemoveLayoutContentManager=function(_cf,_d0){
-this.layoutId=_cf;
-this.pageEditorWidget=_d0;
+jetspeed.widget.RemoveLayoutContentManager=function(_d1,_d2){
+this.layoutId=_d1;
+this.pageEditorWidget=_d2;
 };
 jetspeed.widget.RemoveLayoutContentManager.prototype={getContent:function(){
 if(this.layoutId!=null){
-var _d1="?action=updatepage&method=remove-fragment&id="+this.layoutId;
-var _d2=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_d1;
-var _d3=new jetspeed.om.Id("removelayout",{});
-var _d4={};
-_d4.url=_d2;
-_d4.mimetype="text/xml";
-jetspeed.url.retrieveContent(_d4,this,_d3,jetspeed.debugContentDumpIds);
+var _d3="?action=updatepage&method=remove-fragment&id="+this.layoutId;
+var _d4=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_d3;
+var _d5=new jetspeed.om.Id("removelayout",{});
+var _d6={};
+_d6.url=_d4;
+_d6.mimetype="text/xml";
+jetspeed.url.retrieveContent(_d6,this,_d5,jetspeed.debugContentDumpIds);
 }
-},notifySuccess:function(_d5,_d6,_d7){
-if(jetspeed.url.checkAjaxApiResponse(_d6,_d5,true,"removeportlet")){
+},notifySuccess:function(_d7,_d8,_d9){
+if(jetspeed.url.checkAjaxApiResponse(_d8,_d7,true,"removeportlet")){
 this.pageEditorWidget.refreshPage();
 }
-},notifyFailure:function(_d8,_d9,_da,_db){
-dojo.raise("RemoveLayoutContentManager notifyFailure url: "+_da+" type: "+_d8+jetspeed.formatError(_d9));
+},notifyFailure:function(_da,_db,_dc,_dd){
+dojo.raise("RemoveLayoutContentManager notifyFailure url: "+_dc+" type: "+_da+jetspeed.formatError(_db));
 }};
-jetspeed.widget.AddLayoutContentManager=function(_dc,_dd,_de){
-this.parentLayoutId=_dc;
-this.layoutName=_dd;
-this.pageEditorWidget=_de;
+jetspeed.widget.AddLayoutContentManager=function(_de,_df,_e0){
+this.parentLayoutId=_de;
+this.layoutName=_df;
+this.pageEditorWidget=_e0;
 };
 jetspeed.widget.AddLayoutContentManager.prototype={getContent:function(){
 if(this.parentLayoutId!=null){
-var _df="?action=updatepage&method=add-fragment&layoutid="+this.parentLayoutId+(this.layoutName!=null?("&layout="+this.layoutName):"");
-var _e0=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_df;
-var _e1=new jetspeed.om.Id("addlayout",{});
-var _e2={};
-_e2.url=_e0;
-_e2.mimetype="text/xml";
-jetspeed.url.retrieveContent(_e2,this,_e1,jetspeed.debugContentDumpIds);
+var _e1="?action=updatepage&method=add-fragment&layoutid="+this.parentLayoutId+(this.layoutName!=null?("&layout="+this.layoutName):"");
+var _e2=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_e1;
+var _e3=new jetspeed.om.Id("addlayout",{});
+var _e4={};
+_e4.url=_e2;
+_e4.mimetype="text/xml";
+jetspeed.url.retrieveContent(_e4,this,_e3,jetspeed.debugContentDumpIds);
 }
-},notifySuccess:function(_e3,_e4,_e5){
-if(jetspeed.url.checkAjaxApiResponse(_e4,_e3,true,"addlayout")){
+},notifySuccess:function(_e5,_e6,_e7){
+if(jetspeed.url.checkAjaxApiResponse(_e6,_e5,true,"addlayout")){
 this.pageEditorWidget.refreshPage();
 }
-},notifyFailure:function(_e6,_e7,_e8,_e9){
-dojo.raise("AddLayoutContentManager notifyFailure url: "+_e8+" type: "+_e6+jetspeed.formatError(_e7));
+},notifyFailure:function(_e8,_e9,_ea,_eb){
+dojo.raise("AddLayoutContentManager notifyFailure url: "+_ea+" type: "+_e8+jetspeed.formatError(_e9));
 }};
 

Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.src.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.src.js?rev=588404&r1=588403&r2=588404&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.src.js (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/widget/PageEditor.src.js Thu Oct 25 17:00:37 2007
@@ -63,6 +63,8 @@
 		isContainer: true,
         widgetsInTemplate: true,
 
+        loadTimeDistribute: jetspeed.UAie,
+
         dbOn: djConfig.isDebug,
 
         // style classes
@@ -88,6 +90,7 @@
 
         fillInTemplate: function( args, fragment )
         {
+            var jsObj = jetspeed;
             var djObj = dojo;
             var self = this;
 
@@ -125,7 +128,7 @@
             this.columnSizeDialog = djObj.widget.createWidget( "dialog", columnSizeParams, this.columnSizeDialog );
             this.columnSizeDialog.setCloseControl( this.columnSizeDialog.columnSizeCancel.domNode );
 
-            jetspeed.widget.PageEditor.superclass.fillInTemplate.call( this );
+            jsObj.widget.PageEditor.superclass.fillInTemplate.call( this );
 		},
 
         postCreate: function( args, fragment, parent )
@@ -148,59 +151,126 @@
             var jsObj = jetspeed;
             var jsPage = jsObj.page;
             var djObj = dojo;
-            //jsObj.url.loadingIndicatorHide();
             
-            var layoutImagesRoot = this.layoutImagesRoot;
-            var labels =  this.labels;
-            var dialogLabels =  this.dialogLabels;
-
-            var pageEditorWidgets = new Array();
-            var layoutEditPaneWidgets = new Array();
-            var pageEditPaneWidget = djObj.widget.createWidget( "jetspeed:PageEditPane", { layoutDecoratorDefinitions: jsPage.themeDefinitions.pageDecorations, portletDecoratorDefinitions: jsPage.themeDefinitions.portletDecorations, layoutImagesRoot: layoutImagesRoot, labels: labels, dialogLabels: dialogLabels } );
+            this.pageEditorWidgets = new Array();
+            this.layoutEditPaneWidgets = new Array();
+            var pageEditPaneWidget = djObj.widget.createWidget( "jetspeed:PageEditPane", { layoutDecoratorDefinitions: jsPage.themeDefinitions.pageDecorations, portletDecoratorDefinitions: jsPage.themeDefinitions.portletDecorations, layoutImagesRoot: this.layoutImagesRoot, labels: this.labels, dialogLabels: this.dialogLabels } );
             pageEditPaneWidget.pageEditorWidget = this;
+            pageEditPaneWidget.domNode.style.display = "none";
             djObj.dom.insertAfter( pageEditPaneWidget.domNode, this.domNode );
-            pageEditorWidgets.push( pageEditPaneWidget );
+            this.pageEditorWidgets.push( pageEditPaneWidget );
+            this.pageEditPaneWidget = pageEditPaneWidget;
+            
+            if ( ! this.loadTimeDistribute )
+            {
+                jsObj.url.loadingIndicatorStep( jsObj );
+                this._buildRootPane();
+            }
+            else
+            {
+                djObj.lang.setTimeout( this, this._buildRootPane, 10 );
+                jsObj.url.loadingIndicatorStep( jsObj );
+            }
+        },
+        
+        _buildRootPane: function()
+        {
+            var jsObj = jetspeed;
+            var jsPage = jsObj.page;
+            var djObj = dojo;
 
-            var rootLayoutEditPaneWidget = djObj.widget.createWidget( "jetspeed:LayoutEditPane", { widgetId: "layoutEdit_root", layoutId: jsPage.rootFragmentId, isRootLayout: true, layoutDefinitions: jsPage.themeDefinitions.layouts, layoutImagesRoot: layoutImagesRoot, labels: labels, dialogLabels: dialogLabels } );
+            var rootLayoutEditPaneWidget = djObj.widget.createWidget( "jetspeed:LayoutEditPane", { widgetId: "layoutEdit_root", layoutId: jsPage.rootFragmentId, isRootLayout: true, layoutDefinitions: jsPage.themeDefinitions.layouts, layoutImagesRoot: this.layoutImagesRoot, labels: this.labels, dialogLabels: this.dialogLabels } );
             rootLayoutEditPaneWidget.pageEditorWidget = this;
-            djObj.dom.insertAfter( rootLayoutEditPaneWidget.domNode, pageEditPaneWidget.domNode );
-            pageEditorWidgets.push( rootLayoutEditPaneWidget );
-            layoutEditPaneWidgets.push( rootLayoutEditPaneWidget );
+            rootLayoutEditPaneWidget.domNode.style.display = "none";
+            djObj.dom.insertAfter( rootLayoutEditPaneWidget.domNode, this.pageEditPaneWidget.domNode );
+            this.pageEditorWidgets.push( rootLayoutEditPaneWidget );
+            this.layoutEditPaneWidgets.push( rootLayoutEditPaneWidget );
+
+            this._buildNextColI = 0;
+            this._buildColLen = ( jsObj.prefs.windowTiling ? jsPage.columns.length : 0 );
             
-            if ( jsObj.prefs.windowTiling )
+            if ( ! this.loadTimeDistribute )
+            {
+                jsObj.url.loadingIndicatorStep( jsObj );
+                this._buildNextPane();
+            }
+            else
+            {
+                djObj.lang.setTimeout( this, this._buildNextPane, 10 );
+                jsObj.url.loadingIndicatorStep( jsObj );
+            }
+        },
+
+        _buildNextPane: function()
+        {
+            var jsObj = jetspeed;
+            var jsPage = jsObj.page;
+            var djObj = dojo;
+
+            var i = this._buildNextColI;
+            var colLen = this._buildColLen;
+            if ( i < colLen )
             {
-                var doc = document;
-                var layoutHeaderLayoutInfo = jsPage.layoutInfo.columnLayoutHeader;
-                var col, layoutEditPaneWidget;
-                for ( var i = 0 ; i < jsPage.columns.length; i++ )
+                var col, layoutEditPaneWidget = null;
+                while ( i < colLen && layoutEditPaneWidget == null )
                 {
                     col = jsPage.columns[i];
                     if ( col.layoutHeader )
                     {
-                        layoutEditPaneWidget = djObj.widget.createWidget( "jetspeed:LayoutEditPane", { widgetId: "layoutEdit_" + i, layoutColumn: col, layoutId: col.layoutId, layoutInfo: layoutHeaderLayoutInfo, layoutDefinitions: jsPage.themeDefinitions.layouts, layoutImagesRoot: layoutImagesRoot, labels: labels, dialogLabels: dialogLabels } );
+                        layoutEditPaneWidget = djObj.widget.createWidget( "jetspeed:LayoutEditPane", { widgetId: "layoutEdit_" + i, layoutColumn: col, layoutId: col.layoutId, layoutInfo: jsPage.layoutInfo.columnLayoutHeader, layoutDefinitions: jsPage.themeDefinitions.layouts, layoutImagesRoot: this.layoutImagesRoot, labels: this.labels, dialogLabels: this.dialogLabels } );
                         layoutEditPaneWidget.pageEditorWidget = this;
+                        layoutEditPaneWidget.domNode.style.display = "none";
                         if ( col.domNode.firstChild != null )
                             col.domNode.insertBefore( layoutEditPaneWidget.domNode, col.domNode.firstChild );
                         else
                             col.domNode.appendChild( layoutEditPaneWidget.domNode );
                         layoutEditPaneWidget.initializeDrag();
-                        pageEditorWidgets.push( layoutEditPaneWidget );
-                        layoutEditPaneWidgets.push( layoutEditPaneWidget );
+                        this.pageEditorWidgets.push( layoutEditPaneWidget );
+                        this.layoutEditPaneWidgets.push( layoutEditPaneWidget );
                     }
+                    i++;
                 }
+            }
+
+            if ( i < colLen )
+            {
+                this._buildNextColI = i;
+                if ( ! this.loadTimeDistribute )
+                {
+                    jsObj.url.loadingIndicatorStep( jsObj );
+                    this._buildNextPane();
+                }
+                else
+                {
+                    djObj.lang.setTimeout( this, this._buildNextPane, 10 );
+                    jsObj.url.loadingIndicatorStep( jsObj );
+                }
+            }
+            else
+            {
                 if ( jsObj.UAie )   // provide background when prevent IE bleed-through problem
                 {
                     this.bgIframe = new jsObj.widget.BackgroundIframe( this.domNode, "ieLayoutBackgroundIFrame", djObj );
                 }
-            }
-            this.pageEditorWidgets = pageEditorWidgets;
-            this.layoutEditPaneWidgets = layoutEditPaneWidgets;
-            this.editPageSyncPortletActions();
 
-            jsObj.url.loadingIndicatorHide();
+                var pageEditorWidgets = this.pageEditorWidgets;
+                if ( pageEditorWidgets != null )
+                {
+                    for ( var i = 0 ; i < pageEditorWidgets.length ; i++ )
+                    {
+                        pageEditorWidgets[i].domNode.style.display = "block";
+                    }
+                }
 
-            if ( jsObj.UAie6 )
-                jsPage.displayAllPWins();
+                this.editPageSyncPortletActions();
+
+                jsObj.url.loadingIndicatorHide();
+                if ( jsObj.UAie6 )
+                {
+                    //jsObj.url.loadingIndicatorHide();
+                    jsPage.displayAllPWins();
+                }
+            }
         },
 
         editPageSyncPortletActions: function()
@@ -255,12 +325,18 @@
                     pageEditorWidgets[i] = null;
                 }
             }
+
+            this.pageEditorWidgets = null;
+            this.layoutEditPaneWidgets = null;
+            this.pageEditPaneWidget = null;
+
             if ( this.deletePortletDialog != null )
                 this.deletePortletDialog.destroy();
             if ( this.deleteLayoutDialog != null )
                 this.deleteLayoutDialog.destroy();
             if ( this.columnSizeDialog != null )
                 this.columnSizeDialog.destroy();
+
             this.destroy();
         },
 



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org