portals-jetspeed-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smi...@apache.org
Subject svn commit: r553988 [2/3] - in /portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop: core.js core.src.js
Date Fri, 06 Jul 2007 18:39:45 GMT

Modified: portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js?view=diff&rev=553988&r1=553987&r2=553988
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js (original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js Fri Jul  6 11:39:44 2007
@@ -95,7 +95,7 @@
 }
 jetspeed.prefs.windowActionNoImage=_6;
 }
-var _8=jetspeed.url.parse(document.location.href);
+var _8=jetspeed.url.parse(window.location.href);
 var _9=jetspeed.url.getQueryParameter(_8,"jsprintmode")=="true";
 if(_9){
 _9={};
@@ -131,105 +131,107 @@
 };
 jetspeed.updatePage=function(_c,_d){
 var _e=jetspeed.page;
-if(!_c||jetspeed.pageNavigateSuppress){
+if(!_c||!_e||jetspeed.pageNavigateSuppress){
 return;
 }
-if(_e&&_e.equalsPageUrl(_c)){
+if(_e.equalsPageUrl(_c)){
 return;
 }
-_c=jetspeed.page.makePageUrl(_c);
-if(_e!=null&&_c!=null){
-var _f=_e.getPageUrl();
+_c=_e.makePageUrl(_c);
+if(_c!=null){
+var _f=_e.layoutDecorator;
+var _10=_e.editMode;
 _e.destroy();
-var _10=new jetspeed.om.Page(jetspeed.page.layoutDecorator,_c,(!djConfig.preventBackButtonFix&&!_d));
-jetspeed.page=_10;
-_10.retrievePsml();
+var _11=new jetspeed.om.Page(_f,_c,(!djConfig.preventBackButtonFix&&!_d),_10);
+jetspeed.page=_11;
+_11.retrievePsml();
+window.focus();
 }
 };
-jetspeed.doRender=function(_11,_12){
-if(!_11){
-_11={};
+jetspeed.doRender=function(_12,_13){
+if(!_12){
+_12={};
 }else{
-if((typeof _11=="string"||_11 instanceof String)){
-_11={url:_11};
+if((typeof _12=="string"||_12 instanceof String)){
+_12={url:_12};
 }
 }
-var _13=jetspeed.page.getPortlet(_12);
-if(_13){
+var _14=jetspeed.page.getPortlet(_13);
+if(_14){
 if(jetspeed.debug.doRenderDoAction){
-dojo.debug("doRender ["+_12+"] url: "+_11.url);
+dojo.debug("doRender ["+_13+"] url: "+_12.url);
 }
-_13.retrieveContent(null,_11);
+_14.retrieveContent(null,_12);
 }
 };
-jetspeed.doRenderAll=function(url,_15,_16){
-var _17=jetspeed.debug.doRenderDoAction;
-var _18=jetspeed.debug.pageLoad&&_16;
-if(!_15){
-_15=jetspeed.page.getPortletArray();
-}
-var _19="";
-var _1a=true;
-var _1b=null;
-if(_16){
-_1b=jetspeed.url.parse(jetspeed.page.getPageUrl());
-}
-for(var i=0;i<_15.length;i++){
-var _1d=_15[i];
-if((_17||_18)){
+jetspeed.doRenderAll=function(url,_16,_17){
+var _18=jetspeed.debug.doRenderDoAction;
+var _19=jetspeed.debug.pageLoad&&_17;
+if(!_16){
+_16=jetspeed.page.getPortletArray();
+}
+var _1a="";
+var _1b=true;
+var _1c=null;
+if(_17){
+_1c=jetspeed.url.parse(jetspeed.page.getPageUrl());
+}
+for(var i=0;i<_16.length;i++){
+var _1e=_16[i];
+if((_18||_19)){
 if(i>0){
-_19=_19+", ";
+_1a=_1a+", ";
 }
-var _1e=null;
-if(_1d.getProperty!=null){
-_1e=_1d.getProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID);
+var _1f=null;
+if(_1e.getProperty!=null){
+_1f=_1e.getProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID);
 }
-if(!_1e){
-_1e=_1d.widgetId;
+if(!_1f){
+_1f=_1e.widgetId;
 }
-if(!_1e){
-_1e=_1d.toString();
+if(!_1f){
+_1f=_1e.toString();
 }
-if(_1d.entityId){
-_19=_19+_1d.entityId+"("+_1e+")";
-if(_18&&_1d.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE)){
-_19=_19+" "+_1d.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE);
+if(_1e.entityId){
+_1a=_1a+_1e.entityId+"("+_1f+")";
+if(_19&&_1e.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE)){
+_1a=_1a+" "+_1e.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE);
 }
 }else{
-_19=_19+_1e;
+_1a=_1a+_1f;
 }
 }
-_1d.retrieveContent(null,{url:url,jsPageUrl:_1b},_1a);
+_1e.retrieveContent(null,{url:url,jsPageUrl:_1c},_1b);
 }
-if(_17){
-dojo.debug("doRenderAll ["+_19+"] url: "+url);
-}else{
 if(_18){
-dojo.debug("doRenderAll page-url: "+jetspeed.page.getPsmlUrl()+" portlets: ["+_19+"]"+(url?(" url: "+url):""));
+dojo.debug("doRenderAll ["+_1a+"] url: "+url);
+}else{
+if(_19){
+dojo.debug("doRenderAll page-url: "+jetspeed.page.getPsmlUrl()+" portlets: ["+_1a+"]"+(url?(" url: "+url):""));
 }
 }
 };
-jetspeed.doAction=function(_1f,_20){
-if(!_1f){
-_1f={};
+jetspeed.doAction=function(_20,_21){
+if(!_20){
+_20={};
 }else{
-if((typeof _1f=="string"||_1f instanceof String)){
-_1f={url:_1f};
+if((typeof _20=="string"||_20 instanceof String)){
+_20={url:_20};
 }
 }
-var _21=jetspeed.page.getPortlet(_20);
-if(_21){
+var _22=jetspeed.page.getPortlet(_21);
+if(_22){
 if(jetspeed.debug.doRenderDoAction){
-if(!_1f.formNode){
-dojo.debug("doAction ["+_20+"] url: "+_1f.url+" form: null");
+if(!_20.formNode){
+dojo.debug("doAction ["+_21+"] url: "+_20.url+" form: null");
 }else{
-dojo.debug("doAction ["+_20+"] url: "+_1f.url+" form: "+jetspeed.debugDumpForm(_1f.formNode));
+dojo.debug("doAction ["+_21+"] url: "+_20.url+" form: "+jetspeed.debugDumpForm(_20.formNode));
 }
 }
-_21.retrieveContent(new jetspeed.om.PortletActionContentListener(_21,_1f),_1f);
+_22.retrieveContent(new jetspeed.om.PortletActionContentListener(_22,_20),_20);
 }
 };
-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()",parseContentUrlForDesktopActionRender:function(_22){
+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()",parseContentUrlForDesktopActionRender:function(_23){
 if(this.DESKTOP_ACTION_PREFIX_URL==null){
 this.DESKTOP_ACTION_PREFIX_URL=jetspeed.url.basePortalUrl()+jetspeed.url.path.ACTION;
 }
@@ -237,380 +239,380 @@
 this.DESKTOP_RENDER_PREFIX_URL=jetspeed.url.basePortalUrl()+jetspeed.url.path.RENDER;
 }
 var op=null;
-var _24=_22;
-var _25=null;
-if(_22&&_22.length>this.DESKTOP_ACTION_PREFIX_URL.length&&_22.indexOf(this.DESKTOP_ACTION_PREFIX_URL)==0){
+var _25=_23;
+var _26=null;
+if(_23&&_23.length>this.DESKTOP_ACTION_PREFIX_URL.length&&_23.indexOf(this.DESKTOP_ACTION_PREFIX_URL)==0){
 op=jetspeed.portleturl.PORTLET_REQUEST_ACTION;
 }else{
-if(_22&&_22.length>this.DESKTOP_RENDER_PREFIX_URL.length&&_22.indexOf(this.DESKTOP_RENDER_PREFIX_URL)==0){
+if(_23&&_23.length>this.DESKTOP_RENDER_PREFIX_URL.length&&_23.indexOf(this.DESKTOP_RENDER_PREFIX_URL)==0){
 op=jetspeed.portleturl.PORTLET_REQUEST_RENDER;
 }
 }
 if(op!=null){
-_25=jetspeed.url.getQueryParameter(_22,"entity");
+_26=jetspeed.url.getQueryParameter(_23,"entity");
 }
-if(!jetspeed.url.validateUrlStartsWithHttp(_24)){
-_24=null;
+if(!jetspeed.url.validateUrlStartsWithHttp(_25)){
+_25=null;
 }
-return {url:_24,operation:op,portletEntityId:_25};
-},generateJSPseudoUrlActionRender:function(_26,_27){
-if(!_26||!_26.url||!_26.portletEntityId){
+return {url:_25,operation:op,portletEntityId:_26};
+},generateJSPseudoUrlActionRender:function(_27,_28){
+if(!_27||!_27.url||!_27.portletEntityId){
 return null;
 }
-var _28=null;
-if(_27){
-_28=jetspeed.portleturl.JETSPEED_DO_NOTHING_ACTION;
+var _29=null;
+if(_28){
+_29=jetspeed.portleturl.JETSPEED_DO_NOTHING_ACTION;
 }else{
-_28="javascript:";
-var _29=false;
-if(_26.operation==jetspeed.portleturl.PORTLET_REQUEST_ACTION){
-_28+="doAction(\"";
+_29="javascript:";
+var _2a=false;
+if(_27.operation==jetspeed.portleturl.PORTLET_REQUEST_ACTION){
+_29+="doAction(\"";
 }else{
-if(_26.operation==jetspeed.portleturl.PORTLET_REQUEST_RENDER){
-_28+="doRender(\"";
+if(_27.operation==jetspeed.portleturl.PORTLET_REQUEST_RENDER){
+_29+="doRender(\"";
 }else{
-_29=true;
+_2a=true;
 }
 }
-if(_29){
+if(_2a){
 return null;
 }
-_28+=_26.url+"\",\""+_26.portletEntityId+"\"";
-_28+=")";
+_29+=_27.url+"\",\""+_27.portletEntityId+"\"";
+_29+=")";
 }
-return _28;
+return _29;
 }};
 jetspeed.doNothingNav=function(){
 false;
 };
-jetspeed.loadPortletDecorationStyles=function(_2a){
-var _2b=jetspeed.prefs.getPortletDecorationConfig(_2a);
-if(_2b!=null&&!_2b.css_loaded){
-var _2c=jetspeed.prefs.getPortletDecorationBaseUrl(_2a);
-_2b.css_loaded=true;
-_2b.cssPathCommon=new dojo.uri.Uri(_2c+"/css/styles.css");
-_2b.cssPathDesktop=new dojo.uri.Uri(_2c+"/css/desktop.css");
-dojo.html.insertCssFile(_2b.cssPathCommon,null,true);
-dojo.html.insertCssFile(_2b.cssPathDesktop,null,true);
-}
-return _2b;
-};
-jetspeed.loadPortletDecorationConfig=function(_2d){
-var _2e={};
-jetspeed.prefs.portletDecorationsConfig[_2d]=_2e;
-_2e.windowActionButtonOrder=jetspeed.prefs.windowActionButtonOrder;
-_2e.windowActionNotPortlet=jetspeed.prefs.windowActionNotPortlet;
-_2e.windowActionButtonMax=jetspeed.prefs.windowActionButtonMax;
-_2e.windowActionButtonHide=jetspeed.prefs.windowActionButtonHide;
-_2e.windowActionButtonTooltip=jetspeed.prefs.windowActionButtonTooltip;
-_2e.windowActionMenuOrder=jetspeed.prefs.windowActionMenuOrder;
-_2e.windowActionNoImage=jetspeed.prefs.windowActionNoImage;
-_2e.windowIconEnabled=jetspeed.prefs.windowIconEnabled;
-_2e.windowIconPath=jetspeed.prefs.windowIconPath;
-var _2f=jetspeed.prefs.getPortletDecorationBaseUrl(_2d)+"/"+_2d+".js";
-dojo.hostenv.loadUri(_2f,function(_30){
-for(var j in _30){
-_2e[j]=_30[j];
-}
-if(_2e.windowActionNoImage!=null){
-var _32={};
-for(var i=0;i<_2e.windowActionNoImage.length;i++){
-_32[_2e.windowActionNoImage[i]]=true;
-}
-_2e.windowActionNoImage=_32;
-}
-if(_2e.windowIconPath!=null){
-_2e.windowIconPath=dojo.string.trim(_2e.windowIconPath);
-if(_2e.windowIconPath==null||_2e.windowIconPath.length==0){
-_2e.windowIconPath=null;
-}else{
-var _34=_2e.windowIconPath;
-var _35=_34.charAt(0);
-if(_35!="/"){
-_34="/"+_34;
-}
-var _36=_34.charAt(_34.length-1);
+jetspeed.loadPortletDecorationStyles=function(_2b){
+var _2c=jetspeed.prefs.getPortletDecorationConfig(_2b);
+if(_2c!=null&&!_2c.css_loaded){
+var _2d=jetspeed.prefs.getPortletDecorationBaseUrl(_2b);
+_2c.css_loaded=true;
+_2c.cssPathCommon=new dojo.uri.Uri(_2d+"/css/styles.css");
+_2c.cssPathDesktop=new dojo.uri.Uri(_2d+"/css/desktop.css");
+dojo.html.insertCssFile(_2c.cssPathCommon,null,true);
+dojo.html.insertCssFile(_2c.cssPathDesktop,null,true);
+}
+return _2c;
+};
+jetspeed.loadPortletDecorationConfig=function(_2e){
+var _2f={};
+jetspeed.prefs.portletDecorationsConfig[_2e]=_2f;
+_2f.windowActionButtonOrder=jetspeed.prefs.windowActionButtonOrder;
+_2f.windowActionNotPortlet=jetspeed.prefs.windowActionNotPortlet;
+_2f.windowActionButtonMax=jetspeed.prefs.windowActionButtonMax;
+_2f.windowActionButtonHide=jetspeed.prefs.windowActionButtonHide;
+_2f.windowActionButtonTooltip=jetspeed.prefs.windowActionButtonTooltip;
+_2f.windowActionMenuOrder=jetspeed.prefs.windowActionMenuOrder;
+_2f.windowActionNoImage=jetspeed.prefs.windowActionNoImage;
+_2f.windowIconEnabled=jetspeed.prefs.windowIconEnabled;
+_2f.windowIconPath=jetspeed.prefs.windowIconPath;
+var _30=jetspeed.prefs.getPortletDecorationBaseUrl(_2e)+"/"+_2e+".js";
+dojo.hostenv.loadUri(_30,function(_31){
+for(var j in _31){
+_2f[j]=_31[j];
+}
+if(_2f.windowActionNoImage!=null){
+var _33={};
+for(var i=0;i<_2f.windowActionNoImage.length;i++){
+_33[_2f.windowActionNoImage[i]]=true;
+}
+_2f.windowActionNoImage=_33;
+}
+if(_2f.windowIconPath!=null){
+_2f.windowIconPath=dojo.string.trim(_2f.windowIconPath);
+if(_2f.windowIconPath==null||_2f.windowIconPath.length==0){
+_2f.windowIconPath=null;
+}else{
+var _35=_2f.windowIconPath;
+var _36=_35.charAt(0);
 if(_36!="/"){
-_34=_34+"/";
+_35="/"+_35;
+}
+var _37=_35.charAt(_35.length-1);
+if(_37!="/"){
+_35=_35+"/";
 }
-_2e.windowIconPath=_34;
+_2f.windowIconPath=_35;
 }
 }
 });
 };
-jetspeed.purifyIdentifier=function(src,_38,_39){
+jetspeed.purifyIdentifier=function(src,_39,_3a){
 if(src==null){
 return src;
 }
-var _3a=src.length;
-if(_3a==0){
+var _3b=src.length;
+if(_3b==0){
 return src;
 }
-if(_38==null){
-_38="_";
+if(_39==null){
+_39="_";
 }
-var _3b=new RegExp("[^a-z_0-9A-Z]","g");
-var _3c=src.charCodeAt(0);
-var _3d=null;
-if((_3c>=65&&_3c<=90)||_3c==95||(_3c>=97&&_3c<=122)){
-_3d=src.charAt(0);
-}else{
-_3d=_38;
-}
-var _3e=false,_3f=false;
-if(_39!=null){
-_39=_39.toLowerCase();
-_3e=(_39=="hi"?true:false);
-_3f=(_39=="lo"?true:false);
+var _3c=new RegExp("[^a-z_0-9A-Z]","g");
+var _3d=src.charCodeAt(0);
+var _3e=null;
+if((_3d>=65&&_3d<=90)||_3d==95||(_3d>=97&&_3d<=122)){
+_3e=src.charAt(0);
+}else{
+_3e=_39;
+}
+var _3f=false,_40=false;
+if(_3a!=null){
+_3a=_3a.toLowerCase();
+_3f=(_3a=="hi"?true:false);
+_40=(_3a=="lo"?true:false);
 }
-if(_3a>1){
-if(_3e||_3f){
+if(_3b>1){
+if(_3f||_40){
 upNext=false;
-for(var i=1;i<_3a;i++){
-_3c=src.charCodeAt(i);
-if((_3c>=65&&_3c<=90)||_3c==95||(_3c>=97&&_3c<=122)||(_3c>=48&&_3c<=57)){
-if(upNext&&(_3c>=97&&_3c<=122)){
-_3d+=String.fromCharCode(_3c-32);
+for(var i=1;i<_3b;i++){
+_3d=src.charCodeAt(i);
+if((_3d>=65&&_3d<=90)||_3d==95||(_3d>=97&&_3d<=122)||(_3d>=48&&_3d<=57)){
+if(upNext&&(_3d>=97&&_3d<=122)){
+_3e+=String.fromCharCode(_3d-32);
 }else{
-_3d+=src.charAt(i);
+_3e+=src.charAt(i);
 }
 upNext=false;
 }else{
 upNext=true;
-_3d+=_38;
+_3e+=_39;
 }
 }
 }else{
-_3d+=src.substring(1).replace(_3b,_38);
+_3e+=src.substring(1).replace(_3c,_39);
 }
 }
-if(_3e){
-_3c=_3d.charCodeAt(0);
-if(_3c>=97&&_3c<=122){
-_3d=String.fromCharCode(_3c-32)+_3d.substring(1);
+if(_3f){
+_3d=_3e.charCodeAt(0);
+if(_3d>=97&&_3d<=122){
+_3e=String.fromCharCode(_3d-32)+_3e.substring(1);
 }
 }
-return _3d;
+return _3e;
 };
 jetspeed.notifyRetrieveAllMenusFinished=function(){
 jetspeed.pageNavigateSuppress=true;
 if(dojo.lang.isFunction(window.doMenuBuildAll)){
 window.doMenuBuildAll();
 }
-var _41=jetspeed.page.getMenuNames();
-for(var i=0;i<_41.length;i++){
-var _43=_41[i];
-var _44=dojo.widget.byId(jetspeed.id.MENU_WIDGET_ID_PREFIX+_43);
-if(_44){
-_44.createJetspeedMenu(jetspeed.page.getMenu(_43));
+var _42=jetspeed.page.getMenuNames();
+for(var i=0;i<_42.length;i++){
+var _44=_42[i];
+var _45=dojo.widget.byId(jetspeed.id.MENU_WIDGET_ID_PREFIX+_44);
+if(_45){
+_45.createJetspeedMenu(jetspeed.page.getMenu(_44));
 }
 }
 jetspeed.url.loadingIndicatorHide();
 jetspeed.pageNavigateSuppress=false;
 };
-jetspeed.notifyRetrieveMenuFinished=function(_45){
+jetspeed.notifyRetrieveMenuFinished=function(_46){
 if(dojo.lang.isFunction(window.doMenuBuild)){
-window.doMenuBuild(_45);
+window.doMenuBuild(_46);
 }
 };
-jetspeed.menuNavClickWidget=function(_46,_47){
+jetspeed.menuNavClickWidget=function(_47,_48){
 dojo.debug("jetspeed.menuNavClick");
-if(!_46){
+if(!_47){
 return;
 }
-if(dojo.lang.isString(_46)){
-var _48=_46;
-_46=dojo.widget.byId(_48);
-if(!_46){
-dojo.raise("menuNavClick could not find tab widget for "+_48);
-}
+if(dojo.lang.isString(_47)){
+var _49=_47;
+_47=dojo.widget.byId(_49);
+if(!_47){
+dojo.raise("menuNavClick could not find tab widget for "+_49);
 }
-if(_46){
-var _49=_46.jetspeedmenuname;
-if(!_49&&_46.extraArgs){
-_49=_46.extraArgs.jetspeedmenuname;
 }
-if(!_49){
-dojo.raise("menuNavClick tab widget ["+_46.widgetId+"] does not define jetspeedMenuName");
+if(_47){
+var _4a=_47.jetspeedmenuname;
+if(!_4a&&_47.extraArgs){
+_4a=_47.extraArgs.jetspeedmenuname;
 }
-var _4a=jetspeed.page.getMenu(_49);
 if(!_4a){
-dojo.raise("menuNavClick Menu lookup for tab widget ["+_46.widgetId+"] failed: "+_49);
+dojo.raise("menuNavClick tab widget ["+_47.widgetId+"] does not define jetspeedMenuName");
 }
-var _4b=_4a.getOptionByIndex(_47);
-jetspeed.menuNavClick(_4b);
+var _4b=jetspeed.page.getMenu(_4a);
+if(!_4b){
+dojo.raise("menuNavClick Menu lookup for tab widget ["+_47.widgetId+"] failed: "+_4a);
+}
+var _4c=_4b.getOptionByIndex(_48);
+jetspeed.menuNavClick(_4c);
 }
 };
 jetspeed.pageNavigateSuppress=false;
-jetspeed.pageNavigate=function(_4c,_4d,_4e){
-if(!_4c||jetspeed.pageNavigateSuppress){
+jetspeed.pageNavigate=function(_4d,_4e,_4f){
+if(!_4d||jetspeed.pageNavigateSuppress){
 return;
 }
-if(typeof _4e=="undefined"){
-_4e=false;
+if(typeof _4f=="undefined"){
+_4f=false;
 }
-if(!_4e&&jetspeed.page&&jetspeed.page.equalsPageUrl(_4c)){
+if(!_4f&&jetspeed.page&&jetspeed.page.equalsPageUrl(_4d)){
 return;
 }
-_4c=jetspeed.page.makePageUrl(_4c);
-if(_4d=="top"){
-top.location.href=_4c;
+_4d=jetspeed.page.makePageUrl(_4d);
+if(_4e=="top"){
+top.location.href=_4d;
 }else{
-if(_4d=="parent"){
-parent.location.href=_4c;
+if(_4e=="parent"){
+parent.location.href=_4d;
 }else{
-window.location.href=_4c;
+window.location.href=_4d;
 }
 }
 };
 jetspeed.loadPortletSelector=function(){
-var _4f={};
-_4f[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=false;
-_4f[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=false;
-_4f[jetspeed.id.PORTLET_PROP_WINDOW_DECORATION]=jetspeed.page.getPortletDecorationDefault();
-_4f[jetspeed.id.PORTLET_PROP_WINDOW_TITLE]=jetspeed.prefs.portletSelectorWindowTitle;
-_4f[jetspeed.id.PORTLET_PROP_WINDOW_ICON]=jetspeed.prefs.portletSelectorWindowIcon;
-_4f[jetspeed.id.PORTLET_PROP_WIDGET_ID]=jetspeed.id.PORTLET_WINDOW_ID_PREFIX+jetspeed.id.SELECTOR;
-_4f[jetspeed.id.PORTLET_PROP_WIDTH]=jetspeed.prefs.portletSelectorBounds.width;
-_4f[jetspeed.id.PORTLET_PROP_HEIGHT]=jetspeed.prefs.portletSelectorBounds.height;
-_4f[jetspeed.id.PORTLET_PROP_LEFT]=jetspeed.prefs.portletSelectorBounds.x;
-_4f[jetspeed.id.PORTLET_PROP_TOP]=jetspeed.prefs.portletSelectorBounds.y;
-_4f[jetspeed.id.PORTLET_PROP_EXCLUDE_PCONTENT]=true;
-_4f[jetspeed.id.PORTLET_PROP_CONTENT_RETRIEVER]=new jetspeed.om.PortletSelectorContentRetriever();
-var _50=jetspeed.widget.PortletWindow.prototype.staticDefineAsAltInitParameters(null,_4f);
-jetspeed.ui.createPortletWindow(_50);
-_50.retrieveContent(null,null);
+var _50={};
+_50[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=false;
+_50[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=false;
+_50[jetspeed.id.PORTLET_PROP_WINDOW_DECORATION]=jetspeed.page.getPortletDecorationDefault();
+_50[jetspeed.id.PORTLET_PROP_WINDOW_TITLE]=jetspeed.prefs.portletSelectorWindowTitle;
+_50[jetspeed.id.PORTLET_PROP_WINDOW_ICON]=jetspeed.prefs.portletSelectorWindowIcon;
+_50[jetspeed.id.PORTLET_PROP_WIDGET_ID]=jetspeed.id.PORTLET_WINDOW_ID_PREFIX+jetspeed.id.SELECTOR;
+_50[jetspeed.id.PORTLET_PROP_WIDTH]=jetspeed.prefs.portletSelectorBounds.width;
+_50[jetspeed.id.PORTLET_PROP_HEIGHT]=jetspeed.prefs.portletSelectorBounds.height;
+_50[jetspeed.id.PORTLET_PROP_LEFT]=jetspeed.prefs.portletSelectorBounds.x;
+_50[jetspeed.id.PORTLET_PROP_TOP]=jetspeed.prefs.portletSelectorBounds.y;
+_50[jetspeed.id.PORTLET_PROP_EXCLUDE_PCONTENT]=true;
+_50[jetspeed.id.PORTLET_PROP_CONTENT_RETRIEVER]=new jetspeed.om.PortletSelectorContentRetriever();
+var _51=jetspeed.widget.PortletWindow.prototype.staticDefineAsAltInitParameters(null,_50);
+jetspeed.ui.createPortletWindow(_51);
+_51.retrieveContent(null,null);
 jetspeed.getPortletDefinitions();
 };
 jetspeed.getPortletDefinitions=function(){
-var _51=new jetspeed.om.PortletSelectorAjaxApiContentListener();
-var _52="?action=getportlets";
-var _53=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_52;
-var _54="text/xml";
-var _55=new jetspeed.om.Id("getportlets",{});
-jetspeed.url.retrieveContent({url:_53,mimetype:_54},_51,_55,jetspeed.debugContentDumpIds);
-};
-jetspeed.searchForPortletDefinitions=function(_56,_57){
-var _58=new jetspeed.om.PortletSelectorSearchContentListener(_57);
-var _59="?action=getportlets&filter="+_56;
-var _5a=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_59;
-var _5b="text/xml";
-var _5c=new jetspeed.om.Id("getportlets",{});
-jetspeed.url.retrieveContent({url:_5a,mimetype:_5b},_58,_5c,jetspeed.debugContentDumpIds);
-};
-jetspeed.getFolders=function(_5d,_5e){
-var _5f=new jetspeed.om.FoldersListContentListener(_5e);
-var _60="?action=getfolders&data="+_5d;
-var _61=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_60;
-var _62="text/xml";
-var _63=new jetspeed.om.Id("getfolders",{});
-jetspeed.url.retrieveContent({url:_61,mimetype:_62},_5f,_63,jetspeed.debugContentDumpIds);
-};
-jetspeed.portletDefinitionsforSelector=function(_64,_65,_66,_67,_68){
-var _69=new jetspeed.om.PortletSelectorSearchContentListener(_68);
-var _6a="?action=selectorPortlets&category="+_65+"&portletPerPages="+_67+"&pageNumber="+_66+"&filter="+_64;
-var _6b=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_6a;
-var _6c="text/xml";
-var _6d=new jetspeed.om.Id("selectorPortlets",{});
-jetspeed.url.retrieveContent({url:_6b,mimetype:_6c},_69,_6d,jetspeed.debugContentDumpIds);
+var _52=new jetspeed.om.PortletSelectorAjaxApiContentListener();
+var _53="?action=getportlets";
+var _54=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_53;
+var _55="text/xml";
+var _56=new jetspeed.om.Id("getportlets",{});
+jetspeed.url.retrieveContent({url:_54,mimetype:_55},_52,_56,jetspeed.debugContentDumpIds);
+};
+jetspeed.searchForPortletDefinitions=function(_57,_58){
+var _59=new jetspeed.om.PortletSelectorSearchContentListener(_58);
+var _5a="?action=getportlets&filter="+_57;
+var _5b=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_5a;
+var _5c="text/xml";
+var _5d=new jetspeed.om.Id("getportlets",{});
+jetspeed.url.retrieveContent({url:_5b,mimetype:_5c},_59,_5d,jetspeed.debugContentDumpIds);
+};
+jetspeed.getFolders=function(_5e,_5f){
+var _60=new jetspeed.om.FoldersListContentListener(_5f);
+var _61="?action=getfolders&data="+_5e;
+var _62=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_61;
+var _63="text/xml";
+var _64=new jetspeed.om.Id("getfolders",{});
+jetspeed.url.retrieveContent({url:_62,mimetype:_63},_60,_64,jetspeed.debugContentDumpIds);
+};
+jetspeed.portletDefinitionsforSelector=function(_65,_66,_67,_68,_69){
+var _6a=new jetspeed.om.PortletSelectorSearchContentListener(_69);
+var _6b="?action=selectorPortlets&category="+_66+"&portletPerPages="+_68+"&pageNumber="+_67+"&filter="+_65;
+var _6c=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+_6b;
+var _6d="text/xml";
+var _6e=new jetspeed.om.Id("selectorPortlets",{});
+jetspeed.url.retrieveContent({url:_6c,mimetype:_6d},_6a,_6e,jetspeed.debugContentDumpIds);
 };
-jetspeed.getActionsForPortlet=function(_6e){
-if(_6e==null){
+jetspeed.getActionsForPortlet=function(_6f){
+if(_6f==null){
 return;
 }
-jetspeed.getActionsForPortlets([_6e]);
+jetspeed.getActionsForPortlets([_6f]);
 };
-jetspeed.getActionsForPortlets=function(_6f){
-if(_6f==null){
-_6f=jetspeed.page.getPortletIds();
+jetspeed.getActionsForPortlets=function(_70){
+if(_70==null){
+_70=jetspeed.page.getPortletIds();
 }
-var _70=new jetspeed.om.PortletActionsContentListener(_6f);
-var _71="?action=getactions";
-for(var i=0;i<_6f.length;i++){
-_71+="&id="+_6f[i];
+var _71=new jetspeed.om.PortletActionsContentListener(_70);
+var _72="?action=getactions";
+for(var i=0;i<_70.length;i++){
+_72+="&id="+_70[i];
 }
-var _73=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_71;
-var _74="text/xml";
-var _75=new jetspeed.om.Id("getactions",{});
-jetspeed.url.retrieveContent({url:_73,mimetype:_74},_70,_75,jetspeed.debugContentDumpIds);
+var _74=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_72;
+var _75="text/xml";
+var _76=new jetspeed.om.Id("getactions",{});
+jetspeed.url.retrieveContent({url:_74,mimetype:_75},_71,_76,jetspeed.debugContentDumpIds);
 };
-jetspeed.changeActionForPortlet=function(_76,_77,_78,_79){
-if(_76==null){
+jetspeed.changeActionForPortlet=function(_77,_78,_79,_7a){
+if(_77==null){
 return;
 }
-if(_79==null){
-_79=new jetspeed.om.PortletChangeActionContentListener(_76);
-}
-var _7a="?action=window&id="+(_76!=null?_76:"");
-if(_77!=null){
-_7a+="&state="+_77;
+if(_7a==null){
+_7a=new jetspeed.om.PortletChangeActionContentListener(_77);
 }
+var _7b="?action=window&id="+(_77!=null?_77:"");
 if(_78!=null){
-_7a+="&mode="+_78;
+_7b+="&state="+_78;
 }
-var _7b=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_7a;
-var _7c="text/xml";
-var _7d=new jetspeed.om.Id("changeaction",{});
-jetspeed.url.retrieveContent({url:_7b,mimetype:_7c},_79,_7d,jetspeed.debugContentDumpIds);
-};
-jetspeed.addNewPortletDefinition=function(_7e,_7f,_80,_81){
-var _82=true;
-if(_80!=null){
-_82=false;
-}
-var _83=new jetspeed.om.PortletAddAjaxApiCallbackContentListener(_7e,_7f,_82);
-var _84="?action=add&id="+escape(_7e.getPortletName());
-if(_81!=null&&_81.length>0){
-_84+="&layoutid="+escape(_81);
-}
-var _85=null;
-if(_80!=null){
-_85=_80+_84;
-}else{
-_85=jetspeed.page.getPsmlUrl()+_84;
-}
-var _86="text/xml";
-var _87=new jetspeed.om.Id("addportlet",{});
-jetspeed.url.retrieveContent({url:_85,mimetype:_86},_83,_87,jetspeed.debugContentDumpIds);
+if(_79!=null){
+_7b+="&mode="+_79;
+}
+var _7c=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_7b;
+var _7d="text/xml";
+var _7e=new jetspeed.om.Id("changeaction",{});
+jetspeed.url.retrieveContent({url:_7c,mimetype:_7d},_7a,_7e,jetspeed.debugContentDumpIds);
+};
+jetspeed.addNewPortletDefinition=function(_7f,_80,_81,_82){
+var _83=true;
+if(_81!=null){
+_83=false;
+}
+var _84=new jetspeed.om.PortletAddAjaxApiCallbackContentListener(_7f,_80,_83);
+var _85="?action=add&id="+escape(_7f.getPortletName());
+if(_82!=null&&_82.length>0){
+_85+="&layoutid="+escape(_82);
+}
+var _86=null;
+if(_81!=null){
+_86=_81+_85;
+}else{
+_86=jetspeed.page.getPsmlUrl()+_85;
+}
+var _87="text/xml";
+var _88=new jetspeed.om.Id("addportlet",{});
+jetspeed.url.retrieveContent({url:_86,mimetype:_87},_84,_88,jetspeed.debugContentDumpIds);
 };
 jetspeed.editPageInitiate=function(){
 if(!jetspeed.page.editMode){
-var _88=true;
-var _89=jetspeed.url.getQueryParameter(document.location.href,jetspeed.id.PORTAL_ORIGINATE_PARAMETER);
-if(_89!=null&&_89=="true"){
-_88=false;
+var _89=true;
+var _8a=jetspeed.url.getQueryParameter(window.location.href,jetspeed.id.PORTAL_ORIGINATE_PARAMETER);
+if(_8a!=null&&_8a=="true"){
+_89=false;
 }
 jetspeed.page.editMode=true;
-var _8a=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
-if(_8a==null){
+var _8b=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
+if(_8b==null){
 try{
 jetspeed.url.loadingIndicatorShow("loadpageeditor");
-_8a=dojo.widget.createWidget("jetspeed:PageEditor",{widgetId:jetspeed.id.PAGE_EDITOR_WIDGET_ID,editorInitiatedFromDesktop:_88});
-var _8b=document.getElementById(jetspeed.id.COLUMNS);
-_8b.insertBefore(_8a.domNode,_8b.firstChild);
+_8b=dojo.widget.createWidget("jetspeed:PageEditor",{widgetId:jetspeed.id.PAGE_EDITOR_WIDGET_ID,editorInitiatedFromDesktop:_89});
+var _8c=document.getElementById(jetspeed.id.COLUMNS);
+_8c.insertBefore(_8b.domNode,_8c.firstChild);
 }
 catch(e){
 jetspeed.url.loadingIndicatorHide();
 }
 }else{
-_8a.editPageShow();
+_8b.editPageShow();
 }
 jetspeed.page.syncPageControls();
 }
 };
 jetspeed.editPageTerminate=function(){
 if(jetspeed.page.editMode){
-var _8c=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
-_8c.editModeNormal();
+var _8d=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
+_8d.editModeNormal();
 jetspeed.page.editMode=false;
-if(!_8c.editorInitiatedFromDesktop){
-var _8d=jetspeed.page.getPageUrl(true);
-_8d=jetspeed.url.removeQueryParameter(_8d,jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER);
-_8d=jetspeed.url.removeQueryParameter(_8d,jetspeed.id.PORTAL_ORIGINATE_PARAMETER);
-window.location.href=_8d;
+if(!_8d.editorInitiatedFromDesktop){
+var _8e=jetspeed.page.getPageUrl(true);
+_8e=jetspeed.url.removeQueryParameter(_8e,jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER);
+_8e=jetspeed.url.removeQueryParameter(_8e,jetspeed.id.PORTAL_ORIGINATE_PARAMETER);
+window.location.href=_8e;
 }else{
-if(_8c!=null){
-_8c.editPageHide();
+if(_8d!=null){
+_8d.editPageHide();
 }
 jetspeed.page.syncPageControls();
 }
@@ -618,218 +620,243 @@
 };
 jetspeed.om.PortletContentRetriever=function(){
 };
-jetspeed.om.PortletContentRetriever.prototype={getContent:function(_8e,_8f,_90,_91){
-if(!_8e){
-_8e={};
+jetspeed.om.PortletContentRetriever.prototype={getContent:function(_8f,_90,_91,_92){
+if(!_8f){
+_8f={};
 }
-jetspeed.url.retrieveContent(_8e,_8f,_90,_91);
+jetspeed.url.retrieveContent(_8f,_90,_91,_92);
 }};
 jetspeed.om.PortletSelectorContentRetriever=function(){
 };
-jetspeed.om.PortletSelectorContentRetriever.prototype={getContent:function(_92,_93,_94,_95){
-if(!_92){
-_92={};
-}
-var _96="<div widgetId=\""+jetspeed.id.SELECTOR+"\" dojoType=\"PortletDefContainer\"></div>";
+jetspeed.om.PortletSelectorContentRetriever.prototype={getContent:function(_93,_94,_95,_96){
 if(!_93){
-_93=new jetspeed.om.BasicContentListener();
+_93={};
+}
+var _97="<div widgetId=\""+jetspeed.id.SELECTOR+"\" dojoType=\"PortletDefContainer\"></div>";
+if(!_94){
+_94=new jetspeed.om.BasicContentListener();
 }
-_93.notifySuccess(_96,_92.url,_94);
+_94.notifySuccess(_97,_93.url,_95);
 }};
 jetspeed.om.PortletSelectorContentListener=function(){
 };
-jetspeed.om.PortletSelectorContentListener.prototype={notifySuccess:function(_97,_98,_99){
-var _9a=this.getPortletWindow();
-if(_9a){
-_9a.setPortletContent(_97,renderUrl);
+jetspeed.om.PortletSelectorContentListener.prototype={notifySuccess:function(_98,_99,_9a){
+var _9b=this.getPortletWindow();
+if(_9b){
+_9b.setPortletContent(_98,renderUrl);
 }
-},notifyFailure:function(_9b,_9c,_9d,_9e){
-dojo.raise("PortletSelectorContentListener notifyFailure url: "+_9d+" type: "+_9b+jetspeed.url.formatBindError(_9c));
+},notifyFailure:function(_9c,_9d,_9e,_9f){
+dojo.raise("PortletSelectorContentListener notifyFailure url: "+_9e+" type: "+_9c+jetspeed.url.formatBindError(_9d));
 }};
-jetspeed.om.PageContentListenerUpdate=function(_9f){
-this.previousPage=_9f;
+jetspeed.om.PageContentListenerUpdate=function(_a0){
+this.previousPage=_a0;
 };
-jetspeed.om.PageContentListenerUpdate.prototype={notifySuccess:function(_a0,_a1,_a2){
-dojo.raise("PageContentListenerUpdate notifySuccess - BUT NOT SUPPORTED - url="+_a1);
-},notifyFailure:function(_a3,_a4,_a5,_a6){
-dojo.raise("PageContentListenerUpdate notifyFailure url: "+_a5+" type: "+_a3+jetspeed.url.formatBindError(_a4));
+jetspeed.om.PageContentListenerUpdate.prototype={notifySuccess:function(_a1,_a2,_a3){
+dojo.raise("PageContentListenerUpdate notifySuccess - BUT NOT SUPPORTED - url="+_a2);
+},notifyFailure:function(_a4,_a5,_a6,_a7){
+dojo.raise("PageContentListenerUpdate notifyFailure url: "+_a6+" type: "+_a4+jetspeed.url.formatBindError(_a5));
 }};
 jetspeed.om.PageContentListenerCreateWidget=function(){
 };
-jetspeed.om.PageContentListenerCreateWidget.prototype={notifySuccess:function(_a7,_a8,_a9){
-_a9.loadFromPSML(_a7);
-},notifyFailure:function(_aa,_ab,_ac,_ad){
-dojo.raise("PageContentListenerCreateWidget error url: "+_ac+" type: "+_aa+jetspeed.url.formatBindError(_ab));
+jetspeed.om.PageContentListenerCreateWidget.prototype={notifySuccess:function(_a8,_a9,_aa){
+_aa.loadFromPSML(_a8);
+},notifyFailure:function(_ab,_ac,_ad,_ae){
+dojo.raise("PageContentListenerCreateWidget error url: "+_ad+" type: "+_ab+jetspeed.url.formatBindError(_ac));
 }};
 jetspeed.om.Id=function(){
-var _ae="";
+var _af="";
 for(var i=0;i<arguments.length;i++){
 if(dojo.lang.isString(arguments[i])){
-if(_ae.length>0){
-_ae+="-";
+if(_af.length>0){
+_af+="-";
 }
-_ae+=arguments[i];
+_af+=arguments[i];
 }else{
 if(dojo.lang.isObject(arguments[i])){
-for(var _b0 in arguments[i]){
-this[_b0]=arguments[i][_b0];
+for(var _b1 in arguments[i]){
+this[_b1]=arguments[i][_b1];
 }
 }
 }
 }
-this.jetspeed_om_id=_ae;
+this.jetspeed_om_id=_af;
 };
 dojo.lang.extend(jetspeed.om.Id,{getId:function(){
 return this.jetspeed_om_id;
 }});
-jetspeed.om.Page=function(_b1,_b2,_b3){
-if(_b1!=null&&_b2!=null){
-this.requiredLayoutDecorator=_b1;
-this.setPsmlPathFromDocumentUrl(_b2);
-this.pageUrlFallback=_b2;
+jetspeed.om.Page=function(_b2,_b3,_b4,_b5){
+if(_b2!=null&&_b3!=null){
+this.requiredLayoutDecorator=_b2;
+this.setPsmlPathFromDocumentUrl(_b3);
+this.pageUrlFallback=_b3;
 }else{
 this.setPsmlPathFromDocumentUrl();
 }
-this.addToHistory=_b3;
+if(typeof _b4!="undefined"){
+this.addToHistory=_b4;
+}
+if(typeof _b5!="undefined"){
+this.editMode=_b5;
+}
 this.layouts={};
 this.columns=[];
 this.portlets=[];
 this.menus=[];
 };
 dojo.inherits(jetspeed.om.Page,jetspeed.om.Id);
-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,layouts:null,columns:null,portlets:null,editMode:false,themeDefinitions:null,menus:null,getId:function(){
-var _b4=(this.name!=null&&this.name.length>0?this.name:null);
-if(!_b4){
+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,editMode:false,themeDefinitions:null,menus:null,getId:function(){
+var _b6=(this.name!=null&&this.name.length>0?this.name:null);
+if(!_b6){
 this.getPsmlUrl();
-_b4=this.psmlPath;
+_b6=this.psmlPath;
+}
+return "page-"+_b6;
+},setPsmlPathFromDocumentUrl:function(_b7){
+var _b8=jetspeed.url.path.AJAX_API;
+var _b9=null;
+if(_b7==null){
+_b9=window.location.pathname;
+if(!djConfig.preventBackButtonFix&&jetspeed.prefs.ajaxPageNavigation){
+var _ba=window.location.hash;
+if(_ba!=null&&_ba.length>0){
+if(_ba.indexOf("#")==0){
+_ba=(_ba.length>1?_ba.substring(1):"");
+}
+if(_ba!=null&&_ba.length>1&&_ba.indexOf("/")==0){
+this.psmlPath=jetspeed.url.path.AJAX_API+_ba;
+return;
 }
-return "page-"+_b4;
-},setPsmlPathFromDocumentUrl:function(_b5){
-var _b6=jetspeed.url.path.AJAX_API;
-var _b7=null;
-if(_b5==null){
-_b7=document.location.pathname;
-}else{
-var _b8=jetspeed.url.parse(_b5);
-_b7=_b8.path;
-}
-var _b9=jetspeed.url.path.DESKTOP;
-var _ba=_b7.indexOf(_b9);
-if(_ba!=-1&&_b7.length>(_ba+_b9.length)){
-_b6=_b6+_b7.substring(_ba+_b9.length);
 }
-this.psmlPath=_b6;
+}
+}else{
+var _bb=jetspeed.url.parse(_b7);
+_b9=_bb.path;
+}
+var _bc=jetspeed.url.path.DESKTOP;
+var _bd=_b9.indexOf(_bc);
+if(_bd!=-1&&_b9.length>(_bd+_bc.length)){
+_b8=_b8+_b9.substring(_bd+_bc.length);
+}
+this.psmlPath=_b8;
 },getPsmlUrl:function(){
 if(this.psmlPath==null){
 this.setPsmlPathFromDocumentUrl();
 }
-var _bb=jetspeed.url.basePortalUrl()+this.psmlPath;
+var _be=jetspeed.url.basePortalUrl()+this.psmlPath;
 if(jetspeed.prefs.printModeOnly!=null){
-_bb=jetspeed.url.addQueryParameter(_bb,"layoutid",jetspeed.prefs.printModeOnly.layout);
-_bb=jetspeed.url.addQueryParameter(_bb,"entity",jetspeed.prefs.printModeOnly.entity).toString();
+_be=jetspeed.url.addQueryParameter(_be,"layoutid",jetspeed.prefs.printModeOnly.layout);
+_be=jetspeed.url.addQueryParameter(_be,"entity",jetspeed.prefs.printModeOnly.entity).toString();
 }
-return _bb;
-},retrievePsml:function(_bc){
-if(_bc==null){
-_bc=new jetspeed.om.PageContentListenerCreateWidget();
+return _be;
+},retrievePsml:function(_bf){
+if(_bf==null){
+_bf=new jetspeed.om.PageContentListenerCreateWidget();
 }
-var _bd=this.getPsmlUrl();
-var _be="text/xml";
+var _c0=this.getPsmlUrl();
+var _c1="text/xml";
 if(jetspeed.debug.retrievePsml){
-dojo.debug("retrievePsml url: "+_bd);
+dojo.debug("retrievePsml url: "+_c0);
 }
-jetspeed.url.retrieveContent({url:_bd,mimetype:_be},_bc,this,jetspeed.debugContentDumpIds);
-},loadFromPSML:function(_bf){
-var _c0=this._parsePSML(_bf);
-if(_c0==null){
+jetspeed.url.retrieveContent({url:_c0,mimetype:_c1},_bf,this,jetspeed.debugContentDumpIds);
+},loadFromPSML:function(_c2){
+var _c3=this._parsePSML(_c2);
+if(_c3==null){
 return;
 }
-var _c1={};
-this.columnsStructure=this._layoutCreateModel(_c0,null,_c1,true);
-this.rootFragmentId=_c0.id;
+var _c4={};
+this.columnsStructure=this._layoutCreateModel(_c3,null,_c4,true);
+this.rootFragmentId=_c3.id;
+var _c5=false;
+if(this.editMode){
+this.editMode=false;
+if(jetspeed.prefs.printModeOnly==null){
+_c5=true;
+}
+}
 if(jetspeed.prefs.windowTiling){
 this._createColumnsStart(document.getElementById(jetspeed.id.DESKTOP));
 }
-var _c2=new Array();
-var _c3=this.columns.length;
-for(var _c4=0;_c4<=this.columns.length;_c4++){
-var _c5=null;
-if(_c4==_c3){
-_c5=_c1["z"];
-if(_c5!=null){
-_c5.sort(this._loadPortletZIndexCompare);
-}
-}else{
-_c5=_c1[_c4.toString()];
-}
-if(_c5!=null){
-for(var i=0;i<_c5.length;i++){
-var _c7=_c5[i].portlet;
-_c2.push(_c7);
-_c7.createPortletWindow(_c4);
+var _c6=new Array();
+var _c7=this.columns.length;
+for(var _c8=0;_c8<=this.columns.length;_c8++){
+var _c9=null;
+if(_c8==_c7){
+_c9=_c4["z"];
+if(_c9!=null){
+_c9.sort(this._loadPortletZIndexCompare);
+}
+}else{
+_c9=_c4[_c8.toString()];
+}
+if(_c9!=null){
+for(var i=0;i<_c9.length;i++){
+var _cb=_c9[i].portlet;
+_c6.push(_cb);
+_cb.createPortletWindow(_c8);
 }
 }
 }
 if(jetspeed.prefs.printModeOnly==null){
-if(_c2&&_c2.length>0){
-jetspeed.doRenderAll(null,_c2,true);
+if(_c6&&_c6.length>0){
+jetspeed.doRenderAll(null,_c6,true);
 }
-this._portletsInitializeWindowState(_c1["z"]);
-this.retrieveAllMenus();
-this.renderPageControls();
-this.syncPageControls();
-var _c8=jetspeed.url.getQueryParameter(document.location.href,jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER);
-if((_c8!=null&&_c8=="true")||this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null){
+this._portletsInitializeWindowState(_c4["z"]);
+var _cc=jetspeed.url.getQueryParameter(window.location.href,jetspeed.id.PAGE_EDITOR_INITIATE_PARAMETER);
+if(_c5||(_cc!=null&&_cc=="true")||this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null){
+_c5=false;
 if(this.actions!=null&&(this.actions[jetspeed.id.ACTION_NAME_EDIT]!=null||this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null)){
-jetspeed.editPageInitiate();
+_c5=true;
 }
 }
+this.retrieveMenuDeclarations(true,_c5);
+this.renderPageControls();
+this.syncPageControls();
 }else{
-var _c7=null;
-for(var _c9 in this.portlets){
-_c7=this.portlets[_c9];
+var _cb=null;
+for(var _cd in this.portlets){
+_cb=this.portlets[_cd];
 break;
 }
-if(_c7!=null){
-_c7.renderAction(null,jetspeed.prefs.printModeOnly.action);
-this._portletsInitializeWindowState(_c1["z"]);
+if(_cb!=null){
+_cb.renderAction(null,jetspeed.prefs.printModeOnly.action);
+this._portletsInitializeWindowState(_c4["z"]);
 }
 }
-},_parsePSML:function(_ca){
-var _cb=_ca.getElementsByTagName("page");
-if(!_cb||_cb.length>1){
+},_parsePSML:function(_ce){
+var _cf=_ce.getElementsByTagName("page");
+if(!_cf||_cf.length>1){
 dojo.raise("unexpected zero or multiple <page> elements in psml");
 }
-var _cc=_cb[0];
-var _cd=_cc.childNodes;
-var _ce=new RegExp("(name|path|profiledPath|title|short-title)");
-var _cf=null;
-var _d0={};
-for(var i=0;i<_cd.length;i++){
-var _d2=_cd[i];
-if(_d2.nodeType!=dojo.dom.ELEMENT_NODE){
+var _d0=_cf[0];
+var _d1=_d0.childNodes;
+var _d2=new RegExp("(name|path|profiledPath|title|short-title)");
+var _d3=null;
+var _d4={};
+for(var i=0;i<_d1.length;i++){
+var _d6=_d1[i];
+if(_d6.nodeType!=dojo.dom.ELEMENT_NODE){
 continue;
 }
-var _d3=_d2.nodeName;
-if(_d3=="fragment"){
-_cf=_d2;
+var _d7=_d6.nodeName;
+if(_d7=="fragment"){
+_d3=_d6;
 }else{
-if(_d3=="defaults"){
-this.layoutDecorator=_d2.getAttribute("layout-decorator");
-this.portletDecorator=_d2.getAttribute("portlet-decorator");
+if(_d7=="defaults"){
+this.layoutDecorator=_d6.getAttribute("layout-decorator");
+this.portletDecorator=_d6.getAttribute("portlet-decorator");
 }else{
-if(_d3&&_d3.match(_ce)){
-this[jetspeed.purifyIdentifier(_d3,"","lo")]=((_d2&&_d2.firstChild)?_d2.firstChild.nodeValue:null);
+if(_d7&&_d7.match(_d2)){
+this[jetspeed.purifyIdentifier(_d7,"","lo")]=((_d6&&_d6.firstChild)?_d6.firstChild.nodeValue:null);
 }else{
-if(_d3=="action"){
-this._parsePSMLAction(_d2,_d0);
+if(_d7=="action"){
+this._parsePSMLAction(_d6,_d4);
 }
 }
 }
 }
 }
-this.actions=_d0;
-if(_cf==null){
+this.actions=_d4;
+if(_d3==null){
 dojo.raise("No root fragment in PSML.");
 return null;
 }
@@ -842,99 +869,99 @@
 return null;
 }else{
 if(this.addToHistory){
-var _d4=this.getPageUrl();
+var _d8=this.getPageUrl();
 dojo.undo.browser.addToHistory({back:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("back-nav-button: "+_d4);
+dojo.debug("back-nav-button: "+_d8);
 }
-jetspeed.updatePage(_d4,true);
+jetspeed.updatePage(_d8,true);
 },forward:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("forward-nav-button: "+_d4);
+dojo.debug("forward-nav-button: "+_d8);
 }
-jetspeed.updatePage(_d4,true);
-},changeUrl:false});
+jetspeed.updatePage(_d8,true);
+},changeUrl:escape(this.getPath())});
 }
 }
 }else{
 if(!djConfig.preventBackButtonFix&&jetspeed.prefs.ajaxPageNavigation){
-var _d4=this.getPageUrl();
+var _d8=this.getPageUrl();
 dojo.undo.browser.setInitialState({back:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("back-nav-button initial: "+_d4);
+dojo.debug("back-nav-button initial: "+_d8);
 }
-jetspeed.updatePage(_d4,true);
+jetspeed.updatePage(_d8,true);
 },forward:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("forward-nav-button initial: "+_d4);
+dojo.debug("forward-nav-button initial: "+_d8);
 }
-jetspeed.updatePage(_d4,true);
-},changeUrl:false});
+jetspeed.updatePage(_d8,true);
+},changeUrl:escape(this.getPath())});
 }
 }
-var _d5=this._parsePSMLLayoutFragment(_cf,0);
-return _d5;
-},_parsePSMLLayoutFragment:function(_d6,_d7){
-var _d8=new Array();
-var _d9=((_d6!=null)?_d6.getAttribute("type"):null);
-if(_d9!="layout"){
-dojo.raise("_parsePSMLLayoutFragment called with non-layout fragment: "+_d6);
-return null;
-}
-var _da=false;
-var _db=_d6.getAttribute("name");
-if(_db!=null){
-_db=_db.toLowerCase();
-if(_db.indexOf("noactions")!=-1){
-_da=true;
-}
-}
-var _dc=null,_dd=0;
-var _de={};
-var _df=_d6.childNodes;
-var _e0,_e1,_e2,_e3,_e4;
-for(var i=0;i<_df.length;i++){
-_e0=_df[i];
-if(_e0.nodeType!=dojo.dom.ELEMENT_NODE){
+var _d9=this._parsePSMLLayoutFragment(_d3,0);
+return _d9;
+},_parsePSMLLayoutFragment:function(_da,_db){
+var _dc=new Array();
+var _dd=((_da!=null)?_da.getAttribute("type"):null);
+if(_dd!="layout"){
+dojo.raise("_parsePSMLLayoutFragment called with non-layout fragment: "+_da);
+return null;
+}
+var _de=false;
+var _df=_da.getAttribute("name");
+if(_df!=null){
+_df=_df.toLowerCase();
+if(_df.indexOf("noactions")!=-1){
+_de=true;
+}
+}
+var _e0=null,_e1=0;
+var _e2={};
+var _e3=_da.childNodes;
+var _e4,_e5,_e6,_e7,_e8;
+for(var i=0;i<_e3.length;i++){
+_e4=_e3[i];
+if(_e4.nodeType!=dojo.dom.ELEMENT_NODE){
 continue;
 }
-_e1=_e0.nodeName;
-if(_e1=="fragment"){
-_e4=_e0.getAttribute("type");
-if(_e4=="layout"){
-var _e6=this._parsePSMLLayoutFragment(_e0,i);
-if(_e6!=null){
-_d8.push(_e6);
-}
-}else{
-var _e7=this._parsePSMLProperties(_e0,null);
-var _e8=_e7[jetspeed.id.PORTLET_PROP_WINDOW_ICON];
-if(_e8==null||_e8.length==0){
-_e8=this._parsePSMLIcon(_e0);
-if(_e8!=null&&_e8.length>0){
-_e7[jetspeed.id.PORTLET_PROP_WINDOW_ICON]=_e8;
-}
-}
-_d8.push({id:_e0.getAttribute("id"),type:_e4,name:_e0.getAttribute("name"),properties:_e7,actions:this._parsePSMLActions(_e0,null),currentActionState:this._parsePSMLCurrentActionState(_e0),currentActionMode:this._parsePSMLCurrentActionMode(_e0),decorator:_e0.getAttribute("decorator"),layoutActionsDisabled:_da,documentOrderIndex:i});
-}
-}else{
-if(_e1=="property"){
-if(this._parsePSMLProperty(_e0,_de)=="sizes"){
-if(_dc!=null){
-dojo.raise("_parsePSMLLayoutFragment called with layout fragment that contains more than one sizes property: "+_d6);
+_e5=_e4.nodeName;
+if(_e5=="fragment"){
+_e8=_e4.getAttribute("type");
+if(_e8=="layout"){
+var _ea=this._parsePSMLLayoutFragment(_e4,i);
+if(_ea!=null){
+_dc.push(_ea);
+}
+}else{
+var _eb=this._parsePSMLProperties(_e4,null);
+var _ec=_eb[jetspeed.id.PORTLET_PROP_WINDOW_ICON];
+if(_ec==null||_ec.length==0){
+_ec=this._parsePSMLIcon(_e4);
+if(_ec!=null&&_ec.length>0){
+_eb[jetspeed.id.PORTLET_PROP_WINDOW_ICON]=_ec;
+}
+}
+_dc.push({id:_e4.getAttribute("id"),type:_e8,name:_e4.getAttribute("name"),properties:_eb,actions:this._parsePSMLActions(_e4,null),currentActionState:this._parsePSMLCurrentActionState(_e4),currentActionMode:this._parsePSMLCurrentActionMode(_e4),decorator:_e4.getAttribute("decorator"),layoutActionsDisabled:_de,documentOrderIndex:i});
+}
+}else{
+if(_e5=="property"){
+if(this._parsePSMLProperty(_e4,_e2)=="sizes"){
+if(_e0!=null){
+dojo.raise("_parsePSMLLayoutFragment called with layout fragment that contains more than one sizes property: "+_da);
 return null;
 }
 if(jetspeed.prefs.printModeOnly!=null){
-_dc=["100"];
-_dd=100;
+_e0=["100"];
+_e1=100;
 }else{
-_e3=_e0.getAttribute("value");
-if(_e3!=null&&_e3.length>0){
-_dc=_e3.split(",");
-for(var j=0;j<_dc.length;j++){
+_e7=_e4.getAttribute("value");
+if(_e7!=null&&_e7.length>0){
+_e0=_e7.split(",");
+for(var j=0;j<_e0.length;j++){
 var re=/^[^0-9]*([0-9]+)[^0-9]*$/;
-_dc[j]=_dc[j].replace(re,"$1");
-_dd+=new Number(_dc[j]);
+_e0[j]=_e0[j].replace(re,"$1");
+_e1+=new Number(_e0[j]);
 }
 }
 }
@@ -942,280 +969,280 @@
 }
 }
 }
-_d8.sort(this._fragmentRowCompare);
-var _eb=new Array();
-var _ec=new Array();
-for(var i=0;i<_d8.length;i++){
-if(_d8[i].type=="layout"){
-_eb.push(i);
+_dc.sort(this._fragmentRowCompare);
+var _ef=new Array();
+var _f0=new Array();
+for(var i=0;i<_dc.length;i++){
+if(_dc[i].type=="layout"){
+_ef.push(i);
 }else{
-_ec.push(i);
+_f0.push(i);
 }
 }
-if(_dc==null){
-_dc=new Array();
-_dc.push("100");
-_dd=100;
+if(_e0==null){
+_e0=new Array();
+_e0.push("100");
+_e1=100;
 }
-return {id:_d6.getAttribute("id"),type:_d9,name:_d6.getAttribute("name"),decorator:_d6.getAttribute("decorator"),columnSizes:_dc,columnSizesSum:_dd,properties:_de,fragments:_d8,layoutFragmentIndexes:_eb,otherFragmentIndexes:_ec,layoutActionsDisabled:_da,documentOrderIndex:_d7};
-},_parsePSMLActions:function(_ed,_ee){
-if(_ee==null){
-_ee={};
+return {id:_da.getAttribute("id"),type:_dd,name:_da.getAttribute("name"),decorator:_da.getAttribute("decorator"),columnSizes:_e0,columnSizesSum:_e1,properties:_e2,fragments:_dc,layoutFragmentIndexes:_ef,otherFragmentIndexes:_f0,layoutActionsDisabled:_de,documentOrderIndex:_db};
+},_parsePSMLActions:function(_f1,_f2){
+if(_f2==null){
+_f2={};
 }
-var _ef=_ed.getElementsByTagName("action");
-for(var _f0=0;_f0<_ef.length;_f0++){
-var _f1=_ef[_f0];
-this._parsePSMLAction(_f1,_ee);
+var _f3=_f1.getElementsByTagName("action");
+for(var _f4=0;_f4<_f3.length;_f4++){
+var _f5=_f3[_f4];
+this._parsePSMLAction(_f5,_f2);
 }
-return _ee;
-},_parsePSMLAction:function(_f2,_f3){
-var _f4=_f2.getAttribute("id");
-if(_f4!=null){
-var _f5=_f2.getAttribute("type");
-var _f6=_f2.getAttribute("name");
-var _f7=_f2.getAttribute("url");
-var _f8=_f2.getAttribute("alt");
-_f3[_f4.toLowerCase()]={id:_f4,type:_f5,label:_f6,url:_f7,alt:_f8};
+return _f2;
+},_parsePSMLAction:function(_f6,_f7){
+var _f8=_f6.getAttribute("id");
+if(_f8!=null){
+var _f9=_f6.getAttribute("type");
+var _fa=_f6.getAttribute("name");
+var _fb=_f6.getAttribute("url");
+var _fc=_f6.getAttribute("alt");
+_f7[_f8.toLowerCase()]={id:_f8,type:_f9,label:_fa,url:_fb,alt:_fc};
 }
-},_parsePSMLCurrentActionState:function(_f9){
-var _fa=_f9.getElementsByTagName("state");
-if(_fa!=null&&_fa.length==1&&_fa[0].firstChild!=null){
-return _fa[0].firstChild.nodeValue;
-}
-return null;
-},_parsePSMLCurrentActionMode:function(_fb){
-var _fc=_fb.getElementsByTagName("mode");
-if(_fc!=null&&_fc.length==1&&_fc[0].firstChild!=null){
-return _fc[0].firstChild.nodeValue;
-}
-return null;
-},_parsePSMLIcon:function(_fd){
-var _fe=_fd.getElementsByTagName("icon");
+},_parsePSMLCurrentActionState:function(_fd){
+var _fe=_fd.getElementsByTagName("state");
 if(_fe!=null&&_fe.length==1&&_fe[0].firstChild!=null){
 return _fe[0].firstChild.nodeValue;
 }
 return null;
-},_parsePSMLProperties:function(_ff,_100){
-if(_100==null){
-_100={};
-}
-var _101=_ff.getElementsByTagName("property");
-for(var _102=0;_102<_101.length;_102++){
-this._parsePSMLProperty(_101[_102],_100);
-}
-return _100;
-},_parsePSMLProperty:function(_103,_104){
-var _105=_103.getAttribute("name");
-var _106=_103.getAttribute("value");
-_104[_105]=_106;
-return _105;
-},_fragmentRowCompare:function(_107,_108){
-var rowA=_107.documentOrderIndex*1000;
-var rowB=_108.documentOrderIndex*1000;
-var _10b=_107.properties["row"];
-if(_10b!=null){
-rowA=_10b;
-}
-var _10c=_108.properties["row"];
-if(_10c!=null){
-rowB=_10c;
+},_parsePSMLCurrentActionMode:function(_ff){
+var _100=_ff.getElementsByTagName("mode");
+if(_100!=null&&_100.length==1&&_100[0].firstChild!=null){
+return _100[0].firstChild.nodeValue;
+}
+return null;
+},_parsePSMLIcon:function(_101){
+var _102=_101.getElementsByTagName("icon");
+if(_102!=null&&_102.length==1&&_102[0].firstChild!=null){
+return _102[0].firstChild.nodeValue;
+}
+return null;
+},_parsePSMLProperties:function(_103,_104){
+if(_104==null){
+_104={};
+}
+var _105=_103.getElementsByTagName("property");
+for(var _106=0;_106<_105.length;_106++){
+this._parsePSMLProperty(_105[_106],_104);
+}
+return _104;
+},_parsePSMLProperty:function(_107,_108){
+var _109=_107.getAttribute("name");
+var _10a=_107.getAttribute("value");
+_108[_109]=_10a;
+return _109;
+},_fragmentRowCompare:function(_10b,_10c){
+var rowA=_10b.documentOrderIndex*1000;
+var rowB=_10c.documentOrderIndex*1000;
+var _10f=_10b.properties["row"];
+if(_10f!=null){
+rowA=_10f;
+}
+var _110=_10c.properties["row"];
+if(_110!=null){
+rowB=_110;
 }
 return (rowA-rowB);
-},_layoutCreateModel:function(_10d,_10e,_10f,_110){
-var _111=this.columns.length;
-var _112=this._layoutRegisterAndCreateColumnsModel(_10d,_10e,_110);
-var _113=_112.columnsInLayout;
-if(_112.addedLayoutHeaderColumn){
-_111++;
-}
-var _114=(_113==null?0:_113.length);
-if(_10d.layoutFragmentIndexes!=null&&_10d.layoutFragmentIndexes.length>0){
-var _115=null;
-var _116=0;
-if(_10d.otherFragmentIndexes!=null&&_10d.otherFragmentIndexes.length>0){
-_115=new Array();
-}
-for(var i=0;i<_10d.fragments.length;i++){
-var _118=_10d.fragments[i];
-}
-var _119=new Array();
-for(var i=0;i<_114;i++){
-if(_115!=null){
-_115.push(null);
-}
-_119.push(false);
-}
-for(var i=0;i<_10d.fragments.length;i++){
-var _118=_10d.fragments[i];
-var _11a=i;
-if(_118.properties&&_118.properties[jetspeed.id.PORTLET_PROP_COLUMN]>=0){
-if(_118.properties[jetspeed.id.PORTLET_PROP_COLUMN]!=null&&_118.properties[jetspeed.id.PORTLET_PROP_COLUMN]>=0){
-_11a=_118.properties[jetspeed.id.PORTLET_PROP_COLUMN];
-}
-}
-if(_11a>=_114){
-_11a=(_114>0?(_114-1):0);
-}
-var _11b=((_115==null)?null:_115[_11a]);
-if(_118.type=="layout"){
-_119[_11a]=true;
-if(_11b!=null){
-this._layoutCreateModel(_11b,_113[_11a],_10f,true);
-_115[_11a]=null;
-}
-this._layoutCreateModel(_118,_113[_11a],_10f,false);
-}else{
-if(_11b==null){
-_116++;
-var _11c={};
-dojo.lang.mixin(_11c,_10d);
-_11c.fragments=new Array();
-_11c.layoutFragmentIndexes=new Array();
-_11c.otherFragmentIndexes=new Array();
-_11c.documentOrderIndex=_10d.fragments[i].documentOrderIndex;
-_11c.clonedFromRootId=_11c.id;
-_11c.clonedLayoutFragmentIndex=_116;
-_11c.columnSizes=["100"];
-_11c.columnSizesSum=[100];
-_11c.id=_11c.id+"-jsclone_"+_116;
-_115[_11a]=_11c;
-_11b=_11c;
-}
-_11b.fragments.push(_118);
-_11b.otherFragmentIndexes.push(_11b.fragments.length-1);
-}
-}
-if(_115!=null){
-for(var i=0;i<_114;i++){
-var _11b=_115[i];
-if(_11b!=null){
-_119[i]=true;
-this._layoutCreateModel(_11b,_113[i],_10f,true);
-}
-}
-}
-for(var i=0;i<_114;i++){
-if(_119[i]){
-_113[i].columnContainer=true;
+},_layoutCreateModel:function(_111,_112,_113,_114){
+var _115=this.columns.length;
+var _116=this._layoutRegisterAndCreateColumnsModel(_111,_112,_114);
+var _117=_116.columnsInLayout;
+if(_116.addedLayoutHeaderColumn){
+_115++;
+}
+var _118=(_117==null?0:_117.length);
+if(_111.layoutFragmentIndexes!=null&&_111.layoutFragmentIndexes.length>0){
+var _119=null;
+var _11a=0;
+if(_111.otherFragmentIndexes!=null&&_111.otherFragmentIndexes.length>0){
+_119=new Array();
 }
+for(var i=0;i<_111.fragments.length;i++){
+var _11c=_111.fragments[i];
 }
-if(_10d.otherFragmentIndexes!=null&&_10d.otherFragmentIndexes.length>0){
 var _11d=new Array();
-for(var i=0;i<_10d.fragments.length;i++){
-var _11e=true;
-for(var j=0;j<_10d.otherFragmentIndexes.length;j++){
-if(_10d.otherFragmentIndexes[j]==i){
-_11e=false;
+for(var i=0;i<_118;i++){
+if(_119!=null){
+_119.push(null);
+}
+_11d.push(false);
+}
+for(var i=0;i<_111.fragments.length;i++){
+var _11c=_111.fragments[i];
+var _11e=i;
+if(_11c.properties&&_11c.properties[jetspeed.id.PORTLET_PROP_COLUMN]>=0){
+if(_11c.properties[jetspeed.id.PORTLET_PROP_COLUMN]!=null&&_11c.properties[jetspeed.id.PORTLET_PROP_COLUMN]>=0){
+_11e=_11c.properties[jetspeed.id.PORTLET_PROP_COLUMN];
+}
+}
+if(_11e>=_118){
+_11e=(_118>0?(_118-1):0);
+}
+var _11f=((_119==null)?null:_119[_11e]);
+if(_11c.type=="layout"){
+_11d[_11e]=true;
+if(_11f!=null){
+this._layoutCreateModel(_11f,_117[_11e],_113,true);
+_119[_11e]=null;
+}
+this._layoutCreateModel(_11c,_117[_11e],_113,false);
+}else{
+if(_11f==null){
+_11a++;
+var _120={};
+dojo.lang.mixin(_120,_111);
+_120.fragments=new Array();
+_120.layoutFragmentIndexes=new Array();
+_120.otherFragmentIndexes=new Array();
+_120.documentOrderIndex=_111.fragments[i].documentOrderIndex;
+_120.clonedFromRootId=_120.id;
+_120.clonedLayoutFragmentIndex=_11a;
+_120.columnSizes=["100"];
+_120.columnSizesSum=[100];
+_120.id=_120.id+"-jsclone_"+_11a;
+_119[_11e]=_120;
+_11f=_120;
+}
+_11f.fragments.push(_11c);
+_11f.otherFragmentIndexes.push(_11f.fragments.length-1);
+}
+}
+if(_119!=null){
+for(var i=0;i<_118;i++){
+var _11f=_119[i];
+if(_11f!=null){
+_11d[i]=true;
+this._layoutCreateModel(_11f,_117[i],_113,true);
+}
+}
+}
+for(var i=0;i<_118;i++){
+if(_11d[i]){
+_117[i].columnContainer=true;
+}
+}
+if(_111.otherFragmentIndexes!=null&&_111.otherFragmentIndexes.length>0){
+var _121=new Array();
+for(var i=0;i<_111.fragments.length;i++){
+var _122=true;
+for(var j=0;j<_111.otherFragmentIndexes.length;j++){
+if(_111.otherFragmentIndexes[j]==i){
+_122=false;
 break;
 }
 }
-if(_11e){
-_11d.push(_10d.fragments[i]);
+if(_122){
+_121.push(_111.fragments[i]);
 }
 }
-_10d.fragments=_11d;
-_10d.otherFragmentIndexes=new Array();
+_111.fragments=_121;
+_111.otherFragmentIndexes=new Array();
 }
 }
-this._layoutCreatePortletsModel(_10d,_113,_111,_10f);
-return _113;
-},_layoutFragmentChildCollapse:function(_120,_121){
-var _122=false;
-if(_121==null){
-_121=_120;
-}
-if(_120.layoutFragmentIndexes!=null&&_120.layoutFragmentIndexes.length>0){
-_122=true;
-for(var i=0;i<_120.layoutFragmentIndexes.length;i++){
-var _124=_120.fragments[_120.layoutFragmentIndexes[i]];
-if(_124.otherFragmentIndexes!=null&&_124.otherFragmentIndexes.length>0){
-for(var i=0;i<_124.otherFragmentIndexes.length;i++){
-var _125=_124.fragments[_124.otherFragmentIndexes[i]];
-_125.properties[jetspeed.id.PORTLET_PROP_COLUMN]=-1;
-_125.properties[jetspeed.id.PORTLET_PROP_ROW]=-1;
-_125.documentOrderIndex=_121.fragments.length;
-_121.fragments.push(_125);
-_121.otherFragIndexes.push(_121.fragments.length);
-}
-}
-this._layoutFragmentChildCollapse(_124,_121);
-}
-}
-return _122;
-},_layoutRegisterAndCreateColumnsModel:function(_126,_127,_128){
-this.layouts[_126.id]=_126;
-var _129=false;
-var _12a=new Array();
-if(jetspeed.prefs.windowTiling&&_126.columnSizes.length>0){
-var _12b=false;
+this._layoutCreatePortletsModel(_111,_117,_115,_113);
+return _117;
+},_layoutFragmentChildCollapse:function(_124,_125){
+var _126=false;
+if(_125==null){
+_125=_124;
+}
+if(_124.layoutFragmentIndexes!=null&&_124.layoutFragmentIndexes.length>0){
+_126=true;
+for(var i=0;i<_124.layoutFragmentIndexes.length;i++){
+var _128=_124.fragments[_124.layoutFragmentIndexes[i]];
+if(_128.otherFragmentIndexes!=null&&_128.otherFragmentIndexes.length>0){
+for(var i=0;i<_128.otherFragmentIndexes.length;i++){
+var _129=_128.fragments[_128.otherFragmentIndexes[i]];
+_129.properties[jetspeed.id.PORTLET_PROP_COLUMN]=-1;
+_129.properties[jetspeed.id.PORTLET_PROP_ROW]=-1;
+_129.documentOrderIndex=_125.fragments.length;
+_125.fragments.push(_129);
+_125.otherFragIndexes.push(_125.fragments.length);
+}
+}
+this._layoutFragmentChildCollapse(_128,_125);
+}
+}
+return _126;
+},_layoutRegisterAndCreateColumnsModel:function(_12a,_12b,_12c){
+this.layouts[_12a.id]=_12a;
+var _12d=false;
+var _12e=new Array();
+if(jetspeed.prefs.windowTiling&&_12a.columnSizes.length>0){
+var _12f=false;
 if(jetspeed.browser_IE){
-_12b=true;
+_12f=true;
 }
-if(_127!=null&&!_128){
-var _12c=new jetspeed.om.Column(0,_126.id,(_12b?_126.columnSizesSum-0.1:_126.columnSizesSum),this.columns.length,_126.layoutActionsDisabled);
-_12c.layoutHeader=true;
-this.columns.push(_12c);
-if(_127.columnChildren==null){
-_127.columnChildren=new Array();
-}
-_127.columnChildren.push(_12c);
-_127=_12c;
-_129=true;
-}
-for(var i=0;i<_126.columnSizes.length;i++){
-var size=_126.columnSizes[i];
-if(_12b&&i==(_126.columnSizes.length-1)){
+if(_12b!=null&&!_12c){
+var _130=new jetspeed.om.Column(0,_12a.id,(_12f?_12a.columnSizesSum-0.1:_12a.columnSizesSum),this.columns.length,_12a.layoutActionsDisabled);
+_130.layoutHeader=true;
+this.columns.push(_130);
+if(_12b.columnChildren==null){
+_12b.columnChildren=new Array();
+}
+_12b.columnChildren.push(_130);
+_12b=_130;
+_12d=true;
+}
+for(var i=0;i<_12a.columnSizes.length;i++){
+var size=_12a.columnSizes[i];
+if(_12f&&i==(_12a.columnSizes.length-1)){
 size=size-0.1;
 }
-var _12f=new jetspeed.om.Column(i,_126.id,size,this.columns.length,_126.layoutActionsDisabled);
-this.columns.push(_12f);
-if(_127!=null){
-if(_127.columnChildren==null){
-_127.columnChildren=new Array();
-}
-_127.columnChildren.push(_12f);
-}
-_12a.push(_12f);
-}
-}
-return {columnsInLayout:_12a,addedLayoutHeaderColumn:_129};
-},_layoutCreatePortletsModel:function(_130,_131,_132,_133){
-if(_130.otherFragmentIndexes!=null&&_130.otherFragmentIndexes.length>0){
-var _134=new Array();
-for(var i=0;i<_131.length;i++){
-_134.push(new Array());
+var _133=new jetspeed.om.Column(i,_12a.id,size,this.columns.length,_12a.layoutActionsDisabled);
+this.columns.push(_133);
+if(_12b!=null){
+if(_12b.columnChildren==null){
+_12b.columnChildren=new Array();
+}
+_12b.columnChildren.push(_133);
+}
+_12e.push(_133);
+}
+}
+return {columnsInLayout:_12e,addedLayoutHeaderColumn:_12d};
+},_layoutCreatePortletsModel:function(_134,_135,_136,_137){
+if(_134.otherFragmentIndexes!=null&&_134.otherFragmentIndexes.length>0){
+var _138=new Array();
+for(var i=0;i<_135.length;i++){
+_138.push(new Array());
 }
-for(var i=0;i<_130.otherFragmentIndexes.length;i++){
-var _136=_130.fragments[_130.otherFragmentIndexes[i]];
+for(var i=0;i<_134.otherFragmentIndexes.length;i++){
+var _13a=_134.fragments[_134.otherFragmentIndexes[i]];
 if(jetspeed.debugPortletEntityIdFilter){
-if(!dojo.lang.inArray(jetspeed.debugPortletEntityIdFilter,_136.id)){
-_136=null;
+if(!dojo.lang.inArray(jetspeed.debugPortletEntityIdFilter,_13a.id)){
+_13a=null;
 }
 }
-if(_136!=null){
-var _137="z";
-var _138=_136.properties[jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED];
-var _139=jetspeed.prefs.windowTiling;
-var _13a=jetspeed.prefs.windowHeightExpand;
-if(_138!=null&&jetspeed.prefs.windowTiling&&jetspeed.prefs.printModeOnly==null){
-var _13b=_138.split(jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PAIR_SEPARATOR);
-var _13c=null,_13d=0,_13e=null,_13f=null,_140=false;
-if(_13b!=null&&_13b.length>0){
-var _141=jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PROP_SEPARATOR;
-for(var _142=0;_142<_13b.length;_142++){
-_13c=_13b[_142];
-_13d=((_13c!=null)?_13c.length:0);
-if(_13d>0){
-var _143=_13c.indexOf(_141);
-if(_143>0&&_143<(_13d-1)){
-_13e=_13c.substring(0,_143);
-_13f=_13c.substring(_143+1);
-_140=((_13f=="true")?true:false);
-if(_13e==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_STATICPOS){
-_139=_140;
+if(_13a!=null){
+var _13b="z";
+var _13c=_13a.properties[jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED];
+var _13d=jetspeed.prefs.windowTiling;
+var _13e=jetspeed.prefs.windowHeightExpand;
+if(_13c!=null&&jetspeed.prefs.windowTiling&&jetspeed.prefs.printModeOnly==null){
+var _13f=_13c.split(jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PAIR_SEPARATOR);
+var _140=null,_141=0,_142=null,_143=null,_144=false;
+if(_13f!=null&&_13f.length>0){
+var _145=jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PROP_SEPARATOR;
+for(var _146=0;_146<_13f.length;_146++){
+_140=_13f[_146];
+_141=((_140!=null)?_140.length:0);
+if(_141>0){
+var _147=_140.indexOf(_145);
+if(_147>0&&_147<(_141-1)){
+_142=_140.substring(0,_147);
+_143=_140.substring(_147+1);
+_144=((_143=="true")?true:false);
+if(_142==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_STATICPOS){
+_13d=_144;
 }else{
-if(_13e==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT){
-_13a=_140;
+if(_142==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT){
+_13e=_144;
 }
 }
 }
@@ -1224,177 +1251,177 @@
 }
 }else{
 if(!jetspeed.prefs.windowTiling){
-_139=false;
+_13d=false;
 }
 }
-_136.properties[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=_139;
-_136.properties[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=_13a;
-if(_139&&jetspeed.prefs.windowTiling){
-var _144=_136.properties[jetspeed.id.PORTLET_PROP_COLUMN];
-if(_144==null||_144==""||_144<0||_144>=_131.length){
-var _145=-1;
-for(var j=0;j<_131.length;j++){
-if(_145==-1||_134[j].length<_145){
-_145=_134[j].length;
-_144=j;
+_13a.properties[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=_13d;
+_13a.properties[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=_13e;
+if(_13d&&jetspeed.prefs.windowTiling){
+var _148=_13a.properties[jetspeed.id.PORTLET_PROP_COLUMN];
+if(_148==null||_148==""||_148<0||_148>=_135.length){
+var _149=-1;
+for(var j=0;j<_135.length;j++){
+if(_149==-1||_138[j].length<_149){
+_149=_138[j].length;
+_148=j;
 }
 }
 }
-_134[_144].push(_136.id);
-var _147=_132+new Number(_144);
-_137=_147.toString();
-}
-var _148=new jetspeed.om.Portlet(_136.name,_136.id,null,_136.properties,_136.actions,_136.currentActionState,_136.currentActionMode,_136.decorator,_136.layoutActionsDisabled);
-_148.initialize();
-this.putPortlet(_148);
-if(_133[_137]==null){
-_133[_137]=new Array();
-}
-_133[_137].push({portlet:_148,layout:_130.id});
+_138[_148].push(_13a.id);
+var _14b=_136+new Number(_148);
+_13b=_14b.toString();
+}
+var _14c=new jetspeed.om.Portlet(_13a.name,_13a.id,null,_13a.properties,_13a.actions,_13a.currentActionState,_13a.currentActionMode,_13a.decorator,_13a.layoutActionsDisabled);
+_14c.initialize();
+this.putPortlet(_14c);
+if(_137[_13b]==null){
+_137[_13b]=new Array();
+}
+_137[_13b].push({portlet:_14c,layout:_134.id});
 }
 }
 }
-},_portletsInitializeWindowState:function(_149){
-var _14a={};
-this.getPortletCurrentColumnRow(null,false,_14a);
-for(var _14b in this.portlets){
-var _14c=this.portlets[_14b];
-var _14d=_14a[_14c.getId()];
-if(_14d==null&&_149){
-for(var i=0;i<_149.length;i++){
-if(_149[i].portlet.getId()==_14c.getId()){
-_14d={layout:_149[i].layout};
+},_portletsInitializeWindowState:function(_14d){
+var _14e={};
+this.getPortletCurrentColumnRow(null,false,_14e);
+for(var _14f in this.portlets){
+var _150=this.portlets[_14f];
+var _151=_14e[_150.getId()];
+if(_151==null&&_14d){
+for(var i=0;i<_14d.length;i++){
+if(_14d[i].portlet.getId()==_150.getId()){
+_151={layout:_14d[i].layout};
 break;
 }
 }
 }
-if(_14d!=null){
-_14c._initializeWindowState(_14d,false);
+if(_151!=null){
+_150._initializeWindowState(_151,false);
 }else{
-dojo.raise("page._portletsInitializeWindowState could not find window state init data for portlet: "+_14c.getId());
+dojo.raise("page._portletsInitializeWindowState could not find window state init data for portlet: "+_150.getId());
 }
 }
-},_loadPortletZIndexCompare:function(_14f,_150){
-var _151=null;
-var _152=null;
-var _153=null;
-_151=_14f.portlet._getInitialZIndex();
-_152=_150.portlet._getInitialZIndex();
-if(_151&&!_152){
+},_loadPortletZIndexCompare:function(_153,_154){
+var _155=null;
+var _156=null;
+var _157=null;
+_155=_153.portlet._getInitialZIndex();
+_156=_154.portlet._getInitialZIndex();
+if(_155&&!_156){
 return -1;
 }else{
-if(_152&&!_151){
+if(_156&&!_155){
 return 1;
 }else{
-if(_151==_152){
+if(_155==_156){
 return 0;
 }
 }
 }
-return (_151-_152);
-},_createColumnsStart:function(_154){
+return (_155-_156);
+},_createColumnsStart:function(_158){
 if(!this.columnsStructure||this.columnsStructure.length==0){
 return;
 }
-var _155=document.createElement("div");
-_155.id=jetspeed.id.COLUMNS;
-_155.setAttribute("id",jetspeed.id.COLUMNS);
-for(var _156=0;_156<this.columnsStructure.length;_156++){
-var _157=this.columnsStructure[_156];
-this._createColumns(_157,_155);
-}
-_154.appendChild(_155);
-},_createColumns:function(_158,_159){
-_158.createColumn();
-if(_158.columnChildren!=null&&_158.columnChildren.length>0){
-for(var _15a=0;_15a<_158.columnChildren.length;_15a++){
-var _15b=_158.columnChildren[_15a];
-this._createColumns(_15b,_158.domNode);
+var _159=document.createElement("div");
+_159.id=jetspeed.id.COLUMNS;
+_159.setAttribute("id",jetspeed.id.COLUMNS);
+for(var _15a=0;_15a<this.columnsStructure.length;_15a++){
+var _15b=this.columnsStructure[_15a];
+this._createColumns(_15b,_159);
+}
+_158.appendChild(_159);
+},_createColumns:function(_15c,_15d){
+_15c.createColumn();
+if(_15c.columnChildren!=null&&_15c.columnChildren.length>0){
+for(var _15e=0;_15e<_15c.columnChildren.length;_15e++){
+var _15f=_15c.columnChildren[_15e];
+this._createColumns(_15f,_15c.domNode);
 }
 }
-_159.appendChild(_158.domNode);
-},_removeColumns:function(_15c){
+_15d.appendChild(_15c.domNode);
+},_removeColumns:function(_160){
 if(!this.columns||this.columns.length==0){
 return;
 }
 for(var i=0;i<this.columns.length;i++){
 if(this.columns[i]){
-if(_15c){
-var _15e=jetspeed.ui.getPortletWindowChildren(this.columns[i].domNode,null);
-dojo.lang.forEach(_15e,function(_15f){
-_15c.appendChild(_15f);
+if(_160){
+var _162=jetspeed.ui.getPortletWindowChildren(this.columns[i].domNode,null);
+dojo.lang.forEach(_162,function(_163){
+_160.appendChild(_163);
 });
 }
 dojo.dom.removeNode(this.columns[i]);
 this.columns[i]=null;
 }
 }
-var _160=dojo.byId(jetspeed.id.COLUMNS);
-if(_160){
-dojo.dom.removeNode(_160);
+var _164=dojo.byId(jetspeed.id.COLUMNS);
+if(_164){
+dojo.dom.removeNode(_164);
 }
 this.columns=[];
-},getPortletCurrentColumnRow:function(_161,_162,_163){
+},getPortletCurrentColumnRow:function(_165,_166,_167){
 if(!this.columns||this.columns.length==0){
 return null;
 }
-var _164=null;
-var _165=((_161!=null)?true:false);
-var _166=0;
-var _167=null;
 var _168=null;
-var _169=0;
-var _16a=false;
-for(var _16b=0;_16b<this.columns.length;_16b++){
-var _16c=this.columns[_16b];
-var _16d=_16c.domNode.childNodes;
-if(_168==null||_168!=_16c.getLayoutId()){
-_168=_16c.getLayoutId();
-_167=this.layouts[_168];
-if(_167==null){
-dojo.raise("getPortletCurrentColumnRow cannot locate layout id: "+_168);
-return null;
-}
-_169=0;
-_16a=false;
-if(_167.clonedFromRootId==null){
-_16a=true;
-}else{
-var _16e=this.getColumnFromColumnNode(_16c.domNode.parentNode);
-if(_16e==null){
-dojo.raise("getPortletCurrentColumnRow cannot locate parent column for column: "+_16c);
-return null;
-}
-_16c=_16e;
-}
-}
-var _16f=null;
-for(var _170=0;_170<_16d.length;_170++){
-var _171=_16d[_170];
-if(dojo.html.hasClass(_171,jetspeed.id.PORTLET_WINDOW_STYLE_CLASS)||(_162&&dojo.html.hasClass(_171,jetspeed.id.PORTLET_WINDOW_GHOST_STYLE_CLASS))||(_165&&dojo.html.hasClass(_171,"desktopColumn"))){
-_16f=(_16f==null?0:_16f+1);
-if((_16f+1)>_169){
-_169=(_16f+1);
-}
-if(_161==null||_171==_161){
-var _172={layout:_168,column:_16c.getLayoutColumnIndex(),row:_16f};
-if(!_16a){
-_172.layout=_167.clonedFromRootId;
+var _169=((_165!=null)?true:false);
+var _16a=0;
+var _16b=null;
+var _16c=null;
+var _16d=0;
+var _16e=false;
+for(var _16f=0;_16f<this.columns.length;_16f++){
+var _170=this.columns[_16f];
+var _171=_170.domNode.childNodes;
+if(_16c==null||_16c!=_170.getLayoutId()){
+_16c=_170.getLayoutId();
+_16b=this.layouts[_16c];
+if(_16b==null){
+dojo.raise("getPortletCurrentColumnRow cannot locate layout id: "+_16c);
+return null;
+}
+_16d=0;
+_16e=false;
+if(_16b.clonedFromRootId==null){
+_16e=true;
+}else{
+var _172=this.getColumnFromColumnNode(_170.domNode.parentNode);
+if(_172==null){
+dojo.raise("getPortletCurrentColumnRow cannot locate parent column for column: "+_170);
+return null;
+}
+_170=_172;
+}
+}
+var _173=null;
+for(var _174=0;_174<_171.length;_174++){
+var _175=_171[_174];
+if(dojo.html.hasClass(_175,jetspeed.id.PORTLET_WINDOW_STYLE_CLASS)||(_166&&dojo.html.hasClass(_175,jetspeed.id.PORTLET_WINDOW_GHOST_STYLE_CLASS))||(_169&&dojo.html.hasClass(_175,"desktopColumn"))){
+_173=(_173==null?0:_173+1);
+if((_173+1)>_16d){
+_16d=(_173+1);
+}
+if(_165==null||_175==_165){
+var _176={layout:_16c,column:_170.getLayoutColumnIndex(),row:_173};
+if(!_16e){
+_176.layout=_16b.clonedFromRootId;
 }
-if(_161!=null){
-_164=_172;
+if(_165!=null){
+_168=_176;
 break;
 }else{
-if(_163!=null){
-var _173=this.getPortletWindowFromNode(_171);
-if(_173==null){
+if(_167!=null){
+var _177=this.getPortletWindowFromNode(_175);
+if(_177==null){
 dojo.raise("getPortletCurrentColumnRow cannot locate PortletWindow for node.");
 }else{
-var _174=_173.portlet;
-if(_174==null){
-dojo.raise("getPortletCurrentColumnRow PortletWindow.portlet is for widgetId: "+_173.widgetId);
+var _178=_177.portlet;
+if(_178==null){
+dojo.raise("getPortletCurrentColumnRow PortletWindow.portlet is for widgetId: "+_177.widgetId);
 }else{
-_163[_174.getId()]=_172;
+_167[_178.getId()]=_176;
 }
 }
 }
@@ -1402,196 +1429,196 @@
 }
 }
 }
-if(_164!=null){
+if(_168!=null){
 break;
 }
 }
-return _164;
+return _168;
 },_getPortletArrayByZIndex:function(){
-var _175=this.getPortletArray();
-if(!_175){
-return _175;
-}
-var _176=[];
-for(var i=0;i<_175.length;i++){
-if(!_175[i].getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC)){
-_176.push(_175[i]);
-}
-}
-_176.sort(this._portletZIndexCompare);
-return _176;
-},_portletZIndexCompare:function(_178,_179){
-var _17a=null;
-var _17b=null;
-var _17c=null;
-_17c=_178.getLastSavedWindowState();
-_17a=_17c.zIndex;
-_17c=_179.getLastSavedWindowState();
-_17b=_17c.zIndex;
-if(_17a&&!_17b){
+var _179=this.getPortletArray();
+if(!_179){
+return _179;
+}
+var _17a=[];
+for(var i=0;i<_179.length;i++){
+if(!_179[i].getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC)){
+_17a.push(_179[i]);
+}
+}
+_17a.sort(this._portletZIndexCompare);
+return _17a;
+},_portletZIndexCompare:function(_17c,_17d){
+var _17e=null;
+var _17f=null;
+var _180=null;
+_180=_17c.getLastSavedWindowState();
+_17e=_180.zIndex;
+_180=_17d.getLastSavedWindowState();
+_17f=_180.zIndex;
+if(_17e&&!_17f){
 return -1;
 }else{
-if(_17b&&!_17a){
+if(_17f&&!_17e){
 return 1;
 }else{
-if(_17a==_17b){
+if(_17e==_17f){
 return 0;
 }
 }
 }
-return (_17a-_17b);
+return (_17e-_17f);
 },getPortletDecorationDefault:function(){
 var pd=null;
 if(djConfig.isDebug&&jetspeed.debug.windowDecorationRandom){
 pd=jetspeed.prefs.portletDecorationsAllowed[Math.floor(Math.random()*jetspeed.prefs.portletDecorationsAllowed.length)];
 }else{
-var _17e=this.getPortletDecorator();
-if(dojo.lang.indexOf(jetspeed.prefs.portletDecorationsAllowed,_17e)!=-1){
-pd=_17e;
+var _182=this.getPortletDecorator();
+if(dojo.lang.indexOf(jetspeed.prefs.portletDecorationsAllowed,_182)!=-1){
+pd=_182;
 }else{
 pd=jetspeed.prefs.windowDecoration;
 }
 }
 return pd;
 },getPortletArrayList:function(){
-var _17f=new dojo.collections.ArrayList();
-for(var _180 in this.portlets){
-var _181=this.portlets[_180];
-_17f.add(_181);
+var _183=new dojo.collections.ArrayList();
+for(var _184 in this.portlets){
+var _185=this.portlets[_184];
+_183.add(_185);
 }
-return _17f;
+return _183;
 },getPortletArray:function(){
 if(!this.portlets){
 return null;
 }
-var _182=[];
-for(var _183 in this.portlets){
-var _184=this.portlets[_183];
-_182.push(_184);
+var _186=[];
+for(var _187 in this.portlets){
+var _188=this.portlets[_187];
+_186.push(_188);
 }
-return _182;
+return _186;
 },getPortletIds:function(){
 if(!this.portlets){
 return null;
 }
-var _185=[];
-for(var _186 in this.portlets){
-var _187=this.portlets[_186];
-_185.push(_187.getId());
+var _189=[];
+for(var _18a in this.portlets){
+var _18b=this.portlets[_18a];
+_189.push(_18b.getId());
 }
-return _185;
-},getPortletByName:function(_188){
-if(this.portlets&&_188){
-for(var _189 in this.portlets){
-var _18a=this.portlets[_189];
-if(_18a.name==_188){
-return _18a;
+return _189;
+},getPortletByName:function(_18c){
+if(this.portlets&&_18c){
+for(var _18d in this.portlets){
+var _18e=this.portlets[_18d];
+if(_18e.name==_18c){
+return _18e;
 }
 }
 }
 return null;
-},getPortlet:function(_18b){
-if(this.portlets&&_18b){
-return this.portlets[_18b];
+},getPortlet:function(_18f){
+if(this.portlets&&_18f){
+return this.portlets[_18f];
 }
 return null;
-},getPortletWindowFromNode:function(_18c){
-var _18d=null;
-if(this.portlets&&_18c){
-for(var _18e in this.portlets){
-var _18f=this.portlets[_18e];
-var _190=_18f.getPortletWindow();
-if(_190!=null){
-if(_190.domNode==_18c){
-_18d=_190;
+},getPortletWindowFromNode:function(_190){
+var _191=null;
+if(this.portlets&&_190){
+for(var _192 in this.portlets){
+var _193=this.portlets[_192];
+var _194=_193.getPortletWindow();
+if(_194!=null){
+if(_194.domNode==_190){
+_191=_194;
 break;
 }
 }
 }
 }
-return _18d;
-},putPortlet:function(_191){
-if(!_191){
+return _191;
+},putPortlet:function(_195){
+if(!_195){
 return;
 }
 if(!this.portlets){
 this.portlets=[];
 }
-this.portlets[_191.entityId]=_191;
-},removePortlet:function(_192){
-if(!_192||!this.portlets){
+this.portlets[_195.entityId]=_195;
+},removePortlet:function(_196){
+if(!_196||!this.portlets){
 return;
 }
-delete this.portlets[_192.entityId];
+delete this.portlets[_196.entityId];
 },_destroyPortlets:function(){
-for(var _193 in this.portlets){
-var _194=this.portlets[_193];
-_194._destroy();
+for(var _197 in this.portlets){
+var _198=this.portlets[_197];
+_198._destroy();
 }
 },debugLayoutInfo:function(){
-var _195="";
+var _199="";
 var i=0;
-for(var _197 in this.layouts){
+for(var _19b in this.layouts){
 if(i>0){
-_195+="\r\n";
+_199+="\r\n";
 }
-_195+="layout["+_197+"]: "+jetspeed.printobj(this.layouts[_197],true,true,true);
+_199+="layout["+_19b+"]: "+jetspeed.printobj(this.layouts[_19b],true,true,true);
 i++;
 }
-return _195;
+return _199;
 },debugColumnInfo:function(){
-var _198="";
+var _19c="";
 for(var i=0;i<this.columns.length;i++){
 if(i>0){
-_198+="\r\n";
+_19c+="\r\n";
 }
-_198+=this.columns[i].toString();
+_19c+=this.columns[i].toString();
 }
-return _198;
+return _19c;
 },debugDumpLastSavedWindowState:function(){
 return this._debugDumpLastSavedWindowStateAllPortlets(true);
 },debugDumpWindowState:function(){
 return this._debugDumpLastSavedWindowStateAllPortlets(false);
 },debugPortletActions:function(){
-var _19a=this.getPortletArray();
-var _19b="";
-for(var i=0;i<_19a.length;i++){
-var _19d=_19a[i];
+var _19e=this.getPortletArray();
+var _19f="";
+for(var i=0;i<_19e.length;i++){
+var _1a1=_19e[i];
 if(i>0){
-_19b+="\r\n";
+_19f+="\r\n";
 }
-_19b+="portlet ["+_19d.name+"] actions: {";
-for(var _19e in _19d.actions){
-_19b+=_19e+"={"+jetspeed.printobj(_19d.actions[_19e],true)+"} ";
-}
-_19b+="}";
-}
-return _19b;
-},_debugDumpLastSavedWindowStateAllPortlets:function(_19f){
-var _1a0=this.getPortletArray();
-var _1a1="";
-for(var i=0;i<_1a0.length;i++){
-var _1a3=_1a0[i];
+_19f+="portlet ["+_1a1.name+"] actions: {";
+for(var _1a2 in _1a1.actions){
+_19f+=_1a2+"={"+jetspeed.printobj(_1a1.actions[_1a2],true)+"} ";
+}
+_19f+="}";
+}
+return _19f;
+},_debugDumpLastSavedWindowStateAllPortlets:function(_1a3){
+var _1a4=this.getPortletArray();
+var _1a5="";
+for(var i=0;i<_1a4.length;i++){
+var _1a7=_1a4[i];
 if(i>0){
-_1a1+="\r\n";
+_1a5+="\r\n";
 }
-var _1a4=null;
+var _1a8=null;
 try{
-if(_19f){
-_1a4=_1a3.getLastSavedWindowState();
+if(_1a3){
+_1a8=_1a7.getLastSavedWindowState();
 }else{
-_1a4=_1a3.getCurrentWindowState();
+_1a8=_1a7.getCurrentWindowState();
 }
 }
 catch(e){
 }
-_1a1+="["+_1a3.name+"] "+((_1a4==null)?"null":jetspeed.printobj(_1a4,true));
+_1a5+="["+_1a7.name+"] "+((_1a8==null)?"null":jetspeed.printobj(_1a8,true));
 }
-return _1a1;
+return _1a5;
 },resetWindowLayout:function(){
-for(var _1a5 in this.portlets){
-var _1a6=this.portlets[_1a5];
-_1a6.submitChangedWindowState(false,true);
+for(var _1a9 in this.portlets){
+var _1aa=this.portlets[_1a9];
+_1aa.submitChangedWindowState(false,true);
 }
 this.reload();
 },reload:function(){
@@ -1599,206 +1626,210 @@
 jetspeed.loadPage();
 },destroy:function(){
 this._destroyPortlets();
+this._destroyEditPage();
 this._removeColumns(document.getElementById(jetspeed.id.DESKTOP));
 this._destroyPageControls();
-},getColumnFromColumnNode:function(_1a7){
-if(_1a7==null){
+},getColumnFromColumnNode:function(_1ab){
+if(_1ab==null){
 return null;
 }
-var _1a8=_1a7.getAttribute("columnIndex");
-if(_1a8==null){
+var _1ac=_1ab.getAttribute("columnIndex");
+if(_1ac==null){
 return null;
 }
-var _1a9=new Number(_1a8);
-if(_1a9>=0&&_1a9<this.columns.length){
-return this.columns[_1a9];
+var _1ad=new Number(_1ac);
+if(_1ad>=0&&_1ad<this.columns.length){
+return this.columns[_1ad];
 }
 return null;
 },getColumnIndexContainingNode:function(node){
-var _1ab=null;
+var _1af=null;
 if(!this.columns){
-return _1ab;
+return _1af;
 }
 for(var i=0;i<this.columns.length;i++){
 if(this.columns[i].containsNode(node)){
-_1ab=i;
+_1af=i;
 break;
 }
 }
-return _1ab;
+return _1af;
 },getColumnContainingNode:function(node){
-var _1ae=this.getColumnIndexContainingNode(node);
-return ((_1ae!=null&&_1ae>=0)?this.columns[_1ae]:null);
-},getDescendantColumns:function(_1af){
+var _1b2=this.getColumnIndexContainingNode(node);
+return ((_1b2!=null&&_1b2>=0)?this.columns[_1b2]:null);
+},getDescendantColumns:function(_1b3){
 var dMap={};
-if(_1af==null){
+if(_1b3==null){
 return dMap;
 }
 for(var i=0;i<this.columns.length;i++){
 var col=this.columns[i];
-if(col!=_1af&&_1af.containsDescendantNode(col.domNode)){
+if(col!=_1b3&&_1b3.containsDescendantNode(col.domNode)){
 dMap[i]=col;
 }
 }
 return dMap;
-},addNewPortlet:function(_1b3,_1b4,_1b5){
-var _1b6=new jetspeed.om.Portlet(_1b3,_1b4);
-if(_1b5){
-_1b6.putProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID,_1b5);
-}
-_1b6.initialize();
-this.putPortlet(_1b6);
-_1b6.retrieveContent();
-},removePortletFromPage:function(_1b7){
-var _1b8=new jetspeed.om.PortletAddAjaxApiCallbackContentListener(portletDef,windowWidgetId,false);
-var _1b9="?action=remove&id="+escape(portletDef.getPortletName());
-var _1ba=jetspeed.page.getPsmlUrl()+_1b9;
-var _1bb="text/xml";
-var _1bc=new jetspeed.om.Id("removeportlet",{});
-jetspeed.url.retrieveContent({url:_1ba,mimetype:_1bb},_1b8,_1bc,jetspeed.debugContentDumpIds);
-},putMenu:function(_1bd){
-if(!_1bd){
-return;
-}
-var _1be=(_1bd.getName?_1bd.getName():null);
-if(_1be!=null){
-this.menus[_1be]=_1bd;
-}
-},getMenu:function(_1bf){
-if(_1bf==null){
-return null;
-}
-return this.menus[_1bf];
-},removeMenu:function(_1c0){
-if(_1c0==null){
-return;
-}
-var _1c1=null;
-if(dojo.lang.isString(_1c0)){
-_1c1=_1c0;
+},addNewPortlet:function(_1b7,_1b8,_1b9){
+var _1ba=new jetspeed.om.Portlet(_1b7,_1b8);
+if(_1b9){
+_1ba.putProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID,_1b9);
+}
+_1ba.initialize();
+this.putPortlet(_1ba);
+_1ba.retrieveContent();
+},removePortletFromPage:function(_1bb){
+var _1bc=new jetspeed.om.PortletAddAjaxApiCallbackContentListener(portletDef,windowWidgetId,false);
+var _1bd="?action=remove&id="+escape(portletDef.getPortletName());
+var _1be=jetspeed.page.getPsmlUrl()+_1bd;
+var _1bf="text/xml";
+var _1c0=new jetspeed.om.Id("removeportlet",{});
+jetspeed.url.retrieveContent({url:_1be,mimetype:_1bf},_1bc,_1c0,jetspeed.debugContentDumpIds);
+},putMenu:function(_1c1){
+if(!_1c1){
+return;
+}
+var _1c2=(_1c1.getName?_1c1.getName():null);
+if(_1c2!=null){
+this.menus[_1c2]=_1c1;
+}
+},getMenu:function(_1c3){
+if(_1c3==null){
+return null;
+}
+return this.menus[_1c3];
+},removeMenu:function(_1c4){
+if(_1c4==null){
+return;
+}
+var _1c5=null;
+if(dojo.lang.isString(_1c4)){
+_1c5=_1c4;
 }else{
-_1c1=(_1c0.getName?_1c0.getName():null);
+_1c5=(_1c4.getName?_1c4.getName():null);
 }
-if(_1c1!=null){
-delete this.menus[_1c1];
+if(_1c5!=null){
+delete this.menus[_1c5];
 }
 },clearMenus:function(){
 this.menus=[];
 },getMenuNames:function(){
-var _1c2=[];
-for(var _1c3 in this.menus){
-_1c2.push(_1c3);
-}
-return _1c2;
-},retrieveAllMenus:function(){
-this.retrieveMenuDeclarations(true);
-},retrieveMenuDeclarations:function(_1c4){
-contentListener=new jetspeed.om.MenusAjaxApiContentListener(_1c4);
+var _1c6=[];
+for(var _1c7 in this.menus){
+_1c6.push(_1c7);
+}
+return _1c6;
+},retrieveMenuDeclarations:function(_1c8,_1c9){
+contentListener=new jetspeed.om.MenusAjaxApiContentListener(_1c8,_1c9);
 this.clearMenus();
-var _1c5="?action=getmenus";
-if(_1c4){
-_1c5+="&includeMenuDefs=true";
-}
-var _1c6=this.getPsmlUrl()+_1c5;
-var _1c7="text/xml";
-var _1c8=new jetspeed.om.Id("getmenus",{page:this});
-jetspeed.url.retrieveContent({url:_1c6,mimetype:_1c7},contentListener,_1c8,jetspeed.debugContentDumpIds);
-},retrieveMenu:function(_1c9,_1ca,_1cb){
-if(_1cb==null){
-_1cb=new jetspeed.om.MenuAjaxApiCallbackContentListener();
-}
-var _1cc="?action=getmenu&name="+_1c9;
-var _1cd=this.getPsmlUrl()+_1cc;
-var _1ce="text/xml";
-var _1cf=new jetspeed.om.Id("getmenu-"+_1c9,{page:this,menuName:_1c9,menuType:_1ca});
-jetspeed.url.retrieveContent({url:_1cd,mimetype:_1ce},_1cb,_1cf,jetspeed.debugContentDumpIds);
+var _1ca="?action=getmenus";
+if(_1c8){
+_1ca+="&includeMenuDefs=true";
+}
+var _1cb=this.getPsmlUrl()+_1ca;
+var _1cc="text/xml";
+var _1cd=new jetspeed.om.Id("getmenus",{page:this});
+jetspeed.url.retrieveContent({url:_1cb,mimetype:_1cc},contentListener,_1cd,jetspeed.debugContentDumpIds);
+},retrieveMenu:function(_1ce,_1cf,_1d0){
+if(_1d0==null){
+_1d0=new jetspeed.om.MenuAjaxApiCallbackContentListener();
+}
+var _1d1="?action=getmenu&name="+_1ce;
+var _1d2=this.getPsmlUrl()+_1d1;
+var _1d3="text/xml";
+var _1d4=new jetspeed.om.Id("getmenu-"+_1ce,{page:this,menuName:_1ce,menuType:_1cf});
+jetspeed.url.retrieveContent({url:_1d2,mimetype:_1d3},_1d0,_1d4,jetspeed.debugContentDumpIds);
 },syncPageControls:function(){
 if(this.actionButtons==null){
 return;
 }
-for(var _1d0 in this.actionButtons){
-var _1d1=false;
-if(_1d0==jetspeed.id.ACTION_NAME_EDIT){
+for(var _1d5 in this.actionButtons){
+var _1d6=false;
+if(_1d5==jetspeed.id.ACTION_NAME_EDIT){
 if(!this.editMode){
-_1d1=true;
+_1d6=true;
 }
 }else{
-if(_1d0==jetspeed.id.ACTION_NAME_VIEW){
+if(_1d5==jetspeed.id.ACTION_NAME_VIEW){
 if(this.editMode){
-_1d1=true;
+_1d6=true;
 }
 }else{
-if(_1d0==jetspeed.id.ACTION_NAME_ADDPORTLET){
+if(_1d5==jetspeed.id.ACTION_NAME_ADDPORTLET){
 if(!this.editMode){
-_1d1=true;
+_1d6=true;
 }
 }else{
-_1d1=true;
+_1d6=true;
 }
 }
 }
-if(_1d1){
-this.actionButtons[_1d0].style.display="";
+if(_1d6){
+this.actionButtons[_1d5].style.display="";
 }else{
-this.actionButtons[_1d0].style.display="none";
+this.actionButtons[_1d5].style.display="none";
 }
 }
 },renderPageControls:function(){
-var _1d2=[];
+var _1d7=[];
 if(this.actions!=null){
-for(var _1d3 in this.actions){
-if(_1d3!=jetspeed.id.ACTION_NAME_HELP){
-_1d2.push(_1d3);
+for(var _1d8 in this.actions){
+if(_1d8!=jetspeed.id.ACTION_NAME_HELP){
+_1d7.push(_1d8);
 }
-if(_1d3==jetspeed.id.ACTION_NAME_EDIT){
-_1d2.push(jetspeed.id.ACTION_NAME_ADDPORTLET);
+if(_1d8==jetspeed.id.ACTION_NAME_EDIT){
+_1d7.push(jetspeed.id.ACTION_NAME_ADDPORTLET);
 }
 }
 if(this.actions[jetspeed.id.ACTION_NAME_EDIT]!=null){
 if(this.actions[jetspeed.id.ACTION_NAME_VIEW]==null){
-_1d2.push(jetspeed.id.ACTION_NAME_VIEW);
+_1d7.push(jetspeed.id.ACTION_NAME_VIEW);
 }
 }
 if(this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null){
 if(this.actions[jetspeed.id.ACTION_NAME_EDIT]==null){
-_1d2.push(jetspeed.id.ACTION_NAME_EDIT);
+_1d7.push(jetspeed.id.ACTION_NAME_EDIT);
 }
 }
 }
-var _1d4=dojo.byId(jetspeed.id.PAGE_CONTROLS);
-if(_1d4!=null&&_1d2!=null&&_1d2.length>0){
+var _1d9=dojo.byId(jetspeed.id.PAGE_CONTROLS);
+if(_1d9!=null&&_1d7!=null&&_1d7.length>0){
 if(this.actionButtons==null){
 this.actionButtons={};
 this.actionButtonTooltips=[];
 }
-for(var i=0;i<_1d2.length;i++){
-var _1d3=_1d2[i];
-var _1d6=document.createElement("div");
-_1d6.className="portalPageActionButton";
-_1d6.style.backgroundImage="url("+jetspeed.prefs.getLayoutRootUrl()+"/images/desktop/"+_1d3+".gif)";
-_1d6.actionName=_1d3;
-this.actionButtons[_1d3]=_1d6;
-_1d4.appendChild(_1d6);
-dojo.event.connect(_1d6,"onclick",this,"pageActionButtonClick");
+for(var i=0;i<_1d7.length;i++){
+var _1d8=_1d7[i];
+var _1db=document.createElement("div");
+_1db.className="portalPageActionButton";
+_1db.style.backgroundImage="url("+jetspeed.prefs.getLayoutRootUrl()+"/images/desktop/"+_1d8+".gif)";
+_1db.actionName=_1d8;
+this.actionButtons[_1d8]=_1db;
+_1d9.appendChild(_1db);
+dojo.event.connect(_1db,"onclick",this,"pageActionButtonClick");
 if(jetspeed.prefs.pageActionButtonTooltip){
-var _1d7=null;
+var _1dc=null;
 if(jetspeed.prefs.desktopActionLabels!=null){
-_1d7=jetspeed.prefs.desktopActionLabels[_1d3];
+_1dc=jetspeed.prefs.desktopActionLabels[_1d8];
+}
+if(_1dc==null||_1dc.length==0){
+_1dc=dojo.string.capitalize(_1d8);
 }
-if(_1d7==null||_1d7.length==0){
-_1d7=dojo.string.capitalize(_1d3);
+var _1dd=dojo.widget.createWidget("Tooltip",{isContainer:false,fastMixIn:true,caption:_1dc,connectId:_1db,delay:"100"});
+this.actionButtonTooltips.push(_1dd);
+document.body.appendChild(_1dd.domNode);
 }
-var _1d8=dojo.widget.createWidget("Tooltip",{isContainer:false,fastMixIn:true,caption:_1d7,connectId:_1d6,delay:"100"});
-this.actionButtonTooltips.push(_1d8);
-document.body.appendChild(_1d8.domNode);
 }
 }
+},_destroyEditPage:function(){
+var _1de=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
+if(_1de!=null){
+_1de.editPageDestroy();
 }
 },_destroyPageControls:function(){
-var _1d9=dojo.byId(jetspeed.id.PAGE_CONTROLS);
-if(_1d9!=null&&_1d9.childNodes&&_1d9.childNodes.length>0){
-for(var i=(_1d9.childNodes.length-1);i>=0;i--){
-dojo.dom.removeNode(_1d9.childNodes[i]);
+var _1df=dojo.byId(jetspeed.id.PAGE_CONTROLS);
+if(_1df!=null&&_1df.childNodes&&_1df.childNodes.length>0){
+for(var i=(_1df.childNodes.length-1);i>=0;i--){
+dojo.dom.removeNode(_1df.childNodes[i]);
 }
 }
 if(this.actionButtonTooltips&&this.actionButtonTooltips.length>0){
@@ -1814,29 +1845,29 @@
 return;
 }
 this.pageActionProcess(evt.target.actionName,evt);
-},pageActionProcess:function(_1dc){
-if(_1dc==null){
+},pageActionProcess:function(_1e2){
+if(_1e2==null){
 return;
 }
-if(_1dc==jetspeed.id.ACTION_NAME_ADDPORTLET){
+if(_1e2==jetspeed.id.ACTION_NAME_ADDPORTLET){
 this.addPortletInitiate();
 }else{
-if(_1dc==jetspeed.id.ACTION_NAME_EDIT){
+if(_1e2==jetspeed.id.ACTION_NAME_EDIT){
 jetspeed.editPageInitiate();
 }else{
-if(_1dc==jetspeed.id.ACTION_NAME_VIEW){
+if(_1e2==jetspeed.id.ACTION_NAME_VIEW){
 jetspeed.editPageTerminate();
 }else{
-var _1dd=this.getPageAction(_1dc);
-alert("pageAction "+_1dc+" : "+_1dd);
-if(_1dd==null){
+var _1e3=this.getPageAction(_1e2);
+alert("pageAction "+_1e2+" : "+_1e3);
+if(_1e3==null){
 return;
 }
-if(_1dd.url==null){
+if(_1e3.url==null){
 return;
 }
-var _1de=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/"+_1dd.url;
-jetspeed.pageNavigate(_1de);
+var _1e4=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/"+_1e3.url;
+jetspeed.pageNavigate(_1e4);
 }
 }
 }
@@ -1845,90 +1876,90 @@
 return null;
 }
 return this.actions[name];
-},addPortletInitiate:function(_1e0,_1e1){
-if(!_1e1){
-_1e1=escape(this.getPagePathAndQuery());
+},addPortletInitiate:function(_1e6,_1e7){
+if(!_1e7){
+_1e7=escape(this.getPagePathAndQuery());
 }else{
-_1e1=escape(_1e1);
+_1e7=escape(_1e7);
 }
-var _1e2=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/system/customizer/selector.psml?jspage="+_1e1;
-if(_1e0!=null){
-_1e2+="&jslayoutid="+escape(_1e0);
+var _1e8=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/system/customizer/selector.psml?jspage="+_1e7;
+if(_1e6!=null){
+_1e8+="&jslayoutid="+escape(_1e6);
 }
-jetspeed.changeActionForPortlet(this.rootFragmentId,null,jetspeed.id.ACTION_NAME_EDIT,new jetspeed.om.PageChangeActionContentListener(_1e2));
-},setPageModePortletActions:function(_1e3){
-if(_1e3==null||_1e3.actions==null){
+jetspeed.changeActionForPortlet(this.rootFragmentId,null,jetspeed.id.ACTION_NAME_EDIT,new jetspeed.om.PageChangeActionContentListener(_1e8));
+},setPageModePortletActions:function(_1e9){
+if(_1e9==null||_1e9.actions==null){
 return;
 }
-if(_1e3.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]==null){
-_1e3.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]={id:jetspeed.id.ACTION_NAME_REMOVEPORTLET};
+if(_1e9.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]==null){
+_1e9.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]={id:jetspeed.id.ACTION_NAME_REMOVEPORTLET};
 }
-},getPageUrl:function(_1e4){
-if(this.pageUrl!=null&&!_1e4){
+},getPageUrl:function(_1ea){
+if(this.pageUrl!=null&&!_1ea){
 return this.pageUrl;
 }
-var _1e5=jetspeed.url.path.SERVER+((_1e4)?jetspeed.url.path.PORTAL:jetspeed.url.path.DESKTOP)+this.getPath();
-var _1e6=jetspeed.url.parse(_1e5);
-var _1e7=null;
+var _1eb=jetspeed.url.path.SERVER+((_1ea)?jetspeed.url.path.PORTAL:jetspeed.url.path.DESKTOP)+this.getPath();
+var _1ec=jetspeed.url.parse(_1eb);
+var _1ed=null;
 if(this.pageUrlFallback!=null){
-_1e7=jetspeed.url.parse(this.pageUrlFallback);
+_1ed=jetspeed.url.parse(this.pageUrlFallback);
 }else{
-_1e7=jetspeed.url.parse(document.location.href);
+_1ed=jetspeed.url.parse(window.location.href);
 }
-if(_1e6!=null&&_1e7!=null){
-var _1e8=_1e7.query;
-if(_1e8!=null&&_1e8.length>0){
-var _1e9=_1e6.query;
-if(_1e9!=null&&_1e9.length>0){
-_1e5=_1e5+"&"+_1e8;
+if(_1ec!=null&&_1ed!=null){
+var _1ee=_1ed.query;
+if(_1ee!=null&&_1ee.length>0){
+var _1ef=_1ec.query;
+if(_1ef!=null&&_1ef.length>0){
+_1eb=_1eb+"&"+_1ee;
 }else{
-_1e5=_1e5+"?"+_1e8;
+_1eb=_1eb+"?"+_1ee;
 }
 }
 }
-if(!_1e4){
-this.pageUrl=_1e5;
+if(!_1ea){
+this.pageUrl=_1eb;
 }
-return _1e5;
+return _1eb;
 },getPagePathAndQuery:function(){
 if(this.pagePathAndQuery!=null){
 return this.pagePathAndQuery;
 }
-var _1ea=this.getPath();
-var _1eb=jetspeed.url.parse(_1ea);
-var _1ec=null;
+var _1f0=this.getPath();
+var _1f1=jetspeed.url.parse(_1f0);

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