Author: smilek
Date: Tue Feb 27 05:10:44 2007
New Revision: 512248
URL: http://svn.apache.org/viewvc?view=rev&rev=512248
Log:
changed core getPageRealDirectory back to getPageDirectory with an optional
argument which causes the real page path to be used; changed desktop customizer
add-page to get both the real-path and the profiled-path
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditPane.js
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js
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=512248&r1=512247&r2=512248
==============================================================================
--- portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js
(original)
+++ portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/desktop/core.js Tue
Feb 27 05:10:44 2007
@@ -2577,10 +2577,10 @@
this.pagePathAndQuery = pagePath;
return pagePath;
},
- getPageRealDirectory: function()
+ getPageDirectory: function( useRealPath )
{
var pageDir = "/";
- var pagePath = this.getRealPath();
+ var pagePath = ( useRealPath ? this.getRealPath() : this.getPath() );
if ( pagePath != null )
{
var lastSep = pagePath.lastIndexOf( "/" );
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditPane.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditPane.js?view=diff&rev=512248&r1=512247&r2=512248
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditPane.js
(original)
+++
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditPane.js
Tue Feb 27 05:10:44 2007
@@ -173,8 +173,9 @@
{
if ( pageName != null && pageName.length > 0 )
{
- var pagePath = jetspeed.page.getPageRealDirectory() + pageName;
- var addPageContentManager = new
jetspeed.widget.AddPageContentManager( pagePath, pageName, null, pageTitle,
pageShortTitle, this.pageEditorWidget );
+ var pageRealPath = jetspeed.page.getPageDirectory( true ) +
pageName;
+ var pagePath = jetspeed.page.getPageDirectory() + pageName;
+ var addPageContentManager = new
jetspeed.widget.AddPageContentManager( pageRealPath, pagePath, pageName, null,
pageTitle, pageShortTitle, this.pageEditorWidget );
addPageContentManager.getContent();
}
},
Modified:
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js?view=diff&rev=512248&r1=512247&r2=512248
==============================================================================
---
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js
(original)
+++
portals/jetspeed-2/trunk/src/webapp/javascript/jetspeed/widget/PageEditor.js
Tue Feb 27 05:10:44 2007
@@ -435,8 +435,9 @@
};
// ... jetspeed.widget.AddPageContentManager
-jetspeed.widget.AddPageContentManager = function( pagePath, pageName,
layoutName, pageTitle, pageShortTitle, pageEditorWidget )
+jetspeed.widget.AddPageContentManager = function( pageRealPath, pagePath,
pageName, layoutName, pageTitle, pageShortTitle, pageEditorWidget )
{
+ this.pageRealPath = pageRealPath;
this.pagePath = pagePath;
this.pageName = pageName;
if ( layoutName == null )
@@ -453,9 +454,9 @@
{
getContent: function()
{
- if ( this.pagePath != null && this.pageName != null )
+ if ( this.pageRealPath != null && this.pageName != null )
{
- var queryString = "?action=updatepage&method=add&path=" + escape(
this.pagePath ) + "&name=" + escape( this.pageName );
+ var queryString = "?action=updatepage&method=add&path=" + escape(
this.pageRealPath ) + "&name=" + escape( this.pageName );
if ( this.layoutName != null )
queryString += "&defaultLayout=" + escape( this.layoutName );
if ( this.pageTitle != null )
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
