You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by sm...@apache.org on 2007/08/18 06:42:18 UTC

svn commit: r567229 [2/3] - in /portals/jetspeed-2/branches/JETSPEED-2.1.3/src/webapp/javascript/jetspeed: desktop/ widget/

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?view=diff&rev=567229&r1=567228&r2=567229
==============================================================================
--- 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 Fri Aug 17 21:42:17 2007
@@ -19,7 +19,7 @@
 if(!jetspeed.ui.widget){
 jetspeed.ui.widget={};
 }
-jetspeed.id={PAGE:"jetspeedPage",DESKTOP_CELL:"jetspeedDesktopCell",DESKTOP:"jetspeedDesktop",COLUMNS:"jetspeedColumns",PAGE_CONTROLS:"jetspeedPageControls",TASKBAR:"jetspeedTaskbar",SELECTOR:"jetspeedSelector",PORTLET_STYLE_CLASS:"portlet",PORTLET_WINDOW_STYLE_CLASS:"dojoFloatingPane",PORTLET_WINDOW_GHOST_STYLE_CLASS:"ghostPane",PORTLET_WINDOW_ID_PREFIX:"portletWindow_",PORTLET_PROP_WIDGET_ID:"widgetId",PORTLET_PROP_CONTENT_RETRIEVER:"contentRetriever",PORTLET_PROP_DESKTOP_EXTENDED:"jsdesktop",PORTLET_PROP_WINDOW_POSITION_STATIC:"windowPositionStatic",PORTLET_PROP_WINDOW_HEIGHT_TO_FIT:"windowHeightToFit",PORTLET_PROP_WINDOW_DECORATION:"windowDecoration",PORTLET_PROP_WINDOW_TITLE:"title",PORTLET_PROP_WINDOW_ICON:"windowIcon",PORTLET_PROP_WIDTH:"width",PORTLET_PROP_HEIGHT:"height",PORTLET_PROP_LEFT:"left",PORTLET_PROP_TOP:"top",PORTLET_PROP_COLUMN:"column",PORTLET_PROP_ROW:"row",PORTLET_PROP_EXCLUDE_PCONTENT:"excludePContent",PORTLET_PROP_WINDOW_STATE:"windowState",PORTLET_PR
 OP_DESKTOP_EXTENDED_STATICPOS:"staticpos",PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT:"fitheight",PORTLET_PROP_DESKTOP_EXTENDED_PROP_SEPARATOR:"=",PORTLET_PROP_DESKTOP_EXTENDED_PAIR_SEPARATOR:";",ACTION_NAME_MENU:"menu",ACTION_NAME_MINIMIZE:"minimized",ACTION_NAME_MAXIMIZE:"maximized",ACTION_NAME_RESTORE:"normal",ACTION_NAME_PRINT:"print",ACTION_NAME_EDIT:"edit",ACTION_NAME_VIEW:"view",ACTION_NAME_HELP:"help",ACTION_NAME_ADDPORTLET:"addportlet",ACTION_NAME_REMOVEPORTLET:"removeportlet",ACTION_NAME_DESKTOP_TILE:"tile",ACTION_NAME_DESKTOP_UNTILE:"untile",ACTION_NAME_DESKTOP_HEIGHT_EXPAND:"heightexpand",ACTION_NAME_DESKTOP_HEIGHT_NORMAL:"heightnormal",ACTION_NAME_LOAD_RENDER:"loadportletrender",ACTION_NAME_LOAD_ACTION:"loadportletaction",ACTION_NAME_LOAD_UPDATE:"loadportletupdate",PORTLET_ACTION_TYPE_MODE:"mode",PORTLET_ACTION_TYPE_STATE:"state",MENU_WIDGET_ID_PREFIX:"jetspeed-menu-",PAGE_EDITOR_WIDGET_ID:"jetspeed-page-editor",PAGE_EDITOR_INITIATE_PARAMETER:"editPage",PORTAL_ORIGI
 NATE_PARAMETER:"portal",DEBUG_WINDOW_TAG:"js-dojo-debug"};
+jetspeed.id={PAGE:"jetspeedPage",DESKTOP_CELL:"jetspeedDesktopCell",DESKTOP:"jetspeedDesktop",COLUMNS:"jetspeedColumns",PAGE_CONTROLS:"jetspeedPageControls",TASKBAR:"jetspeedTaskbar",SELECTOR:"jetspeedSelector",PORTLET_STYLE_CLASS:"portlet",PORTLET_WINDOW_STYLE_CLASS:"dojoFloatingPane",PORTLET_WINDOW_GHOST_STYLE_CLASS:"ghostPane",PORTLET_WINDOW_ID_PREFIX:"portletWindow_",PORTLET_PROP_WIDGET_ID:"widgetId",PORTLET_PROP_CONTENT_RETRIEVER:"contentRetriever",PORTLET_PROP_DESKTOP_EXTENDED:"jsdesktop",PORTLET_PROP_WINDOW_POSITION_STATIC:"windowPositionStatic",PORTLET_PROP_WINDOW_HEIGHT_TO_FIT:"windowHeightToFit",PORTLET_PROP_WINDOW_DECORATION:"windowDecoration",PORTLET_PROP_WINDOW_TITLE:"title",PORTLET_PROP_WINDOW_ICON:"windowIcon",PORTLET_PROP_WIDTH:"width",PORTLET_PROP_HEIGHT:"height",PORTLET_PROP_LEFT:"left",PORTLET_PROP_TOP:"top",PORTLET_PROP_COLUMN:"column",PORTLET_PROP_ROW:"row",PORTLET_PROP_EXCLUDE_PCONTENT:"excludePContent",PORTLET_PROP_WINDOW_STATE:"windowState",PORTLET_PR
 OP_DESKTOP_EXTENDED_STATICPOS:"staticpos",PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT:"fitheight",PORTLET_PROP_DESKTOP_EXTENDED_PROP_SEPARATOR:"=",PORTLET_PROP_DESKTOP_EXTENDED_PAIR_SEPARATOR:";",ACTION_NAME_MENU:"menu",ACTION_NAME_MINIMIZE:"minimized",ACTION_NAME_MAXIMIZE:"maximized",ACTION_NAME_RESTORE:"normal",ACTION_NAME_PRINT:"print",ACTION_NAME_EDIT:"edit",ACTION_NAME_VIEW:"view",ACTION_NAME_HELP:"help",ACTION_NAME_ADDPORTLET:"addportlet",ACTION_NAME_REMOVEPORTLET:"removeportlet",ACTION_NAME_DESKTOP_TILE:"tile",ACTION_NAME_DESKTOP_UNTILE:"untile",ACTION_NAME_DESKTOP_HEIGHT_EXPAND:"heightexpand",ACTION_NAME_DESKTOP_HEIGHT_NORMAL:"heightnormal",ACTION_NAME_LOAD_RENDER:"loadportletrender",ACTION_NAME_LOAD_ACTION:"loadportletaction",ACTION_NAME_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_W
 INDOW_TAG:"js-dojo-debug"};
 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;
@@ -589,14 +589,14 @@
 _89=false;
 }
 jetspeed.page.editMode=true;
-var _8b=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
+var _8b=dojo.widget.byId(jetspeed.id.PG_ED_WID);
 if(dojo.render.html.ie60){
 jetspeed.page.displayAllPortlets(true);
 }
 if(_8b==null){
 try{
 jetspeed.url.loadingIndicatorShow("loadpageeditor");
-_8b=dojo.widget.createWidget("jetspeed:PageEditor",{widgetId:jetspeed.id.PAGE_EDITOR_WIDGET_ID,editorInitiatedFromDesktop:_89});
+_8b=dojo.widget.createWidget("jetspeed:PageEditor",{widgetId:jetspeed.id.PG_ED_WID,editorInitiatedFromDesktop:_89});
 var _8c=document.getElementById(jetspeed.id.COLUMNS);
 _8c.insertBefore(_8b.domNode,_8c.firstChild);
 }
@@ -614,101 +614,108 @@
 };
 jetspeed.editPageTerminate=function(){
 if(jetspeed.page.editMode){
-var _8d=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
+var _8d=dojo.widget.byId(jetspeed.id.PG_ED_WID);
 _8d.editModeNormal();
 jetspeed.page.editMode=false;
 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.PG_ED_PARAM);
 _8e=jetspeed.url.removeQueryParameter(_8e,jetspeed.id.PORTAL_ORIGINATE_PARAMETER);
 window.location.href=_8e;
 }else{
+var _8f=jetspeed.url.getQueryParameter(window.location.href,jetspeed.id.PG_ED_PARAM);
+if(_8f!=null&&_8f=="true"){
+var _90=window.location.href;
+_90=jetspeed.url.removeQueryParameter(_90,jetspeed.id.PG_ED_PARAM);
+window.location.href=_90;
+}else{
 if(_8d!=null){
 _8d.editPageHide();
 }
 jetspeed.page.syncPageControls();
 }
 }
+}
 };
 jetspeed.om.PortletContentRetriever=function(){
 };
-jetspeed.om.PortletContentRetriever.prototype={getContent:function(_8f,_90,_91,_92){
-if(!_8f){
-_8f={};
+jetspeed.om.PortletContentRetriever.prototype={getContent:function(_91,_92,_93,_94){
+if(!_91){
+_91={};
 }
-jetspeed.url.retrieveContent(_8f,_90,_91,_92);
+jetspeed.url.retrieveContent(_91,_92,_93,_94);
 }};
 jetspeed.om.PortletSelectorContentRetriever=function(){
 };
-jetspeed.om.PortletSelectorContentRetriever.prototype={getContent:function(_93,_94,_95,_96){
-if(!_93){
-_93={};
-}
-var _97="<div widgetId=\""+jetspeed.id.SELECTOR+"\" dojoType=\"PortletDefContainer\"></div>";
-if(!_94){
-_94=new jetspeed.om.BasicContentListener();
+jetspeed.om.PortletSelectorContentRetriever.prototype={getContent:function(_95,_96,_97,_98){
+if(!_95){
+_95={};
+}
+var _99="<div widgetId=\""+jetspeed.id.SELECTOR+"\" dojoType=\"PortletDefContainer\"></div>";
+if(!_96){
+_96=new jetspeed.om.BasicContentListener();
 }
-_94.notifySuccess(_97,_93.url,_95);
+_96.notifySuccess(_99,_95.url,_97);
 }};
 jetspeed.om.PortletSelectorContentListener=function(){
 };
-jetspeed.om.PortletSelectorContentListener.prototype={notifySuccess:function(_98,_99,_9a){
-var _9b=this.getPortletWindow();
-if(_9b){
-_9b.setPortletContent(_98,renderUrl);
+jetspeed.om.PortletSelectorContentListener.prototype={notifySuccess:function(_9a,_9b,_9c){
+var _9d=this.getPortletWindow();
+if(_9d){
+_9d.setPortletContent(_9a,renderUrl);
 }
-},notifyFailure:function(_9c,_9d,_9e,_9f){
-dojo.raise("PortletSelectorContentListener notifyFailure url: "+_9e+" type: "+_9c+jetspeed.url.formatBindError(_9d));
+},notifyFailure:function(_9e,_9f,_a0,_a1){
+dojo.raise("PortletSelectorContentListener notifyFailure url: "+_a0+" type: "+_9e+jetspeed.url.formatBindError(_9f));
 }};
-jetspeed.om.PageContentListenerUpdate=function(_a0){
-this.previousPage=_a0;
+jetspeed.om.PageContentListenerUpdate=function(_a2){
+this.previousPage=_a2;
 };
-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.PageContentListenerUpdate.prototype={notifySuccess:function(_a3,_a4,_a5){
+dojo.raise("PageContentListenerUpdate notifySuccess - BUT NOT SUPPORTED - url="+_a4);
+},notifyFailure:function(_a6,_a7,_a8,_a9){
+dojo.raise("PageContentListenerUpdate notifyFailure url: "+_a8+" type: "+_a6+jetspeed.url.formatBindError(_a7));
 }};
 jetspeed.om.PageContentListenerCreateWidget=function(){
 };
-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.PageContentListenerCreateWidget.prototype={notifySuccess:function(_aa,_ab,_ac){
+_ac.loadFromPSML(_aa);
+},notifyFailure:function(_ad,_ae,_af,_b0){
+dojo.raise("PageContentListenerCreateWidget error url: "+_af+" type: "+_ad+jetspeed.url.formatBindError(_ae));
 }};
 jetspeed.om.Id=function(){
-var _af="";
+var _b1="";
 for(var i=0;i<arguments.length;i++){
 if(dojo.lang.isString(arguments[i])){
-if(_af.length>0){
-_af+="-";
+if(_b1.length>0){
+_b1+="-";
 }
-_af+=arguments[i];
+_b1+=arguments[i];
 }else{
 if(dojo.lang.isObject(arguments[i])){
-for(var _b1 in arguments[i]){
-this[_b1]=arguments[i][_b1];
+for(var _b3 in arguments[i]){
+this[_b3]=arguments[i][_b3];
 }
 }
 }
 }
-this.jetspeed_om_id=_af;
+this.jetspeed_om_id=_b1;
 };
 dojo.lang.extend(jetspeed.om.Id,{getId:function(){
 return this.jetspeed_om_id;
 }});
-jetspeed.om.Page=function(_b2,_b3,_b4,_b5){
-if(_b2!=null&&_b3!=null){
-this.requiredLayoutDecorator=_b2;
-this.setPsmlPathFromDocumentUrl(_b3);
-this.pageUrlFallback=_b3;
+jetspeed.om.Page=function(_b4,_b5,_b6,_b7){
+if(_b4!=null&&_b5!=null){
+this.requiredLayoutDecorator=_b4;
+this.setPsmlPathFromDocumentUrl(_b5);
+this.pageUrlFallback=_b5;
 }else{
 this.setPsmlPathFromDocumentUrl();
 }
-if(typeof _b4!="undefined"){
-this.addToHistory=_b4;
+if(typeof _b6!="undefined"){
+this.addToHistory=_b6;
 }
-if(typeof _b5!="undefined"){
-this.editMode=_b5;
+if(typeof _b7!="undefined"){
+this.editMode=_b7;
 }
 this.layouts={};
 this.columns=[];
@@ -717,158 +724,158 @@
 };
 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,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){
+var _b8=(this.name!=null&&this.name.length>0?this.name:null);
+if(!_b8){
 this.getPsmlUrl();
-_b6=this.psmlPath;
+_b8=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;
+return "page-"+_b8;
+},setPsmlPathFromDocumentUrl:function(_b9){
+var _ba=jetspeed.url.path.AJAX_API;
+var _bb=null;
+if(_b9==null){
+_bb=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):"");
+var _bc=window.location.hash;
+if(_bc!=null&&_bc.length>0){
+if(_bc.indexOf("#")==0){
+_bc=(_bc.length>1?_bc.substring(1):"");
 }
-if(_ba!=null&&_ba.length>1&&_ba.indexOf("/")==0){
-this.psmlPath=jetspeed.url.path.AJAX_API+_ba;
+if(_bc!=null&&_bc.length>1&&_bc.indexOf("/")==0){
+this.psmlPath=jetspeed.url.path.AJAX_API+_bc;
 return;
 }
 }
 }
 }else{
-var _bb=jetspeed.url.parse(_b7);
-_b9=_bb.path;
+var _bd=jetspeed.url.parse(_b9);
+_bb=_bd.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);
+var _be=jetspeed.url.path.DESKTOP;
+var _bf=_bb.indexOf(_be);
+if(_bf!=-1&&_bb.length>(_bf+_be.length)){
+_ba=_ba+_bb.substring(_bf+_be.length);
 }
-this.psmlPath=_b8;
+this.psmlPath=_ba;
 },getPsmlUrl:function(){
 if(this.psmlPath==null){
 this.setPsmlPathFromDocumentUrl();
 }
-var _be=jetspeed.url.basePortalUrl()+this.psmlPath;
+var _c0=jetspeed.url.basePortalUrl()+this.psmlPath;
 if(jetspeed.prefs.printModeOnly!=null){
-_be=jetspeed.url.addQueryParameter(_be,"layoutid",jetspeed.prefs.printModeOnly.layout);
-_be=jetspeed.url.addQueryParameter(_be,"entity",jetspeed.prefs.printModeOnly.entity).toString();
+_c0=jetspeed.url.addQueryParameter(_c0,"layoutid",jetspeed.prefs.printModeOnly.layout);
+_c0=jetspeed.url.addQueryParameter(_c0,"entity",jetspeed.prefs.printModeOnly.entity).toString();
 }
-return _be;
-},retrievePsml:function(_bf){
-if(_bf==null){
-_bf=new jetspeed.om.PageContentListenerCreateWidget();
+return _c0;
+},retrievePsml:function(_c1){
+if(_c1==null){
+_c1=new jetspeed.om.PageContentListenerCreateWidget();
 }
-var _c0=this.getPsmlUrl();
-var _c1="text/xml";
+var _c2=this.getPsmlUrl();
+var _c3="text/xml";
 if(jetspeed.debug.retrievePsml){
-dojo.debug("retrievePsml url: "+_c0);
+dojo.debug("retrievePsml url: "+_c2);
 }
-jetspeed.url.retrieveContent({url:_c0,mimetype:_c1},_bf,this,jetspeed.debugContentDumpIds);
-},loadFromPSML:function(_c2){
-var _c3=this._parsePSML(_c2);
-if(_c3==null){
+jetspeed.url.retrieveContent({url:_c2,mimetype:_c3},_c1,this,jetspeed.debugContentDumpIds);
+},loadFromPSML:function(_c4){
+var _c5=this._parsePSML(_c4);
+if(_c5==null){
 return;
 }
-var _c4={};
-this.columnsStructure=this._layoutCreateModel(_c3,null,_c4,true);
-this.rootFragmentId=_c3.id;
-var _c5=false;
+var _c6={};
+this.columnsStructure=this._layoutCreateModel(_c5,null,_c6,true);
+this.rootFragmentId=_c5.id;
+var _c7=false;
 if(this.editMode){
 this.editMode=false;
 if(jetspeed.prefs.printModeOnly==null){
-_c5=true;
+_c7=true;
 }
 }
 if(jetspeed.prefs.windowTiling){
 this._createColumnsStart(document.getElementById(jetspeed.id.DESKTOP));
 }
-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);
+var _c8=new Array();
+var _c9=this.columns.length;
+for(var _ca=0;_ca<=this.columns.length;_ca++){
+var _cb=null;
+if(_ca==_c9){
+_cb=_c6["z"];
+if(_cb!=null){
+_cb.sort(this._loadPortletZIndexCompare);
+}
+}else{
+_cb=_c6[_ca.toString()];
+}
+if(_cb!=null){
+for(var i=0;i<_cb.length;i++){
+var _cd=_cb[i].portlet;
+_c8.push(_cd);
+_cd.createPortletWindow(_ca);
 }
 }
 }
 if(jetspeed.prefs.printModeOnly==null){
-if(_c6&&_c6.length>0){
-jetspeed.doRenderAll(null,_c6,true);
+if(_c8&&_c8.length>0){
+jetspeed.doRenderAll(null,_c8,true);
 }
-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;
+this._portletsInitializeWindowState(_c6["z"]);
+var _ce=jetspeed.url.getQueryParameter(window.location.href,jetspeed.id.PG_ED_PARAM);
+if(_c7||(_ce!=null&&_ce=="true")||this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null){
+_c7=false;
 if(this.actions!=null&&(this.actions[jetspeed.id.ACTION_NAME_EDIT]!=null||this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null)){
-_c5=true;
+_c7=true;
 }
 }
-this.retrieveMenuDeclarations(true,_c5);
+this.retrieveMenuDeclarations(true,_c7);
 this.renderPageControls();
 this.syncPageControls();
 }else{
-var _cb=null;
-for(var _cd in this.portlets){
-_cb=this.portlets[_cd];
+var _cd=null;
+for(var _cf in this.portlets){
+_cd=this.portlets[_cf];
 break;
 }
-if(_cb!=null){
-_cb.renderAction(null,jetspeed.prefs.printModeOnly.action);
-this._portletsInitializeWindowState(_c4["z"]);
+if(_cd!=null){
+_cd.renderAction(null,jetspeed.prefs.printModeOnly.action);
+this._portletsInitializeWindowState(_c6["z"]);
 }
 }
-},_parsePSML:function(_ce){
-var _cf=_ce.getElementsByTagName("page");
-if(!_cf||_cf.length>1){
+},_parsePSML:function(_d0){
+var _d1=_d0.getElementsByTagName("page");
+if(!_d1||_d1.length>1){
 dojo.raise("unexpected zero or multiple <page> elements in psml");
 }
-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){
+var _d2=_d1[0];
+var _d3=_d2.childNodes;
+var _d4=new RegExp("(name|path|profiledPath|title|short-title)");
+var _d5=null;
+var _d6={};
+for(var i=0;i<_d3.length;i++){
+var _d8=_d3[i];
+if(_d8.nodeType!=dojo.dom.ELEMENT_NODE){
 continue;
 }
-var _d7=_d6.nodeName;
-if(_d7=="fragment"){
-_d3=_d6;
+var _d9=_d8.nodeName;
+if(_d9=="fragment"){
+_d5=_d8;
 }else{
-if(_d7=="defaults"){
-this.layoutDecorator=_d6.getAttribute("layout-decorator");
-this.portletDecorator=_d6.getAttribute("portlet-decorator");
+if(_d9=="defaults"){
+this.layoutDecorator=_d8.getAttribute("layout-decorator");
+this.portletDecorator=_d8.getAttribute("portlet-decorator");
 }else{
-if(_d7&&_d7.match(_d2)){
-this[jetspeed.purifyIdentifier(_d7,"","lo")]=((_d6&&_d6.firstChild)?_d6.firstChild.nodeValue:null);
+if(_d9&&_d9.match(_d4)){
+this[jetspeed.purifyIdentifier(_d9,"","lo")]=((_d8&&_d8.firstChild)?_d8.firstChild.nodeValue:null);
 }else{
-if(_d7=="action"){
-this._parsePSMLAction(_d6,_d4);
+if(_d9=="action"){
+this._parsePSMLAction(_d8,_d6);
 }
 }
 }
 }
 }
-this.actions=_d4;
-if(_d3==null){
+this.actions=_d6;
+if(_d5==null){
 dojo.raise("No root fragment in PSML.");
 return null;
 }
@@ -881,99 +888,99 @@
 return null;
 }else{
 if(this.addToHistory){
-var _d8=this.getPageUrl();
+var _da=this.getPageUrl();
 dojo.undo.browser.addToHistory({back:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("back-nav-button: "+_d8);
+dojo.debug("back-nav-button: "+_da);
 }
-jetspeed.updatePage(_d8,true);
+jetspeed.updatePage(_da,true);
 },forward:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("forward-nav-button: "+_d8);
+dojo.debug("forward-nav-button: "+_da);
 }
-jetspeed.updatePage(_d8,true);
+jetspeed.updatePage(_da,true);
 },changeUrl:escape(this.getPath())});
 }
 }
 }else{
 if(!djConfig.preventBackButtonFix&&jetspeed.prefs.ajaxPageNavigation){
-var _d8=this.getPageUrl();
+var _da=this.getPageUrl();
 dojo.undo.browser.setInitialState({back:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("back-nav-button initial: "+_d8);
+dojo.debug("back-nav-button initial: "+_da);
 }
-jetspeed.updatePage(_d8,true);
+jetspeed.updatePage(_da,true);
 },forward:function(){
 if(jetspeed.debug.ajaxPageNav){
-dojo.debug("forward-nav-button initial: "+_d8);
+dojo.debug("forward-nav-button initial: "+_da);
 }
-jetspeed.updatePage(_d8,true);
+jetspeed.updatePage(_da,true);
 },changeUrl:escape(this.getPath())});
 }
 }
-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){
+var _db=this._parsePSMLLayoutFragment(_d5,0);
+return _db;
+},_parsePSMLLayoutFragment:function(_dc,_dd){
+var _de=new Array();
+var _df=((_dc!=null)?_dc.getAttribute("type"):null);
+if(_df!="layout"){
+dojo.raise("_parsePSMLLayoutFragment called with non-layout fragment: "+_dc);
+return null;
+}
+var _e0=false;
+var _e1=_dc.getAttribute("name");
+if(_e1!=null){
+_e1=_e1.toLowerCase();
+if(_e1.indexOf("noactions")!=-1){
+_e0=true;
+}
+}
+var _e2=null,_e3=0;
+var _e4={};
+var _e5=_dc.childNodes;
+var _e6,_e7,_e8,_e9,_ea;
+for(var i=0;i<_e5.length;i++){
+_e6=_e5[i];
+if(_e6.nodeType!=dojo.dom.ELEMENT_NODE){
 continue;
 }
-_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);
+_e7=_e6.nodeName;
+if(_e7=="fragment"){
+_ea=_e6.getAttribute("type");
+if(_ea=="layout"){
+var _ec=this._parsePSMLLayoutFragment(_e6,i);
+if(_ec!=null){
+_de.push(_ec);
+}
+}else{
+var _ed=this._parsePSMLProperties(_e6,null);
+var _ee=_ed[jetspeed.id.PORTLET_PROP_WINDOW_ICON];
+if(_ee==null||_ee.length==0){
+_ee=this._parsePSMLIcon(_e6);
+if(_ee!=null&&_ee.length>0){
+_ed[jetspeed.id.PORTLET_PROP_WINDOW_ICON]=_ee;
+}
+}
+_de.push({id:_e6.getAttribute("id"),type:_ea,name:_e6.getAttribute("name"),properties:_ed,actions:this._parsePSMLActions(_e6,null),currentActionState:this._parsePSMLCurrentActionState(_e6),currentActionMode:this._parsePSMLCurrentActionMode(_e6),decorator:_e6.getAttribute("decorator"),layoutActionsDisabled:_e0,documentOrderIndex:i});
+}
+}else{
+if(_e7=="property"){
+if(this._parsePSMLProperty(_e6,_e4)=="sizes"){
+if(_e2!=null){
+dojo.raise("_parsePSMLLayoutFragment called with layout fragment that contains more than one sizes property: "+_dc);
 return null;
 }
 if(jetspeed.prefs.printModeOnly!=null){
-_e0=["100"];
-_e1=100;
+_e2=["100"];
+_e3=100;
 }else{
-_e7=_e4.getAttribute("value");
-if(_e7!=null&&_e7.length>0){
-_e0=_e7.split(",");
-for(var j=0;j<_e0.length;j++){
+_e9=_e6.getAttribute("value");
+if(_e9!=null&&_e9.length>0){
+_e2=_e9.split(",");
+for(var j=0;j<_e2.length;j++){
 var re=/^[^0-9]*([0-9]+)[^0-9]*$/;
-_e0[j]=_e0[j].replace(re,"$1");
-_e1+=new Number(_e0[j]);
+_e2[j]=_e2[j].replace(re,"$1");
+_e3+=new Number(_e2[j]);
 }
 }
 }
@@ -981,280 +988,280 @@
 }
 }
 }
-_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);
+_de.sort(this._fragmentRowCompare);
+var _f1=new Array();
+var _f2=new Array();
+for(var i=0;i<_de.length;i++){
+if(_de[i].type=="layout"){
+_f1.push(i);
 }else{
-_f0.push(i);
+_f2.push(i);
 }
 }
-if(_e0==null){
-_e0=new Array();
-_e0.push("100");
-_e1=100;
+if(_e2==null){
+_e2=new Array();
+_e2.push("100");
+_e3=100;
 }
-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={};
+return {id:_dc.getAttribute("id"),type:_df,name:_dc.getAttribute("name"),decorator:_dc.getAttribute("decorator"),columnSizes:_e2,columnSizesSum:_e3,properties:_e4,fragments:_de,layoutFragmentIndexes:_f1,otherFragmentIndexes:_f2,layoutActionsDisabled:_e0,documentOrderIndex:_dd};
+},_parsePSMLActions:function(_f3,_f4){
+if(_f4==null){
+_f4={};
 }
-var _f3=_f1.getElementsByTagName("action");
-for(var _f4=0;_f4<_f3.length;_f4++){
-var _f5=_f3[_f4];
-this._parsePSMLAction(_f5,_f2);
+var _f5=_f3.getElementsByTagName("action");
+for(var _f6=0;_f6<_f5.length;_f6++){
+var _f7=_f5[_f6];
+this._parsePSMLAction(_f7,_f4);
 }
-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};
+return _f4;
+},_parsePSMLAction:function(_f8,_f9){
+var _fa=_f8.getAttribute("id");
+if(_fa!=null){
+var _fb=_f8.getAttribute("type");
+var _fc=_f8.getAttribute("name");
+var _fd=_f8.getAttribute("url");
+var _fe=_f8.getAttribute("alt");
+_f9[_fa.toLowerCase()]={id:_fa,type:_fb,label:_fc,url:_fd,alt:_fe};
 }
-},_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;
-},_parsePSMLCurrentActionMode:function(_ff){
-var _100=_ff.getElementsByTagName("mode");
+},_parsePSMLCurrentActionState:function(_ff){
+var _100=_ff.getElementsByTagName("state");
 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");
+},_parsePSMLCurrentActionMode:function(_101){
+var _102=_101.getElementsByTagName("mode");
 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;
+},_parsePSMLIcon:function(_103){
+var _104=_103.getElementsByTagName("icon");
+if(_104!=null&&_104.length==1&&_104[0].firstChild!=null){
+return _104[0].firstChild.nodeValue;
+}
+return null;
+},_parsePSMLProperties:function(_105,_106){
+if(_106==null){
+_106={};
+}
+var _107=_105.getElementsByTagName("property");
+for(var _108=0;_108<_107.length;_108++){
+this._parsePSMLProperty(_107[_108],_106);
+}
+return _106;
+},_parsePSMLProperty:function(_109,_10a){
+var _10b=_109.getAttribute("name");
+var _10c=_109.getAttribute("value");
+_10a[_10b]=_10c;
+return _10b;
+},_fragmentRowCompare:function(_10d,_10e){
+var rowA=_10d.documentOrderIndex*1000;
+var rowB=_10e.documentOrderIndex*1000;
+var _111=_10d.properties["row"];
+if(_111!=null){
+rowA=_111;
+}
+var _112=_10e.properties["row"];
+if(_112!=null){
+rowB=_112;
 }
 return (rowA-rowB);
-},_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];
-}
-var _11d=new Array();
-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;
+},_layoutCreateModel:function(_113,_114,_115,_116){
+var _117=this.columns.length;
+var _118=this._layoutRegisterAndCreateColumnsModel(_113,_114,_116);
+var _119=_118.columnsInLayout;
+if(_118.addedLayoutHeaderColumn){
+_117++;
+}
+var _11a=(_119==null?0:_119.length);
+if(_113.layoutFragmentIndexes!=null&&_113.layoutFragmentIndexes.length>0){
+var _11b=null;
+var _11c=0;
+if(_113.otherFragmentIndexes!=null&&_113.otherFragmentIndexes.length>0){
+_11b=new Array();
+}
+for(var i=0;i<_113.fragments.length;i++){
+var _11e=_113.fragments[i];
+}
+var _11f=new Array();
+for(var i=0;i<_11a;i++){
+if(_11b!=null){
+_11b.push(null);
+}
+_11f.push(false);
+}
+for(var i=0;i<_113.fragments.length;i++){
+var _11e=_113.fragments[i];
+var _120=i;
+if(_11e.properties&&_11e.properties[jetspeed.id.PORTLET_PROP_COLUMN]>=0){
+if(_11e.properties[jetspeed.id.PORTLET_PROP_COLUMN]!=null&&_11e.properties[jetspeed.id.PORTLET_PROP_COLUMN]>=0){
+_120=_11e.properties[jetspeed.id.PORTLET_PROP_COLUMN];
+}
+}
+if(_120>=_11a){
+_120=(_11a>0?(_11a-1):0);
+}
+var _121=((_11b==null)?null:_11b[_120]);
+if(_11e.type=="layout"){
+_11f[_120]=true;
+if(_121!=null){
+this._layoutCreateModel(_121,_119[_120],_115,true);
+_11b[_120]=null;
+}
+this._layoutCreateModel(_11e,_119[_120],_115,false);
+}else{
+if(_121==null){
+_11c++;
+var _122={};
+dojo.lang.mixin(_122,_113);
+_122.fragments=new Array();
+_122.layoutFragmentIndexes=new Array();
+_122.otherFragmentIndexes=new Array();
+_122.documentOrderIndex=_113.fragments[i].documentOrderIndex;
+_122.clonedFromRootId=_122.id;
+_122.clonedLayoutFragmentIndex=_11c;
+_122.columnSizes=["100"];
+_122.columnSizesSum=[100];
+_122.id=_122.id+"-jsclone_"+_11c;
+_11b[_120]=_122;
+_121=_122;
+}
+_121.fragments.push(_11e);
+_121.otherFragmentIndexes.push(_121.fragments.length-1);
+}
+}
+if(_11b!=null){
+for(var i=0;i<_11a;i++){
+var _121=_11b[i];
+if(_121!=null){
+_11f[i]=true;
+this._layoutCreateModel(_121,_119[i],_115,true);
+}
+}
+}
+for(var i=0;i<_11a;i++){
+if(_11f[i]){
+_119[i].columnContainer=true;
+}
+}
+if(_113.otherFragmentIndexes!=null&&_113.otherFragmentIndexes.length>0){
+var _123=new Array();
+for(var i=0;i<_113.fragments.length;i++){
+var _124=true;
+for(var j=0;j<_113.otherFragmentIndexes.length;j++){
+if(_113.otherFragmentIndexes[j]==i){
+_124=false;
 break;
 }
 }
-if(_122){
-_121.push(_111.fragments[i]);
+if(_124){
+_123.push(_113.fragments[i]);
+}
+}
+_113.fragments=_123;
+_113.otherFragmentIndexes=new Array();
+}
+}
+this._layoutCreatePortletsModel(_113,_119,_117,_115);
+return _119;
+},_layoutFragmentChildCollapse:function(_126,_127){
+var _128=false;
+if(_127==null){
+_127=_126;
 }
+if(_126.layoutFragmentIndexes!=null&&_126.layoutFragmentIndexes.length>0){
+_128=true;
+for(var i=0;i<_126.layoutFragmentIndexes.length;i++){
+var _12a=_126.fragments[_126.layoutFragmentIndexes[i]];
+if(_12a.otherFragmentIndexes!=null&&_12a.otherFragmentIndexes.length>0){
+for(var i=0;i<_12a.otherFragmentIndexes.length;i++){
+var _12b=_12a.fragments[_12a.otherFragmentIndexes[i]];
+_12b.properties[jetspeed.id.PORTLET_PROP_COLUMN]=-1;
+_12b.properties[jetspeed.id.PORTLET_PROP_ROW]=-1;
+_12b.documentOrderIndex=_127.fragments.length;
+_127.fragments.push(_12b);
+_127.otherFragIndexes.push(_127.fragments.length);
 }
-_111.fragments=_121;
-_111.otherFragmentIndexes=new Array();
 }
+this._layoutFragmentChildCollapse(_12a,_127);
 }
-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){
+}
+return _128;
+},_layoutRegisterAndCreateColumnsModel:function(_12c,_12d,_12e){
+this.layouts[_12c.id]=_12c;
 var _12f=false;
+var _130=new Array();
+if(jetspeed.prefs.windowTiling&&_12c.columnSizes.length>0){
+var _131=false;
 if(jetspeed.browser_IE){
+_131=true;
+}
+if(_12d!=null&&!_12e){
+var _132=new jetspeed.om.Column(0,_12c.id,(_131?_12c.columnSizesSum-0.1:_12c.columnSizesSum),this.columns.length,_12c.layoutActionsDisabled);
+_132.layoutHeader=true;
+this.columns.push(_132);
+if(_12d.columnChildren==null){
+_12d.columnChildren=new Array();
+}
+_12d.columnChildren.push(_132);
+_12d=_132;
 _12f=true;
 }
-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)){
+for(var i=0;i<_12c.columnSizes.length;i++){
+var size=_12c.columnSizes[i];
+if(_131&&i==(_12c.columnSizes.length-1)){
 size=size-0.1;
 }
-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());
+var _135=new jetspeed.om.Column(i,_12c.id,size,this.columns.length,_12c.layoutActionsDisabled);
+this.columns.push(_135);
+if(_12d!=null){
+if(_12d.columnChildren==null){
+_12d.columnChildren=new Array();
+}
+_12d.columnChildren.push(_135);
+}
+_130.push(_135);
+}
+}
+return {columnsInLayout:_130,addedLayoutHeaderColumn:_12f};
+},_layoutCreatePortletsModel:function(_136,_137,_138,_139){
+if(_136.otherFragmentIndexes!=null&&_136.otherFragmentIndexes.length>0){
+var _13a=new Array();
+for(var i=0;i<_137.length;i++){
+_13a.push(new Array());
 }
-for(var i=0;i<_134.otherFragmentIndexes.length;i++){
-var _13a=_134.fragments[_134.otherFragmentIndexes[i]];
+for(var i=0;i<_136.otherFragmentIndexes.length;i++){
+var _13c=_136.fragments[_136.otherFragmentIndexes[i]];
 if(jetspeed.debugPortletEntityIdFilter){
-if(!dojo.lang.inArray(jetspeed.debugPortletEntityIdFilter,_13a.id)){
-_13a=null;
+if(!dojo.lang.inArray(jetspeed.debugPortletEntityIdFilter,_13c.id)){
+_13c=null;
 }
 }
-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;
+if(_13c!=null){
+var _13d="z";
+var _13e=_13c.properties[jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED];
+var _13f=jetspeed.prefs.windowTiling;
+var _140=jetspeed.prefs.windowHeightExpand;
+if(_13e!=null&&jetspeed.prefs.windowTiling&&jetspeed.prefs.printModeOnly==null){
+var _141=_13e.split(jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PAIR_SEPARATOR);
+var _142=null,_143=0,_144=null,_145=null,_146=false;
+if(_141!=null&&_141.length>0){
+var _147=jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PROP_SEPARATOR;
+for(var _148=0;_148<_141.length;_148++){
+_142=_141[_148];
+_143=((_142!=null)?_142.length:0);
+if(_143>0){
+var _149=_142.indexOf(_147);
+if(_149>0&&_149<(_143-1)){
+_144=_142.substring(0,_149);
+_145=_142.substring(_149+1);
+_146=((_145=="true")?true:false);
+if(_144==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_STATICPOS){
+_13f=_146;
 }else{
-if(_142==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT){
-_13e=_144;
+if(_144==jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT){
+_140=_146;
 }
 }
 }
@@ -1263,181 +1270,181 @@
 }
 }else{
 if(!jetspeed.prefs.windowTiling){
-_13d=false;
+_13f=false;
 }
 }
-_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){
-var _149=-1;
-for(var j=0;j<_135.length;j++){
-if(_149==-1||_138[j].length<_149){
-_149=_138[j].length;
-_148=j;
+_13c.properties[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=_13f;
+_13c.properties[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=_140;
+if(_13f&&jetspeed.prefs.windowTiling){
+var _14a=_13c.properties[jetspeed.id.PORTLET_PROP_COLUMN];
+if(_14a==null||_14a==""||_14a<0){
+var _14b=-1;
+for(var j=0;j<_137.length;j++){
+if(_14b==-1||_13a[j].length<_14b){
+_14b=_13a[j].length;
+_14a=j;
 }
 }
 }else{
-if(_148>=_135.length){
-_148=_135.length-1;
+if(_14a>=_137.length){
+_14a=_137.length-1;
 }
 }
-_138[_148].push(_13a.id);
-var _14b=_136+new Number(_148);
-_13b=_14b.toString();
+_13a[_14a].push(_13c.id);
+var _14d=_138+new Number(_14a);
+_13d=_14d.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();
+var _14e=new jetspeed.om.Portlet(_13c.name,_13c.id,null,_13c.properties,_13c.actions,_13c.currentActionState,_13c.currentActionMode,_13c.decorator,_13c.layoutActionsDisabled);
+_14e.initialize();
+this.putPortlet(_14e);
+if(_139[_13d]==null){
+_139[_13d]=new Array();
 }
-_137[_13b].push({portlet:_14c,layout:_134.id});
+_139[_13d].push({portlet:_14e,layout:_136.id});
 }
 }
 }
-},_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};
+},_portletsInitializeWindowState:function(_14f){
+var _150={};
+this.getPortletCurrentColumnRow(null,false,_150);
+for(var _151 in this.portlets){
+var _152=this.portlets[_151];
+var _153=_150[_152.getId()];
+if(_153==null&&_14f){
+for(var i=0;i<_14f.length;i++){
+if(_14f[i].portlet.getId()==_152.getId()){
+_153={layout:_14f[i].layout};
 break;
 }
 }
 }
-if(_151!=null){
-_150._initializeWindowState(_151,false);
+if(_153!=null){
+_152._initializeWindowState(_153,false);
 }else{
-dojo.raise("page._portletsInitializeWindowState could not find window state init data for portlet: "+_150.getId());
+dojo.raise("page._portletsInitializeWindowState could not find window state init data for portlet: "+_152.getId());
 }
 }
-},_loadPortletZIndexCompare:function(_153,_154){
-var _155=null;
-var _156=null;
+},_loadPortletZIndexCompare:function(_155,_156){
 var _157=null;
-_155=_153.portlet._getInitialZIndex();
-_156=_154.portlet._getInitialZIndex();
-if(_155&&!_156){
+var _158=null;
+var _159=null;
+_157=_155.portlet._getInitialZIndex();
+_158=_156.portlet._getInitialZIndex();
+if(_157&&!_158){
 return -1;
 }else{
-if(_156&&!_155){
+if(_158&&!_157){
 return 1;
 }else{
-if(_155==_156){
+if(_157==_158){
 return 0;
 }
 }
 }
-return (_155-_156);
-},_createColumnsStart:function(_158){
+return (_157-_158);
+},_createColumnsStart:function(_15a){
 if(!this.columnsStructure||this.columnsStructure.length==0){
 return;
 }
-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);
+var _15b=document.createElement("div");
+_15b.id=jetspeed.id.COLUMNS;
+_15b.setAttribute("id",jetspeed.id.COLUMNS);
+for(var _15c=0;_15c<this.columnsStructure.length;_15c++){
+var _15d=this.columnsStructure[_15c];
+this._createColumns(_15d,_15b);
+}
+_15a.appendChild(_15b);
+},_createColumns:function(_15e,_15f){
+_15e.createColumn();
+if(_15e.columnChildren!=null&&_15e.columnChildren.length>0){
+for(var _160=0;_160<_15e.columnChildren.length;_160++){
+var _161=_15e.columnChildren[_160];
+this._createColumns(_161,_15e.domNode);
 }
 }
-_15d.appendChild(_15c.domNode);
-},_removeColumns:function(_160){
+_15f.appendChild(_15e.domNode);
+},_removeColumns:function(_162){
 if(!this.columns||this.columns.length==0){
 return;
 }
 for(var i=0;i<this.columns.length;i++){
 if(this.columns[i]){
-if(_160){
-var _162=jetspeed.ui.getPortletWindowChildren(this.columns[i].domNode,null);
-dojo.lang.forEach(_162,function(_163){
-_160.appendChild(_163);
+if(_162){
+var _164=jetspeed.ui.getPortletWindowChildren(this.columns[i].domNode,null);
+dojo.lang.forEach(_164,function(_165){
+_162.appendChild(_165);
 });
 }
 dojo.dom.removeNode(this.columns[i]);
 this.columns[i]=null;
 }
 }
-var _164=dojo.byId(jetspeed.id.COLUMNS);
-if(_164){
-dojo.dom.removeNode(_164);
+var _166=dojo.byId(jetspeed.id.COLUMNS);
+if(_166){
+dojo.dom.removeNode(_166);
 }
 this.columns=[];
-},getPortletCurrentColumnRow:function(_165,_166,_167){
+},getPortletCurrentColumnRow:function(_167,_168,_169){
 if(!this.columns||this.columns.length==0){
 return null;
 }
-var _168=null;
-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;
+var _16a=null;
+var _16b=((_167!=null)?true:false);
+var _16c=0;
+var _16d=null;
+var _16e=null;
+var _16f=0;
+var _170=false;
+for(var _171=0;_171<this.columns.length;_171++){
+var _172=this.columns[_171];
+var _173=_172.domNode.childNodes;
+if(_16e==null||_16e!=_172.getLayoutId()){
+_16e=_172.getLayoutId();
+_16d=this.layouts[_16e];
+if(_16d==null){
+dojo.raise("getPortletCurrentColumnRow cannot locate layout id: "+_16e);
+return null;
+}
+_16f=0;
+_170=false;
+if(_16d.clonedFromRootId==null){
+_170=true;
+}else{
+var _174=this.getColumnFromColumnNode(_172.domNode.parentNode);
+if(_174==null){
+dojo.raise("getPortletCurrentColumnRow cannot locate parent column for column: "+_172);
+return null;
+}
+_172=_174;
+}
+}
+var _175=null;
+for(var _176=0;_176<_173.length;_176++){
+var _177=_173[_176];
+if(dojo.html.hasClass(_177,jetspeed.id.PORTLET_WINDOW_STYLE_CLASS)||(_168&&dojo.html.hasClass(_177,jetspeed.id.PORTLET_WINDOW_GHOST_STYLE_CLASS))||(_16b&&dojo.html.hasClass(_177,"desktopColumn"))){
+_175=(_175==null?0:_175+1);
+if((_175+1)>_16f){
+_16f=(_175+1);
+}
+if(_167==null||_177==_167){
+var _178={layout:_16e,column:_172.getLayoutColumnIndex(),row:_175};
+if(!_170){
+_178.layout=_16d.clonedFromRootId;
 }
-if(_165!=null){
-_168=_176;
+if(_167!=null){
+_16a=_178;
 break;
 }else{
-if(_167!=null){
-var _177=this.getPortletWindowFromNode(_175);
-if(_177==null){
+if(_169!=null){
+var _179=this.getPortletWindowFromNode(_177);
+if(_179==null){
 dojo.raise("getPortletCurrentColumnRow cannot locate PortletWindow for node.");
 }else{
-var _178=_177.portlet;
-if(_178==null){
-dojo.raise("getPortletCurrentColumnRow PortletWindow.portlet is for widgetId: "+_177.widgetId);
+var _17a=_179.portlet;
+if(_17a==null){
+dojo.raise("getPortletCurrentColumnRow PortletWindow.portlet is for widgetId: "+_179.widgetId);
 }else{
-_167[_178.getId()]=_176;
+_169[_17a.getId()]=_178;
 }
 }
 }
@@ -1445,209 +1452,209 @@
 }
 }
 }
-if(_168!=null){
+if(_16a!=null){
 break;
 }
 }
-return _168;
+return _16a;
 },_getPortletArrayByZIndex:function(){
-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]);
+var _17b=this.getPortletArray();
+if(!_17b){
+return _17b;
+}
+var _17c=[];
+for(var i=0;i<_17b.length;i++){
+if(!_17b[i].getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC)){
+_17c.push(_17b[i]);
 }
 }
-_17a.sort(this._portletZIndexCompare);
-return _17a;
-},_portletZIndexCompare:function(_17c,_17d){
-var _17e=null;
-var _17f=null;
+_17c.sort(this._portletZIndexCompare);
+return _17c;
+},_portletZIndexCompare:function(_17e,_17f){
 var _180=null;
-_180=_17c.getLastSavedWindowState();
-_17e=_180.zIndex;
-_180=_17d.getLastSavedWindowState();
-_17f=_180.zIndex;
-if(_17e&&!_17f){
+var _181=null;
+var _182=null;
+_182=_17e.getLastSavedWindowState();
+_180=_182.zIndex;
+_182=_17f.getLastSavedWindowState();
+_181=_182.zIndex;
+if(_180&&!_181){
 return -1;
 }else{
-if(_17f&&!_17e){
+if(_181&&!_180){
 return 1;
 }else{
-if(_17e==_17f){
+if(_180==_181){
 return 0;
 }
 }
 }
-return (_17e-_17f);
+return (_180-_181);
 },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 _182=this.getPortletDecorator();
-if(dojo.lang.indexOf(jetspeed.prefs.portletDecorationsAllowed,_182)!=-1){
-pd=_182;
+var _184=this.getPortletDecorator();
+if(dojo.lang.indexOf(jetspeed.prefs.portletDecorationsAllowed,_184)!=-1){
+pd=_184;
 }else{
 pd=jetspeed.prefs.windowDecoration;
 }
 }
 return pd;
 },getPortletArrayList:function(){
-var _183=new dojo.collections.ArrayList();
-for(var _184 in this.portlets){
-var _185=this.portlets[_184];
-_183.add(_185);
+var _185=new dojo.collections.ArrayList();
+for(var _186 in this.portlets){
+var _187=this.portlets[_186];
+_185.add(_187);
 }
-return _183;
+return _185;
 },getPortletArray:function(){
 if(!this.portlets){
 return null;
 }
-var _186=[];
-for(var _187 in this.portlets){
-var _188=this.portlets[_187];
-_186.push(_188);
+var _188=[];
+for(var _189 in this.portlets){
+var _18a=this.portlets[_189];
+_188.push(_18a);
 }
-return _186;
+return _188;
 },getPortletIds:function(){
 if(!this.portlets){
 return null;
 }
-var _189=[];
-for(var _18a in this.portlets){
-var _18b=this.portlets[_18a];
-_189.push(_18b.getId());
-}
-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;
+var _18b=[];
+for(var _18c in this.portlets){
+var _18d=this.portlets[_18c];
+_18b.push(_18d.getId());
+}
+return _18b;
+},getPortletByName:function(_18e){
+if(this.portlets&&_18e){
+for(var _18f in this.portlets){
+var _190=this.portlets[_18f];
+if(_190.name==_18e){
+return _190;
 }
 }
 }
 return null;
-},getPortlet:function(_18f){
-if(this.portlets&&_18f){
-return this.portlets[_18f];
-}
-return null;
-},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;
+},getPortlet:function(_191){
+if(this.portlets&&_191){
+return this.portlets[_191];
+}
+return null;
+},getPortletWindowFromNode:function(_192){
+var _193=null;
+if(this.portlets&&_192){
+for(var _194 in this.portlets){
+var _195=this.portlets[_194];
+var _196=_195.getPortletWindow();
+if(_196!=null){
+if(_196.domNode==_192){
+_193=_196;
 break;
 }
 }
 }
 }
-return _191;
-},putPortlet:function(_195){
-if(!_195){
+return _193;
+},putPortlet:function(_197){
+if(!_197){
 return;
 }
 if(!this.portlets){
 this.portlets=[];
 }
-this.portlets[_195.entityId]=_195;
-},removePortlet:function(_196){
-if(!_196||!this.portlets){
+this.portlets[_197.entityId]=_197;
+},removePortlet:function(_198){
+if(!_198||!this.portlets){
 return;
 }
-delete this.portlets[_196.entityId];
+delete this.portlets[_198.entityId];
 },_destroyPortlets:function(){
-for(var _197 in this.portlets){
-var _198=this.portlets[_197];
-_198._destroy();
+for(var _199 in this.portlets){
+var _19a=this.portlets[_199];
+_19a._destroy();
 }
 },debugLayoutInfo:function(){
-var _199="";
+var _19b="";
 var i=0;
-for(var _19b in this.layouts){
+for(var _19d in this.layouts){
 if(i>0){
-_199+="\r\n";
+_19b+="\r\n";
 }
-_199+="layout["+_19b+"]: "+jetspeed.printobj(this.layouts[_19b],true,true,true);
+_19b+="layout["+_19d+"]: "+jetspeed.printobj(this.layouts[_19d],true,true,true);
 i++;
 }
-return _199;
+return _19b;
 },debugColumnInfo:function(){
-var _19c="";
+var _19e="";
 for(var i=0;i<this.columns.length;i++){
 if(i>0){
-_19c+="\r\n";
+_19e+="\r\n";
 }
-_19c+=this.columns[i].toString();
+_19e+=this.columns[i].toString();
 }
-return _19c;
+return _19e;
 },debugDumpLastSavedWindowState:function(){
 return this._debugDumpLastSavedWindowStateAllPortlets(true);
 },debugDumpWindowState:function(){
 return this._debugDumpLastSavedWindowStateAllPortlets(false);
 },debugPortletActions:function(){
-var _19e=this.getPortletArray();
-var _19f="";
-for(var i=0;i<_19e.length;i++){
-var _1a1=_19e[i];
+var _1a0=this.getPortletArray();
+var _1a1="";
+for(var i=0;i<_1a0.length;i++){
+var _1a3=_1a0[i];
 if(i>0){
-_19f+="\r\n";
+_1a1+="\r\n";
 }
-_19f+="portlet ["+_1a1.name+"] actions: {";
-for(var _1a2 in _1a1.actions){
-_19f+=_1a2+"={"+jetspeed.printobj(_1a1.actions[_1a2],true)+"} ";
+_1a1+="portlet ["+_1a3.name+"] actions: {";
+for(var _1a4 in _1a3.actions){
+_1a1+=_1a4+"={"+jetspeed.printobj(_1a3.actions[_1a4],true)+"} ";
 }
-_19f+="}";
+_1a1+="}";
 }
-return _19f;
-},displayAllPortlets:function(_1a3){
-var _1a4=this.getPortletArray();
-for(var i=0;i<_1a4.length;i++){
-var _1a6=_1a4[i];
-var _1a7=_1a6.getPortletWindow();
-if(_1a7){
-if(_1a3){
-_1a7.domNode.style.display="none";
+return _1a1;
+},displayAllPortlets:function(_1a5){
+var _1a6=this.getPortletArray();
+for(var i=0;i<_1a6.length;i++){
+var _1a8=_1a6[i];
+var _1a9=_1a8.getPortletWindow();
+if(_1a9){
+if(_1a5){
+_1a9.domNode.style.display="none";
 }else{
-_1a7.domNode.style.display="";
+_1a9.domNode.style.display="";
 }
 }
 }
-},_debugDumpLastSavedWindowStateAllPortlets:function(_1a8){
-var _1a9=this.getPortletArray();
-var _1aa="";
-for(var i=0;i<_1a9.length;i++){
-var _1ac=_1a9[i];
+},_debugDumpLastSavedWindowStateAllPortlets:function(_1aa){
+var _1ab=this.getPortletArray();
+var _1ac="";
+for(var i=0;i<_1ab.length;i++){
+var _1ae=_1ab[i];
 if(i>0){
-_1aa+="\r\n";
+_1ac+="\r\n";
 }
-var _1ad=null;
+var _1af=null;
 try{
-if(_1a8){
-_1ad=_1ac.getLastSavedWindowState();
+if(_1aa){
+_1af=_1ae.getLastSavedWindowState();
 }else{
-_1ad=_1ac.getCurrentWindowState();
+_1af=_1ae.getCurrentWindowState();
 }
 }
 catch(e){
 }
-_1aa+="["+_1ac.name+"] "+((_1ad==null)?"null":jetspeed.printobj(_1ad,true));
+_1ac+="["+_1ae.name+"] "+((_1af==null)?"null":jetspeed.printobj(_1af,true));
 }
-return _1aa;
+return _1ac;
 },resetWindowLayout:function(){
-for(var _1ae in this.portlets){
-var _1af=this.portlets[_1ae];
-_1af.submitChangedWindowState(false,true);
+for(var _1b0 in this.portlets){
+var _1b1=this.portlets[_1b0];
+_1b1.submitChangedWindowState(false,true);
 }
 this.reload();
 },reload:function(){
@@ -1658,207 +1665,207 @@
 this._destroyEditPage();
 this._removeColumns(document.getElementById(jetspeed.id.DESKTOP));
 this._destroyPageControls();
-},getColumnFromColumnNode:function(_1b0){
-if(_1b0==null){
+},getColumnFromColumnNode:function(_1b2){
+if(_1b2==null){
 return null;
 }
-var _1b1=_1b0.getAttribute("columnIndex");
-if(_1b1==null){
+var _1b3=_1b2.getAttribute("columnIndex");
+if(_1b3==null){
 return null;
 }
-var _1b2=new Number(_1b1);
-if(_1b2>=0&&_1b2<this.columns.length){
-return this.columns[_1b2];
+var _1b4=new Number(_1b3);
+if(_1b4>=0&&_1b4<this.columns.length){
+return this.columns[_1b4];
 }
 return null;
 },getColumnIndexContainingNode:function(node){
-var _1b4=null;
+var _1b6=null;
 if(!this.columns){
-return _1b4;
+return _1b6;
 }
 for(var i=0;i<this.columns.length;i++){
 if(this.columns[i].containsNode(node)){
-_1b4=i;
+_1b6=i;
 break;
 }
 }
-return _1b4;
+return _1b6;
 },getColumnContainingNode:function(node){
-var _1b7=this.getColumnIndexContainingNode(node);
-return ((_1b7!=null&&_1b7>=0)?this.columns[_1b7]:null);
-},getDescendantColumns:function(_1b8){
+var _1b9=this.getColumnIndexContainingNode(node);
+return ((_1b9!=null&&_1b9>=0)?this.columns[_1b9]:null);
+},getDescendantColumns:function(_1ba){
 var dMap={};
-if(_1b8==null){
+if(_1ba==null){
 return dMap;
 }
 for(var i=0;i<this.columns.length;i++){
 var col=this.columns[i];
-if(col!=_1b8&&_1b8.containsDescendantNode(col.domNode)){
+if(col!=_1ba&&_1ba.containsDescendantNode(col.domNode)){
 dMap[i]=col;
 }
 }
 return dMap;
-},addNewPortlet:function(_1bc,_1bd,_1be){
-var _1bf=new jetspeed.om.Portlet(_1bc,_1bd);
-if(_1be){
-_1bf.putProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID,_1be);
-}
-_1bf.initialize();
-this.putPortlet(_1bf);
-_1bf.retrieveContent();
-},removePortletFromPage:function(_1c0){
-var _1c1=new jetspeed.om.PortletAddAjaxApiCallbackContentListener(portletDef,windowWidgetId,false);
-var _1c2="?action=remove&id="+escape(portletDef.getPortletName());
-var _1c3=jetspeed.page.getPsmlUrl()+_1c2;
-var _1c4="text/xml";
-var _1c5=new jetspeed.om.Id("removeportlet",{});
-jetspeed.url.retrieveContent({url:_1c3,mimetype:_1c4},_1c1,_1c5,jetspeed.debugContentDumpIds);
-},putMenu:function(_1c6){
-if(!_1c6){
-return;
-}
-var _1c7=(_1c6.getName?_1c6.getName():null);
-if(_1c7!=null){
-this.menus[_1c7]=_1c6;
-}
-},getMenu:function(_1c8){
-if(_1c8==null){
-return null;
-}
-return this.menus[_1c8];
-},removeMenu:function(_1c9){
-if(_1c9==null){
-return;
-}
-var _1ca=null;
-if(dojo.lang.isString(_1c9)){
-_1ca=_1c9;
+},addNewPortlet:function(_1be,_1bf,_1c0){
+var _1c1=new jetspeed.om.Portlet(_1be,_1bf);
+if(_1c0){
+_1c1.putProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID,_1c0);
+}
+_1c1.initialize();
+this.putPortlet(_1c1);
+_1c1.retrieveContent();
+},removePortletFromPage:function(_1c2){
+var _1c3=new jetspeed.om.PortletAddAjaxApiCallbackContentListener(portletDef,windowWidgetId,false);
+var _1c4="?action=remove&id="+escape(portletDef.getPortletName());
+var _1c5=jetspeed.page.getPsmlUrl()+_1c4;
+var _1c6="text/xml";
+var _1c7=new jetspeed.om.Id("removeportlet",{});
+jetspeed.url.retrieveContent({url:_1c5,mimetype:_1c6},_1c3,_1c7,jetspeed.debugContentDumpIds);
+},putMenu:function(_1c8){
+if(!_1c8){
+return;
+}
+var _1c9=(_1c8.getName?_1c8.getName():null);
+if(_1c9!=null){
+this.menus[_1c9]=_1c8;
+}
+},getMenu:function(_1ca){
+if(_1ca==null){
+return null;
+}
+return this.menus[_1ca];
+},removeMenu:function(_1cb){
+if(_1cb==null){
+return;
+}
+var _1cc=null;
+if(dojo.lang.isString(_1cb)){
+_1cc=_1cb;
 }else{
-_1ca=(_1c9.getName?_1c9.getName():null);
+_1cc=(_1cb.getName?_1cb.getName():null);
 }
-if(_1ca!=null){
-delete this.menus[_1ca];
+if(_1cc!=null){
+delete this.menus[_1cc];
 }
 },clearMenus:function(){
 this.menus=[];
 },getMenuNames:function(){
-var _1cb=[];
-for(var _1cc in this.menus){
-_1cb.push(_1cc);
-}
-return _1cb;
-},retrieveMenuDeclarations:function(_1cd,_1ce){
-contentListener=new jetspeed.om.MenusAjaxApiContentListener(_1cd,_1ce);
+var _1cd=[];
+for(var _1ce in this.menus){
+_1cd.push(_1ce);
+}
+return _1cd;
+},retrieveMenuDeclarations:function(_1cf,_1d0){
+contentListener=new jetspeed.om.MenusAjaxApiContentListener(_1cf,_1d0);
 this.clearMenus();
-var _1cf="?action=getmenus";
-if(_1cd){
-_1cf+="&includeMenuDefs=true";
-}
-var _1d0=this.getPsmlUrl()+_1cf;
-var _1d1="text/xml";
-var _1d2=new jetspeed.om.Id("getmenus",{page:this});
-jetspeed.url.retrieveContent({url:_1d0,mimetype:_1d1},contentListener,_1d2,jetspeed.debugContentDumpIds);
-},retrieveMenu:function(_1d3,_1d4,_1d5){
-if(_1d5==null){
-_1d5=new jetspeed.om.MenuAjaxApiCallbackContentListener();
-}
-var _1d6="?action=getmenu&name="+_1d3;
-var _1d7=this.getPsmlUrl()+_1d6;
-var _1d8="text/xml";
-var _1d9=new jetspeed.om.Id("getmenu-"+_1d3,{page:this,menuName:_1d3,menuType:_1d4});
-jetspeed.url.retrieveContent({url:_1d7,mimetype:_1d8},_1d5,_1d9,jetspeed.debugContentDumpIds);
+var _1d1="?action=getmenus";
+if(_1cf){
+_1d1+="&includeMenuDefs=true";
+}
+var _1d2=this.getPsmlUrl()+_1d1;
+var _1d3="text/xml";
+var _1d4=new jetspeed.om.Id("getmenus",{page:this});
+jetspeed.url.retrieveContent({url:_1d2,mimetype:_1d3},contentListener,_1d4,jetspeed.debugContentDumpIds);
+},retrieveMenu:function(_1d5,_1d6,_1d7){
+if(_1d7==null){
+_1d7=new jetspeed.om.MenuAjaxApiCallbackContentListener();
+}
+var _1d8="?action=getmenu&name="+_1d5;
+var _1d9=this.getPsmlUrl()+_1d8;
+var _1da="text/xml";
+var _1db=new jetspeed.om.Id("getmenu-"+_1d5,{page:this,menuName:_1d5,menuType:_1d6});
+jetspeed.url.retrieveContent({url:_1d9,mimetype:_1da},_1d7,_1db,jetspeed.debugContentDumpIds);
 },syncPageControls:function(){
 if(this.actionButtons==null){
 return;
 }
-for(var _1da in this.actionButtons){
-var _1db=false;
-if(_1da==jetspeed.id.ACTION_NAME_EDIT){
+for(var _1dc in this.actionButtons){
+var _1dd=false;
+if(_1dc==jetspeed.id.ACTION_NAME_EDIT){
 if(!this.editMode){
-_1db=true;
+_1dd=true;
 }
 }else{
-if(_1da==jetspeed.id.ACTION_NAME_VIEW){
+if(_1dc==jetspeed.id.ACTION_NAME_VIEW){
 if(this.editMode){
-_1db=true;
+_1dd=true;
 }
 }else{
-if(_1da==jetspeed.id.ACTION_NAME_ADDPORTLET){
+if(_1dc==jetspeed.id.ACTION_NAME_ADDPORTLET){
 if(!this.editMode){
-_1db=true;
+_1dd=true;
 }
 }else{
-_1db=true;
+_1dd=true;
 }
 }
 }
-if(_1db){
-this.actionButtons[_1da].style.display="";
+if(_1dd){
+this.actionButtons[_1dc].style.display="";
 }else{
-this.actionButtons[_1da].style.display="none";
+this.actionButtons[_1dc].style.display="none";
 }
 }
 },renderPageControls:function(){
-var _1dc=[];
+var _1de=[];
 if(this.actions!=null){
-for(var _1dd in this.actions){
-if(_1dd!=jetspeed.id.ACTION_NAME_HELP){
-_1dc.push(_1dd);
+for(var _1df in this.actions){
+if(_1df!=jetspeed.id.ACTION_NAME_HELP){
+_1de.push(_1df);
 }
-if(_1dd==jetspeed.id.ACTION_NAME_EDIT){
-_1dc.push(jetspeed.id.ACTION_NAME_ADDPORTLET);
+if(_1df==jetspeed.id.ACTION_NAME_EDIT){
+_1de.push(jetspeed.id.ACTION_NAME_ADDPORTLET);
 }
 }
 if(this.actions[jetspeed.id.ACTION_NAME_EDIT]!=null){
 if(this.actions[jetspeed.id.ACTION_NAME_VIEW]==null){
-_1dc.push(jetspeed.id.ACTION_NAME_VIEW);
+_1de.push(jetspeed.id.ACTION_NAME_VIEW);
 }
 }
 if(this.actions[jetspeed.id.ACTION_NAME_VIEW]!=null){
 if(this.actions[jetspeed.id.ACTION_NAME_EDIT]==null){
-_1dc.push(jetspeed.id.ACTION_NAME_EDIT);
+_1de.push(jetspeed.id.ACTION_NAME_EDIT);
 }
 }
 }
-var _1de=dojo.byId(jetspeed.id.PAGE_CONTROLS);
-if(_1de!=null&&_1dc!=null&&_1dc.length>0){
+var _1e0=dojo.byId(jetspeed.id.PAGE_CONTROLS);
+if(_1e0!=null&&_1de!=null&&_1de.length>0){
 if(this.actionButtons==null){
 this.actionButtons={};
 this.actionButtonTooltips=[];
 }
-for(var i=0;i<_1dc.length;i++){
-var _1dd=_1dc[i];
-var _1e0=document.createElement("div");
-_1e0.className="portalPageActionButton";
-_1e0.style.backgroundImage="url("+jetspeed.prefs.getLayoutRootUrl()+"/images/desktop/"+_1dd+".gif)";
-_1e0.actionName=_1dd;
-this.actionButtons[_1dd]=_1e0;
-_1de.appendChild(_1e0);
-dojo.event.connect(_1e0,"onclick",this,"pageActionButtonClick");
+for(var i=0;i<_1de.length;i++){
+var _1df=_1de[i];
+var _1e2=document.createElement("div");
+_1e2.className="portalPageActionButton";
+_1e2.style.backgroundImage="url("+jetspeed.prefs.getLayoutRootUrl()+"/images/desktop/"+_1df+".gif)";
+_1e2.actionName=_1df;
+this.actionButtons[_1df]=_1e2;
+_1e0.appendChild(_1e2);
+dojo.event.connect(_1e2,"onclick",this,"pageActionButtonClick");
 if(jetspeed.prefs.pageActionButtonTooltip){
-var _1e1=null;
+var _1e3=null;
 if(jetspeed.prefs.desktopActionLabels!=null){
-_1e1=jetspeed.prefs.desktopActionLabels[_1dd];
+_1e3=jetspeed.prefs.desktopActionLabels[_1df];
 }
-if(_1e1==null||_1e1.length==0){
-_1e1=dojo.string.capitalize(_1dd);
+if(_1e3==null||_1e3.length==0){
+_1e3=dojo.string.capitalize(_1df);
 }
-var _1e2=dojo.widget.createWidget("Tooltip",{isContainer:false,fastMixIn:true,caption:_1e1,connectId:_1e0,delay:"100"});
-this.actionButtonTooltips.push(_1e2);
-document.body.appendChild(_1e2.domNode);
+var _1e4=dojo.widget.createWidget("Tooltip",{isContainer:false,fastMixIn:true,caption:_1e3,connectId:_1e2,delay:"100"});
+this.actionButtonTooltips.push(_1e4);
+document.body.appendChild(_1e4.domNode);
 }
 }
 }
 },_destroyEditPage:function(){
-var _1e3=dojo.widget.byId(jetspeed.id.PAGE_EDITOR_WIDGET_ID);
-if(_1e3!=null){
-_1e3.editPageDestroy();
+var _1e5=dojo.widget.byId(jetspeed.id.PG_ED_WID);
+if(_1e5!=null){
+_1e5.editPageDestroy();
 }
 },_destroyPageControls:function(){
-var _1e4=dojo.byId(jetspeed.id.PAGE_CONTROLS);
-if(_1e4!=null&&_1e4.childNodes&&_1e4.childNodes.length>0){
-for(var i=(_1e4.childNodes.length-1);i>=0;i--){
-dojo.dom.removeNode(_1e4.childNodes[i]);
+var _1e6=dojo.byId(jetspeed.id.PAGE_CONTROLS);
+if(_1e6!=null&&_1e6.childNodes&&_1e6.childNodes.length>0){
+for(var i=(_1e6.childNodes.length-1);i>=0;i--){
+dojo.dom.removeNode(_1e6.childNodes[i]);
 }
 }
 if(this.actionButtonTooltips&&this.actionButtonTooltips.length>0){
@@ -1874,29 +1881,29 @@
 return;
 }
 this.pageActionProcess(evt.target.actionName,evt);
-},pageActionProcess:function(_1e7){
-if(_1e7==null){
+},pageActionProcess:function(_1e9){
+if(_1e9==null){
 return;
 }
-if(_1e7==jetspeed.id.ACTION_NAME_ADDPORTLET){
+if(_1e9==jetspeed.id.ACTION_NAME_ADDPORTLET){
 this.addPortletInitiate();
 }else{
-if(_1e7==jetspeed.id.ACTION_NAME_EDIT){
+if(_1e9==jetspeed.id.ACTION_NAME_EDIT){
 jetspeed.editPageInitiate();
 }else{
-if(_1e7==jetspeed.id.ACTION_NAME_VIEW){
+if(_1e9==jetspeed.id.ACTION_NAME_VIEW){
 jetspeed.editPageTerminate();
 }else{
-var _1e8=this.getPageAction(_1e7);
-alert("pageAction "+_1e7+" : "+_1e8);
-if(_1e8==null){
+var _1ea=this.getPageAction(_1e9);
+alert("pageAction "+_1e9+" : "+_1ea);
+if(_1ea==null){
 return;
 }
-if(_1e8.url==null){
+if(_1ea.url==null){
 return;
 }
-var _1e9=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/"+_1e8.url;
-jetspeed.pageNavigate(_1e9);
+var _1eb=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/"+_1ea.url;
+jetspeed.pageNavigate(_1eb);
 }
 }
 }
@@ -1905,90 +1912,90 @@
 return null;
 }
 return this.actions[name];
-},addPortletInitiate:function(_1eb,_1ec){
-if(!_1ec){
-_1ec=escape(this.getPagePathAndQuery());
+},addPortletInitiate:function(_1ed,_1ee){
+if(!_1ee){
+_1ee=escape(this.getPagePathAndQuery());
 }else{
-_1ec=escape(_1ec);
+_1ee=escape(_1ee);
 }
-var _1ed=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/system/customizer/selector.psml?jspage="+_1ec;
-if(_1eb!=null){
-_1ed+="&jslayoutid="+escape(_1eb);
+var _1ef=jetspeed.url.basePortalUrl()+jetspeed.url.path.DESKTOP+"/system/customizer/selector.psml?jspage="+_1ee;
+if(_1ed!=null){
+_1ef+="&jslayoutid="+escape(_1ed);
 }
-jetspeed.changeActionForPortlet(this.rootFragmentId,null,jetspeed.id.ACTION_NAME_EDIT,new jetspeed.om.PageChangeActionContentListener(_1ed));
-},setPageModePortletActions:function(_1ee){
-if(_1ee==null||_1ee.actions==null){
+jetspeed.changeActionForPortlet(this.rootFragmentId,null,jetspeed.id.ACTION_NAME_EDIT,new jetspeed.om.PageChangeActionContentListener(_1ef));
+},setPageModePortletActions:function(_1f0){
+if(_1f0==null||_1f0.actions==null){
 return;
 }
-if(_1ee.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]==null){
-_1ee.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]={id:jetspeed.id.ACTION_NAME_REMOVEPORTLET};
+if(_1f0.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]==null){
+_1f0.actions[jetspeed.id.ACTION_NAME_REMOVEPORTLET]={id:jetspeed.id.ACTION_NAME_REMOVEPORTLET};
 }
-},getPageUrl:function(_1ef){
-if(this.pageUrl!=null&&!_1ef){
+},getPageUrl:function(_1f1){
+if(this.pageUrl!=null&&!_1f1){
 return this.pageUrl;
 }
-var _1f0=jetspeed.url.path.SERVER+((_1ef)?jetspeed.url.path.PORTAL:jetspeed.url.path.DESKTOP)+this.getPath();
-var _1f1=jetspeed.url.parse(_1f0);
-var _1f2=null;
+var _1f2=jetspeed.url.path.SERVER+((_1f1)?jetspeed.url.path.PORTAL:jetspeed.url.path.DESKTOP)+this.getPath();
+var _1f3=jetspeed.url.parse(_1f2);
+var _1f4=null;
 if(this.pageUrlFallback!=null){
-_1f2=jetspeed.url.parse(this.pageUrlFallback);
+_1f4=jetspeed.url.parse(this.pageUrlFallback);
 }else{
-_1f2=jetspeed.url.parse(window.location.href);
+_1f4=jetspeed.url.parse(window.location.href);
 }
-if(_1f1!=null&&_1f2!=null){
-var _1f3=_1f2.query;
-if(_1f3!=null&&_1f3.length>0){
-var _1f4=_1f1.query;
-if(_1f4!=null&&_1f4.length>0){
-_1f0=_1f0+"&"+_1f3;
+if(_1f3!=null&&_1f4!=null){
+var _1f5=_1f4.query;
+if(_1f5!=null&&_1f5.length>0){
+var _1f6=_1f3.query;
+if(_1f6!=null&&_1f6.length>0){
+_1f2=_1f2+"&"+_1f5;
 }else{
-_1f0=_1f0+"?"+_1f3;
+_1f2=_1f2+"?"+_1f5;
 }
 }
 }
-if(!_1ef){
-this.pageUrl=_1f0;
+if(!_1f1){
+this.pageUrl=_1f2;
 }
-return _1f0;
+return _1f2;
 },getPagePathAndQuery:function(){
 if(this.pagePathAndQuery!=null){
 return this.pagePathAndQuery;
 }
-var _1f5=this.getPath();
-var _1f6=jetspeed.url.parse(_1f5);
-var _1f7=null;
+var _1f7=this.getPath();
+var _1f8=jetspeed.url.parse(_1f7);
+var _1f9=null;
 if(this.pageUrlFallback!=null){
-_1f7=jetspeed.url.parse(this.pageUrlFallback);
+_1f9=jetspeed.url.parse(this.pageUrlFallback);
 }else{
-_1f7=jetspeed.url.parse(window.location.href);
+_1f9=jetspeed.url.parse(window.location.href);
 }
-if(_1f6!=null&&_1f7!=null){
-var _1f8=_1f7.query;
-if(_1f8!=null&&_1f8.length>0){
-var _1f9=_1f6.query;
-if(_1f9!=null&&_1f9.length>0){
-_1f5=_1f5+"&"+_1f8;
+if(_1f8!=null&&_1f9!=null){
+var _1fa=_1f9.query;
+if(_1fa!=null&&_1fa.length>0){
+var _1fb=_1f8.query;
+if(_1fb!=null&&_1fb.length>0){
+_1f7=_1f7+"&"+_1fa;
 }else{
-_1f5=_1f5+"?"+_1f8;
+_1f7=_1f7+"?"+_1fa;
 }
 }
 }
-this.pagePathAndQuery=_1f5;
-return _1f5;
-},getPageDirectory:function(_1fa){
-var _1fb="/";
-var _1fc=(_1fa?this.getRealPath():this.getPath());
-if(_1fc!=null){
-var _1fd=_1fc.lastIndexOf("/");
-if(_1fd!=-1){
-if((_1fd+1)<_1fc.length){
-_1fb=_1fc.substring(0,_1fd+1);
+this.pagePathAndQuery=_1f7;
+return _1f7;
+},getPageDirectory:function(_1fc){
+var _1fd="/";
+var _1fe=(_1fc?this.getRealPath():this.getPath());
+if(_1fe!=null){
+var _1ff=_1fe.lastIndexOf("/");
+if(_1ff!=-1){
+if((_1ff+1)<_1fe.length){
+_1fd=_1fe.substring(0,_1ff+1);
 }else{
-_1fb=_1fc;
+_1fd=_1fe;
 }
 }
 }
-return _1fb;
+return _1fd;
 },equalsPageUrl:function(url){
 if(url==this.getPath()){
 return true;
@@ -1997,14 +2004,14 @@
 return true;
 }
 return false;
-},makePageUrl:function(_1ff){
-if(!_1ff){
-_1ff="";
+},makePageUrl:function(_201){
+if(!_201){
+_201="";
 }
-if(!jetspeed.url.validateUrlStartsWithHttp(_1ff)){
-return jetspeed.url.path.SERVER+jetspeed.url.path.DESKTOP+_1ff;
+if(!jetspeed.url.validateUrlStartsWithHttp(_201)){
+return jetspeed.url.path.SERVER+jetspeed.url.path.DESKTOP+_201;
 }
-return _1ff;
+return _201;
 },getName:function(){
 return this.name;
 },getPath:function(){
@@ -2020,36 +2027,36 @@
 },getPortletDecorator:function(){
 return this.portletDecorator;
 }});
-jetspeed.om.Column=function(_200,_201,size,_203,_204){
-this.layoutColumnIndex=_200;
-this.layoutId=_201;
+jetspeed.om.Column=function(_202,_203,size,_205,_206){
+this.layoutColumnIndex=_202;
+this.layoutId=_203;
 this.size=size;
-this.pageColumnIndex=new Number(_203);
-if(typeof _204!="undefined"){
-this.layoutActionsDisabled=_204;
+this.pageColumnIndex=new Number(_205);
+if(typeof _206!="undefined"){
+this.layoutActionsDisabled=_206;
 }
-this.id="jscol_"+_203;
+this.id="jscol_"+_205;
 this.domNode=null;
 };
 dojo.inherits(jetspeed.om.Column,jetspeed.om.Id);
-dojo.lang.extend(jetspeed.om.Column,{layoutColumnIndex:null,layoutId:null,size:null,pageColumnIndex:null,layoutActionsDisabled:false,domNode:null,columnContainer:false,layoutHeader:false,createColumn:function(_205){
-var _206="desktopColumn";
+dojo.lang.extend(jetspeed.om.Column,{layoutColumnIndex:null,layoutId:null,size:null,pageColumnIndex:null,layoutActionsDisabled:false,domNode:null,columnContainer:false,layoutHeader:false,createColumn:function(_207){
+var _208="desktopColumn";
 if(this.isStartOfColumnSet()&&this.getPageColumnIndex()>0){
-_206="desktopColumn desktopColumnClear";
+_208="desktopColumn desktopColumnClear";
 }
-var _207=document.createElement("div");
-_207.setAttribute("columnIndex",this.getPageColumnIndex());
-_207.style.width=this.size+"%";
+var _209=document.createElement("div");
+_209.setAttribute("columnIndex",this.getPageColumnIndex());
+_209.style.width=this.size+"%";
 if(this.layoutHeader){
-_206="desktopColumn desktopLayoutHeader";
+_208="desktopColumn desktopLayoutHeader";
 }else{
-_207.style.minHeight="40px";
+_209.style.minHeight="40px";
 }
-_207.className=_206;
-_207.id=this.getId();
-this.domNode=_207;
-if(_205!=null){
-_205.appendChild(_207);
+_209.className=_208;
+_209.id=this.getId();
+this.domNode=_209;
+if(_207!=null){
+_207.appendChild(_209);
 }
 },containsNode:function(node){
 return ((this.domNode!=null&&node!=null&&this.domNode==node.parentNode)?true:false);
@@ -2063,9 +2070,9 @@
 var out="column["+this.pageColumnIndex+"]";
 out+=" layoutCol="+this.layoutColumnIndex+" layoutId="+this.layoutId+" size="+this.size+(this.columnChildren==null?"":(" column-child-count="+this.columnChildren.length))+(this.columnContainer?" colContainer=true":"")+(this.layoutHeader?" layoutHeader=true":"");
 if(this.domNode!=null){
-var _20b=dojo.html.getAbsolutePosition(this.domNode,true);
-var _20c=dojo.html.getMarginBox(this.domNode);
-out+=" dims={"+"left:"+(_20b.x)+", right:"+(_20b.x+_20c.width)+", top:"+(_20b.y)+", bottom:"+(_20b.y+_20c.height)+"}";
+var _20d=dojo.html.getAbsolutePosition(this.domNode,true);
+var _20e=dojo.html.getMarginBox(this.domNode);
+out+=" dims={"+"left:"+(_20d.x)+", right:"+(_20d.x+_20e.width)+", top:"+(_20d.y)+", bottom:"+(_20d.y+_20e.height)+"}";
 }
 return out;
 },getId:function(){
@@ -2079,33 +2086,33 @@
 },getPageColumnIndex:function(){
 return this.pageColumnIndex;
 }});
-jetspeed.om.Portlet=function(_20d,_20e,_20f,_210,_211,_212,_213,_214,_215){
-this.name=_20d;
-this.entityId=_20e;
-if(_210){
-this.properties=_210;
+jetspeed.om.Portlet=function(_20f,_210,_211,_212,_213,_214,_215,_216,_217){
+this.name=_20f;
+this.entityId=_210;
+if(_212){
+this.properties=_212;
 }else{
 this.properties={};
 }
-if(_211){
-this.actions=_211;
+if(_213){
+this.actions=_213;
 }else{
 this.actions={};
 }
 jetspeed.page.setPageModePortletActions(this);
-this.currentActionState=_212;
-this.currentActionMode=_213;
-if(_20f){
-this.contentRetriever=_20f;
-}
-if(_214!=null&&_214.length>0){
-if(dojo.lang.indexOf(jetspeed.prefs.portletDecorationsAllowed,_214)!=-1){
-this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_DECORATION,_214);
+this.currentActionState=_214;
+this.currentActionMode=_215;
+if(_211){
+this.contentRetriever=_211;
+}
+if(_216!=null&&_216.length>0){
+if(dojo.lang.indexOf(jetspeed.prefs.portletDecorationsAllowed,_216)!=-1){
+this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_DECORATION,_216);
 }
 }
 this.layoutActionsDisabled=false;
-if(typeof _215!="undefined"){
-this.layoutActionsDisabled=_215;
+if(typeof _217!="undefined"){
+this.layoutActionsDisabled=_217;
 }
 };
 dojo.inherits(jetspeed.om.Portlet,jetspeed.om.Id);
@@ -2116,446 +2123,446 @@
 if(!this.getProperty(jetspeed.id.PORTLET_PROP_CONTENT_RETRIEVER)){
 this.putProperty(jetspeed.id.PORTLET_PROP_CONTENT_RETRIEVER,this.contentRetriever);
 }
-var _216=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC);
+var _218=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC);
 if(jetspeed.prefs.windowTiling){
-if(_216=="true"){
-_216=true;
+if(_218=="true"){
+_218=true;
 }else{
-if(_216=="false"){
-_216=false;
+if(_218=="false"){
+_218=false;
 }else{
-if(_216!=true&&_216!=false){
-_216=true;
+if(_218!=true&&_218!=false){
+_218=true;
 }
 }
 }
 }else{
-_216=false;
+_218=false;
 }
-this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC,_216);
-var _217=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT);
-if(_217=="true"){
-_217=true;
+this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC,_218);
+var _219=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT);
+if(_219=="true"){
+_219=true;
 }else{
-if(_216=="false"){
-_217=false;
+if(_218=="false"){
+_219=false;
 }else{
-if(_217!=true&&_217!=false){
-_217=true;
+if(_219!=true&&_219!=false){
+_219=true;
 }
 }
 }
-this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT,_217);
-var _218=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE);
-if(!_218&&this.name){
+this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT,_219);
+var _21a=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE);
+if(!_21a&&this.name){
 var re=(/^[^:]*:*/);
-_218=this.name.replace(re,"");
-this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE,_218);
+_21a=this.name.replace(re,"");
+this.putProperty(jetspeed.id.PORTLET_PROP_WINDOW_TITLE,_21a);
 }
-},postParseAnnotateHtml:function(_21a){
-if(_21a){
-var _21b=_21a;
-var _21c=_21b.getElementsByTagName("form");
-var _21d=jetspeed.debug.postParseAnnotateHtml;
-var _21e=jetspeed.debug.postParseAnnotateHtmlDisableAnchors;
+},postParseAnnotateHtml:function(_21c){
 if(_21c){
-for(var i=0;i<_21c.length;i++){
-var _220=_21c[i];
-var _221=_220.action;
-var _222=jetspeed.portleturl.parseContentUrlForDesktopActionRender(_221);
-var _223=_222.operation;
-if(_223==jetspeed.portleturl.PORTLET_REQUEST_ACTION||_223==jetspeed.portleturl.PORTLET_REQUEST_RENDER){
-var _224=jetspeed.portleturl.generateJSPseudoUrlActionRender(_222,true);
-_220.action=_224;
-var _225=new jetspeed.om.ActionRenderFormBind(_220,_222.url,_222.portletEntityId,_223);
-if(_21d){
-dojo.debug("postParseAnnotateHtml ["+this.entityId+"] adding FormBind ("+_223+") for form with action: "+_221);
-}
-}else{
-if(_221==null||_221.length==0){
-var _225=new jetspeed.om.ActionRenderFormBind(_220,null,this.entityId,null);
-if(_21d){
+var _21d=_21c;
+var _21e=_21d.getElementsByTagName("form");
+var _21f=jetspeed.debug.postParseAnnotateHtml;
+var _220=jetspeed.debug.postParseAnnotateHtmlDisableAnchors;
+if(_21e){
+for(var i=0;i<_21e.length;i++){
+var _222=_21e[i];
+var _223=_222.action;
+var _224=jetspeed.portleturl.parseContentUrlForDesktopActionRender(_223);
+var _225=_224.operation;
+if(_225==jetspeed.portleturl.PORTLET_REQUEST_ACTION||_225==jetspeed.portleturl.PORTLET_REQUEST_RENDER){
+var _226=jetspeed.portleturl.generateJSPseudoUrlActionRender(_224,true);
+_222.action=_226;
+var _227=new jetspeed.om.ActionRenderFormBind(_222,_224.url,_224.portletEntityId,_225);
+if(_21f){
+dojo.debug("postParseAnnotateHtml ["+this.entityId+"] adding FormBind ("+_225+") for form with action: "+_223);
+}
+}else{
+if(_223==null||_223.length==0){
+var _227=new jetspeed.om.ActionRenderFormBind(_222,null,this.entityId,null);
+if(_21f){
 dojo.debug("postParseAnnotateHtml ["+this.entityId+"] form action attribute is empty - adding FormBind with expectation that form action will be set via script");
 }
 }else{
-if(_21d){
-dojo.debug("postParseAnnotateHtml ["+this.entityId+"] form action attribute doesn't match annotation criteria, leaving as is: "+_221);
+if(_21f){
+dojo.debug("postParseAnnotateHtml ["+this.entityId+"] form action attribute doesn't match annotation criteria, leaving as is: "+_223);
 }
 }
 }
 }
 }
-var _226=_21b.getElementsByTagName("a");
-if(_226){
-for(var i=0;i<_226.length;i++){
-var _227=_226[i];
-var _228=_227.href;
-var _222=jetspeed.portleturl.parseContentUrlForDesktopActionRender(_228);
-var _229=null;
-if(!_21e){
-_229=jetspeed.portleturl.generateJSPseudoUrlActionRender(_222);
+var _228=_21d.getElementsByTagName("a");
+if(_228){
+for(var i=0;i<_228.length;i++){
+var _229=_228[i];
+var _22a=_229.href;
+var _224=jetspeed.portleturl.parseContentUrlForDesktopActionRender(_22a);
+var _22b=null;
+if(!_220){
+_22b=jetspeed.portleturl.generateJSPseudoUrlActionRender(_224);
 }
-if(!_229){
-if(_21d){
-dojo.debug("postParseAnnotateHtml ["+this.entityId+"] leaving href as is: "+_228);
+if(!_22b){
+if(_21f){
+dojo.debug("postParseAnnotateHtml ["+this.entityId+"] leaving href as is: "+_22a);
 }
 }else{
-if(_229==_228){
-if(_21d){
-dojo.debug("postParseAnnotateHtml ["+this.entityId+"] href parsed and regenerated identically: "+_228);
+if(_22b==_22a){
+if(_21f){
+dojo.debug("postParseAnnotateHtml ["+this.entityId+"] href parsed and regenerated identically: "+_22a);
 }
 }else{
-if(_21d){
-dojo.debug("postParseAnnotateHtml ["+this.entityId+"] href parsed, replacing: "+_228+" with: "+_229);
+if(_21f){
+dojo.debug("postParseAnnotateHtml ["+this.entityId+"] href parsed, replacing: "+_22a+" with: "+_22b);
 }
-_227.href=_229;
+_229.href=_22b;
 }
 }
 }
 }
 }
 },getPortletWindow:function(){
-var _22a=this.getProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID);
-if(_22a){
-return dojo.widget.byId(_22a);
+var _22c=this.getProperty(jetspeed.id.PORTLET_PROP_WIDGET_ID);
+if(_22c){
+return dojo.widget.byId(_22c);
 }
 return null;
-},getCurrentWindowState:function(_22b){
-var _22c=this.getPortletWindow();
-if(!_22c){
+},getCurrentWindowState:function(_22d){
+var _22e=this.getPortletWindow();
+if(!_22e){
 return null;
 }
-var _22d=_22c.getCurrentWindowStateForPersistence(_22b);
-if(!_22b){
-if(_22d.layout==null){
-_22d.layout=this.lastSavedWindowState.layout;
+var _22f=_22e.getCurrentWindowStateForPersistence(_22d);
+if(!_22d){
+if(_22f.layout==null){
+_22f.layout=this.lastSavedWindowState.layout;
 }
 }
-return _22d;
+return _22f;
 },getLastSavedWindowState:function(){
 if(!this.lastSavedWindowState){
 dojo.raise("portlet.getLastSavedWindowState() is null - portlet ("+this.name+") not properly initialized.");
 }
 return this.lastSavedWindowState;
-},getInitialWindowDimensions:function(_22e,_22f){
-if(!_22e){
-_22e={};
+},getInitialWindowDimensions:function(_230,_231){
+if(!_230){
+_230={};
 }
-var _230=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC);
-var _231=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT);
-_22e[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=_230;
-_22e[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=_231;
-var _232=this.getProperty("width");
-if(!_22f&&_232!=null&&_232>0){
-_22e.width=Math.floor(_232);
+var _232=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC);
+var _233=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT);
+_230[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC]=_232;
+_230[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT]=_233;
+var _234=this.getProperty("width");
+if(!_231&&_234!=null&&_234>0){
+_230.width=Math.floor(_234);
 }else{
-if(_22f){
-_22e.width=-1;
+if(_231){
+_230.width=-1;
 }
 }
-var _233=this.getProperty("height");
-if(!_22f&&_233!=null&&_233>0){
-_22e.height=Math.floor(_233);
+var _235=this.getProperty("height");
+if(!_231&&_235!=null&&_235>0){
+_230.height=Math.floor(_235);
 }else{
-if(_22f){
-_22e.height=-1;
+if(_231){
+_230.height=-1;
 }
 }
-if(!_230||!jetspeed.prefs.windowTiling){
-var _234=this.getProperty("x");
-if(!_22f&&_234!=null&&_234>=0){
-_22e.left=Math.floor(((_234>0)?_234:0));
+if(!_232||!jetspeed.prefs.windowTiling){
+var _236=this.getProperty("x");
+if(!_231&&_236!=null&&_236>=0){
+_230.left=Math.floor(((_236>0)?_236:0));
 }else{
-if(_22f){
-_22e.left=-1;
+if(_231){
+_230.left=-1;
 }
 }
-var _235=this.getProperty("y");
-if(!_22f&&_235!=null&&_235>=0){
-_22e.top=Math.floor(((_235>0)?_235:0));
+var _237=this.getProperty("y");
+if(!_231&&_237!=null&&_237>=0){
+_230.top=Math.floor(((_237>0)?_237:0));
 }else{
-_22e.top=-1;
+_230.top=-1;
 }
-var _236=this._getInitialZIndex(_22f);
-if(_236!=null){
-_22e.zIndex=_236;
+var _238=this._getInitialZIndex(_231);
+if(_238!=null){
+_230.zIndex=_238;
 }
 }
-return _22e;
-},_initializeWindowState:function(_237,_238){
-var _239=(_237?_237:{});
-this.getInitialWindowDimensions(_239,_238);
+return _230;
+},_initializeWindowState:function(_239,_23a){
+var _23b=(_239?_239:{});
+this.getInitialWindowDimensions(_23b,_23a);
 if(jetspeed.debug.initializeWindowState){
-var _23a=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC);
-if(!_23a||!jetspeed.prefs.windowTiling){
-dojo.debug("initializeWindowState ["+this.entityId+"] z="+_239.zIndex+" x="+_239.left+" y="+_239.top+" width="+_239.width+" height="+_239.height);
-}else{
-dojo.debug("initializeWindowState ["+this.entityId+"] column="+_239.column+" row="+_239.row+" width="+_239.width+" height="+_239.height);
-}
-}
-this.lastSavedWindowState=_239;
-return _239;
-},_getInitialZIndex:function(_23b){
-var _23c=null;
-var _23d=this.getProperty("z");
-if(!_23b&&_23d!=null&&_23d>=0){
-_23c=Math.floor(_23d);
-}else{
-if(_23b){
-_23c=-1;
-}
-}
-return _23c;
-},_getChangedWindowState:function(_23e){
-var _23f=this.getLastSavedWindowState();
-if(_23f&&dojo.lang.isEmpty(_23f)){
-_23f=null;
-_23e=false;
-}
-var _240=this.getCurrentWindowState(_23e);
-var _241=_240[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC];
-var _242=!_241;
-if(!_23f){
-var _243={state:_240,positionChanged:true,extendedPropChanged:true};
-if(_242){
-_243.zIndexChanged=true;
+var _23c=this.getProperty(jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC);
+if(!_23c||!jetspeed.prefs.windowTiling){
+dojo.debug("initializeWindowState ["+this.entityId+"] z="+_23b.zIndex+" x="+_23b.left+" y="+_23b.top+" width="+_23b.width+" height="+_23b.height);
+}else{
+dojo.debug("initializeWindowState ["+this.entityId+"] column="+_23b.column+" row="+_23b.row+" width="+_23b.width+" height="+_23b.height);
+}
+}
+this.lastSavedWindowState=_23b;
+return _23b;
+},_getInitialZIndex:function(_23d){
+var _23e=null;
+var _23f=this.getProperty("z");
+if(!_23d&&_23f!=null&&_23f>=0){
+_23e=Math.floor(_23f);
+}else{
+if(_23d){
+_23e=-1;
+}
+}
+return _23e;
+},_getChangedWindowState:function(_240){
+var _241=this.getLastSavedWindowState();
+if(_241&&dojo.lang.isEmpty(_241)){
+_241=null;
+_240=false;
+}
+var _242=this.getCurrentWindowState(_240);
+var _243=_242[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC];
+var _244=!_243;
+if(!_241){
+var _245={state:_242,positionChanged:true,extendedPropChanged:true};
+if(_244){
+_245.zIndexChanged=true;
 }
-return _243;
+return _245;
 }
-var _244=false;
-var _245=false;
 var _246=false;
 var _247=false;
-for(var _248 in _240){
-if(_240[_248]!=_23f[_248]){
-if(_248==jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC||_248==jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT){
-_244=true;
+var _248=false;
+var _249=false;
+for(var _24a in _242){
+if(_242[_24a]!=_241[_24a]){
+if(_24a==jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC||_24a==jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT){
 _246=true;
-_245=true;
-}else{
-if(_248=="zIndex"){
-if(_242){
-_244=true;
+_248=true;
 _247=true;
+}else{
+if(_24a=="zIndex"){
+if(_244){
+_246=true;
+_249=true;
 }
 }else{
-_244=true;
-_245=true;
+_246=true;
+_247=true;
 }
 }
 }
 }
+if(_246){
+var _245={state:_242,positionChanged:_247,extendedPropChanged:_248};
 if(_244){
-var _243={state:_240,positionChanged:_245,extendedPropChanged:_246};
-if(_242){
-_243.zIndexChanged=_247;
-}
-return _243;
-}
-return null;
-},createPortletWindow:function(_249){
-jetspeed.ui.createPortletWindow(this,_249);
-},getPortletUrl:function(_24a){
-var _24b=null;
-if(_24a&&_24a.url){
-_24b=_24a.url;
-}else{
-if(_24a&&_24a.formNode){
-var _24c=_24a.formNode.getAttribute("action");
-if(_24c){
-_24b=_24c;
-}
+_245.zIndexChanged=_249;
 }
+return _245;
 }
-if(_24b==null){
-_24b=jetspeed.url.basePortalUrl()+jetspeed.url.path.PORTLET+jetspeed.page.getPath();
-}
-if(!_24a.dontAddQueryArgs){
-_24b=jetspeed.url.parse(_24b);
-_24b=jetspeed.url.addQueryParameter(_24b,"entity",this.entityId,true);
-_24b=jetspeed.url.addQueryParameter(_24b,"portlet",this.name,true);
-_24b=jetspeed.url.addQueryParameter(_24b,"encoder","desktop",true);
-if(_24a.jsPageUrl!=null){
-var _24d=_24a.jsPageUrl.query;
-if(_24d!=null&&_24d.length>0){
-_24b=_24b.toString()+"&"+_24d;
+return null;
+},createPortletWindow:function(_24b){
+jetspeed.ui.createPortletWindow(this,_24b);
+},getPortletUrl:function(_24c){
+var _24d=null;
+if(_24c&&_24c.url){
+_24d=_24c.url;
+}else{
+if(_24c&&_24c.formNode){
+var _24e=_24c.formNode.getAttribute("action");
+if(_24e){
+_24d=_24e;
 }
 }
 }
-if(_24a){
-_24a.url=_24b.toString();
-}
-return _24b;
-},_submitJetspeedAjaxApi:function(_24e,_24f,_250){
-var _251="?action="+_24e+"&id="+this.entityId+_24f;
-var _252=jetspeed.url.basePortalUrl()+jetspeed.url.path.AJAX_API+jetspeed.page.getPath()+_251;
-var _253="text/xml";
-var _254=new jetspeed.om.Id(_24e,this.entityId);
-_254.portlet=this;
-jetspeed.url.retrieveContent({url:_252,mimetype:_253},_250,_254,null);
-},submitChangedWindowState:function(_255,_256){
-var _257=null;
-if(_256){
-_257={state:this._initializeWindowState(null,true)};
-}else{
-_257=this._getChangedWindowState(_255);
-}
-if(_257){
-var _258=_257.state;
-var _259=_258[jetspeed.id.PORTLET_PROP_WINDOW_POSITION_STATIC];
-var _25a=_258[jetspeed.id.PORTLET_PROP_WINDOW_HEIGHT_TO_FIT];
-var _25b=null;
-if(_257.extendedPropChanged){
-var _25c=jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PROP_SEPARATOR;
-var _25d=jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_PAIR_SEPARATOR;
-_25b=jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_STATICPOS+_25c+_259.toString();
-_25b+=_25d+jetspeed.id.PORTLET_PROP_DESKTOP_EXTENDED_FITHEIGHT+_25c+_25a.toString();
-_25b=escape(_25b);
+if(_24d==null){
+_24d=jetspeed.url.basePortalUrl()+jetspeed.url.path.PORTLET+jetspeed.page.getPath();
 }
-var _25e="";
-var _25f=null;
-if(_259){
-_25f="moveabs";
-if(_258.column!=null){
-_25e+="&col="+_258.column;
+if(!_24c.dontAddQueryArgs){
+_24d=jetspeed.url.parse(_24d);
+_24d=jetspeed.url.addQueryParameter(_24d,"entity",this.entityId,true);
+_24d=jetspeed.url.addQueryParameter(_24d,"portlet",this.name,true);
+_24d=jetspeed.url.addQueryParameter(_24d,"encoder","desktop",true);

[... 1990 lines stripped ...]


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