svnno****@sourc*****
svnno****@sourc*****
2007年 7月 18日 (水) 18:01:42 JST
Revision: 288
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=288
Author: shinsuke
Date: 2007-07-18 18:01:41 +0900 (Wed, 18 Jul 2007)
Log Message:
-----------
added delete button, removed unused tabs.
Modified Paths:
--------------
pal-admin/trunk/pom.xml
pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java
pal-admin/trunk/src/main/resources/appMessages.properties
pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html
pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html
pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
-------------- next part --------------
Modified: pal-admin/trunk/pom.xml
===================================================================
--- pal-admin/trunk/pom.xml 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/pom.xml 2007-07-18 09:01:41 UTC (rev 288)
@@ -228,12 +228,14 @@
<artifactId>commons-io</artifactId>
<version>1.1</version>
</dependency>
+<!--
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
<version>1.2.14</version>
<type>jar</type>
</dependency>
+-->
<dependency>
<groupId>xerces</groupId>
<artifactId>xercesImpl</artifactId>
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-07-18 09:01:41 UTC (rev 288)
@@ -30,6 +30,7 @@
import org.apache.jetspeed.page.PageNotFoundException;
import org.apache.jetspeed.page.PageNotUpdatedException;
import org.apache.jetspeed.page.document.DocumentException;
+import org.apache.jetspeed.page.document.Node;
import org.apache.jetspeed.page.document.NodeException;
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.request.RequestContext;
@@ -538,6 +539,30 @@
}
}
+ public String deletePage(String path) throws CommonException {
+ Page page = getPage(getFolderOrPagePath(path));
+ if (page == null) {
+ throw new CommonException("could.not.find.page",
+ "Could not find a page: " + path);
+ }
+ Node parent = page.getParent();
+ String parentPath = "/";
+ if (parent != null) {
+ parentPath = parent.getPath();
+ }
+
+ try {
+ getPageManager().removePage(page);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.delete.page",
+ "Could not delete a page: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.delete.page",
+ "Could not delete a page: " + path, e);
+ }
+ return parentPath;
+ }
+
public void addPage(String path, String pageName, String pageTitle,
String pageShortTitle, String layoutName, String pageDecorator,
String portletDecorator, String desktopTheme, boolean pageHidden)
@@ -680,6 +705,35 @@
}
}
+ public String deleteFolder(String path) throws CommonException {
+ if ("/".equals(path)) {
+ throw new CommonException("could.not.delete.root.folder",
+ "Could not find a folder: " + path);
+ }
+ Folder folder = getFolder(getFolderOrPagePath(path));
+ if (folder == null) {
+ throw new CommonException("could.not.find.folder",
+ "Could not find a folder: " + path);
+ }
+ Node parent = folder.getParent();
+ String parentPath = "/";
+ if (parent != null) {
+ parentPath = parent.getPath();
+ }
+
+ try {
+ getPageManager().removeFolder(folder);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.delete.folder",
+ "Could not update a folder: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.delete.folder",
+ "Could not update a folder: " + path, e);
+ }
+
+ return parentPath;
+ }
+
public void addFolder(String path, String folderName, String folderTitle,
String folderShortTitle, String layoutName, String pageDecorator,
String portletDecorator, String desktopTheme, boolean folderHidden)
@@ -806,7 +860,13 @@
throw new CommonException("could.not.find.layout",
"Could not find a page: " + path);
}
+
String fid = getFragmentId(path);
+ if (fid == null || fid.equals("")) {
+ throw new CommonException("could.not.find.layout",
+ "Could not find a page: " + path);
+ }
+
Fragment fragment = page.getFragmentById(fid);
fragment.setName(layoutName);
fragment.setDecorator(decorator);
@@ -815,13 +875,47 @@
getPageManager().updatePage(page);
} catch (PageNotUpdatedException e) {
throw new CommonException("could.not.update.layout",
- "Could not update a page: " + path, e);
+ "Could not update a layout: " + path, e);
} catch (NodeException e) {
throw new CommonException("could.not.update.layout",
- "Could not update a page: " + path, e);
+ "Could not update a layout: " + path, e);
}
}
+ public String deleteLayout(String path) throws CommonException {
+ String p = getFolderOrPagePath(path);
+ Page page = getPage(p);
+ if (page == null) {
+ throw new CommonException("could.not.find.layout",
+ "Could not find a page: " + path);
+ }
+
+ String fid = getFragmentId(path);
+ if (fid == null || fid.equals("")) {
+ throw new CommonException("could.not.find.layout",
+ "Could not find a page: " + path);
+ }
+
+ Fragment rootFragment = page.getRootFragment();
+ if (rootFragment != null && fid.equals(rootFragment.getId())) {
+ throw new CommonException("could.not.delete.root.layout",
+ "Could not delete a root layout: " + path);
+ }
+
+ page.removeFragmentById(fid);
+
+ try {
+ getPageManager().updatePage(page);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.delete.layout",
+ "Could not delete a layout: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.delete.layout",
+ "Could not delete a layout: " + path, e);
+ }
+ return p;
+ }
+
public Map<String, Object> getPortletInfo(String path)
throws CommonException {
Map<String, Object> map = new HashMap<String, Object>();
@@ -865,6 +959,34 @@
}
}
+ public String deletePortlet(String path) throws CommonException {
+ String p = getFolderOrPagePath(path);
+ Page page = getPage(p);
+ if (page == null) {
+ throw new CommonException("could.not.find.portlet",
+ "Could not find a page: " + path);
+ }
+
+ String fid = getFragmentId(path);
+ if (fid == null || fid.equals("")) {
+ throw new CommonException("could.not.find.layout",
+ "Could not find a page: " + path);
+ }
+
+ page.removeFragmentById(fid);
+
+ try {
+ getPageManager().updatePage(page);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.delete.portlet",
+ "Could not delete a portlet: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.delete.portlet",
+ "Could not delete a portlet: " + path, e);
+ }
+ return p;
+ }
+
public void addLayout(String path, String layoutName)
throws CommonException {
Page page = getPage(getFolderOrPagePath(path));
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-07-18 09:01:41 UTC (rev 288)
@@ -153,6 +153,15 @@
page.isPageHidden());
}
+ public void deletePage(PageInfoEditorPage page) throws CommonException {
+ String parent = getSiteEditorLogic().deletePage(page.getPath());
+ if (parent != null) {
+ page.setPath(parent);
+ } else {
+ page.setPath("/");
+ }
+ }
+
public void updateFolder(FolderInfoEditorPage page) throws CommonException {
getSiteEditorLogic().updateFolder(page.getPath(),
page.getFolderTitle(), page.getFolderShortTitle(),
@@ -160,11 +169,29 @@
page.getDesktopTheme(), page.isFolderHidden());
}
+ public void deleteFolder(FolderInfoEditorPage page) throws CommonException {
+ String parent = getSiteEditorLogic().deleteFolder(page.getPath());
+ if (parent != null) {
+ page.setPath(parent);
+ } else {
+ page.setPath("/");
+ }
+ }
+
public void updateLayout(LayoutInfoEditorPage page) throws CommonException {
getSiteEditorLogic().updateLayout(page.getPath(), page.getLayoutName(),
page.getDecorator(), page.getDesktopTheme());
}
+ public void deleteLayout(LayoutInfoEditorPage page) throws CommonException {
+ String newPath = getSiteEditorLogic().deleteLayout(page.getPath());
+ if (newPath != null) {
+ page.setPath(newPath);
+ } else {
+ page.setPath("/");
+ }
+ }
+
public void updatePortlet(PortletInfoEditorPage page)
throws CommonException {
getSiteEditorLogic().updatePortlet(page.getPath(),
@@ -172,6 +199,16 @@
page.getDesktopTheme());
}
+ public void deletePortlet(PortletInfoEditorPage page)
+ throws CommonException {
+ String newPath = getSiteEditorLogic().deletePortlet(page.getPath());
+ if (newPath != null) {
+ page.setPath(newPath);
+ } else {
+ page.setPath("/");
+ }
+ }
+
public void addLayout(LayoutAddPortletEditorPage page)
throws CommonException {
if (page.getLayoutName() == null) {
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderInfoEditorPage.java 2007-07-18 09:01:41 UTC (rev 288)
@@ -163,4 +163,20 @@
return null;
}
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
+ public Class<?> doDelete() {
+ try {
+ getSiteEditorService().deleteFolder(this);
+ FacesMessageUtil.addInfoMessage("deleted.folder");
+ return FolderInfoEditorPage.class;
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.delete.folder");
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/LayoutInfoEditorPage.java 2007-07-18 09:01:41 UTC (rev 288)
@@ -134,4 +134,20 @@
}
return null;
}
+
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
+ public Class<?> doDelete() {
+ try {
+ getSiteEditorService().deleteLayout(this);
+ FacesMessageUtil.addInfoMessage("deleted.layout");
+ return PageInfoEditorPage.class;
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.delete.layout");
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-07-18 09:01:41 UTC (rev 288)
@@ -211,4 +211,20 @@
return null;
}
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
+ public Class<?> doDelete() {
+ try {
+ getSiteEditorService().deletePage(this);
+ FacesMessageUtil.addInfoMessage("deleted.page");
+ return FolderInfoEditorPage.class;
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.delete.page");
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PortletInfoEditorPage.java 2007-07-18 09:01:41 UTC (rev 288)
@@ -134,4 +134,20 @@
}
return null;
}
+
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
+ public Class<?> doDelete() {
+ try {
+ getSiteEditorService().deletePortlet(this);
+ FacesMessageUtil.addInfoMessage("deleted.layout");
+ return PageInfoEditorPage.class;
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.delete.layout");
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
}
Modified: pal-admin/trunk/src/main/resources/appMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-18 09:01:41 UTC (rev 288)
@@ -130,3 +130,18 @@
could.not.add.page=Could not add a page. Please try again. If you see this error message again, please contact a site administrator.
could.not.change.page.order=Could not change a page order. Please try again. If you see this error message again, please contact a site administrator.
need.to.specify.page.name=Need to specify a page name.
+
+could.not.delete.root.folder=Could not delete a root folder.
+could.not.delete.folder=Could not delete the folder. Please try again. If you see this error message again, please contact a site administrator.
+deleted.folder=Deleted folder.
+
+could.not.delete.page=Could not delete the page. Please try again. If you see this error message again, please contact a site administrator.
+deleted.page=Deleted page.
+
+could.not.delete.layout=Could not delete the layout. Please try again. If you see this error message again, please contact a site administrator.
+deleted.layout=Deleted layout.
+could.not.delete.root.layout=Cannot delete a root folder.
+
+could.not.delete.portlet=Could not delete the portlet. Please try again. If you see this error message again, please contact a site administrator.
+deleted.portlet=Deleted portlet.
+
Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-07-18 09:01:41 UTC (rev 288)
@@ -34,12 +34,14 @@
<span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Info</span>
</a>
<label id="addTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</label>
+<!--
<a id="jumpPageSecurityEditor-tab" href="folderSecurityEditor.html?path=a&returnPath=b" style="text-decoration: none;">
<span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span>
</a>
<a id="jumpPageMetadataEditor-tab" href="folderMetadataEditor.html?path=a&returnPath=b" style="text-decoration: none;">
<span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span>
</a>
+ -->
</div>
<div>
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-07-18 09:01:41 UTC (rev 288)
@@ -34,12 +34,14 @@
<a id="jumpFolderAddFolderAndPageEditor-tab" href="folderAddFolderAndPageEditor.html?path=a&returnPath=b" style="text-decoration: none;">
<span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span>
</a>
+<!--
<a id="jumpPageSecurityEditor-tab" href="folderSecurityEditor.html?path=a&returnPath=b" style="text-decoration: none;">
<span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span>
</a>
<a id="jumpPageMetadataEditor-tab" href="folderMetadataEditor.html?path=a&returnPath=b" style="text-decoration: none;">
<span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span>
</a>
+ -->
</div>
<div>
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
@@ -79,6 +81,9 @@
<div style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
</div>
+ <div style="margin-top: 5px;text-align: right;">
+ <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this folder?')){return true;}return false;"/>
+ </div>
</div>
</dir>
<br style="clear: both;" />
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-07-18 09:01:41 UTC (rev 288)
@@ -46,9 +46,11 @@
<span id="infoTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</span>
</a>
<label id="addTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</label>
+<!--
<a id="jumpLayoutMetadataEditor-tab" href="layoutMetadataEditor.html" style="text-decoration: none;">
<span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span>
</a>
+ -->
</div>
<div>
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-07-18 09:01:41 UTC (rev 288)
@@ -46,9 +46,11 @@
<a id="jumpLayoutAddPortletEditor-tab" href="layoutAddPortletEditor.html?path=a&returnPath=b" style="text-decoration: none;">
<span id="addTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Add</span>
</a>
+<!--
<a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html" style="text-decoration: none;">
<span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span>
</a>
+ -->
</div>
<div>
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
@@ -80,6 +82,9 @@
<div style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
</div>
+ <div style="margin-top: 5px;text-align: right;">
+ <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this layout?')){return true;}return false;"/>
+ </div>
</div>
</dir>
<br style="clear: both;" />
Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-07-18 09:01:41 UTC (rev 288)
@@ -43,12 +43,14 @@
<dir style="width: 500px;float: left;padding: 5px;margin: 0px;">
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
<label id="infoTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</label>
+<!--
<a id="jumpPageSecurityEditor-tab" href="pageSecurityEditor.html" style="text-decoration: none;">
<span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span>
</a>
<a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html" style="text-decoration: none;">
<span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span>
</a>
+ -->
</div>
<div>
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
@@ -88,6 +90,9 @@
<div style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
</div>
+ <div style="margin-top: 5px;text-align: right;">
+ <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this page?')){return true;}return false;"/>
+ </div>
</div>
</dir>
<br style="clear: both;" />
Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-07-18 06:56:04 UTC (rev 287)
+++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-07-18 09:01:41 UTC (rev 288)
@@ -43,12 +43,14 @@
<dir style="width: 500px;float: left;padding: 5px;margin: 0px;">
<div style="padding: 0px 0px 3px 10px; margin:5px 0px;border-bottom:1px solid #000000;">
<label id="infoTabLabel" style="border-top:1px solid #000000;border-right:1px solid #000000;border-bottom:1px solid #ffffff;border-left:1px solid #000000;padding: 3px 5px 3px 5px; margin: 0px 0px;">Information</label>
+<!--
<a id="jumpPageSecurityEditor-tab" href="pageSecurityEditor.html" style="text-decoration: none;">
<span id="securityTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Security</span>
</a>
<a id="jumpPageMetadataEditor-tab" href="pageMetadataEditor.html" style="text-decoration: none;">
<span id="metadataTabLabel" style="font-weight: bold;color:#ffffff;background-color:#999999;border:1px solid #000000; padding: 3px 5px 3px 5px; margin: 0px 0px;">Metadata</span>
</a>
+ -->
</div>
<div>
<span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
@@ -80,6 +82,9 @@
<div style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
</div>
+ <div style="margin-top: 5px;text-align: right;">
+ <input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this portlet?')){return true;}return false;"/>
+ </div>
</div>
</dir>
<br style="clear: both;" />