svnno****@sourc*****
svnno****@sourc*****
2007年 7月 23日 (月) 11:59:53 JST
Revision: 350
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=350
Author: shinsuke
Date: 2007-07-23 11:59:52 +0900 (Mon, 23 Jul 2007)
Log Message:
-----------
added path display.
Modified Paths:
--------------
pal-admin/trunk/.classpath
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/AbstractSiteEditorPage.java
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_ja.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/folderSecurityEditor.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/pageSecurityEditor.html
pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
-------------- next part --------------
Modified: pal-admin/trunk/.classpath
===================================================================
--- pal-admin/trunk/.classpath 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/.classpath 2007-07-23 02:59:52 UTC (rev 350)
@@ -17,14 +17,15 @@
<classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.6.2/xercesImpl-2.6.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/portlet-output-optimizer/0.2/portlet-output-optimizer-0.2-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-locator/2.2-dev_pal-1.0-beta6-dev/jetspeed-locator-2.2-dev_pal-1.0-beta6-dev.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.8/teeda-ajax-1.0.8.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.8/teeda-ajax-1.0.8-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2.jar" sourcepath="M2_REPO/jp/sf/pal/faces-response-filter/0.2/faces-response-filter-0.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.8/teeda-ajax-1.0.8.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-ajax/1.0.8/teeda-ajax-1.0.8-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1.jar" sourcepath="M2_REPO/commons-io/commons-io/1.1/commons-io-1.1-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/jboss/javassist/3.4.ga/javassist-3.4.ga.jar"/>
<classpathentry kind="var" path="M2_REPO/jp/sf/pal/common-utils/0.3-SNAPSHOT/common-utils-0.3-SNAPSHOT.jar" sourcepath="M2_REPO/jp/sf/pal/common-utils/0.3-SNAPSHOT/common-utils-0.3-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/portals/jetspeed-2/jetspeed-api/2.2-dev_pal-1.0-beta6-dev/jetspeed-api-2.2-dev_pal-1.0-beta6-dev.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seasar/container/s2-framework/2.4.15/s2-framework-2.4.15.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1.jar" sourcepath="M2_REPO/commons-logging/commons-logging/1.1/commons-logging-1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.3/servlet-api-2.3-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/seasar/teeda/teeda-core/1.0.8/teeda-core-1.0.8.jar" sourcepath="M2_REPO/org/seasar/teeda/teeda-core/1.0.8/teeda-core-1.0.8-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/ognl/ognl/2.6.9-patch-20070624/ognl-2.6.9-patch-20070624.jar"/>
<classpathentry kind="var" path="M2_REPO/jp/sf/pal/jsf4portlet/0.1/jsf4portlet-0.1.jar" sourcepath="M2_REPO/jp/sf/pal/jsf4portlet/0.1/jsf4portlet-0.1-sources.jar"/>
@@ -34,5 +35,4 @@
<classpathentry kind="var" path="M2_REPO/xerces/xmlParserAPIs/2.6.2/xmlParserAPIs-2.6.2.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/geronimo/specs/geronimo-ejb_2.1_spec/1.0/geronimo-ejb_2.1_spec-1.0.jar"/>
<classpathentry kind="var" path="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0.jar" sourcepath="M2_REPO/commons-el/commons-el/1.0/commons-el-1.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.14/log4j-1.2.14.jar"/>
</classpath>
Modified: pal-admin/trunk/pom.xml
===================================================================
--- pal-admin/trunk/pom.xml 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/pom.xml 2007-07-23 02:59:52 UTC (rev 350)
@@ -143,6 +143,12 @@
</dependency>
@@@@ SERVLET DEV: END -->
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>portlet-api</groupId>
<artifactId>portlet-api</artifactId>
<version>1.0</version>
@@ -226,7 +232,7 @@
<artifactId>commons-io</artifactId>
<version>1.1</version>
</dependency>
-<!--
+ <!--
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</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-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/logic/SiteEditorLogic.java 2007-07-23 02:59:52 UTC (rev 350)
@@ -56,7 +56,6 @@
import org.apache.jetspeed.profiler.Profiler;
import org.apache.jetspeed.request.RequestContext;
import org.apache.jetspeed.security.PermissionManager;
-import org.apache.jetspeed.security.om.InternalPermission;
import org.seasar.framework.log.Logger;
public class SiteEditorLogic implements Serializable {
@@ -191,7 +190,7 @@
throws CommonException {
List<NodeInfo> treeList = new ArrayList<NodeInfo>();
treeList.add(new NodeInfo(NodeInfo.FOLDER, "/", "/", returnPath, 0,
- true, true));
+ true, true/*"/".equals(getFolderOrPagePath(path))*/));
try {
Folder rootFolder = getPageManager().getFolder("/");
@@ -301,7 +300,7 @@
if (childTreeList != null) {
treeList.add(new NodeInfo(NodeInfo.FOLDER, child
.getName(), child.getPath(), returnPath,
- depth, true, false));
+ depth, true, true));
treeList.addAll(childTreeList);
} else {
treeList.add(new NodeInfo(NodeInfo.FOLDER, child
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-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/service/SiteEditorService.java 2007-07-23 02:59:52 UTC (rev 350)
@@ -4,6 +4,8 @@
import java.util.ArrayList;
import java.util.List;
+import javax.servlet.http.HttpServletRequest;
+
import jp.sf.pal.admin.dxo.SiteEditorDxo;
import jp.sf.pal.admin.entity.NodeInfo;
import jp.sf.pal.admin.logic.SiteEditorLogic;
@@ -394,4 +396,26 @@
getSiteEditorLogic().removeConstraintRef(page.getPath(),
page.getApplyOrder().intValue());
}
+
+ public String getReturnPathURL(String returnPath) {
+ //"${req.scheme}://${req.serverName}:${req.serverPort}${req.contextPath}/
+ HttpServletRequest request = getSiteEditorLogic().getRequestContext()
+ .getRequest();
+ StringBuffer buf = new StringBuffer();
+ buf.append(request.getScheme()).append("://").append(
+ request.getServerName()).append(":").append(
+ request.getServerPort()).append(request.getContextPath());
+
+ if (!buf.toString().endsWith("/")) {
+ buf.append("/");
+ }
+
+ if (returnPath != null && returnPath.startsWith("/")) {
+ buf.append(returnPath.substring(1));
+ } else {
+ buf.append(returnPath);
+ }
+
+ return buf.toString();
+ }
}
Modified: pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java
===================================================================
--- pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2007-07-23 02:59:52 UTC (rev 350)
@@ -19,11 +19,11 @@
import javax.faces.context.FacesContext;
-import org.seasar.teeda.extension.util.LabelHelper;
-
import jp.sf.pal.admin.entity.NodeInfo;
import jp.sf.pal.admin.service.SiteEditorService;
+import org.seasar.teeda.extension.util.LabelHelper;
+
public abstract class AbstractSiteEditorPage {
private List<NodeInfo> nodeItems;
@@ -163,6 +163,9 @@
NodeInfo entity = getNodeItems().get(getNodeIndex());
buf.append(entity.getDepth() * 10);
buf.append("px;");
+ if (entity.isSelected()) {
+ buf.append("background-color:yellow;");
+ }
return buf.toString();
}
@@ -224,4 +227,12 @@
NodeInfo entity = getNodeItems().get(getNodeIndex());
return entity.getType() == NodeInfo.PORTLET;
}
+
+ public String getReturnPathLinkHref() {
+ return getSiteEditorService().getReturnPathURL(getReturnPath());
+ }
+
+ public String getCurrentPath() {
+ return path;
+ }
}
\ No newline at end of file
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-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label.properties 2007-07-23 02:59:52 UTC (rev 350)
@@ -2,6 +2,8 @@
securityTab=Security
metadataTab=Metadata
addTab=Add
+path=Path:
+finish=Finish
securityConstraintType=Definition
securityConstraintsRefType=Reference
Modified: pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties
===================================================================
--- pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/resources/jp/sf/pal/admin/web/site/label_ja.properties 2007-07-23 02:59:52 UTC (rev 350)
@@ -2,6 +2,8 @@
securityTab=\u30bb\u30ad\u30e5\u30ea\u30c6\u30a3
metadataTab=\u30e1\u30bf\u30c7\u30fc\u30bf
addTab=\u8ffd\u52a0
+path=\u30d1\u30b9:
+finish=\u5b8c\u4e86
securityConstraintType=\u5b9a\u7fa9
securityConstraintsRefType=\u53c2\u7167
Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -29,7 +29,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 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>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -29,7 +29,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 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="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>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -29,7 +29,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 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>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -41,7 +41,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;">
<a id="jumpLayoutInfoEditor-tab" href="layoutInfoEditor.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;">Information</span>
</a>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -41,7 +41,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 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="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>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -41,7 +41,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 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?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>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -41,7 +41,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 5px 0px;border-bottom:1px solid #000000;">
<a id="jumpPageInfoEditor-tab" href="pageInfoEditor.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>
Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-07-23 02:24:34 UTC (rev 349)
+++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-07-23 02:59:52 UTC (rev 350)
@@ -41,7 +41,16 @@
<!-- 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;">
+ <div style="height: 20px;margin-bottom: 5px;padding: 2px;border: 1px dotted black;">
+ <div style="float: left;">
+ <label id="pathLabel">Path:</label>
+ <span id="currentPath">/path/path</span>
+ </div>
+ <div style="float: right;width:50px;text-align: right;">
+ <a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
+ </div>
+ </div>
+ <div style="clear: both;padding: 0px 0px 3px 10px; margin:10px 0px 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;">