Author: smilek
Date: Sat Dec 8 01:33:11 2007
New Revision: 602420
URL: http://svn.apache.org/viewvc?rev=602420&view=rev
Log:
The following revision comments are from branches/JETSPEED-2.1.3 revisions
which were not individually checked-in to trunk
=== ---------------------------------------------------------------- ===
[ from branches/JETSPEED-2.1.3 r595411 ] | smilek | 2007-11-15 13:06:54 -0700
(Thu, 15 Nov 2007) | 1 line
major improvements to page editor (UI, config options, flow, no action
layouts); support for create-new-page-on-edit
=== ---------------------------------------------------------------- ===
[ from branches/JETSPEED-2.1.3 r583998 ] | smilek | 2007-10-11 18:36:12 -0600
(Thu, 11 Oct 2007) | 1 line
continuation of desktop overhaul
=== ---------------------------------------------------------------- ===
[ from branches/JETSPEED-2.1.3 r578909 ] | smilek | 2007-09-24 13:08:29 -0600
(Mon, 24 Sep 2007) | 1 line
desktop overhaul - PortletWindow is no longer a dojo widget
=== ---------------------------------------------------------------- ===
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.src.js
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.src.js
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.src.js?rev=602420&r1=602419&r2=602420&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.src.js
(original)
+++
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.src.js
Sat Dec 8 01:33:11 2007
@@ -75,7 +75,7 @@
{
var self = this;
this.deletePageDialog = dojo.widget.createWidget( "dialog", {
widgetsInTemplate: true, deletePageConfirmed: function() { this.hide();
self.deletePageConfirmed(); } }, this.deletePageDialog );
- this.deletePageDialog.setCloseControl(
this.deletePageDialog.deletePageCancel.domNode );
+ this.deletePageDialog.setCloseControl(
this.deletePageDialog.deletePageCancel.domNode );
var createPageParams = {};
createPageParams.widgetsInTemplate = true;
@@ -88,7 +88,7 @@
self.createPageConfirmed( pageName, pageTitle, pageShortTitle
);
};
this.createPageDialog = dojo.widget.createWidget( "dialog",
createPageParams, this.createPageDialog );
- this.createPageDialog.setCloseControl(
this.createPageDialog.createPageCancel.domNode );
+ this.createPageDialog.setCloseControl(
this.createPageDialog.createPageCancel.domNode );
jetspeed.widget.PageEditPane.superclass.fillInTemplate.call( this
);
},
@@ -103,62 +103,88 @@
postCreate: function( args, fragment, parent )
{
- jetspeed.widget.PageEditPane.superclass.postCreate.apply( this,
arguments );
+ var jsObj = jetspeed;
+ var djH = dojo.html;
- if ( ! dojo.render.html.ie )
- { /* in IE6, if fieldset background color is set the fieldset
will not be rendered nicely (with rounded borders) */
- if ( this.pageEditContainer != null )
- this.pageEditContainer.style.backgroundColor = "#d3d3d3";
- if ( this.pageEditLDContainer != null )
- this.pageEditLDContainer.style.backgroundColor = "#eeeeee";
- if ( this.pageEditPDContainer != null )
- this.pageEditPDContainer.style.backgroundColor = "#eeeeee";
- }
+ jsObj.widget.PageEditPane.superclass.postCreate.apply( this,
arguments );
+
+ var pageEditorProto = jsObj.widget.PageEditor.prototype;
+ if ( this.pageEditContainer != null )
+ djH.addClass( this.pageEditContainer,
pageEditorProto.styleBaseAdd );
+ if ( this.pageEditLDContainer != null )
+ djH.addClass( this.pageEditLDContainer,
pageEditorProto.styleDetailAdd );
+ if ( this.pageEditPDContainer != null )
+ djH.addClass( this.pageEditPDContainer,
pageEditorProto.styleDetailAdd );
if ( this.layoutDecoratorSelect != null )
- {
- var currentLayoutDecorator = jetspeed.page.layoutDecorator;
-
- var layoutDecoratorData = [];
- if ( this.layoutDecoratorDefinitions )
+ {
+ if ( ! pageEditorProto.checkPerm( pageEditorProto.PM_PG_L_D,
jsObj ) )
+ {
+ if ( this.pageEditLDContainer )
+ this.pageEditLDContainer.style.display = "none";
+ else
+ this.layoutDecoratorSelect.domNode.style.display =
"none";
+ }
+ else
{
- for ( var i = 0 ; i <
this.layoutDecoratorDefinitions.length ; i++ )
+ var currentLayoutDecorator = jsObj.page.layoutDecorator;
+ var layoutDecoratorData = [];
+ if ( this.layoutDecoratorDefinitions )
{
- var layoutDecoratorDef =
this.layoutDecoratorDefinitions[i];
- if ( layoutDecoratorDef && layoutDecoratorDef.length
== 2 )
+ for ( var i = 0 ; i <
this.layoutDecoratorDefinitions.length ; i++ )
{
- layoutDecoratorData.push( [layoutDecoratorDef[0],
layoutDecoratorDef[1]] );
- if ( currentLayoutDecorator ==
layoutDecoratorDef[1] )
+ var layoutDecoratorDef =
this.layoutDecoratorDefinitions[i];
+ if ( layoutDecoratorDef &&
layoutDecoratorDef.length == 2 )
{
- this.layoutDecoratorSelect.setAllValues(
layoutDecoratorDef[0], layoutDecoratorDef[1] );
- }
- }
- }
+ layoutDecoratorData.push(
[layoutDecoratorDef[0], layoutDecoratorDef[1]] );
+ if ( currentLayoutDecorator ==
layoutDecoratorDef[1] )
+ {
+ this.layoutDecoratorSelect.setAllValues(
layoutDecoratorDef[0], layoutDecoratorDef[1] );
+ }
+ }
+ }
+ }
+ this.layoutDecoratorSelect.dataProvider.setData(
layoutDecoratorData );
}
- this.layoutDecoratorSelect.dataProvider.setData(
layoutDecoratorData );
}
if ( this.portletDecoratorSelect != null )
- {
- var currentPortletDecorator = jetspeed.page.portletDecorator;
-
- var portletDecoratorData = [];
- if ( this.portletDecoratorDefinitions )
+ {
+ if ( ! pageEditorProto.checkPerm( pageEditorProto.PM_PG_P_D,
jsObj ) )
+ {
+ if ( this.pageEditPDContainer )
+ this.pageEditPDContainer.style.display = "none";
+ else
+ this.portletDecoratorSelect.domNode.style.display =
"none";
+ }
+ else
{
- for ( var i = 0 ; i <
this.portletDecoratorDefinitions.length ; i++ )
+ var currentPortletDecorator = jsObj.page.portletDecorator;
+ var portletDecoratorData = [];
+ if ( this.portletDecoratorDefinitions )
{
- var portletDecoratorDef =
this.portletDecoratorDefinitions[i];
- if ( portletDecoratorDef && portletDecoratorDef.length
== 2 )
+ for ( var i = 0 ; i <
this.portletDecoratorDefinitions.length ; i++ )
{
- portletDecoratorData.push(
[portletDecoratorDef[0], portletDecoratorDef[1]] );
- if ( currentPortletDecorator ==
portletDecoratorDef[1] )
+ var portletDecoratorDef =
this.portletDecoratorDefinitions[i];
+ if ( portletDecoratorDef &&
portletDecoratorDef.length == 2 )
{
- this.portletDecoratorSelect.setAllValues(
portletDecoratorDef[0], portletDecoratorDef[1] );
- }
- }
- }
+ portletDecoratorData.push(
[portletDecoratorDef[0], portletDecoratorDef[1]] );
+ if ( currentPortletDecorator ==
portletDecoratorDef[1] )
+ {
+ this.portletDecoratorSelect.setAllValues(
portletDecoratorDef[0], portletDecoratorDef[1] );
+ }
+ }
+ }
+ }
+ this.portletDecoratorSelect.dataProvider.setData(
portletDecoratorData );
}
- this.portletDecoratorSelect.dataProvider.setData(
portletDecoratorData );
+ }
+
+ var addPgPerm = pageEditorProto.checkPerm(
pageEditorProto.PM_PG_AD, jsObj );
+ if ( ! addPgPerm )
+ {
+ this.createPageButton.domNode.style.display = "none";
+ //this.deletePageButton.domNode.style.display = "none";
}
},
@@ -167,7 +193,7 @@
deletePage: function()
{
- this.deletePageDialog.show();
+ this.pageEditorWidget._openDialog( this.deletePageDialog );
},
deletePageConfirmed: function()
{
@@ -176,7 +202,7 @@
},
createPage: function()
{
- this.createPageDialog.show();
+ this.pageEditorWidget._openDialog( this.createPageDialog );
},
createPageConfirmed: function( pageName, pageTitle, pageShortTitle )
{
@@ -201,6 +227,21 @@
editModeRedisplay: function()
{
this.show();
+ },
+ onBrowserWindowResize: function()
+ { // called after ie6 resize window
+ var deletePageDialog = this.deletePageDialog;
+ var createPageDialog = this.createPageDialog;
+ if ( deletePageDialog && deletePageDialog.isShowing() )
+ {
+ deletePageDialog.domNode.style.display = "none";
+ deletePageDialog.domNode.style.display = "block";
+ }
+ if ( createPageDialog && createPageDialog.isShowing() )
+ {
+ createPageDialog.domNode.style.display = "none";
+ createPageDialog.domNode.style.display = "block";
+ }
}
}
);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
