portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r583999 [2/5] - in /portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed: ./ desktop/ widget/
Date Fri, 12 Oct 2007 00:36:48 GMT
Modified: portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/desktop/core.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/desktop/core.js?rev=583999&r1=583998&r2=583999&view=diff
==============================================================================
--- portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/desktop/core.js (original)
+++ portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed/desktop/core.js Thu Oct 11 17:36:47 2007
@@ -14,7 +14,7 @@
 if(!jetspeed.debug){
 jetspeed.debug={};
 }
-jetspeed.id={PAGE:"jetspeedPage",DESKTOP_CELL:"jetspeedDesktopCell",DESKTOP:"jetspeedDesktop",COLUMNS:"jetspeedColumns",PAGE_CONTROLS:"jetspeedPageControls",P_CLASS:"portlet",PWIN_CLASS:"portletWindow",PWIN_GHOST_CLASS:"ghostPane",PW_ID_PREFIX:"pw_",PP_WIDGET_ID:"widgetId",PP_CONTENT_RETRIEVER:"contentRetriever",PP_DESKTOP_EXTENDED:"jsdesktop",PP_WINDOW_POSITION_STATIC:"windowPositionStatic",PP_WINDOW_HEIGHT_TO_FIT:"windowHeightToFit",PP_WINDOW_DECORATION:"windowDecoration",PP_WINDOW_TITLE:"title",PP_WINDOW_ICON:"windowIcon",PP_WIDTH:"width",PP_HEIGHT:"height",PP_LEFT:"left",PP_TOP:"top",PP_COLUMN:"column",PP_ROW:"row",PP_EXCLUDE_PCONTENT:"excludePContent",PP_WINDOW_STATE:"windowState",PP_STATICPOS:"staticpos",PP_FITHEIGHT:"fitheight",PP_PROP_SEPARATOR:"=",PP_PAIR_SEPARATOR:";",ACT_MENU:"menu",ACT_MINIMIZE:"minimized",ACT_MAXIMIZE:"maximized",ACT_RESTORE:"normal",ACT_PRINT:"print",ACT_EDIT:"edit",ACT_VIEW:"view",ACT_HELP:"help",ACT_ADDPORTLET:"addportlet",ACT_REMOVEPORTLET:"
 removeportlet",ACT_DESKTOP_TILE:"tile",ACT_DESKTOP_UNTILE:"untile",ACT_DESKTOP_HEIGHT_EXPAND:"heightexpand",ACT_DESKTOP_HEIGHT_NORMAL:"heightnormal",ACT_LOAD_RENDER:"loadportletrender",ACT_LOAD_ACTION:"loadportletaction",ACT_LOAD_UPDATE:"loadportletupdate",PORTLET_ACTION_TYPE_MODE:"mode",PORTLET_ACTION_TYPE_STATE:"state",MENU_WIDGET_ID_PREFIX:"jetspeed-menu-",PG_ED_WID:"jetspeed-page-editor",PG_ED_PARAM:"editPage",PORTAL_ORIGINATE_PARAMETER:"portal",DEBUG_WINDOW_TAG:"js-db"};
+jetspeed.id={PAGE:"jetspeedPage",DESKTOP_CELL:"jetspeedDesktopCell",DESKTOP:"jetspeedDesktop",COLUMNS:"jetspeedColumns",PAGE_CONTROLS:"jetspeedPageControls",P_CLASS:"portlet",PWIN_CLASS:"portletWindow",PWIN_GHOST_CLASS:"ghostPane",PW_ID_PREFIX:"pw_",COL_CLASS:"desktopColumn",COL_LAYOUTHEADER_CLASS:"desktopLayoutHeader",PP_WIDGET_ID:"widgetId",PP_CONTENT_RETRIEVER:"contentRetriever",PP_DESKTOP_EXTENDED:"jsdesktop",PP_WINDOW_POSITION_STATIC:"windowPositionStatic",PP_WINDOW_HEIGHT_TO_FIT:"windowHeightToFit",PP_WINDOW_DECORATION:"windowDecoration",PP_WINDOW_TITLE:"title",PP_WINDOW_ICON:"windowIcon",PP_WIDTH:"width",PP_HEIGHT:"height",PP_LEFT:"left",PP_TOP:"top",PP_COLUMN:"column",PP_ROW:"row",PP_EXCLUDE_PCONTENT:"excludePContent",PP_WINDOW_STATE:"windowState",PP_STATICPOS:"staticpos",PP_FITHEIGHT:"fitheight",PP_PROP_SEPARATOR:"=",PP_PAIR_SEPARATOR:";",ACT_MENU:"menu",ACT_MINIMIZE:"minimized",ACT_MAXIMIZE:"maximized",ACT_RESTORE:"normal",ACT_PRINT:"print",ACT_EDIT:"edit",ACT_VIEW
 :"view",ACT_HELP:"help",ACT_ADDPORTLET:"addportlet",ACT_REMOVEPORTLET:"removeportlet",ACT_DESKTOP_TILE:"tile",ACT_DESKTOP_UNTILE:"untile",ACT_DESKTOP_HEIGHT_EXPAND:"heightexpand",ACT_DESKTOP_HEIGHT_NORMAL:"heightnormal",ACT_DESKTOP_MOVE_TILED:"movetiled",ACT_DESKTOP_MOVE_UNTILED:"moveuntiled",ACT_LOAD_RENDER:"loadportletrender",ACT_LOAD_ACTION:"loadportletaction",ACT_LOAD_UPDATE:"loadportletupdate",PORTLET_ACTION_TYPE_MODE:"mode",PORTLET_ACTION_TYPE_STATE:"state",MENU_WIDGET_ID_PREFIX:"jetspeed-menu-",PG_ED_WID:"jetspeed-page-editor",PG_ED_PARAM:"editPage",PORTAL_ORIGINATE_PARAMETER:"portal",DEBUG_WINDOW_TAG:"js-db"};
 jetspeed.prefs={windowTiling:true,windowHeightExpand:false,ajaxPageNavigation:false,windowWidth:null,windowHeight:null,layoutName:null,layoutRootUrl:null,getLayoutName:function(){
 if(jetspeed.prefs.layoutName==null&&djConfig.jetspeed!=null){
 jetspeed.prefs.layoutName=djConfig.jetspeed.layoutName;
@@ -30,172 +30,218 @@
 jetspeed.prefs.portletDecorationsRootUrl=jetspeed.url.basePortalDesktopUrl()+djConfig.jetspeed.portletDecorationsPath;
 }
 return jetspeed.prefs.portletDecorationsRootUrl;
-},portletSelectorWindowTitle:"Portlet Selector",portletSelectorWindowIcon:"text-x-script.png",portletSelectorBounds:{x:20,y:20,width:400,height:600},windowActionButtonMax:5,windowActionButtonHide:false,windowActionButtonTooltip:true,windowIconEnabled:true,windowIconPath:"/images/portlets/small/",windowDecoration:"tigris",pageActionButtonTooltip:true,getPortletDecorationBaseUrl:function(_1){
+},portletSelectorWindowTitle:"Portlet Selector",portletSelectorWindowIcon:"text-x-script.png",portletSelectorBounds:{x:20,y:20,width:400,height:600},windowActionButtonMax:5,windowActionButtonHide:false,windowActionButtonTooltip:true,windowIconEnabled:true,windowIconPath:"/images/portlets/small/",windowTitlebar:true,windowResizebar:true,windowDecoration:"tigris",pageActionButtonTooltip:true,getPortletDecorationBaseUrl:function(_1){
 return jetspeed.prefs.getPortletDecorationsRootUrl()+"/"+_1;
 },getPortletDecorationConfig:function(_2){
 if(jetspeed.prefs.portletDecorationsConfig==null||_2==null){
 return null;
 }
 return jetspeed.prefs.portletDecorationsConfig[_2];
+},getActionLabel:function(_3,_4,_5,_6){
+if(_3==null){
+return null;
+}
+var _7=null;
+var _8=_5.desktopActionLabels;
+if(_8!=null){
+_7=_8[_3];
+}
+if(_7==null||_7.length==0){
+_7=null;
+if(!_4){
+_7=_6.string.capitalize(_3);
+}
+}
+return _7;
 }};
 jetspeed.page=null;
 jetspeed.initializeDesktop=function(){
-var _3=jetspeed;
-var _4=_3.id;
-var _5=_3.prefs;
-var _6=_3.debug;
-var _7=dojo;
-_3.getBody();
-_3.ui.initCssObj();
-_5.windowActionButtonOrder=[_4.ACT_MENU,"edit","view","help",_4.ACT_MINIMIZE,_4.ACT_RESTORE,_4.ACT_MAXIMIZE];
-_5.windowActionNotPortlet=[_4.ACT_MENU,_4.ACT_MINIMIZE,_4.ACT_RESTORE,_4.ACT_MAXIMIZE];
-_5.windowActionMenuOrder=[_4.ACT_DESKTOP_HEIGHT_EXPAND,_4.ACT_DESKTOP_HEIGHT_NORMAL,_4.ACT_DESKTOP_TILE,_4.ACT_DESKTOP_UNTILE];
-_3.url.pathInitialize();
-var _8=djConfig.jetspeed;
-if(_8!=null){
-for(var _9 in _8){
-var _a=_8[_9];
-if(_a!=null){
-if(_6[_9]!=null){
-_6[_9]=_a;
-}else{
-_5[_9]=_a;
+var _9=jetspeed;
+var _a=_9.id;
+var _b=_9.prefs;
+var _c=_9.debug;
+var _d=dojo;
+_9.getBody();
+_9.ui.initCssObj();
+_b.windowActionButtonOrder=[_a.ACT_MENU,"edit","view","help",_a.ACT_MINIMIZE,_a.ACT_RESTORE,_a.ACT_MAXIMIZE];
+_b.windowActionNotPortlet=[_a.ACT_MENU,_a.ACT_MINIMIZE,_a.ACT_RESTORE,_a.ACT_MAXIMIZE];
+_b.windowActionMenuOrder=[_a.ACT_DESKTOP_HEIGHT_EXPAND,_a.ACT_DESKTOP_HEIGHT_NORMAL,_a.ACT_DESKTOP_TILE,_a.ACT_DESKTOP_UNTILE];
+_9.url.pathInitialize();
+var _e=djConfig.jetspeed;
+if(_e!=null){
+for(var _f in _e){
+var _10=_e[_f];
+if(_10!=null){
+if(_c[_f]!=null){
+_c[_f]=_10;
+}else{
+_b[_f]=_10;
 }
 }
 }
-if(_5.windowWidth==null||isNaN(_5.windowWidth)){
-_5.windowWidth="280";
+if(_b.windowWidth==null||isNaN(_b.windowWidth)){
+_b.windowWidth="280";
+}
+if(_b.windowHeight==null||isNaN(_b.windowHeight)){
+_b.windowHeight="200";
+}
+var _11={};
+_11[_a.ACT_DESKTOP_HEIGHT_EXPAND]=true;
+_11[_a.ACT_DESKTOP_HEIGHT_NORMAL]=true;
+_11[_a.ACT_DESKTOP_TILE]=true;
+_11[_a.ACT_DESKTOP_UNTILE]=true;
+_b.windowActionDesktop=_11;
+}
+var _12=new _d.uri.Uri(jetspeed.url.basePortalDesktopUrl()+"/javascript/jetspeed/widget/PortletWindow.css");
+_d.html.insertCssFile(_12,document,true);
+if(_b.portletDecorationsAllowed==null||_b.portletDecorationsAllowed.length==0){
+if(_b.windowDecoration!=null){
+_b.portletDecorationsAllowed=[_b.windowDecoration];
+}
+}else{
+if(_b.windowDecoration==null){
+_b.windowDecoration=_b.portletDecorationsAllowed[0];
+}
+}
+if(_b.windowDecoration==null||_b.portletDecorationsAllowed==null){
+_d.raise("No portlet decorations");
+return;
+}
+if(_b.windowActionNoImage!=null){
+var _13={};
+for(var i=0;i<_b.windowActionNoImage.length;i++){
+_13[_b.windowActionNoImage[i]]=true;
 }
-if(_5.windowHeight==null||isNaN(_5.windowHeight)){
-_5.windowHeight="200";
+_b.windowActionNoImage=_13;
 }
-var _b={};
-_b[_4.ACT_DESKTOP_HEIGHT_EXPAND]=true;
-_b[_4.ACT_DESKTOP_HEIGHT_NORMAL]=true;
-_b[_4.ACT_DESKTOP_TILE]=true;
-_b[_4.ACT_DESKTOP_UNTILE]=true;
-_5.windowActionDesktop=_b;
+var _15=_9.url.parse(window.location.href);
+var _16=_9.url.getQueryParameter(_15,"jsprintmode")=="true";
+if(_16){
+_16={};
+_16.action=_9.url.getQueryParameter(_15,"jsaction");
+_16.entity=_9.url.getQueryParameter(_15,"jsentity");
+_16.layout=_9.url.getQueryParameter(_15,"jslayoutid");
+_b.printModeOnly=_16;
+_b.windowTiling=true;
+_b.windowHeightExpand=true;
+_b.ajaxPageNavigation=false;
+}
+_b.portletDecorationsConfig={};
+for(var i=0;i<_b.portletDecorationsAllowed.length;i++){
+_9.loadPortletDecorationConfig(_b.portletDecorationsAllowed[i]);
 }
-var _c=new _7.uri.Uri(jetspeed.url.basePortalDesktopUrl()+"/javascript/jetspeed/widget/PortletWindow.css");
-_7.html.insertCssFile(_c,document,true);
-if(_5.portletDecorationsAllowed==null||_5.portletDecorationsAllowed.length==0){
-if(_5.windowDecoration!=null){
-_5.portletDecorationsAllowed=[_5.windowDecoration];
+if(_9.UAie6){
+_b.ajaxPageNavigation=false;
 }
-}else{
-if(_5.windowDecoration==null){
-_5.windowDecoration=_5.portletDecorationsAllowed[0];
+if(_16){
+for(var _17 in _b.portletDecorationsConfig){
+var _18=_b.portletDecorationsConfig[_17];
+if(_18!=null){
+_18.windowActionButtonOrder=null;
+_18.windowActionMenuOrder=null;
+_18.windowDisableResize=true;
+_18.windowDisableMove=true;
 }
 }
-if(_5.windowDecoration==null||_5.portletDecorationsAllowed==null){
-_7.raise("No portlet decorations");
-return;
 }
-if(_5.windowActionNoImage!=null){
-var _d={};
-for(var i=0;i<_5.windowActionNoImage.length;i++){
-_d[_5.windowActionNoImage[i]]=true;
+_9.url.loadingIndicatorShow();
+if(_b.windowActionButtonOrder){
+var _19={};
+var _1a,_1b;
+for(var aI=0;aI<_b.windowActionButtonOrder.length;aI++){
+_1a=_b.windowActionButtonOrder[aI];
+if(_1a!=null){
+_19[_1a]=_b.getActionLabel(_1a,false,_b,_d);
 }
-_5.windowActionNoImage=_d;
 }
-var _f=_3.url.parse(window.location.href);
-var _10=_3.url.getQueryParameter(_f,"jsprintmode")=="true";
-if(_10){
-_10={};
-_10.action=_3.url.getQueryParameter(_f,"jsaction");
-_10.entity=_3.url.getQueryParameter(_f,"jsentity");
-_10.layout=_3.url.getQueryParameter(_f,"jslayoutid");
-_5.printModeOnly=_10;
-_5.windowTiling=true;
-_5.windowHeightExpand=true;
-_5.ajaxPageNavigation=false;
+for(_1a in _b.windowActionDesktop){
+if(_1a!=null){
+_19[_1a]=_b.getActionLabel(_1a,false,_b,_d);
 }
-_5.portletDecorationsConfig={};
-for(var i=0;i<_5.portletDecorationsAllowed.length;i++){
-_3.loadPortletDecorationConfig(_5.portletDecorationsAllowed[i]);
 }
-if(_3.UAie6){
-_5.ajaxPageNavigation=false;
+_1a=_a.ACT_DESKTOP_MOVE_TILED;
+_1b=_b.getActionLabel(_1a,true,_b,_d);
+if(_1b!=null){
+_19[_1a]=_1b;
 }
-if(_10){
-for(var _11 in _5.portletDecorationsConfig){
-var _12=_5.portletDecorationsConfig[_11];
-if(_12!=null){
-_12.windowActionButtonOrder=null;
-_12.windowActionMenuOrder=null;
-_12.windowDisableResize=true;
-_12.windowDisableMove=true;
+_1a=_a.ACT_DESKTOP_MOVE_UNTILED;
+_1b=_b.getActionLabel(_1a,true,_b,_d);
+if(_1b!=null){
+_19[_1a]=_1b;
 }
+_9.widget.PortletWindow.prototype.actionLabels=_19;
 }
+_9.page=new _9.om.Page();
+if(!_16&&djConfig.isDebug){
+if(_9.debugWindowLoad){
+_9.debugWindowLoad();
 }
-_3.url.loadingIndicatorShow();
-_3.page=new _3.om.Page();
-if(!_10&&djConfig.isDebug){
-if(_3.debugWindowLoad){
-_3.debugWindowLoad();
+if(_9.debug.profile&&_d.profile){
+_d.profile.start("initializeDesktop");
+}else{
+_9.debug.profile=false;
 }
-if(_3.debug.profile&&_7.profile){
-_7.profile.start("initializeDesktop");
 }else{
-_3.debug.profile=false;
+_9.debug.profile=false;
 }
+_9.page.retrievePsml();
+if(_9.UAie6){
+_9.ui.windowResizeMgr.init(window,_9.docBody);
 }else{
-_3.debug.profile=false;
 }
-_3.page.retrievePsml();
 };
-jetspeed.updatePage=function(_13,_14){
-var _15=jetspeed;
-var _16=false;
-if(djConfig.isDebug&&_15.debug.profile){
-_16=true;
+jetspeed.updatePage=function(_1d,_1e){
+var _1f=jetspeed;
+var _20=false;
+if(djConfig.isDebug&&_1f.debug.profile){
+_20=true;
 dojo.profile.start("updatePage");
 }
-var _17=_15.page;
-if(!_13||!_17||_15.pageNavigateSuppress){
+var _21=_1f.page;
+if(!_1d||!_21||_1f.pageNavigateSuppress){
 return;
 }
-if(_17.equalsPageUrl(_13)){
+if(_21.equalsPageUrl(_1d)){
 return;
 }
-_13=_17.makePageUrl(_13);
-if(_13!=null){
-_15.updatePageBegin();
-var _18=_17.layoutDecorator;
-var _19=_17.editMode;
-if(_16){
+_1d=_21.makePageUrl(_1d);
+if(_1d!=null){
+_1f.updatePageBegin();
+var _22=_21.layoutDecorator;
+var _23=_21.editMode;
+if(_20){
 dojo.profile.start("destroyPage");
 }
-_17.destroy();
-if(_16){
+_21.destroy();
+if(_20){
 dojo.profile.end("destroyPage");
 }
-var _1a=_17.portlet_windows;
-var _1b=_17.portlet_window_count;
-var _1c=new _15.om.Page(_18,_13,(!djConfig.preventBackButtonFix&&!_14),_19,_17.tooltipMgr,_17.iframeCoverByWinId);
-_15.page=_1c;
-var _1d;
-if(_1b>0){
-for(var _1e in _1a){
-_1d=_1a[_1e];
-_1d.bringToTop(null,true);
-}
-}
-_1c.retrievePsml(new _15.om.PageCLCreateWidget(true));
-if(_1b>0){
-for(var _1e in _1a){
-_1d=_1a[_1e];
-_1c.putPWin(_1d);
+var _24=_21.portlet_windows;
+var _25=_21.portlet_window_count;
+var _26=new _1f.om.Page(_22,_1d,(!djConfig.preventBackButtonFix&&!_1e),_23,_21.tooltipMgr,_21.iframeCoverByWinId);
+_1f.page=_26;
+var _27;
+if(_25>0){
+for(var _28 in _24){
+_27=_24[_28];
+_27.bringToTop(null,true,false,_1f);
+}
+}
+_26.retrievePsml(new _1f.om.PageCLCreateWidget(true));
+if(_25>0){
+for(var _28 in _24){
+_27=_24[_28];
+_26.putPWin(_27);
 }
 }
 window.focus();
 }
 };
 jetspeed.updatePageBegin=function(){
-var _1f=jetspeed;
-if(_1f.UAie6){
-_1f.docBody.attachEvent("onclick",_1f.ie6StopMouseEvts);
-_1f.docBody.setCapture();
+var _29=jetspeed;
+if(_29.UAie6){
+_29.docBody.attachEvent("onclick",_29.ie6StopMouseEvts);
+_29.docBody.setCapture();
 }
 };
 jetspeed.ie6StopMouseEvts=function(e){
@@ -205,69 +251,69 @@
 }
 };
 jetspeed.updatePageEnd=function(){
-var _21=jetspeed;
-if(_21.UAie6){
-_21.docBody.releaseCapture();
-_21.docBody.detachEvent("onclick",_21.ie6StopMouseEvts);
-_21.docBody.releaseCapture();
+var _2b=jetspeed;
+if(_2b.UAie6){
+_2b.docBody.releaseCapture();
+_2b.docBody.detachEvent("onclick",_2b.ie6StopMouseEvts);
+_2b.docBody.releaseCapture();
 }
 };
-jetspeed.doRender=function(_22,_23){
-if(!_22){
-_22={};
+jetspeed.doRender=function(_2c,_2d){
+if(!_2c){
+_2c={};
 }else{
-if((typeof _22=="string"||_22 instanceof String)){
-_22={url:_22};
+if((typeof _2c=="string"||_2c instanceof String)){
+_2c={url:_2c};
 }
 }
-var _24=jetspeed.page.getPortlet(_23);
-if(_24){
+var _2e=jetspeed.page.getPortlet(_2d);
+if(_2e){
 if(jetspeed.debug.doRenderDoAction){
-dojo.debug("doRender ["+_23+"] url: "+_22.url);
+dojo.debug("doRender ["+_2d+"] url: "+_2c.url);
 }
-_24.retrieveContent(null,_22);
+_2e.retrieveContent(null,_2c);
 }
 };
-jetspeed.doAction=function(_25,_26){
-if(!_25){
-_25={};
+jetspeed.doAction=function(_2f,_30){
+if(!_2f){
+_2f={};
 }else{
-if((typeof _25=="string"||_25 instanceof String)){
-_25={url:_25};
+if((typeof _2f=="string"||_2f instanceof String)){
+_2f={url:_2f};
 }
 }
-var _27=jetspeed.page.getPortlet(_26);
-if(_27){
+var _31=jetspeed.page.getPortlet(_30);
+if(_31){
 if(jetspeed.debug.doRenderDoAction){
-if(!_25.formNode){
-dojo.debug("doAction ["+_26+"] url: "+_25.url+" form: null");
+if(!_2f.formNode){
+dojo.debug("doAction ["+_30+"] url: "+_2f.url+" form: null");
 }else{
-dojo.debug("doAction ["+_26+"] url: "+_25.url+" form: "+jetspeed.debugDumpForm(_25.formNode));
+dojo.debug("doAction ["+_30+"] url: "+_2f.url+" form: "+jetspeed.debugDumpForm(_2f.formNode));
 }
 }
-_27.retrieveContent(new jetspeed.om.PortletActionCL(_27,_25),_25);
+_31.retrieveContent(new jetspeed.om.PortletActionCL(_31,_2f),_2f);
 }
 };
-jetspeed.PortletRenderer=function(_28,_29,_2a,_2b,_2c){
-var _2d=jetspeed;
-var _2e=_2d.page;
-this._jsObj=_2d;
-this.createWindows=_28;
-this.isPageLoad=_29;
-this.isPageUpdate=_2a;
+jetspeed.PortletRenderer=function(_32,_33,_34,_35,_36){
+var _37=jetspeed;
+var _38=_37.page;
+this._jsObj=_37;
+this.createWindows=_32;
+this.isPageLoad=_33;
+this.isPageUpdate=_34;
 this.pageLoadUrl=null;
-if(_29){
-this.pageLoadUrl=_2d.url.parse(_2e.getPageUrl());
+if(_33){
+this.pageLoadUrl=_37.url.parse(_38.getPageUrl());
 }
-this.renderUrl=_2b;
-this.suppressGetActions=_2c;
-this._colLen=_2e.columns.length;
+this.renderUrl=_35;
+this.suppressGetActions=_36;
+this._colLen=_38.columns.length;
 this._colIndex=0;
 this._portletIndex=0;
-this.psByCol=_2e.portletsByPageColumn;
-this.debugPageLoad=_2d.debug.pageLoad&&_29;
+this.psByCol=_38.portletsByPageColumn;
+this.debugPageLoad=_37.debug.pageLoad&&_33;
 this.debugMsg=null;
-if(_2d.debug.doRenderDoAction||this.debugPageLoad){
+if(_37.debug.doRenderDoAction||this.debugPageLoad){
 this.debugMsg="";
 }
 };
@@ -284,97 +330,97 @@
 this._finished();
 }
 },_finished:function(){
-var _2f=this._jsObj;
-var _30=this.debugMsg;
-if(_30!=null){
+var _39=this._jsObj;
+var _3a=this.debugMsg;
+if(_3a!=null){
 if(this.debugPageLoad){
-dojo.debug("portlet-renderer page-url: "+_2f.page.getPsmlUrl()+" portlets: ["+renderMsg+"]"+(url?(" url: "+url):""));
+dojo.debug("portlet-renderer page-url: "+_39.page.getPsmlUrl()+" portlets: ["+renderMsg+"]"+(url?(" url: "+url):""));
 }else{
 dojo.debug("portlet-renderer ["+renderMsg+"] url: "+url);
 }
 }
 if(this.isPageLoad){
-_2f.page.loadPostRender(this.isPageUpdate);
+_39.page.loadPostRender(this.isPageUpdate);
 }
 },_renderCurrent:function(){
-var _31=this._jsObj;
-var _32=this._colLen;
-var _33=this._colIndex;
-var _34=this._portletIndex;
-if(_33<=_32){
-var _35;
-if(_33<_32){
-_35=this.psByCol[_33.toString()];
-}else{
-_35=this.psByCol["z"];
-_33=null;
-}
-var _36=(_35!=null?_35.length:0);
-if(_36>0){
-var _37=_35[_34];
-if(_37){
-var _38=_37.portlet;
+var _3b=this._jsObj;
+var _3c=this._colLen;
+var _3d=this._colIndex;
+var _3e=this._portletIndex;
+if(_3d<=_3c){
+var _3f;
+if(_3d<_3c){
+_3f=this.psByCol[_3d.toString()];
+}else{
+_3f=this.psByCol["z"];
+_3d=null;
+}
+var _40=(_3f!=null?_3f.length:0);
+if(_40>0){
+var _41=_3f[_3e];
+if(_41){
+var _42=_41.portlet;
 if(this.createWindows){
-_31.ui.createPortletWindow(_38,_33,_31);
+_3b.ui.createPortletWindow(_42,_3d,_3b);
 }
-var _39=this.debugMsg;
-if(_39!=null){
-if(_39.length>0){
-_39=_39+", ";
+var _43=this.debugMsg;
+if(_43!=null){
+if(_43.length>0){
+_43=_43+", ";
 }
-var _3a=null;
-if(_38.getProperty!=null){
-_3a=_38.getProperty(_31.id.PP_WIDGET_ID);
+var _44=null;
+if(_42.getProperty!=null){
+_44=_42.getProperty(_3b.id.PP_WIDGET_ID);
 }
-if(!_3a){
-_3a=_38.widgetId;
+if(!_44){
+_44=_42.widgetId;
 }
-if(!_3a){
-_3a=_38.toString();
+if(!_44){
+_44=_42.toString();
 }
-if(_38.entityId){
-_39=_39+_38.entityId+"("+_3a+")";
-if(this._dbPgLd&&_38.getProperty(_31.id.PP_WINDOW_TITLE)){
-_39=_39+" "+_38.getProperty(_31.id.PP_WINDOW_TITLE);
+if(_42.entityId){
+_43=_43+_42.entityId+"("+_44+")";
+if(this._dbPgLd&&_42.getProperty(_3b.id.PP_WINDOW_TITLE)){
+_43=_43+" "+_42.getProperty(_3b.id.PP_WINDOW_TITLE);
 }
 }else{
-_39=_39+_3a;
+_43=_43+_44;
 }
 }
-_38.retrieveContent(null,{url:this.renderUrl,jsPageUrl:this.pageLoadUrl},this.suppressGetActions);
+_42.retrieveContent(null,{url:this.renderUrl,jsPageUrl:this.pageLoadUrl},this.suppressGetActions);
 }
 }
 }
 },_evalNext:function(){
-var _3b=false;
-var _3c=this._colLen;
-var _3d=this._colIndex;
-var _3e=this._portletIndex;
-var _3f=_3d;
-var _40;
-for(++_3d;_3d<=_3c;_3d++){
-_40=this.psByCol[_3d==_3c?"z":_3d.toString()];
-if(_3e<(_40!=null?_40.length:0)){
-_3b=true;
-this._colIndex=_3d;
+var _45=false;
+var _46=this._colLen;
+var _47=this._colIndex;
+var _48=this._portletIndex;
+var _49=_47;
+var _4a;
+for(++_47;_47<=_46;_47++){
+_4a=this.psByCol[_47==_46?"z":_47.toString()];
+if(_48<(_4a!=null?_4a.length:0)){
+_45=true;
+this._colIndex=_47;
 break;
 }
 }
-if(!_3b){
-++_3e;
-for(_3d=0;_3d<=_3f;_3d++){
-_40=this.psByCol[_3d==_3c?"z":_3d.toString()];
-if(_3e<(_40!=null?_40.length:0)){
-_3b=true;
-this._colIndex=_3d;
-this._portletIndex=_3e;
+if(!_45){
+++_48;
+for(_47=0;_47<=_49;_47++){
+_4a=this.psByCol[_47==_46?"z":_47.toString()];
+if(_48<(_4a!=null?_4a.length:0)){
+_45=true;
+this._colIndex=_47;
+this._portletIndex=_48;
 break;
 }
 }
 }
-return _3b;
+return _45;
 }});
-jetspeed.portleturl={DESKTOP_ACTION_PREFIX_URL:null,DESKTOP_RENDER_PREFIX_URL:null,JAVASCRIPT_ARG_QUOTE:"&"+"quot;",PORTLET_REQUEST_ACTION:"action",PORTLET_REQUEST_RENDER:"render",JETSPEED_DO_NOTHING_ACTION:"javascript:jetspeed.doNothingNav()",parseContentUrl:function(_41){
+jetspeed.portleturl={DESKTOP_ACTION_PREFIX_URL:null,DESKTOP_RENDER_PREFIX_URL:null,JAVASCRIPT_ARG_QUOTE:"&"+"quot;",PORTLET_REQUEST_ACTION:"action",PORTLET_REQUEST_RENDER:"render",JETSPEED_DO_NOTHING_ACTION:"javascript:jetspeed.doNothingNav()",parseContentUrl:function(_4b){
 if(this.DESKTOP_ACTION_PREFIX_URL==null){
 this.DESKTOP_ACTION_PREFIX_URL=jetspeed.url.basePortalUrl()+jetspeed.url.path.ACTION;
 }
@@ -382,1060 +428,992 @@
 this.DESKTOP_RENDER_PREFIX_URL=jetspeed.url.basePortalUrl()+jetspeed.url.path.RENDER;
 }
 var op=null;
-var _43=_41;
-var _44=null;
-if(_41&&_41.length>this.DESKTOP_ACTION_PREFIX_URL.length&&_41.indexOf(this.DESKTOP_ACTION_PREFIX_URL)==0){
+var _4d=_4b;
+var _4e=null;
+if(_4b&&_4b.length>this.DESKTOP_ACTION_PREFIX_URL.length&&_4b.indexOf(this.DESKTOP_ACTION_PREFIX_URL)==0){
 op=jetspeed.portleturl.PORTLET_REQUEST_ACTION;
 }else{
-if(_41&&_41.length>this.DESKTOP_RENDER_PREFIX_URL.length&&_41.indexOf(this.DESKTOP_RENDER_PREFIX_URL)==0){
+if(_4b&&_4b.length>this.DESKTOP_RENDER_PREFIX_URL.length&&_4b.indexOf(this.DESKTOP_RENDER_PREFIX_URL)==0){
 op=jetspeed.portleturl.PORTLET_REQUEST_RENDER;
 }
 }
 if(op!=null){
-_44=jetspeed.url.getQueryParameter(_41,"entity");
+_4e=jetspeed.url.getQueryParameter(_4b,"entity");
 }
-if(!jetspeed.url.urlStartsWithHttp(_43)){
-_43=null;
+if(!jetspeed.url.urlStartsWithHttp(_4d)){
+_4d=null;
 }
-return {url:_43,operation:op,portletEntityId:_44};
-},genPseudoUrl:function(_45,_46){
-if(!_45||!_45.url||!_45.portletEntityId){
+return {url:_4d,operation:op,portletEntityId:_4e};
+},genPseudoUrl:function(_4f,_50){
+if(!_4f||!_4f.url||!_4f.portletEntityId){
 return null;
 }
-var _47=null;
-if(_46){
-_47=jetspeed.portleturl.JETSPEED_DO_NOTHING_ACTION;
+var _51=null;
+if(_50){
+_51=jetspeed.portleturl.JETSPEED_DO_NOTHING_ACTION;
 }else{
-_47="javascript:";
-var _48=false;
-if(_45.operation==jetspeed.portleturl.PORTLET_REQUEST_ACTION){
-_47+="doAction(\"";
+_51="javascript:";
+var _52=false;
+if(_4f.operation==jetspeed.portleturl.PORTLET_REQUEST_ACTION){
+_51+="doAction(\"";
 }else{
-if(_45.operation==jetspeed.portleturl.PORTLET_REQUEST_RENDER){
-_47+="doRender(\"";
+if(_4f.operation==jetspeed.portleturl.PORTLET_REQUEST_RENDER){
+_51+="doRender(\"";
 }else{
-_48=true;
+_52=true;
 }
 }
-if(_48){
+if(_52){
 return null;
 }
-_47+=_45.url+"\",\""+_45.portletEntityId+"\"";
-_47+=")";
+_51+=_4f.url+"\",\""+_4f.portletEntityId+"\"";
+_51+=")";
 }
-return _47;
+return _51;
 }};
 jetspeed.doNothingNav=function(){
 false;
 };
-jetspeed.loadPortletDecorationStyles=function(_49){
-var _4a=jetspeed.prefs.getPortletDecorationConfig(_49);
-if(_4a!=null&&!_4a._initialized){
-var _4b=jetspeed.prefs.getPortletDecorationBaseUrl(_49);
-_4a._initialized=true;
-_4a.cssPathCommon=new dojo.uri.Uri(_4b+"/css/styles.css");
-_4a.cssPathDesktop=new dojo.uri.Uri(_4b+"/css/desktop.css");
-dojo.html.insertCssFile(_4a.cssPathCommon,null,true);
-dojo.html.insertCssFile(_4a.cssPathDesktop,null,true);
-}
-return _4a;
-};
-jetspeed.loadPortletDecorationConfig=function(_4c){
-var _4d=jetspeed.prefs;
-var _4e={};
-_4d.portletDecorationsConfig[_4c]=_4e;
-_4e.windowActionButtonOrder=_4d.windowActionButtonOrder;
-_4e.windowActionNotPortlet=_4d.windowActionNotPortlet;
-_4e.windowActionButtonMax=_4d.windowActionButtonMax;
-_4e.windowActionButtonHide=_4d.windowActionButtonHide;
-_4e.windowActionButtonTooltip=_4d.windowActionButtonTooltip;
-_4e.windowActionMenuOrder=_4d.windowActionMenuOrder;
-_4e.windowActionNoImage=_4d.windowActionNoImage;
-_4e.windowIconEnabled=_4d.windowIconEnabled;
-_4e.windowIconPath=_4d.windowIconPath;
-var _4f=_4d.getPortletDecorationBaseUrl(_4c)+"/"+_4c+".js";
-dojo.hostenv.loadUri(_4f,function(_50){
-for(var j in _50){
-_4e[j]=_50[j];
-}
-if(_4e.windowActionNoImage!=null){
-var _52={};
-for(var i=0;i<_4e.windowActionNoImage.length;i++){
-_52[_4e.windowActionNoImage[i]]=true;
-}
-_4e.windowActionNoImage=_52;
-}
-if(_4e.windowIconPath!=null){
-_4e.windowIconPath=dojo.string.trim(_4e.windowIconPath);
-if(_4e.windowIconPath==null||_4e.windowIconPath.length==0){
-_4e.windowIconPath=null;
-}else{
-var _54=_4e.windowIconPath;
-var _55=_54.charAt(0);
-if(_55!="/"){
-_54="/"+_54;
-}
-var _56=_54.charAt(_54.length-1);
-if(_56!="/"){
-_54=_54+"/";
+jetspeed.loadPortletDecorationStyles=function(_53){
+var _54=jetspeed.prefs.getPortletDecorationConfig(_53);
+if(_54!=null&&!_54._initialized){
+var _55=jetspeed.prefs.getPortletDecorationBaseUrl(_53);
+_54._initialized=true;
+_54.cssPathCommon=new dojo.uri.Uri(_55+"/css/styles.css");
+_54.cssPathDesktop=new dojo.uri.Uri(_55+"/css/desktop.css");
+dojo.html.insertCssFile(_54.cssPathCommon,null,true);
+dojo.html.insertCssFile(_54.cssPathDesktop,null,true);
+}
+return _54;
+};
+jetspeed.loadPortletDecorationConfig=function(_56){
+var _57=jetspeed.prefs;
+var _58={};
+_57.portletDecorationsConfig[_56]=_58;
+_58.windowActionButtonOrder=_57.windowActionButtonOrder;
+_58.windowActionNotPortlet=_57.windowActionNotPortlet;
+_58.windowActionButtonMax=_57.windowActionButtonMax;
+_58.windowActionButtonHide=_57.windowActionButtonHide;
+_58.windowActionButtonTooltip=_57.windowActionButtonTooltip;
+_58.windowActionMenuOrder=_57.windowActionMenuOrder;
+_58.windowActionNoImage=_57.windowActionNoImage;
+_58.windowIconEnabled=_57.windowIconEnabled;
+_58.windowIconPath=_57.windowIconPath;
+_58.windowTitlebar=_57.windowTitlebar;
+_58.windowResizebar=_57.windowResizebar;
+var _59=_57.getPortletDecorationBaseUrl(_56)+"/"+_56+".js";
+dojo.hostenv.loadUri(_59,function(_5a){
+for(var j in _5a){
+_58[j]=_5a[j];
+}
+if(_58.windowActionNoImage!=null){
+var _5c={};
+for(var i=0;i<_58.windowActionNoImage.length;i++){
+_5c[_58.windowActionNoImage[i]]=true;
+}
+_58.windowActionNoImage=_5c;
+}
+if(_58.windowIconPath!=null){
+_58.windowIconPath=dojo.string.trim(_58.windowIconPath);
+if(_58.windowIconPath==null||_58.windowIconPath.length==0){
+_58.windowIconPath=null;
+}else{
+var _5e=_58.windowIconPath;
+var _5f=_5e.charAt(0);
+if(_5f!="/"){
+_5e="/"+_5e;
+}
+var _60=_5e.charAt(_5e.length-1);
+if(_60!="/"){
+_5e=_5e+"/";
 }
-_4e.windowIconPath=_54;
+_58.windowIconPath=_5e;
 }
 }
 });
 };
 jetspeed.notifyRetrieveAllMenusFinished=function(){
-var _57=jetspeed;
-_57.pageNavigateSuppress=true;
+var _61=jetspeed;
+_61.pageNavigateSuppress=true;
 if(dojo.lang.isFunction(window.doMenuBuildAll)){
 window.doMenuBuildAll();
 }
-var _58=_57.page.getMenuNames();
-for(var i=0;i<_58.length;i++){
-var _5a=_58[i];
-var _5b=dojo.widget.byId(_57.id.MENU_WIDGET_ID_PREFIX+_5a);
-if(_5b){
-_5b.createJetspeedMenu(_57.page.getMenu(_5a));
+var _62=_61.page.getMenuNames();
+for(var i=0;i<_62.length;i++){
+var _64=_62[i];
+var _65=dojo.widget.byId(_61.id.MENU_WIDGET_ID_PREFIX+_64);
+if(_65){
+_65.createJetspeedMenu(_61.page.getMenu(_64));
 }
 }
-_57.url.loadingIndicatorHide();
-_57.pageNavigateSuppress=false;
+_61.url.loadingIndicatorHide();
+_61.pageNavigateSuppress=false;
 };
-jetspeed.notifyRetrieveMenuFinished=function(_5c){
+jetspeed.notifyRetrieveMenuFinished=function(_66){
 if(dojo.lang.isFunction(window.doMenuBuild)){
-window.doMenuBuild(_5c);
+window.doMenuBuild(_66);
 }
 };
-jetspeed.menuNavClickWidget=function(_5d,_5e){
+jetspeed.menuNavClickWidget=function(_67,_68){
 dojo.debug("jetspeed.menuNavClick");
-if(!_5d){
+if(!_67){
 return;
 }
-if(dojo.lang.isString(_5d)){
-var _5f=_5d;
-_5d=dojo.widget.byId(_5f);
-if(!_5d){
-dojo.raise("Tab widget not found: "+_5f);
+if(dojo.lang.isString(_67)){
+var _69=_67;
+_67=dojo.widget.byId(_69);
+if(!_67){
+dojo.raise("Tab widget not found: "+_69);
 }
 }
-if(_5d){
-var _60=_5d.jetspeedmenuname;
-if(!_60&&_5d.extraArgs){
-_60=_5d.extraArgs.jetspeedmenuname;
+if(_67){
+var _6a=_67.jetspeedmenuname;
+if(!_6a&&_67.extraArgs){
+_6a=_67.extraArgs.jetspeedmenuname;
 }
-if(!_60){
-dojo.raise("Tab widget is invalid: "+_5d.widgetId);
+if(!_6a){
+dojo.raise("Tab widget is invalid: "+_67.widgetId);
 }
-var _61=jetspeed.page.getMenu(_60);
-if(!_61){
-dojo.raise("Tab widget "+_5d.widgetId+" no menu: "+_60);
+var _6b=jetspeed.page.getMenu(_6a);
+if(!_6b){
+dojo.raise("Tab widget "+_67.widgetId+" no menu: "+_6a);
 }
-var _62=_61.getOptionByIndex(_5e);
-jetspeed.menuNavClick(_62);
+var _6c=_6b.getOptionByIndex(_68);
+jetspeed.menuNavClick(_6c);
 }
 };
 jetspeed.pageNavigateSuppress=false;
-jetspeed.pageNavigate=function(_63,_64,_65){
-if(!_63||jetspeed.pageNavigateSuppress){
+jetspeed.pageNavigate=function(_6d,_6e,_6f){
+if(!_6d||jetspeed.pageNavigateSuppress){
 return;
 }
-if(typeof _65=="undefined"){
-_65=false;
+if(typeof _6f=="undefined"){
+_6f=false;
 }
-if(!_65&&jetspeed.page&&jetspeed.page.equalsPageUrl(_63)){
+if(!_6f&&jetspeed.page&&jetspeed.page.equalsPageUrl(_6d)){
 return;
 }
-_63=jetspeed.page.makePageUrl(_63);
-if(_64=="top"){
-top.location.href=_63;
+_6d=jetspeed.page.makePageUrl(_6d);
+if(_6e=="top"){
+top.location.href=_6d;
 }else{
-if(_64=="parent"){
-parent.location.href=_63;
+if(_6e=="parent"){
+parent.location.href=_6d;
 }else{
-window.location.href=_63;
+window.location.href=_6d;
 }
 }
 };
-jetspeed.getActionsForPortlet=function(_66){
-if(_66==null){
+jetspeed.getActionsForPortlet=function(_70){
+if(_70==null){
 return;
 }
-jetspeed.getActionsForPortlets([_66]);
+jetspeed.getActionsForPortlets([_70]);
 };
-jetspeed.getActionsForPortlets=function(_67){
-if(_67==null){
-_67=jetspeed.page.getPortletIds();
-}
-var _68=new jetspeed.om.PortletActionsCL(_67);
-var _69="?action=getactions";
-for(var i=0;i<_67.length;i++){
-_69+="&id="+_67[i];
-}
-var _6b=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_69;
-var _6c="text/xml";
-var _6d=new jetspeed.om.Id("getactions",{});
-jetspeed.url.retrieveContent({url:_6b,mimetype:_6c},_68,_6d,jetspeed.debugContentDumpIds);
-};
-jetspeed.changeActionForPortlet=function(_6e,_6f,_70,_71){
-if(_6e==null){
-return;
-}
+jetspeed.getActionsForPortlets=function(_71){
 if(_71==null){
-_71=new jetspeed.om.PortletChangeActionCL(_6e);
+_71=jetspeed.page.getPortletIds();
 }
-var _72="?action=window&id="+(_6e!=null?_6e:"");
-if(_6f!=null){
-_72+="&state="+_6f;
-}
-if(_70!=null){
-_72+="&mode="+_70;
-}
-var _73=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_72;
-var _74="text/xml";
-var _75=new jetspeed.om.Id("changeaction",{});
-jetspeed.url.retrieveContent({url:_73,mimetype:_74},_71,_75,jetspeed.debugContentDumpIds);
-};
-jetspeed.editPageInitiate=function(){
-var _76=jetspeed;
-if(!_76.page.editMode){
-var _77=true;
-var _78=_76.url.getQueryParameter(window.location.href,_76.id.PORTAL_ORIGINATE_PARAMETER);
-if(_78!=null&&_78=="true"){
-_77=false;
-}
-_76.page.editMode=true;
-var _79=dojo.widget.byId(_76.id.PG_ED_WID);
-if(_76.UAie6){
-_76.page.displayAllPWins(true);
+var _72=new jetspeed.om.PortletActionsCL(_71);
+var _73="?action=getactions";
+for(var i=0;i<_71.length;i++){
+_73+="&id="+_71[i];
+}
+var _75=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_73;
+var _76="text/xml";
+var _77=new jetspeed.om.Id("getactions",{});
+jetspeed.url.retrieveContent({url:_75,mimetype:_76},_72,_77,jetspeed.debugContentDumpIds);
+};
+jetspeed.changeActionForPortlet=function(_78,_79,_7a,_7b){
+if(_78==null){
+return;
+}
+if(_7b==null){
+_7b=new jetspeed.om.PortletChangeActionCL(_78);
+}
+var _7c="?action=window&id="+(_78!=null?_78:"");
+if(_79!=null){
+_7c+="&state="+_79;
+}
+if(_7a!=null){
+_7c+="&mode="+_7a;
+}
+var _7d=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_7c;
+var _7e="text/xml";
+var _7f=new jetspeed.om.Id("changeaction",{});
+jetspeed.url.retrieveContent({url:_7d,mimetype:_7e},_7b,_7f,jetspeed.debugContentDumpIds);
+};
+jetspeed.editPageInitiate=function(_80){
+if(!_80.page.editMode){
+var _81=true;
+var _82=_80.url.getQueryParameter(window.location.href,_80.id.PORTAL_ORIGINATE_PARAMETER);
+if(_82!=null&&_82=="true"){
+_81=false;
+}
+_80.page.editMode=true;
+var _83=dojo.widget.byId(_80.id.PG_ED_WID);
+if(_80.UAie6){
+_80.page.displayAllPWins(true);
 }
-if(_79==null){
+if(_83==null){
 try{
-_76.url.loadingIndicatorShow("loadpageeditor");
-_79=dojo.widget.createWidget("jetspeed:PageEditor",{widgetId:_76.id.PG_ED_WID,editorInitiatedFromDesktop:_77});
-var _7a=document.getElementById(_76.id.COLUMNS);
-_7a.insertBefore(_79.domNode,_7a.firstChild);
+_80.url.loadingIndicatorShow("loadpageeditor");
+_83=dojo.widget.createWidget("jetspeed:PageEditor",{widgetId:_80.id.PG_ED_WID,editorInitiatedFromDesktop:_81});
+var _84=document.getElementById(_80.id.COLUMNS);
+_84.insertBefore(_83.domNode,_84.firstChild);
 }
 catch(e){
-_76.url.loadingIndicatorHide();
-if(_76.UAie6){
-_76.page.displayAllPWins();
+_80.url.loadingIndicatorHide();
+if(_80.UAie6){
+_80.page.displayAllPWins();
 }
 }
 }else{
-_79.editPageShow();
+_83.editPageShow();
 }
-_76.page.syncPageControls();
+_80.page.syncPageControls(_80);
 }
 };
-jetspeed.editPageTerminate=function(){
-if(jetspeed.page.editMode){
-var _7b=dojo.widget.byId(jetspeed.id.PG_ED_WID);
-_7b.editModeNormal();
-jetspeed.page.editMode=false;
-if(!_7b.editorInitiatedFromDesktop){
-var _7c=jetspeed.page.getPageUrl(true);
-_7c=jetspeed.url.removeQueryParameter(_7c,jetspeed.id.PG_ED_PARAM);
-_7c=jetspeed.url.removeQueryParameter(_7c,jetspeed.id.PORTAL_ORIGINATE_PARAMETER);
-window.location.href=_7c;
+jetspeed.editPageTerminate=function(_85){
+if(_85.page.editMode){
+var _86=dojo.widget.byId(_85.id.PG_ED_WID);
+_86.editMoveModeExit();
+_85.page.editMode=false;
+if(!_86.editorInitiatedFromDesktop){
+var _87=_85.page.getPageUrl(true);
+_87=_85.url.removeQueryParameter(_87,_85.id.PG_ED_PARAM);
+_87=_85.url.removeQueryParameter(_87,_85.id.PORTAL_ORIGINATE_PARAMETER);
+window.location.href=_87;
 }else{
-var _7d=jetspeed.url.getQueryParameter(window.location.href,jetspeed.id.PG_ED_PARAM);
-if(_7d!=null&&_7d=="true"){
-var _7e=window.location.href;
-_7e=jetspeed.url.removeQueryParameter(_7e,jetspeed.id.PG_ED_PARAM);
-window.location.href=_7e;
+var _88=_85.url.getQueryParameter(window.location.href,_85.id.PG_ED_PARAM);
+if(_88!=null&&_88=="true"){
+var _89=window.location.href;
+_89=_85.url.removeQueryParameter(_89,_85.id.PG_ED_PARAM);
+window.location.href=_89;
 }else{
-if(_7b!=null){
-_7b.editPageHide();
+if(_86!=null){
+_86.editPageHide();
 }
-jetspeed.page.syncPageControls();
+_85.page.syncPageControls(_85);
 }
 }
 }
 };
 jetspeed.om.PortletContentRetriever=function(){
 };
-jetspeed.om.PortletContentRetriever.prototype={getContent:function(_7f,_80,_81,_82){
-if(!_7f){
-_7f={};
+jetspeed.om.PortletContentRetriever.prototype={getContent:function(_8a,_8b,_8c,_8d){
+if(!_8a){
+_8a={};
 }
-jetspeed.url.retrieveContent(_7f,_80,_81,_82);
+jetspeed.url.retrieveContent(_8a,_8b,_8c,_8d);
 }};
-jetspeed.om.PageCLCreateWidget=function(_83){
-if(typeof _83=="undefined"){
-_83=false;
-}
-this.isPageUpdate=_83;
-};
-jetspeed.om.PageCLCreateWidget.prototype={notifySuccess:function(_84,_85,_86){
-_86.loadFromPSML(_84,this.isPageUpdate);
-},notifyFailure:function(_87,_88,_89,_8a){
-dojo.raise("PageCLCreateWidget error url: "+_89+" type: "+_87+jetspeed.url.formatBindError(_88));
+jetspeed.om.PageCLCreateWidget=function(_8e){
+if(typeof _8e=="undefined"){
+_8e=false;
+}
+this.isPageUpdate=_8e;
+};
+jetspeed.om.PageCLCreateWidget.prototype={notifySuccess:function(_8f,_90,_91){
+_91.loadFromPSML(_8f,this.isPageUpdate);
+},notifyFailure:function(_92,_93,_94,_95){
+dojo.raise("PageCLCreateWidget error url: "+_94+" type: "+_92+jetspeed.formatError(_93));
 }};
-jetspeed.om.Page=function(_8b,_8c,_8d,_8e,_8f,_90){
-if(_8b!=null&&_8c!=null){
-this.requiredLayoutDecorator=_8b;
-this.setPsmlPathFromDocumentUrl(_8c);
-this.pageUrlFallback=_8c;
+jetspeed.om.Page=function(_96,_97,_98,_99,_9a,_9b){
+if(_96!=null&&_97!=null){
+this.requiredLayoutDecorator=_96;
+this.setPsmlPathFromDocumentUrl(_97);
+this.pageUrlFallback=_97;
 }else{
 this.setPsmlPathFromDocumentUrl();
 }
-if(typeof _8d!="undefined"){
-this.addToHistory=_8d;
+if(typeof _98!="undefined"){
+this.addToHistory=_98;
 }
-if(typeof _8e!="undefined"){
-this.editMode=_8e;
+if(typeof _99!="undefined"){
+this.editMode=_99;
 }
 this.layouts={};
 this.columns=[];
+this.colFirstNormI=-1;
 this.portlets=[];
 this.portlet_count=0;
 this.portlet_windows={};
 this.portlet_window_count=0;
-if(_90!=null){
-this.iframeCoverByWinId=_90;
+if(_9b!=null){
+this.iframeCoverByWinId=_9b;
 }else{
 this.iframeCoverByWinId={};
 }
 this.portlet_tiled_high_z=10;
 this.portlet_untiled_high_z=-1;
 this.menus=[];
-if(_8f!=null){
-this.tooltipMgr=_8f;
+if(_9a!=null){
+this.tooltipMgr=_9a;
 }else{
 this.tooltipMgr=dojo.widget.createWidget("jetspeed:PortalTooltipManager",{isContainer:false,fastMixIn:true});
 jetspeed.docBody.appendChild(this.tooltipMgr.domNode);
 }
 };
 dojo.lang.extend(jetspeed.om.Page,{psmlPath:null,name:null,path:null,pageUrl:null,pagePathAndQuery:null,title:null,shortTitle:null,layoutDecorator:null,portletDecorator:null,requiredLayoutDecorator:null,pageUrlFallback:null,addToHistory:false,layouts:null,columns:null,portlets:null,portletsByPageColumn:null,editMode:false,themeDefinitions:null,menus:null,getId:function(){
-var _91=(this.name!=null&&this.name.length>0?this.name:null);
-if(!_91){
+var _9c=(this.name!=null&&this.name.length>0?this.name:null);
+if(!_9c){
 this.getPsmlUrl();
-_91=this.psmlPath;
+_9c=this.psmlPath;
 }
-return "page-"+_91;
-},setPsmlPathFromDocumentUrl:function(_92){
-var _93=jetspeed.url.path.AJAX_API;
-var _94=null;
-if(_92==null){
-_94=window.location.pathname;
-if(!djConfig.preventBackButtonFix&&jetspeed.prefs.ajaxPageNavigation){
-var _95=window.location.hash;
-if(_95!=null&&_95.length>0){
-if(_95.indexOf("#")==0){
-_95=(_95.length>1?_95.substring(1):"");
+return "page-"+_9c;
+},setPsmlPathFromDocumentUrl:function(_9d){
+var _9e=jetspeed;
+var _9f=_9e.url.path.AJAX_API;
+var _a0=null;
+if(_9d==null){
+_a0=window.location.pathname;
+if(!djConfig.preventBackButtonFix&&_9e.prefs.ajaxPageNavigation){
+var _a1=window.location.hash;
+if(_a1!=null&&_a1.length>0){
+if(_a1.indexOf("#")==0){
+_a1=(_a1.length>1?_a1.substring(1):"");
 }
-if(_95!=null&&_95.length>1&&_95.indexOf("/")==0){
-this.psmlPath=jetspeed.url.path.AJAX_API+_95;
+if(_a1!=null&&_a1.length>1&&_a1.indexOf("/")==0){
+this.psmlPath=_9e.url.path.AJAX_API+_a1;
 return;
 }
 }
 }
 }else{
-var _96=jetspeed.url.parse(_92);
-_94=_96.path;
+var _a2=_9e.url.parse(_9d);
+_a0=_a2.path;
 }
-var _97=jetspeed.url.path.DESKTOP;
-var _98=_94.indexOf(_97);
-if(_98!=-1&&_94.length>(_98+_97.length)){
-_93=_93+_94.substring(_98+_97.length);
+var _a3=_9e.url.path.DESKTOP;
+var _a4=_a0.indexOf(_a3);
+if(_a4!=-1&&_a0.length>(_a4+_a3.length)){
+_9f=_9f+_a0.substring(_a4+_a3.length);
 }
-this.psmlPath=_93;
+this.psmlPath=_9f;
 },getPsmlUrl:function(){
+var _a5=jetspeed;
 if(this.psmlPath==null){
 this.setPsmlPathFromDocumentUrl();
 }
-var _99=jetspeed.url.basePortalUrl()+this.psmlPath;
-if(jetspeed.prefs.printModeOnly!=null){
-_99=jetspeed.url.addQueryParameter(_99,"layoutid",jetspeed.prefs.printModeOnly.layout);
-_99=jetspeed.url.addQueryParameter(_99,"entity",jetspeed.prefs.printModeOnly.entity).toString();
-}
-return _99;
-},retrievePsml:function(_9a){
-if(_9a==null){
-_9a=new jetspeed.om.PageCLCreateWidget();
-}
-var _9b=this.getPsmlUrl();
-var _9c="text/xml";
-if(jetspeed.debug.retrievePsml){
-dojo.debug("retrievePsml url: "+_9b);
-}
-jetspeed.url.retrieveContent({url:_9b,mimetype:_9c},_9a,this,jetspeed.debugContentDumpIds);
-},loadFromPSML:function(_9d,_9e){
-var _9f=jetspeed;
-var _a0=_9f.prefs.printModeOnly;
-if(djConfig.isDebug&&_9f.debug.profile&&_a0==null){
-dojo.profile.start("loadFromPSML");
+var _a6=_a5.url.basePortalUrl()+this.psmlPath;
+if(_a5.prefs.printModeOnly!=null){
+_a6=_a5.url.addQueryParameter(_a6,"layoutid",_a5.prefs.printModeOnly.layout);
+_a6=_a5.url.addQueryParameter(_a6,"entity",_a5.prefs.printModeOnly.entity).toString();
+}
+return _a6;
+},retrievePsml:function(_a7){
+var _a8=jetspeed;
+if(_a7==null){
+_a7=new _a8.om.PageCLCreateWidget();
+}
+var _a9=this.getPsmlUrl();
+var _aa="text/xml";
+if(_a8.debug.retrievePsml){
+dojo.debug("retrievePsml url: "+_a9);
 }
-var _a1=this._parsePSML(_9d);
-if(_a1==null){
+_a8.url.retrieveContent({url:_a9,mimetype:_aa},_a7,this,_a8.debugContentDumpIds);
+},loadFromPSML:function(_ab,_ac){
+var _ad=jetspeed;
+var _ae=dojo;
+var _af=_ad.prefs.printModeOnly;
+if(djConfig.isDebug&&_ad.debug.profile&&_af==null){
+_ae.profile.start("loadFromPSML");
+}
+var _b0=this._parsePSML(_ab);
+if(_b0==null){
 return;
 }
 this.portletsByPageColumn={};
-this.columnsStructure=this._layoutCreateModel(_a1,null,this.portletsByPageColumn,true);
-this.rootFragmentId=_a1.id;
-var _a2=false;
+this.columnsStructure=this._layoutCreateModel(_b0,null,this.portletsByPageColumn,true,_ae,_ad);
+this.rootFragmentId=_b0.id;
+var _b1=false;
 if(this.editMode){
 this.editMode=false;
-if(_a0==null){
-_a2=true;
+if(_af==null){
+_b1=true;
 }
 }
-if(_9f.prefs.windowTiling){
-this._createColsStart(document.getElementById(_9f.id.DESKTOP));
+if(_ad.prefs.windowTiling){
+this._createColsStart(document.getElementById(_ad.id.DESKTOP),_ad.id.COLUMNS);
 }
-var _a3=this.portletsByPageColumn["z"];
-if(_a3){
-_a3.sort(this._loadPortletZIndexCompare);
-}
-var _a4=new jetspeed.PortletRenderer(true,true,_9e,null,true);
-_a4.renderAllTimeDistribute();
-},loadPostRender:function(_a5){
-var _a6=jetspeed;
-var _a7=_a6.prefs.printModeOnly;
-if(_a7==null){
+this.createLayoutInfo(_ad);
+var _b2=this.portletsByPageColumn["z"];
+if(_b2){
+_b2.sort(this._loadPortletZIndexCompare);
+}
+var _b3=new _ad.PortletRenderer(true,true,_ac,null,true);
+_b3.renderAllTimeDistribute();
+},loadPostRender:function(_b4){
+var _b5=jetspeed;
+var _b6=_b5.prefs.printModeOnly;
+if(_b6==null){
 this._portletsInitWinState(this.portletsByPageColumn["z"]);
-var _a8=false;
+var _b7=false;
 if(this.editMode){
-_a8=true;
+_b7=true;
 }
-var _a9=_a6.url.getQueryParameter(window.location.href,_a6.id.PG_ED_PARAM);
-if(_a8||(_a9!=null&&_a9=="true")||this.actions[_a6.id.ACT_VIEW]!=null){
-_a8=false;
-if(this.actions!=null&&(this.actions[_a6.id.ACT_EDIT]!=null||this.actions[_a6.id.ACT_VIEW]!=null)){
-_a8=true;
-}
-}
-this.retrieveMenuDeclarations(true,_a8,_a5);
-this.renderPageControls();
-this.syncPageControls();
-}else{
-for(var _aa in this.portlets){
-var _ab=this.portlets[_aa];
-if(_ab!=null){
-_ab.renderAction(null,_a7.action);
+var _b8=_b5.url.getQueryParameter(window.location.href,_b5.id.PG_ED_PARAM);
+if(_b7||(_b8!=null&&_b8=="true")||this.actions[_b5.id.ACT_VIEW]!=null){
+_b7=false;
+if(this.actions!=null&&(this.actions[_b5.id.ACT_EDIT]!=null||this.actions[_b5.id.ACT_VIEW]!=null)){
+_b7=true;
+}
+}
+this.retrieveMenuDeclarations(true,_b7,_b4);
+this.renderPageControls(_b5);
+this.syncPageControls(_b5);
+}else{
+for(var _b9 in this.portlets){
+var _ba=this.portlets[_b9];
+if(_ba!=null){
+_ba.renderAction(null,_b6.action);
 }
 break;
 }
-if(_a5){
-_a6.updatePageEnd();
+if(_b4){
+_b5.updatePageEnd();
 }
 }
-},_parsePSML:function(_ac){
-var _ad=jetspeed;
-var _ae=_ac.getElementsByTagName("page");
-if(!_ae||_ae.length>1||_ae[0]==null){
+if(_b5.UAie6){
+_b5.ui.evtConnect("after",window,"onresize",_b5.ui.windowResizeMgr,"onResize",dojo.event);
+_b5.ui.windowResizeMgr.onResizeDelayedCompare();
+}
+var _bb,_bc=this.columns;
+if(_bc){
+for(var i=0;i<_bc.length;i++){
+_bb=_bc[i].domNode;
+if(!_bb.childNodes||_bb.childNodes.length==0){
+_bb.style.height="1px";
+}
+}
+}
+var _be=this.maximizedOnInit;
+if(_be!=null){
+var _bf=this.getPWin(_be);
+if(_bf==null){
+dojo.raise("Cannot identify window to maximize");
+}else{
+dojo.lang.setTimeout(_bf,_bf._postCreateMaximizeWindow,500);
+}
+this.maximizedOnInit=null;
+}
+},_parsePSML:function(_c0){
+var _c1=jetspeed;
+var _c2=_c0.getElementsByTagName("page");
+if(!_c2||_c2.length>1||_c2[0]==null){
 dojo.raise("Expected one <page> in PSML");
 }
-var _af=_ae[0];
-var _b0=_af.childNodes;
-var _b1=new RegExp("(name|path|profiledPath|title|short-title)");
-var _b2=null;
-var _b3={};
-for(var i=0;i<_b0.length;i++){
-var _b5=_b0[i];
-if(_b5.nodeType!=dojo.dom.ELEMENT_NODE){
+var _c3=_c2[0];
+var _c4=_c3.childNodes;
+var _c5=new RegExp("(name|path|profiledPath|title|short-title)");
+var _c6=null;
+var _c7={};
+for(var i=0;i<_c4.length;i++){
+var _c9=_c4[i];
+if(_c9.nodeType!=1){
 continue;
 }
-var _b6=_b5.nodeName;
-if(_b6=="fragment"){
-_b2=_b5;
+var _ca=_c9.nodeName;
+if(_ca=="fragment"){
+_c6=_c9;
 }else{
-if(_b6=="defaults"){
-this.layoutDecorator=_b5.getAttribute("layout-decorator");
-this.portletDecorator=_b5.getAttribute("portlet-decorator");
+if(_ca=="defaults"){
+this.layoutDecorator=_c9.getAttribute("layout-decorator");
+this.portletDecorator=_c9.getAttribute("portlet-decorator");
 }else{
-if(_b6&&_b6.match(_b1)){
-if(_b6=="short-title"){
-_b6="shortTitle";
+if(_ca&&_ca.match(_c5)){
+if(_ca=="short-title"){
+_ca="shortTitle";
 }
-this[_b6]=((_b5&&_b5.firstChild)?_b5.firstChild.nodeValue:null);
+this[_ca]=((_c9&&_c9.firstChild)?_c9.firstChild.nodeValue:null);
 }else{
-if(_b6=="action"){
-this._parsePSMLAction(_b5,_b3);
+if(_ca=="action"){
+this._parsePSMLAction(_c9,_c7);
 }
 }
 }
 }
 }
-this.actions=_b3;
-if(_b2==null){
+this.actions=_c7;
+if(_c6==null){
 dojo.raise("No root fragment in PSML");
 return null;
 }
 if(this.requiredLayoutDecorator!=null&&this.pageUrlFallback!=null){
 if(this.layoutDecorator!=this.requiredLayoutDecorator){
-if(_ad.debug.ajaxPageNav){
+if(_c1.debug.ajaxPageNav){
 dojo.debug("ajaxPageNavigation _parsePSML different layout decorator ("+this.requiredLayoutDecorator+" != "+this.layoutDecorator+") - fallback to normal page navigation - "+this.pageUrlFallback);
 }
-_ad.pageNavigate(this.pageUrlFallback,null,true);
+_c1.pageNavigate(this.pageUrlFallback,null,true);
 return null;
 }else{
 if(this.addToHistory){
-var _b7=this.getPageUrl();
+var _cb=this.getPageUrl();
 dojo.undo.browser.addToHistory({back:function(){
-if(_ad.debug.ajaxPageNav){
-dojo.debug("back-nav-button: "+_b7);
+if(_c1.debug.ajaxPageNav){
+dojo.debug("back-nav-button: "+_cb);
 }
-_ad.updatePage(_b7,true);
+_c1.updatePage(_cb,true);
 },forward:function(){
-if(_ad.debug.ajaxPageNav){
-dojo.debug("forward-nav-button: "+_b7);
+if(_c1.debug.ajaxPageNav){
+dojo.debug("forward-nav-button: "+_cb);
 }
-_ad.updatePage(_b7,true);
+_c1.updatePage(_cb,true);
 },changeUrl:escape(this.getPath())});
 }
 }
 }else{
-if(!djConfig.preventBackButtonFix&&_ad.prefs.ajaxPageNavigation){
-var _b7=this.getPageUrl();
+if(!djConfig.preventBackButtonFix&&_c1.prefs.ajaxPageNavigation){
+var _cb=this.getPageUrl();
 dojo.undo.browser.setInitialState({back:function(){
-if(_ad.debug.ajaxPageNav){
-dojo.debug("back-nav-button initial: "+_b7);
+if(_c1.debug.ajaxPageNav){
+dojo.debug("back-nav-button initial: "+_cb);
 }
-_ad.updatePage(_b7,true);
+_c1.updatePage(_cb,true);
 },forward:function(){
-if(_ad.debug.ajaxPageNav){
-dojo.debug("forward-nav-button initial: "+_b7);
+if(_c1.debug.ajaxPageNav){
+dojo.debug("forward-nav-button initial: "+_cb);
 }
-_ad.updatePage(_b7,true);
+_c1.updatePage(_cb,true);
 },changeUrl:escape(this.getPath())});
 }
 }
-var _b8=this._parsePSMLFrag(_b2,0);
-return _b8;
-},_parsePSMLFrag:function(_b9,_ba){
-var _bb=jetspeed;
-var _bc=new Array();
-var _bd=((_b9!=null)?_b9.getAttribute("type"):null);
-if(_bd!="layout"){
-dojo.raise("Expected layout fragment: "+_b9);
-return null;
-}
-var _be=false;
-var _bf=_b9.getAttribute("name");
-if(_bf!=null){
-_bf=_bf.toLowerCase();
-if(_bf.indexOf("noactions")!=-1){
-_be=true;
-}
-}
-var _c0=null,_c1=0;
-var _c2={};
-var _c3=_b9.childNodes;
-var _c4,_c5,_c6,_c7,_c8;
-for(var i=0;i<_c3.length;i++){
-_c4=_c3[i];
-if(_c4.nodeType!=dojo.dom.ELEMENT_NODE){
+var _cc=this._parsePSMLFrag(_c6,0);
+return _cc;
+},_parsePSMLFrag:function(_cd,_ce){
+var _cf=jetspeed;
+var _d0=new Array();
+var _d1=((_cd!=null)?_cd.getAttribute("type"):null);
+if(_d1!="layout"){
+dojo.raise("Expected layout fragment: "+_cd);
+return null;
+}
+var _d2=false;
+var _d3=_cd.getAttribute("name");
+if(_d3!=null){
+_d3=_d3.toLowerCase();
+if(_d3.indexOf("noactions")!=-1){
+_d2=true;
+}
+}
+var _d4=null,_d5=0;
+var _d6={};
+var _d7=_cd.childNodes;
+var _d8,_d9,_da,_db,_dc;
+for(var i=0;i<_d7.length;i++){
+_d8=_d7[i];
+if(_d8.nodeType!=1){
 continue;
 }
-_c5=_c4.nodeName;
-if(_c5=="fragment"){
-_c8=_c4.getAttribute("type");
-if(_c8=="layout"){
-var _ca=this._parsePSMLFrag(_c4,i);
-if(_ca!=null){
-_bc.push(_ca);
+_d9=_d8.nodeName;
+if(_d9=="fragment"){
+_dc=_d8.getAttribute("type");
+if(_dc=="layout"){
+var _de=this._parsePSMLFrag(_d8,i);
+if(_de!=null){
+_d0.push(_de);
 }
 }else{
-var _cb=this._parsePSMLProps(_c4,null);
-var _cc=_cb[_bb.id.PP_WINDOW_ICON];
-if(_cc==null||_cc.length==0){
-_cc=this._parsePSMLIcon(_c4);
-if(_cc!=null&&_cc.length>0){
-_cb[_bb.id.PP_WINDOW_ICON]=_cc;
+var _df=this._parsePSMLProps(_d8,null);
+var _e0=_df[_cf.id.PP_WINDOW_ICON];
+if(_e0==null||_e0.length==0){
+_e0=this._parsePSMLChildOrAttr(_d8,"icon");
+if(_e0!=null&&_e0.length>0){
+_df[_cf.id.PP_WINDOW_ICON]=_e0;
 }
 }
-_bc.push({id:_c4.getAttribute("id"),type:_c8,name:_c4.getAttribute("name"),properties:_cb,actions:this._parsePSMLActions(_c4,null),currentActionState:this._parsePSMLActionState(_c4),currentActionMode:this._parsePSMLActionMode(_c4),decorator:_c4.getAttribute("decorator"),layoutActionsDisabled:_be,documentOrderIndex:i});
+_d0.push({id:_d8.getAttribute("id"),type:_dc,name:_d8.getAttribute("name"),properties:_df,actions:this._parsePSMLActions(_d8,null),currentActionState:this._parsePSMLChildOrAttr(_d8,"state"),currentActionMode:this._parsePSMLChildOrAttr(_d8,"mode"),decorator:_d8.getAttribute("decorator"),layoutActionsDisabled:_d2,documentOrderIndex:i});
 }
 }else{
-if(_c5=="property"){
-if(this._parsePSMLProp(_c4,_c2)=="sizes"){
-if(_c0!=null){
-dojo.raise("Layout fragment has multiple sizes definitions: "+_b9);
+if(_d9=="property"){
+if(this._parsePSMLProp(_d8,_d6)=="sizes"){
+if(_d4!=null){
+dojo.raise("Layout fragment has multiple sizes definitions: "+_cd);
 return null;
 }
-if(_bb.prefs.printModeOnly!=null){
-_c0=["100"];
-_c1=100;
+if(_cf.prefs.printModeOnly!=null){
+_d4=["100"];
+_d5=100;
 }else{
-_c7=_c4.getAttribute("value");
-if(_c7!=null&&_c7.length>0){
-_c0=_c7.split(",");
-for(var j=0;j<_c0.length;j++){
+_db=_d8.getAttribute("value");
+if(_db!=null&&_db.length>0){
+_d4=_db.split(",");
+for(var j=0;j<_d4.length;j++){
 var re=/^[^0-9]*([0-9]+)[^0-9]*$/;
-_c0[j]=_c0[j].replace(re,"$1");
-_c1+=new Number(_c0[j]);
-}
-}
-}
+_d4[j]=_d4[j].replace(re,"$1");
+_d5+=new Number(_d4[j]);
 }
 }
 }
 }
-_bc.sort(this._fragmentRowCompare);
-var _cf=new Array();
-var _d0=new Array();
-for(var i=0;i<_bc.length;i++){
-if(_bc[i].type=="layout"){
-_cf.push(i);
-}else{
-_d0.push(i);
-}
-}
-if(_c0==null){
-_c0=new Array();
-_c0.push("100");
-_c1=100;
 }
-return {id:_b9.getAttribute("id"),type:_bd,name:_b9.getAttribute("name"),decorator:_b9.getAttribute("decorator"),columnSizes:_c0,columnSizesSum:_c1,properties:_c2,fragments:_bc,layoutFragmentIndexes:_cf,otherFragmentIndexes:_d0,layoutActionsDisabled:_be,documentOrderIndex:_ba};
-},_parsePSMLActions:function(_d1,_d2){
-if(_d2==null){
-_d2={};
 }
-var _d3=_d1.getElementsByTagName("action");
-for(var _d4=0;_d4<_d3.length;_d4++){
-var _d5=_d3[_d4];
-this._parsePSMLAction(_d5,_d2);
 }
-return _d2;
-},_parsePSMLAction:function(_d6,_d7){
-var _d8=_d6.getAttribute("id");
-if(_d8!=null){
-var _d9=_d6.getAttribute("type");
-var _da=_d6.getAttribute("name");
-var _db=_d6.getAttribute("url");
-var _dc=_d6.getAttribute("alt");
-_d7[_d8.toLowerCase()]={id:_d8,type:_d9,label:_da,url:_db,alt:_dc};
+_d0.sort(this._fragmentRowCompare);
+if(_d4==null){
+_d4=new Array();
+_d4.push("100");
+_d5=100;
 }
-},_parsePSMLActionState:function(_dd){
-var _de=_dd.getElementsByTagName("state");
-if(_de!=null&&_de.length==1&&_de[0].firstChild!=null){
-return _de[0].firstChild.nodeValue;
-}
-return null;
-},_parsePSMLActionMode:function(_df){
-var _e0=_df.getElementsByTagName("mode");
-if(_e0!=null&&_e0.length==1&&_e0[0].firstChild!=null){
-return _e0[0].firstChild.nodeValue;
-}
-return null;
-},_parsePSMLIcon:function(_e1){
-var _e2=_e1.getElementsByTagName("icon");
-if(_e2!=null&&_e2.length==1&&_e2[0].firstChild!=null){
-return _e2[0].firstChild.nodeValue;
-}
-return null;
-},_parsePSMLProps:function(_e3,_e4){
+return {id:_cd.getAttribute("id"),type:_d1,name:_cd.getAttribute("name"),decorator:_cd.getAttribute("decorator"),columnSizes:_d4,columnSizesSum:_d5,properties:_d6,fragments:_d0,layoutActionsDisabled:_d2,documentOrderIndex:_ce};
+},_parsePSMLActions:function(_e3,_e4){
 if(_e4==null){
 _e4={};
 }
-var _e5=_e3.getElementsByTagName("property");
+var _e5=_e3.getElementsByTagName("action");
 for(var _e6=0;_e6<_e5.length;_e6++){
-this._parsePSMLProp(_e5[_e6],_e4);
+var _e7=_e5[_e6];
+this._parsePSMLAction(_e7,_e4);
 }
 return _e4;
-},_parsePSMLProp:function(_e7,_e8){
-var _e9=_e7.getAttribute("name");
-var _ea=_e7.getAttribute("value");
-_e8[_e9]=_ea;
-return _e9;
-},_fragmentRowCompare:function(_eb,_ec){
-var _ed=_eb.documentOrderIndex*1000;
-var _ee=_ec.documentOrderIndex*1000;
-var _ef=_eb.properties["row"];
-if(_ef!=null){
-_ed=_ef;
-}
-var _f0=_ec.properties["row"];
-if(_f0!=null){
-_ee=_f0;
-}
-return (_ed-_ee);
-},_layoutCreateModel:function(_f1,_f2,_f3,_f4){
-var _f5=jetspeed;
-var _f6=dojo;
-var _f7=this.columns.length;
-var _f8=this._layoutCreateColsModel(_f1,_f2,_f4);
-var _f9=_f8.columnsInLayout;
-if(_f8.addedLayoutHeaderColumn){
-_f7++;
-}
-var _fa=(_f9==null?0:_f9.length);
-if(_f1.layoutFragmentIndexes!=null&&_f1.layoutFragmentIndexes.length>0){
-var _fb=null;
-var _fc=0;
-if(_f1.otherFragmentIndexes!=null&&_f1.otherFragmentIndexes.length>0){
-_fb=new Array();
-}
-for(var i=0;i<_f1.fragments.length;i++){
-var _fe=_f1.fragments[i];
-}
-var _ff=new Array();
-for(var i=0;i<_fa;i++){
-if(_fb!=null){
-_fb.push(null);
-}
-_ff.push(false);
-}
-for(var i=0;i<_f1.fragments.length;i++){
-var _fe=_f1.fragments[i];
-var _100=i;
-if(_fe.properties&&_fe.properties[_f5.id.PP_COLUMN]>=0){
-if(_fe.properties[_f5.id.PP_COLUMN]!=null&&_fe.properties[_f5.id.PP_COLUMN]>=0){
-_100=_fe.properties[_f5.id.PP_COLUMN];
-}
-}
-if(_100>=_fa){
-_100=(_fa>0?(_fa-1):0);
-}
-var _101=((_fb==null)?null:_fb[_100]);
-if(_fe.type=="layout"){
-_ff[_100]=true;
-if(_101!=null){
-this._layoutCreateModel(_101,_f9[_100],_f3,true);
-_fb[_100]=null;
-}
-this._layoutCreateModel(_fe,_f9[_100],_f3,false);
-}else{
-if(_101==null){
-_fc++;
-var _102={};
-_f6.lang.mixin(_102,_f1);
-_102.fragments=new Array();
-_102.layoutFragmentIndexes=new Array();
-_102.otherFragmentIndexes=new Array();
-_102.documentOrderIndex=_f1.fragments[i].documentOrderIndex;
-_102.clonedFromRootId=_102.id;
-_102.clonedLayoutFragmentIndex=_fc;
-_102.columnSizes=["100"];
-_102.columnSizesSum=[100];
-_102.id=_102.id+"-jsclone_"+_fc;
-_fb[_100]=_102;
-_101=_102;
-}
-_101.fragments.push(_fe);
-_101.otherFragmentIndexes.push(_101.fragments.length-1);
-}
-}
-if(_fb!=null){
-for(var i=0;i<_fa;i++){
-var _101=_fb[i];
-if(_101!=null){
-_ff[i]=true;
-this._layoutCreateModel(_101,_f9[i],_f3,true);
-}
-}
-}
-for(var i=0;i<_fa;i++){
-if(_ff[i]){
-_f9[i].columnContainer=true;
-}
-}
-if(_f1.otherFragmentIndexes!=null&&_f1.otherFragmentIndexes.length>0){
-var _103=new Array();
-for(var i=0;i<_f1.fragments.length;i++){
-var _104=true;
-for(var j=0;j<_f1.otherFragmentIndexes.length;j++){
-if(_f1.otherFragmentIndexes[j]==i){
-_104=false;
-break;
-}
-}
-if(_104){
-_103.push(_f1.fragments[i]);
-}
-}
-_f1.fragments=_103;
-_f1.otherFragmentIndexes=new Array();
-}
-}
-this._layoutCreatePortletsModel(_f1,_f9,_f7,_f3);
+},_parsePSMLAction:function(_e8,_e9){
+var _ea=_e8.getAttribute("id");
+if(_ea!=null){
+var _eb=_e8.getAttribute("type");
+var _ec=_e8.getAttribute("name");
+var _ed=_e8.getAttribute("url");
+var _ee=_e8.getAttribute("alt");
+_e9[_ea.toLowerCase()]={id:_ea,type:_eb,label:_ec,url:_ed,alt:_ee};
+}
+},_parsePSMLChildOrAttr:function(_ef,_f0){
+var _f1=null;
+var _f2=_ef.getElementsByTagName(_f0);
+if(_f2!=null&&_f2.length==1&&_f2[0].firstChild!=null){
+_f1=_f2[0].firstChild.nodeValue;
+}
+if(!_f1){
+_f1=_ef.getAttribute(_f0);
+}
+if(_f1==null||_f1.length==0){
+_f1=null;
+}
+return _f1;
+},_parsePSMLProps:function(_f3,_f4){
+if(_f4==null){
+_f4={};
+}
+var _f5=_f3.getElementsByTagName("property");
+for(var _f6=0;_f6<_f5.length;_f6++){
+this._parsePSMLProp(_f5[_f6],_f4);
+}
+return _f4;
+},_parsePSMLProp:function(_f7,_f8){
+var _f9=_f7.getAttribute("name");
+var _fa=_f7.getAttribute("value");
+_f8[_f9]=_fa;
 return _f9;
-},_layoutFragChildCollapse:function(_106,_107){
-var _108=jetspeed;
-var _109=false;
-if(_107==null){
-_107=_106;
-}
-if(_106.layoutFragmentIndexes!=null&&_106.layoutFragmentIndexes.length>0){
-_109=true;
-for(var i=0;i<_106.layoutFragmentIndexes.length;i++){
-var _10b=_106.fragments[_106.layoutFragmentIndexes[i]];
-if(_10b.otherFragmentIndexes!=null&&_10b.otherFragmentIndexes.length>0){
-for(var i=0;i<_10b.otherFragmentIndexes.length;i++){
-var _10c=_10b.fragments[_10b.otherFragmentIndexes[i]];
-_10c.properties[_108.id.PP_COLUMN]=-1;
-_10c.properties[_108.id.PP_ROW]=-1;
-_10c.documentOrderIndex=_107.fragments.length;
-_107.fragments.push(_10c);
-_107.otherFragIndexes.push(_107.fragments.length);
-}
-}
-this._layoutFragChildCollapse(_10b,_107);
-}
-}
-return _109;
-},_layoutCreateColsModel:function(_10d,_10e,_10f){
-var _110=jetspeed;
-this.layouts[_10d.id]=_10d;
-var _111=false;
-var _112=new Array();
-if(_110.prefs.windowTiling&&_10d.columnSizes.length>0){
-var _113=false;
-if(_110.UAie){
-_113=true;
-}
-if(_10e!=null&&!_10f){
-var _114=new _110.om.Column(0,_10d.id,(_113?_10d.columnSizesSum-0.1:_10d.columnSizesSum),this.columns.length,_10d.layoutActionsDisabled);
-_114.layoutHeader=true;
-this.columns.push(_114);
-if(_10e.columnChildren==null){
-_10e.columnChildren=new Array();
-}
-_10e.columnChildren.push(_114);
-_10e=_114;
-_111=true;
-}
-for(var i=0;i<_10d.columnSizes.length;i++){
-var size=_10d.columnSizes[i];
-if(_113&&i==(_10d.columnSizes.length-1)){
-size=size-0.1;
-}
-var _117=new _110.om.Column(i,_10d.id,size,this.columns.length,_10d.layoutActionsDisabled);
-this.columns.push(_117);
-if(_10e!=null){
-if(_10e.columnChildren==null){
-_10e.columnChildren=new Array();
-}
-_10e.columnChildren.push(_117);
+},_fragmentRowCompare:function(_fb,_fc){
+var _fd=_fb.documentOrderIndex*1000;
+var _fe=_fc.documentOrderIndex*1000;
+var _ff=_fb.properties["row"];
+if(_ff!=null){
+_fd=_ff;
+}
+var _100=_fc.properties["row"];
+if(_100!=null){
+_fe=_100;
+}
+return (_fd-_fe);
+},_layoutCreateModel:function(_101,_102,_103,_104,_105,_106){
+var _107=this.columns.length;
+var _108=this._layoutCreateColsModel(_101,_102,_104);
+var _109=_108.columnsInLayout;
+if(_108.addedLayoutHeaderColumn){
+_107++;
+}
+var _10a=(_109==null?0:_109.length);
+var _10b=new Array(_10a);
+var _10c=new Array(_10a);
+for(var i=0;i<_101.fragments.length;i++){
+var _10e=_101.fragments[i];
+if(_10e.type=="layout"){
+var _10f=i;
+var _10f=(_10e.properties?_10e.properties[_106.id.PP_COLUMN]:i);
+if(_10f==null||_10f<0||_10f>=_10a){
+_10f=(_10a>0?(_10a-1):0);
 }
-_112.push(_117);
-}
-}
-return {columnsInLayout:_112,addedLayoutHeaderColumn:_111};
-},_layoutCreatePortletsModel:function(_118,_119,_11a,_11b){
-var _11c=jetspeed;
-if(_118.otherFragmentIndexes!=null&&_118.otherFragmentIndexes.length>0){
-var _11d=new Array();
-for(var i=0;i<_119.length;i++){
-_11d.push(new Array());
-}
-for(var i=0;i<_118.otherFragmentIndexes.length;i++){
-var _11f=_118.fragments[_118.otherFragmentIndexes[i]];
-if(_11c.debugPortletEntityIdFilter){
-if(!dojo.lang.inArray(_11c.debugPortletEntityIdFilter,_11f.id)){
-_11f=null;
-}
-}
-if(_11f!=null){
-var _120="z";
-var _121=_11f.properties[_11c.id.PP_DESKTOP_EXTENDED];
-var _122=_11c.prefs.windowTiling;
-var _123=_11c.prefs.windowHeightExpand;
-if(_121!=null&&_11c.prefs.windowTiling&&_11c.prefs.printModeOnly==null){
-var _124=_121.split(_11c.id.PP_PAIR_SEPARATOR);
-var _125=null,_126=0,_127=null,_128=null,_129=false;
-if(_124!=null&&_124.length>0){
-var _12a=_11c.id.PP_PROP_SEPARATOR;
-for(var _12b=0;_12b<_124.length;_12b++){
-_125=_124[_12b];
-_126=((_125!=null)?_125.length:0);
-if(_126>0){
-var _12c=_125.indexOf(_12a);
-if(_12c>0&&_12c<(_126-1)){
-_127=_125.substring(0,_12c);
-_128=_125.substring(_12c+1);
-_129=((_128=="true")?true:false);
-if(_127==_11c.id.PP_STATICPOS){
-_122=_129;
+_10c[_10f]=true;
+this._layoutCreateModel(_10e,_109[_10f],_103,false,_105,_106);
 }else{
-if(_127==_11c.id.PP_FITHEIGHT){
-_123=_129;
-}
+this._layoutCreatePortlet(_10e,_101,_109,_107,_103,_10b,_105,_106);
 }
 }
+return _109;
+},_layoutCreatePortlet:function(_110,_111,_112,_113,_114,_115,_116,_117){
+if(_110&&_117.debugPortletEntityIdFilter){
+if(!_116.lang.inArray(_117.debugPortletEntityIdFilter,_110.id)){
+_110=null;
+}
+}
+if(_110){
+var _118="z";
+var _119=_110.properties[_117.id.PP_DESKTOP_EXTENDED];
+var _11a=_117.prefs.windowTiling;
+var _11b=_11a;
+var _11c=_117.prefs.windowHeightExpand;
+if(_119!=null&&_11a&&_117.prefs.printModeOnly==null){
+var _11d=_119.split(_117.id.PP_PAIR_SEPARATOR);
+var _11e=null,_11f=0,_120=null,_121=null,_122=false;
+if(_11d!=null&&_11d.length>0){
+var _123=_117.id.PP_PROP_SEPARATOR;
+for(var _124=0;_124<_11d.length;_124++){
+_11e=_11d[_124];
+_11f=((_11e!=null)?_11e.length:0);
+if(_11f>0){
+var _125=_11e.indexOf(_123);
+if(_125>0&&_125<(_11f-1)){
+_120=_11e.substring(0,_125);
+_121=_11e.substring(_125+1);
+_122=((_121=="true")?true:false);
+if(_120==_117.id.PP_STATICPOS){
+_11b=_122;
+}else{
+if(_120==_117.id.PP_FITHEIGHT){
+_11c=_122;
 }
 }
 }
-}else{
-if(!_11c.prefs.windowTiling){
-_122=false;
 }
 }
-_11f.properties[_11c.id.PP_WINDOW_POSITION_STATIC]=_122;
-_11f.properties[_11c.id.PP_WINDOW_HEIGHT_TO_FIT]=_123;
-if(_122&&_11c.prefs.windowTiling){
-var _12d=_11f.properties[_11c.id.PP_COLUMN];
-if(_12d==null||_12d==""||_12d<0){
-var _12e=-1;
-for(var j=0;j<_119.length;j++){
-if(_12e==-1||_11d[j].length<_12e){
-_12e=_11d[j].length;
-_12d=j;
-}
 }
 }else{
-if(_12d>=_119.length){
-_12d=_119.length-1;
-}
-}
-_11d[_12d].push(_11f.id);
-var _130=_11a+new Number(_12d);
-_120=_130.toString();
-}
-var _131=new _11c.om.Portlet(_11f.name,_11f.id,null,_11f.properties,_11f.actions,_11f.currentActionState,_11f.currentActionMode,_11f.decorator,_11f.layoutActionsDisabled);
-_131.initialize();
-this.putPortlet(_131);
-if(_11b[_120]==null){
-_11b[_120]=new Array();
-}
-_11b[_120].push({portlet:_131,layout:_118.id});
-}
-}
+if(!_11a){
+_11b=false;
+}
+}
+_110.properties[_117.id.PP_WINDOW_POSITION_STATIC]=_11b;
+_110.properties[_117.id.PP_WINDOW_HEIGHT_TO_FIT]=_11c;
+if(_11b&&_11a){
+var _126=_110.properties[_117.id.PP_COLUMN];
+if(_126==null||_126==""||_126<0){
+var _127=-1;
+for(var j=0;j<_112.length;j++){
+var _129=(_115[j]?_115[j].length:0);
+if(_127==-1||_129<_127){
+_127=_129;
+_126=j;
+}
+}
+}else{
+if(_126>=_112.length){
+_126=_112.length-1;
+}
+}
+if(_115[_126]==null){
+_115[_126]=new Array();
+}
+_115[_126].push(_110.id);
+var _12a=_113+new Number(_126);
+_118=_12a.toString();
+}
+if(_110.currentActionState==_117.id.ACT_MAXIMIZE){
+this.maximizedOnInit=_110.id;
+}
+var _12b=new _117.om.Portlet(_110.name,_110.id,null,_110.properties,_110.actions,_110.currentActionState,_110.currentActionMode,_110.decorator,_110.layoutActionsDisabled);
+_12b.initialize();
+this.putPortlet(_12b);
+if(_114[_118]==null){
+_114[_118]=new Array();
+}
+_114[_118].push({portlet:_12b,layout:_111.id});
+}
+},_layoutCreateColsModel:function(_12c,_12d,_12e){
+var _12f=jetspeed;
+this.layouts[_12c.id]=_12c;
+var _130=false;
+var _131=new Array();
+if(_12f.prefs.windowTiling&&_12c.columnSizes.length>0){
+var _132=false;
+if(_12f.UAie){
+_132=true;
+}
+if(_12d!=null&&!_12e){
+var _133=new _12f.om.Column(0,_12c.id,(_132?_12c.columnSizesSum-0.1:_12c.columnSizesSum),this.columns.length,_12c.layoutActionsDisabled);
+_133.layoutHeader=true;
+this.columns.push(_133);
+if(_12d.buildColChildren==null){
+_12d.buildColChildren=new Array();
+}
+_12d.buildColChildren.push(_133);
+_12d=_133;
+_130=true;
+}
+for(var i=0;i<_12c.columnSizes.length;i++){
+var size=_12c.columnSizes[i];
+if(_132&&i==(_12c.columnSizes.length-1)){
+size=size-0.1;
 }
-},_portletsInitWinState:function(_132){
-var _133={};
-this.getPortletCurColRow(null,false,_133);
-for(var _134 in this.portlets){
-var _135=this.portlets[_134];
-var _136=_133[_135.getId()];
-if(_136==null&&_132){
-for(var i=0;i<_132.length;i++){
-if(_132[i].portlet.getId()==_135.getId()){
-_136={layout:_132[i].layout};
+var _136=new _12f.om.Column(i,_12c.id,size,this.columns.length,_12c.layoutActionsDisabled);
+this.columns.push(_136);
+if(_12d!=null){
+if(_12d.buildColChildren==null){
+_12d.buildColChildren=new Array();
+}
+_12d.buildColChildren.push(_136);
+}
+_131.push(_136);
+}
+}
+return {columnsInLayout:_131,addedLayoutHeaderColumn:_130};
+},_portletsInitWinState:function(_137){
+var _138={};
+this.getPortletCurColRow(null,false,_138);
+for(var _139 in this.portlets){
+var _13a=this.portlets[_139];
+var _13b=_138[_13a.getId()];
+if(_13b==null&&_137){
+for(var i=0;i<_137.length;i++){
+if(_137[i].portlet.getId()==_13a.getId()){
+_13b={layout:_137[i].layout};
 break;
 }
 }
 }
-if(_136!=null){
-_135._initWinState(_136,false);
+if(_13b!=null){
+_13a._initWinState(_13b,false);
 }else{
-dojo.raise("Window state data not found for portlet: "+_135.getId());
+dojo.raise("Window state data not found for portlet: "+_13a.getId());
 }
 }
-},_loadPortletZIndexCompare:function(_138,_139){
-var _13a=null;
-var _13b=null;
-var _13c=null;
-_13a=_138.portlet._getInitialZIndex();
-_13b=_139.portlet._getInitialZIndex();
-if(_13a&&!_13b){
+},_loadPortletZIndexCompare:function(_13d,_13e){
+var _13f=null;
+var _140=null;
+var _141=null;
+_13f=_13d.portlet._getInitialZIndex();
+_140=_13e.portlet._getInitialZIndex();
+if(_13f&&!_140){
 return -1;
 }else{
-if(_13b&&!_13a){
+if(_140&&!_13f){
 return 1;
 }else{
-if(_13a==_13b){
+if(_13f==_140){
 return 0;
 }
 }
 }
-return (_13a-_13b);
-},_createColsStart:function(_13d){
+return (_13f-_140);
+},_createColsStart:function(_142,_143){
 if(!this.columnsStructure||this.columnsStructure.length==0){
 return;
 }
-var _13e=document.createElement("div");
-_13e.id=jetspeed.id.COLUMNS;
-_13e.setAttribute("id",jetspeed.id.COLUMNS);
-for(var _13f=0;_13f<this.columnsStructure.length;_13f++){
-var _140=this.columnsStructure[_13f];
-this._createCols(_140,_13e);
-}
-_13d.appendChild(_13e);
-},_createCols:function(_141,_142){
-_141.createColumn();
-if(_141.columnChildren!=null&&_141.columnChildren.length>0){
-for(var _143=0;_143<_141.columnChildren.length;_143++){
-var _144=_141.columnChildren[_143];
-this._createCols(_144,_141.domNode);
-}
-}
-_142.appendChild(_141.domNode);
-},_removeCols:function(_145){
+var _144=document.createElement("div");
+_144.id=_143;
+_144.setAttribute("id",_143);
+for(var _145=0;_145<this.columnsStructure.length;_145++){
+var _146=this.columnsStructure[_145];
+this._createCols(_146,_144);
+}
+_142.appendChild(_144);
+},_createCols:function(_147,_148){
+_147.createColumn();
+if(this.colFirstNormI==-1&&!_147.columnContainer&&!_147.layoutHeader){
+this.colFirstNormI=_147.getPageColumnIndex();
+}
+var _149=_147.buildColChildren;
+if(_149!=null&&_149.length>0){
+for(var _14a=0;_14a<_149.length;_14a++){
+this._createCols(_149[_14a],_147.domNode);
+}
+}
+delete _147.buildColChildren;
+_148.appendChild(_147.domNode);
+},_removeCols:function(_14b){
 if(!this.columns||this.columns.length==0){
 return;
 }
 for(var i=0;i<this.columns.length;i++){
 if(this.columns[i]){
-if(_145){
-var _147=jetspeed.ui.getPWinChildren(this.columns[i].domNode,null);
-dojo.lang.forEach(_147,function(_148){
-_145.appendChild(_148);
+if(_14b){
+var _14d=jetspeed.ui.getPWinAndColChildren(this.columns[i].domNode,null);
+dojo.lang.forEach(_14d,function(_14e){
+_14b.appendChild(_14e);
 });
 }
 dojo.dom.removeNode(this.columns[i]);
 this.columns[i]=null;
 }
 }
-var _149=dojo.byId(jetspeed.id.COLUMNS);
-if(_149){
-dojo.dom.removeNode(_149);
+var _14f=dojo.byId(jetspeed.id.COLUMNS);
+if(_14f){
+dojo.dom.removeNode(_14f);
 }
 this.columns=[];
-},getPortletCurColRow:function(_14a,_14b,_14c){
+},getColumnDefault:function(){
+if(this.colFirstNormI!=-1){
+return this.columns[this.colFirstNormI];
+}
+return null;
+},getPortletCurColRow:function(_150,_151,_152){
 if(!this.columns||this.columns.length==0){
 return null;
 }
-var _14d=null;
-var _14e=((_14a!=null)?true:false);
-var _14f=0;
-var _150=null;
-var _151=null;
-var _152=0;
-var _153=false;
-for(var _154=0;_154<this.columns.length;_154++){
-var _155=this.columns[_154];
-var _156=_155.domNode.childNodes;
-if(_151==null||_151!=_155.getLayoutId()){
-_151=_155.getLayoutId();
-_150=this.layouts[_151];
-if(_150==null){
-dojo.raise("Layout not found: "+_151);
-return null;
-}
-_152=0;
-_153=false;
-if(_150.clonedFromRootId==null){
-_153=true;
-}else{
-var _157=this.getColFromColNode(_155.domNode.parentNode);
-if(_157==null){
-dojo.raise("Parent column not found: "+_155);
-return null;
-}
-_155=_157;
-}
-}
-var _158=null;
-var _159=jetspeed;
-var _15a=dojo;
-for(var _15b=0;_15b<_156.length;_15b++){
-var _15c=_156[_15b];
-if(_15a.html.hasClass(_15c,_159.id.PWIN_CLASS)||(_14b&&_15a.html.hasClass(_15c,_159.id.PWIN_GHOST_CLASS))||(_14e&&_15a.html.hasClass(_15c,"desktopColumn"))){
-_158=(_158==null?0:_158+1);
-if((_158+1)>_152){
-_152=(_158+1);
-}
-if(_14a==null||_15c==_14a){
-var _15d={layout:_151,column:_155.getLayoutColumnIndex(),row:_158};
-if(!_153){
-_15d.layout=_150.clonedFromRootId;
+var _153=null;
+var _154=((_150!=null)?true:false);
+var _155=0;
+var _156=null;
+var _157=null;
+var _158=0;
+var _159=false;
+for(var _15a=0;_15a<this.columns.length;_15a++){
+var _15b=this.columns[_15a];
+var _15c=_15b.domNode.childNodes;
+if(_157==null||_157!=_15b.getLayoutId()){
+_157=_15b.getLayoutId();
+_156=this.layouts[_157];
+if(_156==null){
+dojo.raise("Layout not found: "+_157);
+return null;
+}
+_158=0;
+_159=false;
+if(_156.clonedFromRootId==null){
+_159=true;
+}else{
+var _15d=this.getColFromColNode(_15b.domNode.parentNode);
+if(_15d==null){
+dojo.raise("Parent column not found: "+_15b);
+return null;
+}
+_15b=_15d;
+}
+}
+var _15e=null;
+var _15f=jetspeed;
+var _160=dojo;
+var _161=_15f.id.PWIN_CLASS;
+if(_151){
+_161+="|"+_15f.id.PWIN_GHOST_CLASS;
+}
+if(_154){
+_161+="|"+_15f.id.COL_CLASS;
+}
+var _162=new RegExp("(^|\\s+)("+_161+")(\\s+|$)");
+for(var _163=0;_163<_15c.length;_163++){
+var _164=_15c[_163];
+if(_162.test(_160.html.getClass(_164))){
+_15e=(_15e==null?0:_15e+1);
+if((_15e+1)>_158){
+_158=(_15e+1);
+}
+if(_150==null||_164==_150){
+var _165={layout:_157,column:_15b.getLayoutColumnIndex(),row:_15e,columnObj:_15b};
+if(!_159){
+_165.layout=_156.clonedFromRootId;
 }
-if(_14a!=null){
-_14d=_15d;
+if(_150!=null){
+_153=_165;
 break;
 }else{
-if(_14c!=null){
-var _15e=this.getPWinFromNode(_15c);
-if(_15e==null){
-_15a.raise("PortletWindow not found for node");
+if(_152!=null){
+var _166=this.getPWinFromNode(_164);
+if(_166==null){
+_160.raise("PortletWindow not found for node");
 }else{
-var _15f=_15e.portlet;
-if(_15f==null){
-_15a.raise("PortletWindow for node has null portlet: "+_15e.widgetId);
+var _167=_166.portlet;
+if(_167==null){
+_160.raise("PortletWindow for node has null portlet: "+_166.widgetId);
 }else{
-_14c[_15f.getId()]=_15d;
+_152[_167.getId()]=_165;
 }
 }
 }
@@ -1443,56 +1421,56 @@
 }
 }
 }
-if(_14d!=null){
+if(_153!=null){
 break;
 }
 }
-return _14d;
+return _153;
 },_getPortletArrayByZIndex:function(){
-var _160=jetspeed;
-var _161=this.getPortletArray();
-if(!_161){
-return _161;
-}
-var _162=[];
-for(var i=0;i<_161.length;i++){
-if(!_161[i].getProperty(_160.id.PP_WINDOW_POSITION_STATIC)){
-_162.push(_161[i]);
-}
-}
-_162.sort(this._portletZIndexCompare);
-return _162;
-},_portletZIndexCompare:function(_164,_165){
-var _166=null;
-var _167=null;
-var _168=null;
-_168=_164.getSavedWinState();
-_166=_168.zIndex;
-_168=_165.getSavedWinState();
-_167=_168.zIndex;
-if(_166&&!_167){
+var _168=jetspeed;
+var _169=this.getPortletArray();
+if(!_169){
+return _169;
+}
+var _16a=[];
+for(var i=0;i<_169.length;i++){
+if(!_169[i].getProperty(_168.id.PP_WINDOW_POSITION_STATIC)){
+_16a.push(_169[i]);
+}
+}
+_16a.sort(this._portletZIndexCompare);
+return _16a;
+},_portletZIndexCompare:function(_16c,_16d){
+var _16e=null;
+var _16f=null;
+var _170=null;
+_170=_16c.getSavedWinState();
+_16e=_170.zIndex;
+_170=_16d.getSavedWinState();
+_16f=_170.zIndex;
+if(_16e&&!_16f){
 return -1;
 }else{
-if(_167&&!_166){
+if(_16f&&!_16e){
 return 1;
 }else{
-if(_166==_167){
+if(_16e==_16f){
 return 0;
 }
 }
 }
-return (_166-_167);
+return (_16e-_16f);
 },getPortletDecorationDefault:function(){
-var _169=jetspeed;
+var _171=jetspeed;
 var pd=null;
-if(djConfig.isDebug&&_169.debug.windowDecorationRandom){
-pd=_169.prefs.portletDecorationsAllowed[Math.floor(Math.random()*_169.prefs.portletDecorationsAllowed.length)];
+if(djConfig.isDebug&&_171.debug.windowDecorationRandom){
+pd=_171.prefs.portletDecorationsAllowed[Math.floor(Math.random()*_171.prefs.portletDecorationsAllowed.length)];
 }else{
-var _16b=this.getPortletDecorator();
-if(dojo.lang.indexOf(_169.prefs.portletDecorationsAllowed,_16b)!=-1){
-pd=_16b;
+var _173=this.getPortletDecorator();
+if(dojo.lang.indexOf(_171.prefs.portletDecorationsAllowed,_173)!=-1){
+pd=_173;
 }else{
-pd=_169.prefs.windowDecoration;
+pd=_171.prefs.windowDecoration;
 }
 }
 return pd;
@@ -1500,355 +1478,419 @@
 if(!this.portlets){
 return null;
 }
-var _16c=[];
-for(var _16d in this.portlets){
-var _16e=this.portlets[_16d];
-_16c.push(_16e);
+var _174=[];
+for(var _175 in this.portlets){
+var _176=this.portlets[_175];
+_174.push(_176);
 }
-return _16c;
+return _174;
 },getPortletIds:function(){
 if(!this.portlets){
 return null;
 }
-var _16f=[];
-for(var _170 in this.portlets){
-var _171=this.portlets[_170];
-_16f.push(_171.getId());
-}
-return _16f;
-},getPortletByName:function(_172){
-if(this.portlets&&_172){
-for(var _173 in this.portlets){
-var _174=this.portlets[_173];
-if(_174.name==_172){
-return _174;
+var _177=[];
+for(var _178 in this.portlets){
+var _179=this.portlets[_178];
+_177.push(_179.getId());
 }
+return _177;
+},getPortletByName:function(_17a){
+if(this.portlets&&_17a){
+for(var _17b in this.portlets){
+var _17c=this.portlets[_17b];
+if(_17c.name==_17a){
+return _17c;
 }
 }
-return null;
-},getPortlet:function(_175){
-if(this.portlets&&_175){
-return this.portlets[_175];
 }
 return null;
-},getPWinFromNode:function(_176){
-var _177=null;
-if(this.portlets&&_176){
-for(var _178 in this.portlets){
-var _179=this.portlets[_178];
-var _17a=_179.getPWin();
-if(_17a!=null){
-if(_17a.domNode==_176){
-_177=_17a;
+},getPortlet:function(_17d){
+if(this.portlets&&_17d){
+return this.portlets[_17d];
+}
+return null;
+},getPWinFromNode:function(_17e){
+var _17f=null;
+if(this.portlets&&_17e){
+for(var _180 in this.portlets){
+var _181=this.portlets[_180];
+var _182=_181.getPWin();
+if(_182!=null){
+if(_182.domNode==_17e){
+_17f=_182;
 break;
 }
 }
 }
 }
-return _177;
-},putPortlet:function(_17b){
-if(!_17b){
+return _17f;
+},putPortlet:function(_183){
+if(!_183){
 return;
 }
 if(!this.portlets){
 this.portlets=[];
 }
-this.portlets[_17b.entityId]=_17b;
+this.portlets[_183.entityId]=_183;
 this.portlet_count++;
-},putPWin:function(_17c){
-if(!_17c){
+},putPWin:function(_184){
+if(!_184){
 return;
 }
-var _17d=_17c.widgetId;
-if(!_17d){
+var _185=_184.widgetId;
+if(!_185){
 dojo.raise("PortletWindow id is null");
 }
-this.portlet_windows[_17d]=_17c;
+this.portlet_windows[_185]=_184;
 this.portlet_window_count++;
-},getPWin:function(_17e){
-if(this.portlet_windows&&_17e){
-return this.portlet_windows[_17e];
+},getPWin:function(_186){
+if(this.portlet_windows&&_186){
+var pWin=this.portlet_windows[_186];
+if(pWin==null){
+var jsId=jetspeed.id;
+pWin=this.portlet_windows[jsId.PW_ID_PREFIX+_186];
+if(pWin==null){
+var p=this.getPortlet(_186);
+if(p!=null){
+pWin=this.portlet_windows[p.properties[jsObj.id.PP_WIDGET_ID]];
+}
+}
+}
+return pWin;
 }
 return null;
-},getPWins:function(_17f){
-var _180=this.portlet_windows;
+},getPWins:function(_18a){
+var _18b=this.portlet_windows;
 var pWin;
-var _182=[];
-for(var _183 in _180){
-pWin=_180[_183];
-if(pWin&&(!_17f||pWin.portlet)){
-_182.push(pWin);
+var _18d=[];
+for(var _18e in _18b){
+pWin=_18b[_18e];
+if(pWin&&(!_18a||pWin.portlet)){
+_18d.push(pWin);
 }
 }
-return _182;
-},getPWinTopZIndex:function(_184){
-var _185=0;
-if(_184){
-_185=this.portlet_tiled_high_z+1;
-this.portlet_tiled_high_z=_185;
+return _18d;
+},getPWinTopZIndex:function(_18f){
+var _190=0;
+if(_18f){
+_190=this.portlet_tiled_high_z+1;
+this.portlet_tiled_high_z=_190;
 }else{
 if(this.portlet_untiled_high_z==-1){
 this.portlet_untiled_high_z=200;
 }
-_185=this.portlet_untiled_high_z+1;
-this.portlet_untiled_high_z=_185;
+_190=this.portlet_untiled_high_z+1;
+this.portlet_untiled_high_z=_190;
 }
-return _185;
+return _190;
 },getPWinHighZIndex:function(){
 return Math.max(this.portlet_tiled_high_z,this.portlet_untiled_high_z);
-},displayAllPWins:function(_186){
-var _187=this.getPortletArray();
-for(var i=0;i<_187.length;i++){
-var _189=_187[i];
-var pWin=_189.getPWin();
+},displayAllPWins:function(_191,_192){
+var pWin;
+if(!_192){
+var _194=this.portlet_windows;
+for(var _195 in _194){
+pWin=_194[_195];
 if(pWin){
-if(_186){
-pWin.domNode.style.display="none";
+pWin.domNode.style.display=(_191?"none":"");
+}
+}
 }else{
-pWin.domNode.style.display="";
+for(var i=0;i<_192.length;i++){
+pWin=_192[i];
+if(pWin){
+pWin.domNode.style.display=(_191?"none":"");
+}
 }
 }
+},onBrowserWindowResize:function(){
+var _197=jetspeed;
+if(_197.UAie6){
+var _198=this.portlet_windows;
+var pWin;
+for(var _19a in _198){
+pWin=_198[_19a];
+pWin.onBrowserWindowResize();
+}
+if(this.editMode){
+var _19b=dojo.widget.byId(_197.id.PG_ED_WID);
+if(_19b!=null){
+_19b.onBrowserWindowResize();
 }
-},regPWinIFrameCover:function(_18b){
-if(!_18b){
+}
+}
+},regPWinIFrameCover:function(_19c){
+if(!_19c){
 return;
 }
-this.iframeCoverByWinId[_18b.widgetId]=true;
-},unregPWinIFrameCover:function(_18c){
-if(!_18c){
+this.iframeCoverByWinId[_19c.widgetId]=true;
+},unregPWinIFrameCover:function(_19d){
+if(!_19d){
 return;
 }
-delete this.iframeCoverByWinId[_18c.widgetId];
-},displayAllPWinIFrameCovers:function(_18d,_18e){
-var _18f=this.portlet_windows;
-var _190=this.iframeCoverByWinId;
-if(!_18f||!_190){
+delete this.iframeCoverByWinId[_19d.widgetId];
+},displayAllPWinIFrameCovers:function(_19e,_19f){
+var _1a0=this.portlet_windows;
+var _1a1=this.iframeCoverByWinId;
+if(!_1a0||!_1a1){
 return;
 }
-for(var _191 in _190){
-if(_191==_18e){
+for(var _1a2 in _1a1){
+if(_1a2==_19f){
 continue;
 }
-var pWin=_18f[_191];
-var _193=(pWin&&pWin.iframesInfo?pWin.iframesInfo.iframeCover:null);
-if(_193){
-if(_18d){
-_193.style.display="none";
+var pWin=_1a0[_1a2];
+var _1a4=(pWin&&pWin.iframesInfo?pWin.iframesInfo.iframeCover:null);
+if(_1a4){
+_1a4.style.display=(_19e?"none":"block");
+}
+}
+},createLayoutInfo:function(_1a5){
+var _1a6=dojo;
+var _1a7=null;
+var _1a8=null;
+var _1a9=null;
+var _1aa=null;
+var _1ab=document.getElementById(_1a5.id.DESKTOP);
+if(_1ab!=null){
+_1a7=_1a5.ui.getLayoutExtents(_1ab,null,_1a6,_1a5);
+}
+var _1ac=document.getElementById(_1a5.id.COLUMNS);
+if(_1ac!=null){
+_1a8=_1a5.ui.getLayoutExtents(_1ac,null,_1a6,_1a5);
+}
+if(this.columns){
+for(var i=0;i<this.columns.length;i++){
+var col=this.columns[i];
+if(col.layoutHeader){
+_1aa=_1a5.ui.getLayoutExtents(col.domNode,null,_1a6,_1a5);
 }else{
-_193.style.display="block";
+if(!col.columnContainer){
+_1a9=_1a5.ui.getLayoutExtents(col.domNode,null,_1a6,_1a5);
+}
+}
+if(_1a9!=null&&_1aa!=null){
+break;
 }
 }
 }
+this.layoutInfo={desktop:(_1a7!=null?_1a7:{}),columns:(_1a8!=null?_1a8:{}),column:(_1a9!=null?_1a9:{}),columnLayoutHeader:(_1aa!=null?_1aa:{})};
+_1a5.widget.PortletWindow.prototype.colWidth_pbE=((_1a9&&_1a9.pbE)?_1a9.pbE.w:0);
 },destroy:function(){
-var _194=this.portlet_windows;
-var _195=this.getPWins(true);
-var pWin,_197;
-for(var i=0;i<_195.length;i++){
-pWin=_195[i];
-_197=pWin.widgetId;
+var _1af=jetspeed;
+var _1b0=dojo;
+if(_1af.UAie6){
+_1af.ui.evtDisconnect("after",window,"onresize",_1af.ui.windowResizeMgr,"onResize",_1b0.event);
+}
+var _1b1=this.portlet_windows;
+var _1b2=this.getPWins(true);
+var pWin,_1b4;
+for(var i=0;i<_1b2.length;i++){
+pWin=_1b2[i];
+_1b4=pWin.widgetId;
 pWin.closeWindow();
-delete _194[_197];
+delete _1b1[_1b4];
 this.portlet_window_count--;
 }
 this.portlets=[];
 this.portlet_count=0;
-var _199=dojo.widget.byId(jetspeed.id.PG_ED_WID);
-if(_199!=null){
-_199.editPageDestroy();
+var _1b6=_1b0.widget.byId(_1af.id.PG_ED_WID);
+if(_1b6!=null){
+_1b6.editPageDestroy();
 }
-this._removeCols(document.getElementById(jetspeed.id.DESKTOP));
+this._removeCols(document.getElementById(_1af.id.DESKTOP));
 this._destroyPageControls();
-},getColFromColNode:function(_19a){
-if(_19a==null){
+},getColFromColNode:function(_1b7){
+if(_1b7==null){
 return null;
 }
-var _19b=_19a.getAttribute("columnIndex");
-if(_19b==null){
+var _1b8=_1b7.getAttribute("columnindex");
+if(_1b8==null){
 return null;
 }
-var _19c=new Number(_19b);
-if(_19c>=0&&_19c<this.columns.length){
-return this.columns[_19c];
+var _1b9=new Number(_1b8);
+if(_1b9>=0&&_1b9<this.columns.length){
+return this.columns[_1b9];
 }
 return null;
 },getColIndexForNode:function(node){
-var _19e=null;
+var _1bb=null;
 if(!this.columns){
-return _19e;
+return _1bb;
 }
 for(var i=0;i<this.columns.length;i++){
 if(this.columns[i].containsNode(node)){
-_19e=i;
+_1bb=i;
 break;
 }
 }
-return _19e;
+return _1bb;
 },getColWithNode:function(node){
-var _1a1=this.getColIndexForNode(node);
-return ((_1a1!=null&&_1a1>=0)?this.columns[_1a1]:null);
-},getDescendantCols:function(_1a2){
+var _1be=this.getColIndexForNode(node);
+return ((_1be!=null&&_1be>=0)?this.columns[_1be]:null);
+},getDescendantCols:function(_1bf){
 var dMap={};
-if(_1a2==null){
+if(_1bf==null){
 return dMap;
 }
 for(var i=0;i<this.columns.length;i++){
 var col=this.columns[i];
-if(col!=_1a2&&_1a2.containsDescendantNode(col.domNode)){
+if(col!=_1bf&&_1bf.containsDescendantNode(col.domNode)){
 dMap[i]=col;
 }
 }
 return dMap;
-},putMenu:function(_1a6){
-if(!_1a6){
+},putMenu:function(_1c3){
+if(!_1c3){
 return;
 }
-var _1a7=(_1a6.getName?_1a6.getName():null);
-if(_1a7!=null){
-this.menus[_1a7]=_1a6;
+var _1c4=(_1c3.getName?_1c3.getName():null);
+if(_1c4!=null){
+this.menus[_1c4]=_1c3;
 }
-},getMenu:function(_1a8){
-if(_1a8==null){
+},getMenu:function(_1c5){
+if(_1c5==null){
 return null;
 }
-return this.menus[_1a8];
-},removeMenu:function(_1a9){
-if(_1a9==null){
+return this.menus[_1c5];
+},removeMenu:function(_1c6){
+if(_1c6==null){
 return;
 }
-var _1aa=null;
-if(dojo.lang.isString(_1a9)){
-_1aa=_1a9;
+var _1c7=null;
+if(dojo.lang.isString(_1c6)){
+_1c7=_1c6;
 }else{
-_1aa=(_1a9.getName?_1a9.getName():null);
+_1c7=(_1c6.getName?_1c6.getName():null);
 }
-if(_1aa!=null){
-delete this.menus[_1aa];
+if(_1c7!=null){
+delete this.menus[_1c7];
 }
 },clearMenus:function(){
 this.menus=[];
 },getMenuNames:function(){
-var _1ab=[];
-for(var _1ac in this.menus){
-_1ab.push(_1ac);
-}
-return _1ab;
-},retrieveMenuDeclarations:function(_1ad,_1ae,_1af){
-contentListener=new jetspeed.om.MenusApiCL(_1ad,_1ae,_1af);
+var _1c8=[];
+for(var _1c9 in this.menus){
+_1c8.push(_1c9);
+}
+return _1c8;
+},retrieveMenuDeclarations:function(_1ca,_1cb,_1cc){
+contentListener=new jetspeed.om.MenusApiCL(_1ca,_1cb,_1cc);
 this.clearMenus();
-var _1b0="?action=getmenus";
-if(_1ad){
-_1b0+="&includeMenuDefs=true";
-}
-var _1b1=this.getPsmlUrl()+_1b0;
-var _1b2="text/xml";
-var _1b3=new jetspeed.om.Id("getmenus",{page:this});
-jetspeed.url.retrieveContent({url:_1b1,mimetype:_1b2},contentListener,_1b3,jetspeed.debugContentDumpIds);
-},syncPageControls:function(){
-var jsId=jetspeed.id;
+var _1cd="?action=getmenus";
+if(_1ca){
+_1cd+="&includeMenuDefs=true";
+}
+var _1ce=this.getPsmlUrl()+_1cd;
+var _1cf="text/xml";
+var _1d0=new jetspeed.om.Id("getmenus",{page:this});
+jetspeed.url.retrieveContent({url:_1ce,mimetype:_1cf},contentListener,_1d0,jetspeed.debugContentDumpIds);
+},syncPageControls:function(_1d1){
+var jsId=_1d1.id;
 if(this.actionButtons==null){
 return;
 }
-for(var _1b5 in this.actionButtons){
-var _1b6=false;
-if(_1b5==jsId.ACT_EDIT){
+for(var _1d3 in this.actionButtons){
+var _1d4=false;
+if(_1d3==jsId.ACT_EDIT){
 if(!this.editMode){
-_1b6=true;
+_1d4=true;
 }
 }else{
-if(_1b5==jsId.ACT_VIEW){
+if(_1d3==jsId.ACT_VIEW){
 if(this.editMode){
-_1b6=true;
+_1d4=true;
 }
 }else{
-if(_1b5==jsId.ACT_ADDPORTLET){
+if(_1d3==jsId.ACT_ADDPORTLET){
 if(!this.editMode){
-_1b6=true;
+_1d4=true;
 }
 }else{
-_1b6=true;
+_1d4=true;
 }
 }
 }
-if(_1b6){
-this.actionButtons[_1b5].style.display="";
+if(_1d4){
+this.actionButtons[_1d3].style.display="";
 }else{
-this.actionButtons[_1b5].style.display="none";
+this.actionButtons[_1d3].style.display="none";
 }
 }
-},renderPageControls:function(){
-var _1b7=jetspeed;
-var jsId=_1b7.id;
-var _1b9=dojo;
-var _1ba=[];
+},renderPageControls:function(_1d5){
+var _1d5=jetspeed;
+var jsId=_1d5.id;
+var _1d7=dojo;
+var _1d8=[];
 if(this.actions!=null){
-for(var _1bb in this.actions){
-if(_1bb!=jsId.ACT_HELP){
-_1ba.push(_1bb);
+for(var _1d9 in this.actions){
+if(_1d9!=jsId.ACT_HELP){
+_1d8.push(_1d9);
 }
-if(_1bb==jsId.ACT_EDIT){
-_1ba.push(jsId.ACT_ADDPORTLET);
+if(_1d9==jsId.ACT_EDIT){
+_1d8.push(jsId.ACT_ADDPORTLET);
 }
 }
 if(this.actions[jsId.ACT_EDIT]!=null){
 if(this.actions[jsId.ACT_VIEW]==null){
-_1ba.push(jsId.ACT_VIEW);
+_1d8.push(jsId.ACT_VIEW);
 }
 }
 if(this.actions[jsId.ACT_VIEW]!=null){
 if(this.actions[jsId.ACT_EDIT]==null){
-_1ba.push(jsId.ACT_EDIT);
+_1d8.push(jsId.ACT_EDIT);
 }
 }
 }
-var _1bc=_1b9.byId(jsId.PAGE_CONTROLS);
-if(_1bc!=null&&_1ba!=null&&_1ba.length>0){
-var _1bd=_1b7.prefs;
-var jsUI=_1b7.ui;
-var _1bf=_1b9.event;
-var _1c0=_1b7.page.tooltipMgr;
+var _1da=_1d7.byId(jsId.PAGE_CONTROLS);
+if(_1da!=null&&_1d8!=null&&_1d8.length>0){
+var _1db=_1d5.prefs;
+var jsUI=_1d5.ui;
+var _1dd=_1d7.event;
+var _1de=_1d5.page.tooltipMgr;
 if(this.actionButtons==null){
 this.actionButtons={};
 this.actionButtonTooltips=[];
 }
-var _1c1=this.actionButtonTooltips;
-for(var i=0;i<_1ba.length;i++){
-var _1bb=_1ba[i];
-var _1c3=document.createElement("div");
-_1c3.className="portalPageActionButton";
-_1c3.style.backgroundImage="url("+_1bd.getLayoutRootUrl()+"/images/desktop/"+_1bb+".gif)";
-_1c3.actionName=_1bb;
-this.actionButtons[_1bb]=_1c3;
-_1bc.appendChild(_1c3);
-jsUI.evtConnect("after",_1c3,"onclick",this,"pageActionButtonClick",_1bf);
-if(_1bd.pageActionButtonTooltip){
-var _1c4=null;
-if(_1bd.desktopActionLabels!=null){
-_1c4=_1bd.desktopActionLabels[_1bb];
+var _1df=this.actionButtonTooltips;
+for(var i=0;i<_1d8.length;i++){
+var _1d9=_1d8[i];
+var _1e1=document.createElement("div");
+_1e1.className="portalPageActionButton";
+_1e1.style.backgroundImage="url("+_1db.getLayoutRootUrl()+"/images/desktop/"+_1d9+".gif)";
+_1e1.actionName=_1d9;
+this.actionButtons[_1d9]=_1e1;
+_1da.appendChild(_1e1);
+jsUI.evtConnect("after",_1e1,"onclick",this,"pageActionButtonClick",_1dd);
+if(_1db.pageActionButtonTooltip){
+var _1e2=null;
+if(_1db.desktopActionLabels!=null){
+_1e2=_1db.desktopActionLabels[_1d9];
 }
-if(_1c4==null||_1c4.length==0){
-_1c4=_1b9.string.capitalize(_1bb);
+if(_1e2==null||_1e2.length==0){
+_1e2=_1d7.string.capitalize(_1d9);
 }
-_1c1.push(_1c0.addNode(_1c3,_1c4,true,_1b7,jsUI,_1bf));
+_1df.push(_1de.addNode(_1e1,_1e2,true,null,null,null,_1d5,jsUI,_1dd));
 }
 }
 }
 },_destroyPageControls:function(){
-var _1c5=jetspeed;
+var _1e3=jetspeed;
 if(this.actionButtons){
-for(var _1c6 in this.actionButtons){
-var _1c7=this.actionButtons[_1c6];
-if(_1c7){
-_1c5.ui.evtDisconnect("after",_1c7,"onclick",this,"pageActionButtonClick");
+for(var _1e4 in this.actionButtons){
+var _1e5=this.actionButtons[_1e4];
+if(_1e5){
+_1e3.ui.evtDisconnect("after",_1e5,"onclick",this,"pageActionButtonClick");
 }
 }
 }
-var _1c8=dojo.byId(_1c5.id.PAGE_CONTROLS);
-if(_1c8!=null&&_1c8.childNodes&&_1c8.childNodes.length>0){
-for(var i=(_1c8.childNodes.length-1);i>=0;i--){
-dojo.dom.removeNode(_1c8.childNodes[i]);
+var _1e6=dojo.byId(_1e3.id.PAGE_CONTROLS);
+if(_1e6!=null&&_1e6.childNodes&&_1e6.childNodes.length>0){
+for(var i=(_1e6.childNodes.length-1);i>=0;i--){
+dojo.dom.removeNode(_1e6.childNodes[i]);
 }
 }
-_1c5.page.tooltipMgr.removeNodes(this.actionButtonTooltips);
+_1e3.page.tooltipMgr.removeNodes(this.actionButtonTooltips);
 this.actionButtonTooltips=null;
 this.actionButtons==null;
 },pageActionButtonClick:function(evt){
@@ -1856,30 +1898,30 @@
 return;
 }
 this.pageActionProcess(evt.target.actionName,evt);
-},pageActionProcess:function(_1cb){
-var _1cc=jetspeed;
-if(_1cb==null){
+},pageActionProcess:function(_1e9){
+var _1ea=jetspeed;
+if(_1e9==null){
 return;
 }
-if(_1cb==_1cc.id.ACT_ADDPORTLET){
+if(_1e9==_1ea.id.ACT_ADDPORTLET){
 this.addPortletInitiate();
 }else{
-if(_1cb==_1cc.id.ACT_EDIT){
-_1cc.editPageInitiate();
+if(_1e9==_1ea.id.ACT_EDIT){
+_1ea.editPageInitiate(_1ea);
 }else{
-if(_1cb==_1cc.id.ACT_VIEW){
-_1cc.editPageTerminate();
+if(_1e9==_1ea.id.ACT_VIEW){
+_1ea.editPageTerminate(_1ea);
 }else{
-var _1cd=this.getPageAction(_1cb);
-alert("pageAction "+_1cb+" : "+_1cd);
-if(_1cd==null){
+var _1eb=this.getPageAction(_1e9);
+alert("pageAction "+_1e9+" : "+_1eb);
+if(_1eb==null){
 return;
 }
-if(_1cd.url==null){
+if(_1eb.url==null){
 return;
 }

[... 2231 lines stripped ...]


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


Mime
View raw message