portals-jetspeed-dev mailing list archives

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

[... 2350 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