Author: smilek
Date: Sat Dec 8 01:33:08 2007
New Revision: 602418
URL: http://svn.apache.org/viewvc?rev=602418&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 r584879 ] | smilek | 2007-10-15 13:53:54 -0600
(Mon, 15 Oct 2007) | 1 line
changed label property names - changelayouttheme->changepagelayouttheme,
changeportlettheme->changepageportlettheme
=== ---------------------------------------------------------------- ===
[ 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
=== ---------------------------------------------------------------- ===
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.html
Modified:
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.html
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.html?rev=602418&r1=602417&r2=602418&view=diff
==============================================================================
---
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.html
(original)
+++
portals/jetspeed-2/trunk/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PageEditPane.html
Sat Dec 8 01:33:08 2007
@@ -18,32 +18,33 @@
dojo will look for a body tag and use its content -->
<body>
<div class="pageEditPane">
+
<div dojoAttachPoint="containerNode" class="container"></div>
<fieldset class="pageEditorPaneContainer"
dojoAttachPoint="pageEditContainer">
<div class="detail">
- <div><img src="${this.layoutImagesRoot}customizer.png"> <span
class="pageEditorName">Jetspeed Customizer</span></div>
+ <div><img src="${this.layoutImagesRoot}customizer.png"> <span
class="pageEditorName">${this.labels.title}</span></div>
<div class="rowContainer">
- <fieldset class="pageEditorDetailContainer"
dojoAttachPoint="pageEditLDContainer">
+ <fieldset class="pageEditorPaneContainer
pageEditorDetailContainer" dojoAttachPoint="pageEditLDContainer">
<div class="layoutDecoratorContainer">
<select class="layoutDecorator"
name="layoutDecoratorSelect" dojoAttachPoint="layoutDecoratorSelect"
dojoType="Select" autocomplete="false"></select>
</div>
- <button dojoType="Button"
dojoAttachPoint="changeLayoutDecoratorButton"
dojoAttachEvent="onClick:changeLayoutDecorator"><img height="16"
src="${this.layoutImagesRoot}button_ok.png"> Change Layout Theme</button>
+ <button dojoType="Button"
dojoAttachPoint="changeLayoutDecoratorButton"
dojoAttachEvent="onClick:changeLayoutDecorator"><img height="16"
src="${this.layoutImagesRoot}button_ok.png"> ${this.labels.changepagelayouttheme}</button>
</fieldset>
- <fieldset class="pageEditorDetailContainer"
dojoAttachPoint="pageEditPDContainer">
+ <fieldset class="pageEditorPaneContainer
pageEditorDetailContainer" dojoAttachPoint="pageEditPDContainer">
<div class="portletDecoratorContainer">
<select class="portletDecorator"
name="portletDecoratorSelect" dojoAttachPoint="portletDecoratorSelect"
dojoType="Select" autocomplete="false"></select>
</div>
- <button dojoType="Button"
dojoAttachPoint="changePortletDecoratorButton"
dojoAttachEvent="onClick:changePortletDecorator"><img height="16"
src="${this.layoutImagesRoot}button_ok.png"> Change Portlet Theme</button>
+ <button dojoType="Button"
dojoAttachPoint="changePortletDecoratorButton"
dojoAttachEvent="onClick:changePortletDecorator"><img height="16"
src="${this.layoutImagesRoot}button_ok.png"> ${this.labels.changepageportlettheme}</button>
</fieldset>
<div class="buttonContainerRight">
<table cellpadding="0" cellspacing="6" border="0">
<!-- height on images is currently needed to size the
button properly, especially when button is inside a table -->
<tr align="right">
- <td><button dojoType="Button"
dojoAttachEvent="onClick:createPage"><img height="16"
src="${this.layoutImagesRoot}page_new.png"> Create New
Page…</button></td>
+ <td><button dojoType="Button"
dojoAttachEvent="onClick:createPage" dojoAttachPoint="createPageButton"><img
height="16"
src="${this.layoutImagesRoot}page_new.png"> ${this.labels.newpage}</button></td>
</tr>
<tr align="right">
- <td><button dojoType="Button"
dojoAttachEvent="onClick:deletePage"><img height="16"
src="${this.layoutImagesRoot}page_delete.png"> Delete
Page…</button></td>
+ <td><button dojoType="Button"
dojoAttachEvent="onClick:deletePage" dojoAttachPoint="deletePageButton"><img
height="16"
src="${this.layoutImagesRoot}page_delete.png"> ${this.labels.deletepage}</button></td>
</tr>
</table>
</div>
@@ -54,9 +55,15 @@
<div dojoAttachPoint="deletePageDialog">
<div class="container" dojoAttachPoint="deletePageDialogBg">
<div class="deletePageDialog"
dojoAttachPoint="deletePageDialogFg">
- <h2>Are you sure you want to delete this
page?</h2>
- <button dojoType="Button" id="deletePageYes"
dojoAttachEvent="onClick:deletePageConfirmed">Yes</button>
- <button dojoType="Button" id="deletePageNo"
dojoAttachPoint="deletePageCancel">No</button>
+ <h2>${this.dialogLabels.deletepage}</h2>
+ <div class="dialogBottom">
+ <div class="dialogButtonContainerRight">
+ <table><tr>
+ <td><button dojoType="Button"
id="deletePageYes"
dojoAttachEvent="onClick:deletePageConfirmed">${this.dialogLabels.yes}</button></td>
+ <td><button dojoType="Button"
id="deletePageNo"
dojoAttachPoint="deletePageCancel">${this.dialogLabels.no}</button></td>
+ </tr></table>
+ </div>
+ </div>
<p></p>
</div>
</div>
@@ -65,25 +72,25 @@
<div dojoAttachPoint="createPageDialog">
<div class="container" dojoAttachPoint="createPageDialogBg">
<div class="createPageDialog"
dojoAttachPoint="createPageDialogFg">
- <h2>Create New Page</h2>
+ <h2>${this.dialogLabels.newpage}</h2>
<div dojoAttachPoint="createPageNameField"
class="createPageField">
- <div>Name</div>
+ <div>${this.dialogLabels.newpage_name}</div>
<input dojoType="Textbox"
dojoAttachPoint="createPageNameTextbox" maxlength="30">
</div>
<div dojoAttachPoint="createPageTitleField"
class="createPageField">
- <div>Title</div>
+ <div>${this.dialogLabels.newpage_title}</div>
<input dojoType="Textbox"
dojoAttachPoint="createPageTitleTextbox" maxlength="30">
</div>
<div dojoAttachPoint="createPageShortTitleField"
class="createPageField">
- <div>Short Title</div>
+ <div>${this.dialogLabels.newpage_titleshort}</div>
<input dojoType="Textbox"
dojoAttachPoint="createPageShortTitleTextbox" maxlength="30">
</div>
- <button dojoType="Button" id="createPageYes"
dojoAttachEvent="onClick:createPageConfirmed">OK</button>
- <button dojoType="Button" id="createPageNo"
dojoAttachPoint="createPageCancel">Cancel</button>
+ <button dojoType="Button" id="createPageYes"
dojoAttachEvent="onClick:createPageConfirmed">${this.dialogLabels.ok}</button>
+ <button dojoType="Button" id="createPageNo"
dojoAttachPoint="createPageCancel">${this.dialogLabels.cancel}</button>
<p></p>
</div>
</div>
</div>
</div>
-</body>
\ No newline at end of file
+</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
