svnno****@sourc*****
svnno****@sourc*****
2007年 7月 18日 (水) 15:56:05 JST
Revision: 287
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=287
Author: shinsuke
Date: 2007-07-18 15:56:04 +0900 (Wed, 18 Jul 2007)
Log Message:
-----------
add folder and page on folder editor.
Modified Paths:
--------------
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/resources/PAMessages.properties
pal-admin/trunk/src/main/resources/appMessages.properties
pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties
pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
Added Paths:
-----------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
-------------- next part --------------
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:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-07-18 06:56:04 UTC (rev 287)
@@ -25,6 +25,7 @@
import org.apache.jetspeed.om.folder.InvalidFolderException;
import org.apache.jetspeed.om.page.Fragment;
import org.apache.jetspeed.om.page.Page;
+import org.apache.jetspeed.page.FolderNotUpdatedException;
import org.apache.jetspeed.page.PageManager;
import org.apache.jetspeed.page.PageNotFoundException;
import org.apache.jetspeed.page.PageNotUpdatedException;
@@ -458,8 +459,9 @@
if (page != null) {
map.put("pageTitle", page.getTitle());
map.put("pageShortTitle", page.getShortTitle());
- map.put("pageDecorator", page.getDefaultDecorator("layout"));
- map.put("portletDecorator", page.getDefaultDecorator("portlet"));
+ map.put("pageDecorator", page.getDefaultDecorator(Fragment.LAYOUT));
+ map.put("portletDecorator", page
+ .getDefaultDecorator(Fragment.PORTLET));
map.put("desktopTheme", page.getSkin());
map.put("pageHidden", page.isHidden());
}
@@ -521,8 +523,8 @@
}
page.setTitle(pageTitle);
page.setShortTitle(pageShortTitle);
- page.setDefaultDecorator(pageDecorator, "layout");
- page.setDefaultDecorator(portletDecorator, "portlet");
+ page.setDefaultDecorator(pageDecorator, Fragment.LAYOUT);
+ page.setDefaultDecorator(portletDecorator, Fragment.PORTLET);
page.setSkin(desktopTheme);
page.setHidden(pageHidden);
try {
@@ -536,6 +538,61 @@
}
}
+ public void addPage(String path, String pageName, String pageTitle,
+ String pageShortTitle, String layoutName, String pageDecorator,
+ String portletDecorator, String desktopTheme, boolean pageHidden)
+ throws CommonException {
+ Folder folder = getFolder(getFolderOrPagePath(path));
+ if (folder == null) {
+ throw new CommonException("could.not.find.folder",
+ "Could not find a folder: " + path);
+ }
+
+ // add page
+ String pagePath = folder.getPath();
+ if (pagePath.endsWith(Folder.PATH_SEPARATOR)) {
+ pagePath = pagePath + pageName;
+ } else {
+ pagePath = pagePath + Folder.PATH_SEPARATOR + pageName;
+ }
+ Page childPage = getPageManager().newPage(pagePath);
+ childPage.getRootFragment().setName(layoutName);
+ childPage.setDefaultDecorator(pageDecorator, Fragment.LAYOUT);
+ childPage.setDefaultDecorator(portletDecorator, Fragment.PORTLET);
+ childPage.setTitle(pageTitle);
+ childPage.setShortTitle(pageShortTitle);
+ childPage.setSkin(desktopTheme);
+ childPage.setHidden(pageHidden);
+ try {
+ getPageManager().updatePage(childPage);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.add.page",
+ "Could not add a page: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.add.page",
+ "Could not add a page: " + path, e);
+ }
+
+ List<String> orderList = folder.getDocumentOrder();
+ if (orderList != null) {
+ String name = childPage.getName();
+ if (orderList.indexOf(name) < 0) {
+ orderList.add(name);
+ folder.setDocumentOrder(orderList);
+ try {
+ getPageManager().updateFolder(folder);
+ } catch (FolderNotUpdatedException e) {
+ throw new CommonException("could.not.change.page.order",
+ "Could not change a page order: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.change.page.order",
+ "Could not change a page order: " + path, e);
+ }
+ }
+ }
+
+ }
+
public Map<String, Object> getFolderInfo(String path)
throws CommonException {
Map<String, Object> map = new HashMap<String, Object>();
@@ -544,8 +601,10 @@
if (folder != null) {
map.put("folderTitle", folder.getTitle());
map.put("folderShortTitle", folder.getShortTitle());
- map.put("pageDecorator", folder.getDefaultDecorator("layout"));
- map.put("portletDecorator", folder.getDefaultDecorator("portlet"));
+ map.put("pageDecorator", folder
+ .getDefaultDecorator(Fragment.LAYOUT));
+ map.put("portletDecorator", folder
+ .getDefaultDecorator(Fragment.PORTLET));
map.put("desktopTheme", folder.getSkin());
map.put("folderHidden", folder.isHidden());
}
@@ -606,8 +665,8 @@
}
folder.setTitle(pageTitle);
folder.setShortTitle(pageShortTitle);
- folder.setDefaultDecorator(pageDecorator, "layout");
- folder.setDefaultDecorator(portletDecorator, "portlet");
+ folder.setDefaultDecorator(pageDecorator, Fragment.LAYOUT);
+ folder.setDefaultDecorator(portletDecorator, Fragment.PORTLET);
folder.setSkin(desktopTheme);
folder.setHidden(pageHidden);
try {
@@ -621,6 +680,105 @@
}
}
+ public void addFolder(String path, String folderName, String folderTitle,
+ String folderShortTitle, String layoutName, String pageDecorator,
+ String portletDecorator, String desktopTheme, boolean folderHidden)
+ throws CommonException {
+ Folder folder = getFolder(getFolderOrPagePath(path));
+ if (folder == null) {
+ throw new CommonException("could.not.find.folder",
+ "Could not find a folder: " + path);
+ }
+
+ String folderPath = folder.getPath();
+ if (folderPath.endsWith(Folder.PATH_SEPARATOR)) {
+ folderPath = folderPath + folderName;
+ } else {
+ folderPath = folderPath + Folder.PATH_SEPARATOR + folderName;
+ }
+ Folder child = getPageManager().newFolder(folderPath);
+ child.setTitle(folderTitle);
+ child.setShortTitle(folderShortTitle);
+ child.setDefaultDecorator(pageDecorator, Fragment.LAYOUT);
+ child.setDefaultDecorator(portletDecorator, Fragment.PORTLET);
+ child.setSkin(desktopTheme);
+ child.setHidden(folderHidden);
+ try {
+ getPageManager().updateFolder(child);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.add.folder",
+ "Could not add a folder: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.add.folder",
+ "Could not add a folder: " + path, e);
+ }
+
+ // change a folder order
+ List<String> orderList = folder.getDocumentOrder();
+ if (orderList != null) {
+ String name = child.getName();
+ if (orderList.indexOf(name) < 0) {
+ orderList.add(name);
+ folder.setDocumentOrder(orderList);
+ try {
+ getPageManager().updateFolder(folder);
+ } catch (FolderNotUpdatedException e) {
+ throw new CommonException("could.not.change.folder.order",
+ "Could not change a folder order: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.change.folder.order",
+ "Could not change a folder order: " + path, e);
+ }
+ }
+ }
+
+ // add default childPage
+ String pagePath = child.getPath();
+ if (pagePath.endsWith(Folder.PATH_SEPARATOR)) {
+ pagePath = pagePath + "default-page";
+ } else {
+ pagePath = pagePath + Folder.PATH_SEPARATOR + "default-page";
+ }
+ Page childPage = getPageManager().newPage(pagePath);
+ childPage.getRootFragment().setName(layoutName);
+ childPage.setDefaultDecorator(pageDecorator, Fragment.LAYOUT);
+ childPage.setDefaultDecorator(portletDecorator, Fragment.PORTLET);
+ childPage.setTitle(folderTitle);
+ childPage.setShortTitle(folderShortTitle);
+ childPage.setSkin(desktopTheme);
+ childPage.setHidden(folderHidden);
+ try {
+ getPageManager().updatePage(childPage);
+ } catch (PageNotUpdatedException e) {
+ throw new CommonException("could.not.add.default.page",
+ "Could not add a default page: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException("could.not.add.default.page",
+ "Could not add a default page: " + path, e);
+ }
+
+ orderList = child.getDocumentOrder();
+ if (orderList != null) {
+ String name = childPage.getName();
+ if (orderList.indexOf(name) < 0) {
+ orderList.add(name);
+ child.setDocumentOrder(orderList);
+ try {
+ getPageManager().updateFolder(child);
+ } catch (FolderNotUpdatedException e) {
+ throw new CommonException(
+ "could.not.change.default.page.order",
+ "Could not change a default page order: " + path, e);
+ } catch (NodeException e) {
+ throw new CommonException(
+ "could.not.change.default.page.order",
+ "Could not change a default page order: " + path, e);
+ }
+ }
+ }
+
+ }
+
public Map<String, Object> getLayoutInfo(String path)
throws CommonException {
Map<String, Object> map = new HashMap<String, Object>();
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:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-07-18 06:56:04 UTC (rev 287)
@@ -8,6 +8,7 @@
import jp.sf.pal.admin.entity.NodeInfo;
import jp.sf.pal.admin.logic.SiteEditorLogic;
import jp.sf.pal.admin.web.site.AbstractSiteEditorPage;
+import jp.sf.pal.admin.web.site.FolderAddFolderAndPageEditorPage;
import jp.sf.pal.admin.web.site.FolderInfoEditorPage;
import jp.sf.pal.admin.web.site.LayoutAddPortletEditorPage;
import jp.sf.pal.admin.web.site.LayoutInfoEditorPage;
@@ -81,6 +82,20 @@
getSiteEditorLogic().getFolderInfo(page.getPath()), page);
}
+ public void loadPage(FolderAddFolderAndPageEditorPage page)
+ throws CommonException {
+ loadTree(page);
+
+ page.setLayoutNameItems(getSiteEditorLogic().createLayoutNamesList());
+ page.setPageDecoratorItems(getSiteEditorLogic()
+ .createPageDecorationsList());
+ page.setPortletDecoratorItems(getSiteEditorLogic()
+ .createPortletDecorationsList());
+ page.setDesktopThemeItems(getSiteEditorLogic()
+ .createDesktopPageDecorationsList());
+
+ }
+
public void loadPage(LayoutInfoEditorPage page) throws CommonException {
loadTree(page);
@@ -174,4 +189,48 @@
}
getSiteEditorLogic().addPortlet(page.getPath(), page.getPortletName());
}
+
+ public void addFolder(FolderAddFolderAndPageEditorPage page)
+ throws CommonException {
+ String name = page.getFolderOrPageName();
+ if (name == null) {
+ throw new CommonException("need.to.specify.folder.name",
+ "a folder name is empty");
+ }
+ if (name.endsWith(".psml")) {
+ // cut .psml
+ name = name.substring(0, name.length() - 4);
+ }
+ if ("".equals(name)) {
+ throw new CommonException("need.to.specify.folder.name",
+ "a folder name is empty");
+ }
+ getSiteEditorLogic().addFolder(page.getPath(), name,
+ page.getFolderOrPageTitle(), page.getFolderOrPageShortTitle(),
+ page.getLayoutName(), page.getPageDecorator(),
+ page.getPortletDecorator(), page.getDesktopTheme(),
+ page.isFolderOrPageHidden());
+ }
+
+ public void addPage(FolderAddFolderAndPageEditorPage page)
+ throws CommonException {
+ String name = page.getFolderOrPageName();
+ if (name == null) {
+ throw new CommonException("need.to.specify.page.name",
+ "a page name is empty");
+ }
+ if (!name.endsWith(".psml")) {
+ // add .psml
+ name = name + ".psml";
+ }
+ if ("".equals(name)) {
+ throw new CommonException("need.to.specify.page.name",
+ "a page name is empty");
+ }
+ getSiteEditorLogic().addPage(page.getPath(), name,
+ page.getFolderOrPageTitle(), page.getFolderOrPageShortTitle(),
+ page.getLayoutName(), page.getPageDecorator(),
+ page.getPortletDecorator(), page.getDesktopTheme(),
+ page.isFolderOrPageHidden());
+ }
}
Added: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2007-07-18 06:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java 2007-07-18 06:56:04 UTC (rev 287)
@@ -0,0 +1,219 @@
+package jp.sf.pal.admin.web.site;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import javax.faces.internal.FacesMessageUtil;
+
+import jp.sf.pal.common.CommonException;
+
+import org.seasar.framework.log.Logger;
+import org.seasar.teeda.extension.annotation.takeover.TakeOver;
+import org.seasar.teeda.extension.annotation.takeover.TakeOverType;
+import org.seasar.teeda.extension.annotation.validator.Required;
+
+public class FolderAddFolderAndPageEditorPage extends AbstractSiteEditorPage
+ implements Serializable {
+
+ /**
+ *
+ */
+ private static final long serialVersionUID = 7554996409131145939L;
+
+ /**
+ * Logger for this class
+ */
+ private static final Logger logger = Logger
+ .getLogger(FolderInfoEditorPage.class);
+
+ @Required
+ private String layoutName;
+
+ private List<Map<String, String>> layoutNameItems;
+
+ private String desktopTheme;
+
+ private List<Map<String, String>> desktopThemeItems;
+
+ private boolean folderOrPageHidden;
+
+ private String folderOrPageName;
+
+ private String folderOrPageShortTitle;
+
+ private String folderOrPageTitle;
+
+ private String pageDecorator;
+
+ private List<Map<String, String>> pageDecoratorItems;
+
+ private String portletDecorator;
+
+ private List<Map<String, String>> portletDecoratorItems;
+
+ /**
+ * @return the layoutName
+ */
+ public String getLayoutName() {
+ return layoutName;
+ }
+
+ /**
+ * @param layoutName the layoutName to set
+ */
+ public void setLayoutName(String layoutName) {
+ this.layoutName = layoutName;
+ }
+
+ /**
+ * @return the layoutNameItems
+ */
+ public List<Map<String, String>> getLayoutNameItems() {
+ return layoutNameItems;
+ }
+
+ /**
+ * @param layoutNameItems the layoutNameItems to set
+ */
+ public void setLayoutNameItems(List<Map<String, String>> layoutNameItems) {
+ this.layoutNameItems = layoutNameItems;
+ }
+
+ public String getDesktopTheme() {
+ return desktopTheme;
+ }
+
+ public void setDesktopTheme(String desktopTheme) {
+ this.desktopTheme = desktopTheme;
+ }
+
+ public List<Map<String, String>> getDesktopThemeItems() {
+ return desktopThemeItems;
+ }
+
+ public void setDesktopThemeItems(List<Map<String, String>> desktopThemeItems) {
+ this.desktopThemeItems = desktopThemeItems;
+ }
+
+ public boolean isFolderOrPageHidden() {
+ return folderOrPageHidden;
+ }
+
+ public void setFolderOrPageHidden(boolean folderOrPageHidden) {
+ this.folderOrPageHidden = folderOrPageHidden;
+ }
+
+ public String getFolderOrPageName() {
+ return folderOrPageName;
+ }
+
+ public void setFolderOrPageName(String folderOrPageName) {
+ this.folderOrPageName = folderOrPageName;
+ }
+
+ public String getFolderOrPageShortTitle() {
+ return folderOrPageShortTitle;
+ }
+
+ public void setFolderOrPageShortTitle(String folderOrPageShortTitle) {
+ this.folderOrPageShortTitle = folderOrPageShortTitle;
+ }
+
+ public String getFolderOrPageTitle() {
+ return folderOrPageTitle;
+ }
+
+ public void setFolderOrPageTitle(String folderOrPageTitle) {
+ this.folderOrPageTitle = folderOrPageTitle;
+ }
+
+ public String getPageDecorator() {
+ return pageDecorator;
+ }
+
+ public void setPageDecorator(String pageDecorator) {
+ this.pageDecorator = pageDecorator;
+ }
+
+ public List<Map<String, String>> getPageDecoratorItems() {
+ return pageDecoratorItems;
+ }
+
+ public void setPageDecoratorItems(
+ List<Map<String, String>> pageDecoratorItems) {
+ this.pageDecoratorItems = pageDecoratorItems;
+ }
+
+ public String getPortletDecorator() {
+ return portletDecorator;
+ }
+
+ public void setPortletDecorator(String portletDecorator) {
+ this.portletDecorator = portletDecorator;
+ }
+
+ public List<Map<String, String>> getPortletDecoratorItems() {
+ return portletDecoratorItems;
+ }
+
+ public void setPortletDecoratorItems(
+ List<Map<String, String>> portletDecoratorItems) {
+ this.portletDecoratorItems = portletDecoratorItems;
+ }
+
+ public Class<?> initialize() {
+ return null;
+ }
+
+ public Class<?> prerender() {
+ if (getPath() == null) {
+ setPath("/");
+ }
+
+ if (getReturnPath() == null) {
+ setReturnPath("/");
+ }
+
+ try {
+ getSiteEditorService().loadPage(this);
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0001", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
+ public Class<?> doAddFolder() {
+ try {
+ getSiteEditorService().addFolder(this);
+ FacesMessageUtil.addInfoMessage("added.folder");
+ return FolderAddFolderAndPageEditorPage.class;
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.add.folder");
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
+ @TakeOver(type = TakeOverType.INCLUDE, properties = "path,returnPath")
+ public Class<?> doAddPage() {
+ try {
+ getSiteEditorService().addPage(this);
+ FacesMessageUtil.addInfoMessage("added.page");
+ return FolderAddFolderAndPageEditorPage.class;
+ } catch (CommonException e) {
+ FacesMessageUtil.addErrorMessage(e.getMessageId());
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ } catch (Exception e) {
+ FacesMessageUtil.addErrorMessage("could.not.add.page");
+ logger.log("EPA0002", new Object[] { this.toString() }, e);
+ }
+ return null;
+ }
+
+}
Property changes on: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/FolderAddFolderAndPageEditorPage.java
___________________________________________________________________
Name: svn:eol-style
+ native
Modified: pal-admin/trunk/src/main/resources/PAMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/PAMessages.properties 2007-07-18 06:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/resources/PAMessages.properties 2007-07-18 06:56:04 UTC (rev 287)
@@ -2,4 +2,4 @@
EPA0002=Could not send a forgotten password mail.
EPA0003=Could not update a password.
EPA0004=Could not read a term of service.
-EPA0005=Could not load a user info.
\ No newline at end of file
+EPA0005=Could not load a user info.
Modified: pal-admin/trunk/src/main/resources/appMessages.properties
===================================================================
--- pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-18 06:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/resources/appMessages.properties 2007-07-18 06:56:04 UTC (rev 287)
@@ -119,3 +119,14 @@
need.to.specify.portlet=Need to specify a portlet.
could.not.add.portlet=Could not add a portlet. Please try again. If you see this error message again, please contact a site administrator.
added.portlet=Added portlet.
+
+added.folder=Added folder.
+could.not.add.folder=Could not add a folder. Please try again. If you see this error message again, please contact a site administrator.
+could.not.change.folder.order=Could not change a folder order. Please try again. If you see this error message again, please contact a site administrator.
+could.not.add.default.page=Could not add a default page. Please try again. If you see this error message again, please contact a site administrator.
+could.not.change.default.page.order=Could not change a default page order. Please try again. If you see this error message again, please contact a site administrator.
+need.to.specify.folder.name=Need to specify a folder name.
+added.page=Added page.
+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.
Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-07-18 06:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-07-18 06:56:04 UTC (rev 287)
@@ -23,9 +23,18 @@
layoutInfoEditor.desktopTheme=Desktop Theme:
portletInfoEditor.fragmentId=ID:
-portletInfoEditor.portletName=portlet:
+portletInfoEditor.portletName=Portlet:
portletInfoEditor.decorator=Decorator:
portletInfoEditor.desktopTheme=Desktop Theme:
layoutAddPortletEditor.layoutName=Layout:
layoutAddPortletEditor.portletName=Portlet:
+
+folderAddFolderAndPageEditor.folderOrPageName=Name:
+folderAddFolderAndPageEditor.folderOrPageTitle=Title:
+folderAddFolderAndPageEditor.folderOrPageShortTitle=Short Title:
+folderAddFolderAndPageEditor.layoutName=Layout:
+folderAddFolderAndPageEditor.pageDecorator=Page Decorator:
+folderAddFolderAndPageEditor.portletDecorator=Portlet Decorator:
+folderAddFolderAndPageEditor.desktopTheme=Desktop Theme:
+folderAddFolderAndPageEditor.folderOrPageHidden=Hide This Folder/Page?:
Added: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-07-18 06:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-07-18 06:56:04 UTC (rev 287)
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://java.sun.com/jsf/html" xmlns:f="http://java.sun.com/jsf/core" xmlns:te="http://www.seasar.org/teeda/extension">
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+ <link rel="stylesheet" type="text/css" href="../../css/global.css" />
+ </head>
+ <body>
+ <form id="folderAddFolderAndPageEditorForm">
+ <input id="path" type="hidden"/>
+ <input id="returnPath" type="hidden"/>
+<!-- tree: BEGIN -->
+ <div style="width: 200px;height: 400px;float: left;border: 1px solid #666666;overflow: auto;">
+ <div id="nodeItems">
+ <div id="isFolder" style="white-space: nowrap;">
+ <a id="jumpFolderInfoEditor" href="folderInfoEditor.html?path=a&returnPath=b" style="">
+ <img id="folderIcon" src="" border="0" style="vertical-align:middle;" />
+ <span id="name-folder">Name</span>
+ </a>
+ </div>
+ <div id="isPage" style="white-space: nowrap;">
+ <a id="jumpPageInfoEditor" href="pageInfoEditor.html?path=a&returnPath=b" style="">
+ <img id="pageIcon" src="" border="0" style="vertical-align:middle;" />
+ <span id="name-page">Name</span>
+ </a>
+ </div>
+ </div>
+ </div>
+<!-- tree: END -->
+<!-- content: BEGIN -->
+ <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;">
+ <a id="jumpFolderInfoEditor-tab" href="folderInfoEditor.html?path=a&returnPath=b" style="text-decoration: none;">
+ <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>
+ </div>
+ <div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="folderOrPageNameLabel" for="folderOrPageName">Name:</label></div>
+ <input id="folderOrPageName" type="text" size="30"/><label>(a-zA-Z0-9 only)</label>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="folderOrPageTitleLabel" for="folderOrPageTitle">Title:</label></div>
+ <input id="folderOrPageTitle" type="text" size="30"/>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="folderOrPageShortTitleLabel" for="folderOrPageShortTitle" style="width:100px;">Short Title:</label></div>
+ <input id="folderOrPageShortTitle" type="text" size="30"/>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="layoutNameLabel" for="layoutName">Layout:</label></div>
+ <select id="layoutName">
+ <option value="hoge">HOGE</option>
+ </select>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="pageDecoratorLabel" for="pageDecorator" style="width:100px;">Page Decorator:</label></div>
+ <select id="pageDecorator">
+ <option value="hoge">HOGE</option>
+ </select>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="portletDecoratorLabel" for="portletDecorator" style="width:100px;">Portlet Decorator:</label></div>
+ <select id="portletDecorator">
+ <option value="hoge">HOGE</option>
+ </select>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="desktopThemeLabel" for="desktopTheme" style="width:100px;">Desktop Theme:</label></div>
+ <select id="desktopTheme">
+ <option value="hoge">HOGE</option>
+ </select>
+ </div>
+ <div style="clear:both;">
+ <div style="width:120px;float: left;"><label id="folderOrPageHiddenLabel" for="folderOrPageHidden" style="width:100px;">Desktop Theme:</label></div>
+ <input type="checkbox" id="folderOrPageHidden" />
+ </div>
+ <div style="margin-top: 20px;text-align: center;">
+ <input id="doAddFolder" type="button" value="Add Folder"/>
+ <input id="doAddPage" type="button" value="Add Page"/>
+ </div>
+ </div>
+ </dir>
+ <br style="clear: both;" />
+<!-- content: END -->
+ </form>
+ </body>
+</html>
Property changes on: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
___________________________________________________________________
Name: svn:eol-style
+ native
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:55:29 UTC (rev 286)
+++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-07-18 06:56:04 UTC (rev 287)
@@ -7,9 +7,6 @@
</head>
<body>
<form id="folderEditorForm">
- <div>
- <span id="allMessages" fatalClass="portlet-msg-error" errorClass="portlet-msg-error" warnClass="portlet-msg-alert" infoClass="portlet-msg-info"></span>
- </div>
<input id="path" type="hidden"/>
<input id="returnPath" type="hidden"/>
<!-- tree: BEGIN -->
@@ -34,14 +31,20 @@
<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="folderSecurityEditor.html" style="text-decoration: none;">
+ <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" style="text-decoration: none;">
+ <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>
+ </div>
+ <div>
<!-- TODO : Rename file -->
<div style="clear:both;">
<div style="width:120px;float: left;"><label id="folderTitleLabel" for="folderTitle">Title:</label></div>