svnno****@sourc*****
svnno****@sourc*****
2007年 10月 22日 (月) 11:26:37 JST
Revision: 646
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=646
Author: shinsuke
Date: 2007-10-22 11:26:37 +0900 (Mon, 22 Oct 2007)
Log Message:
-----------
move delete button, and fixed wrong html.
Modified Paths:
--------------
pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java
pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html
pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.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
pal-admin/trunk/src/main/webapp/view/user/userConfirm.html
-------------- next part --------------
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-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/java/jp/sf/pal/admin/web/site/PageInfoEditorPage.java 2007-10-22 02:26:37 UTC (rev 646)
@@ -270,4 +270,7 @@
return getLabelHelper().getLabelValue("delete");
}
+ public String getOpenThisPageValue() {
+ return getLabelHelper().getLabelValue("jumpToThisPage");
+ }
}
Modified: pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html 2007-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/webapp/view/deployer/remoteRepositoryConfirm.html 2007-10-22 02:26:37 UTC (rev 646)
@@ -22,13 +22,13 @@
<!-- content: BEGIN -->
<div style="padding:5px 0px;">
- <div class="portlet-section-header" id="isCreate">
+ <div class="portlet-section-header" id="isCreate-header">
<label id="createRepositoryLabel">Create Repository</label>
</div>
- <div class="portlet-section-header" id="isUpdate">
+ <div class="portlet-section-header" id="isUpdate-header">
<label id="editRepositoryLabel">Edit Repository</label>
</div>
- <div class="portlet-section-header" id="isDelete">
+ <div class="portlet-section-header" id="isDelete-header">
<label id="deleteRepositoryLabel">Delete Repository</label>
</div>
@@ -40,20 +40,30 @@
<label id="remoteTabLabel">Remote</label>
</div>
+ <div id="isDelete">
<table class="tablebg">
<tr>
+ <td class="portlet-section-subheader"><label id="repositoryNameLabel-isDelete">Repository Name</label></td>
+ <td class="portlet-section-body"><span id="name-isDelete">REPOSITORY</span><input type="hidden" id="name-hidden-isDelete" /></td>
+ <td><span id="nameMessage-isDelete"></span></td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="isNotDelete">
+ <table class="tablebg">
+ <tr>
<td class="portlet-section-subheader"><label id="repositoryNameLabel">Repository Name</label></td>
<td class="portlet-section-body"><span id="name">REPOSITORY</span><input type="hidden" id="name-hidden" /></td>
<td><span id="nameMessage"></span></td>
</tr>
- <div id="isNotDelete">
<tr>
<td class="portlet-section-subheader"><label id="configPathLabel">Config Path</label></td>
<td class="portlet-section-body"><span id="configPath">PATH</span><input type="hidden" id="configPath-hidden" /></td>
<td><span id="configPathMessage"></span></td>
</tr>
- </div>
</table>
+ </div>
<div>
<div id="isComeFromList" style="display:inline;">
Modified: pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/webapp/view/site/folderInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646)
@@ -90,8 +90,6 @@
</div>
<div id="isEditable-update" style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
- </div>
- <div id="isEditable-delete" 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>
Modified: pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/webapp/view/site/layoutInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646)
@@ -90,8 +90,6 @@
</div>
<div id="isEditable-update" style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
- </div>
- <div id="isEditable-delete" 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>
Modified: pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/webapp/view/site/pageInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646)
@@ -96,9 +96,7 @@
</div>
<div id="isEditable-update" style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
- <a id="viewLink" href="" style="text-decoration: none;"><span id="jumpToThisPageLabel">Jump to this page</span></a>
- </div>
- <div id="isEditable-delete" style="margin-top: 5px;text-align: right;">
+ <input id="openThisPage" type="button" value="Jump to this page" onclick="location.href=this.nextSibling.getAttribute('href');return true;"/><a id="viewLink" href="" style="text-decoration: none;display: none;"><span id="jumpToThisPageLabel">Jump to this page</span></a>
<input id="doDelete" type="button" value="Delete" onclick="if(confirm('Do you want to delete this page?')){return true;}return false;"/>
</div>
</div>
Modified: pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/webapp/view/site/portletInfoEditor.html 2007-10-22 02:26:37 UTC (rev 646)
@@ -90,8 +90,6 @@
</div>
<div id="isEditable-update" style="margin-top: 20px;text-align: center;">
<input id="doUpdate" type="button" value="Update"/>
- </div>
- <div id="isEditable-delete" 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>
Modified: pal-admin/trunk/src/main/webapp/view/user/userConfirm.html
===================================================================
--- pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 02:25:05 UTC (rev 645)
+++ pal-admin/trunk/src/main/webapp/view/user/userConfirm.html 2007-10-22 02:26:37 UTC (rev 646)
@@ -29,13 +29,23 @@
<label id="userInformationLabel">User Information</label>
</div>
+ <div id="isDelete">
<table class="tablebg">
<tr>
+ <td class="portlet-section-subheader"><label id="userNameLabel-isDelete">User Name</label></td>
+ <td class="portlet-section-body"><span id="name-isDelete">user</span><input type="hidden" id="name-hidden-isDelete" /></td>
+ <td><span id="nameMessage-isDelete"></span></td>
+ </tr>
+ </table>
+ </div>
+
+ <div id="isNotDelete">
+ <table class="tablebg">
+ <tr>
<td class="portlet-section-subheader"><label id="userNameLabel">User Name</label></td>
<td class="portlet-section-body"><span id="name">user</span><input type="hidden" id="name-hidden" /></td>
<td><span id="nameMessage"></span></td>
</tr>
- <div id="isNotDelete">
<tr>
<td class="portlet-section-subheader"><label id="passwordLabel">Password</label></td>
<td class="portlet-section-body"><span id="password">TODO</span><input type="hidden" id="password-hidden" /></td>
@@ -51,8 +61,8 @@
<td class="portlet-section-body"><span id="roleName">ROLE</span><input type="hidden" id="roleName-hidden" /></td>
<td><span id="roleNameMessage"></span></td>
</tr>
- </div>
</table>
+ </div>
<div>
<div id="isComeFromList" style="display:inline;">