svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 18:18:23 JST
Revision: 1489
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1489
Author: shinsuke
Date: 2008-12-01 18:18:22 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
updated ui and fixed permission problem.
Modified Paths:
--------------
notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java
notepad/trunk/src/main/resources/application.properties
notepad/trunk/src/main/resources/application_ja.properties
notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/edit.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/error.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/index.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/error.jsp
notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp
-------------- next part --------------
Modified: notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java
===================================================================
--- notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/java/jp/sf/pal/notepad/action/user/NotepadAction.java 2008-12-01 09:18:22 UTC (rev 1489)
@@ -306,6 +306,7 @@
String type = notepadForm.type;
if (type != null) {
if (NotepadConstants.PRIVATE_CATEGORY.equals(type)
+ || NotepadConstants.PUBLIC_CATEGORY.equals(type)
|| NotepadConstants.DEFAULT_CATEGORY.equals(type)) {
String userId = request.getRemoteUser();
if (userId != null && userId.equals(notepadForm.createdBy)) {
@@ -318,6 +319,10 @@
return false;
}
+ public String getUserId() {
+ return request.getRemoteUser();
+ }
+
/**
* @return the request
*/
Modified: notepad/trunk/src/main/resources/application.properties
===================================================================
--- notepad/trunk/src/main/resources/application.properties 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/resources/application.properties 2008-12-01 09:18:22 UTC (rev 1489)
@@ -104,3 +104,6 @@
labels.sortOrder=Sort Order
labels.title=Title
+labels.tab_notepad=Notepad
+labels.tab_category=Category
+
Modified: notepad/trunk/src/main/resources/application_ja.properties
===================================================================
--- notepad/trunk/src/main/resources/application_ja.properties 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/resources/application_ja.properties 2008-12-01 09:18:22 UTC (rev 1489)
@@ -97,3 +97,6 @@
labels.content=\u5185\u5bb9
labels.sortOrder=\u9806\u756a
labels.title=\u30bf\u30a4\u30c8\u30eb
+
+labels.tab_notepad=\u30e1\u30e2
+labels.tab_category=\u30ab\u30c6\u30b4\u30ea
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="form-table">
+<div class="form-table" style="margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="form-table">
+<div class="form-table" style="margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,12 +21,23 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="list-table">
+<div class="list-table" style="margin-top: 3px;">
<s:link href="createpage"><bean:message key="labels.create_category"/></s:link>
-|
-<s:link href="/admin/notepad/"><bean:message key="labels.link_list"/></s:link>
<table>
<thead>
<tr>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/confirm.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,9 +21,22 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="list-table">
+<div class="list-table" style="margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/edit.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/edit.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,9 +21,22 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="list-table">
+<div class="list-table" style="margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/error.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/error.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/index.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/admin/notepad/index.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,13 +21,24 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/admin/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="list-table">
+<div class="list-table" style="margin-top: 3px;">
<div>
<s:link href="createpage"><bean:message key="labels.create_notepad"/></s:link>
-|
-<s:link href="/admin/category/"><bean:message key="labels.category_list"/></s:link>
</div>
<table border="1">
<thead>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="form-table">
+<div class="form-table" style="margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="form-table">
+<div class="form-table" style="margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,12 +21,23 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/notepad/" style="text-decoration: none;"><bean:message key="labels.tab_notepad"/></s:link></li>
+ <li class="spacer"></li>
+ <li class="selected"><span><bean:message key="labels.tab_category"/></span></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div class="list-table">
+<div class="list-table" style="margin-top: 3px;">
<s:link href="createpage"><bean:message key="labels.create_category"/></s:link>
-|
-<s:link href="/user/notepad/"><bean:message key="labels.link_list"/></s:link>
<table>
<thead>
<tr>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/confirm.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="form-table">
+<div style="float: left; width: 150px;margin-top: 3px;" class="form-table">
<table style="width: 145px;">
<tbody>
<tr>
@@ -46,7 +59,7 @@
</table>
</div>
-<div style="float: left;margin-left:10px;">
+<div style="float: left;margin-left:10px;margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/edit.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="form-table">
+<div style="float: left; width: 150px;margin-top: 3px;" class="form-table">
<table style="width: 145px;">
<tbody>
<tr>
@@ -46,7 +59,7 @@
</table>
</div>
-<div style="float: left;margin-left:10px;">
+<div style="float: left;margin-left:10px;margin-top: 3px;">
<s:form>
<html:hidden property="id"/>
<html:hidden property="mode"/>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/error.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/error.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<html:errors/>
<br>
<s:link href="index"><bean:message key="labels.back"/></s:link>
Modified: notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp
===================================================================
--- notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
+++ notepad/trunk/src/main/webapp/WEB-INF/view/user/notepad/index.jsp 2008-12-01 09:18:22 UTC (rev 1489)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="notepad-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_notepad"/></span></li>
+ <li class="spacer"></li>
+ <li class="selectable"><s:link href="/user/category/" style="text-decoration: none;"><bean:message key="labels.tab_category"/></s:link></li>
+ <li class="last-spacer"></li>
+ <li class="last"></li>
+ </ul>
+</div>
+<!-- tab: END -->
+
<div><html:messages id="msg" message="true"><bean:write name="msg" ignore="true"/></html:messages><html:errors/></div>
-<div style="float: left; width: 150px;" class="form-table">
+<div style="float: left; width: 150px;margin-top:3px;" class="form-table">
<table style="width: 145px;">
<tbody>
<tr>
@@ -46,11 +59,9 @@
</table>
</div>
-<div style="float: left;margin-left:10px;" class="list-table">
+<div style="float: left;margin-left:10px;margin-top: 3px;" class="list-table">
<div>
<s:link href="createpage"><bean:message key="labels.create_notepad"/></s:link>
-|
-<s:link href="/user/category/"><bean:message key="labels.category_list"/></s:link>
</div>
<table border="1">
<thead>
@@ -67,7 +78,7 @@
<td><s:link href="confirmpage/4/${f:u(l.id)}">${f:h(l.title)}</s:link></td>
<td style="text-align: center;"><bean:message key="display.name" arg0="${f:h(l.userInfoByCreatedBy.nameArg0)}" arg1="${f:h(l.userInfoByCreatedBy.nameArg1)}" arg2="${f:h(l.userInfoByCreatedBy.nameArg2)}"/></td>
<td>
- <c:if test="${l.notepadCategory.type=='R'||l.notepadCategory.type=='S'||l.notepadCategory.type=='D'}">
+ <c:if test="${l.notepadCategory.type=='R'||l.notepadCategory.type=='S'||l.notepadCategory.type=='D'||l.createdBy==userId}">
<table border="0" cellpadding="0" cellspacing="0" style="border: 0;">
<tr>
<td style="width:50px;text-align: center;border: 0;">
@@ -85,14 +96,14 @@
</tr>
</table>
</c:if>
- <c:if test="${l.notepadCategory.type!='R'&&l.notepadCategory.type!='S'&&l.notepadCategory.type!='D'}"> </c:if>
+ <c:if test="${l.notepadCategory.type!='R'&&l.notepadCategory.type!='S'&&l.notepadCategory.type!='D'&&l.createdBy!=userId}"> </c:if>
</td>
<td align="center">
- <c:if test="${l.notepadCategory.type=='R'||l.notepadCategory.type=='S'||l.notepadCategory.type=='D'}">
+ <c:if test="${l.notepadCategory.type=='R'||l.notepadCategory.type=='S'||l.notepadCategory.type=='D'||l.createdBy==userId}">
<s:link href="editpage/2/${f:u(l.id)}"><bean:message key="labels.edit"/></s:link>
<s:link href="deletepage/3/${f:u(l.id)}"><bean:message key="labels.delete"/></s:link>
</c:if>
- <c:if test="${l.notepadCategory.type!='R'&&l.notepadCategory.type!='S'&&l.notepadCategory.type!='D'}"> </c:if>
+ <c:if test="${l.notepadCategory.type!='R'&&l.notepadCategory.type!='S'&&l.notepadCategory.type!='D'&&l.createdBy!=userId}"> </c:if>
</td>
</tr>
</c:forEach>