svnno****@sourc*****
svnno****@sourc*****
2008年 3月 11日 (火) 07:09:27 JST
Revision: 849
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=849
Author: shinsuke
Date: 2008-03-11 07:09:26 +0900 (Tue, 11 Mar 2008)
Log Message:
-----------
display a finish link if it has a return url.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java
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/folderMetadataEditor.html
pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.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/layoutPreferenceEditor.html
pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html
pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html
pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html
pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html
pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html
-------------- next part --------------
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 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/AbstractSiteEditorPage.java 2008-03-10 22:09:26 UTC (rev 849)
@@ -264,6 +264,10 @@
getReturnPath());
}
+ public boolean isReturnPathDisplay() {
+ return returnPath != null && !returnPath.equals("/");
+ }
+
public String getCurrentPath() {
return path;
}
Modified: pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/folderAddFolderAndPageEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -34,7 +34,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -34,7 +34,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/folderMetadataEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -34,7 +34,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/folderOrderEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -38,7 +38,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/folderSecurityEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -34,7 +34,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutAddPortletEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutPreferenceEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutPropertyEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/pageMetadataEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/pageSecurityEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/portletPreferenceEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2008-03-10 13:15:45 UTC (rev 848)
+++ pal-admin/trunk/src/main/webapp/view/site/portletPropertyEditor.html 2008-03-10 22:09:26 UTC (rev 849)
@@ -46,7 +46,7 @@
<label id="pathLabel">Path:</label>
<span id="currentPath">/path/path</span>
</div>
- <div style="float: right;width:50px;text-align: right;">
+ <div id="isReturnPathDisplay" style="float: right;width:50px;text-align: right;">
<a id="returnPathLink" href="" style="text-decoration: none;"><span id="finishLabel">Finish</span></a>
</div>
</div>