svnno****@sourc*****
svnno****@sourc*****
2008年 12月 1日 (月) 17:47:01 JST
Revision: 1488
http://svn.sourceforge.jp/view?root=pal&view=rev&rev=1488
Author: shinsuke
Date: 2008-12-01 17:47:01 +0900 (Mon, 01 Dec 2008)
Log Message:
-----------
updated ui.
Modified Paths:
--------------
bookmark/trunk/src/main/resources/application.properties
bookmark/trunk/src/main/resources/application_ja.properties
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/error.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/error.jsp
bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp
-------------- next part --------------
Modified: bookmark/trunk/src/main/resources/application.properties
===================================================================
--- bookmark/trunk/src/main/resources/application.properties 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/resources/application.properties 2008-12-01 08:47:01 UTC (rev 1488)
@@ -93,3 +93,5 @@
labels.sortOrder=Sort Order
labels.url=URL
+labels.tab_link=Link
+labels.tab_category=Category
Modified: bookmark/trunk/src/main/resources/application_ja.properties
===================================================================
--- bookmark/trunk/src/main/resources/application_ja.properties 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/resources/application_ja.properties 2008-12-01 08:47:01 UTC (rev 1488)
@@ -86,3 +86,6 @@
labels.categoryId=\u30ab\u30c6\u30b4\u30ea ID
labels.sortOrder=\u9806\u756a
labels.url=URL
+
+labels.tab_link=\u30ea\u30f3\u30af
+labels.tab_category=\u30ab\u30c6\u30b4\u30ea
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/category/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,12 +21,23 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/admin/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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/link/"><bean:message key="labels.link_list"/></s:link>
<table>
<thead>
<tr>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/confirm.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,9 +21,22 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,9 +21,22 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/error.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/error.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/admin/link/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,13 +21,24 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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_link"/></s:link>
-|
-<s:link href="/admin/category/"><bean:message key="labels.category_list"/></s:link>
</div>
<table border="1">
<thead>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/category/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,12 +21,23 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selectable"><s:link href="/user/link/" style="text-decoration: none;"><bean:message key="labels.tab_link"/></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/link/"><bean:message key="labels.link_list"/></s:link>
<table>
<thead>
<tr>
Modified: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/confirm.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/edit.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/error.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/error.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/error.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -20,6 +20,19 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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: bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp
===================================================================
--- bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2008-12-01 08:10:57 UTC (rev 1487)
+++ bookmark/trunk/src/main/webapp/WEB-INF/view/user/link/index.jsp 2008-12-01 08:47:01 UTC (rev 1488)
@@ -21,8 +21,21 @@
// -->
</script>
<div class="bookmark-portlet" style="padding:3px;">
+<!-- tab: BEGIN -->
+<div class="tab-nav">
+ <ul>
+ <li class="first"></li>
+ <li class="selected"><span><bean:message key="labels.tab_link"/></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_link"/></s:link>
-|
-<s:link href="/user/category/"><bean:message key="labels.category_list"/></s:link>
</div>
<table border="1">
<thead>