[pal-cvs 2407] [139] replaced text with icon.

svnno****@sourc***** svnno****@sourc*****
2007年 5月 14日 (月) 17:02:24 JST


Revision: 139
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=139
Author:   shinsuke
Date:     2007-05-14 17:02:24 +0900 (Mon, 14 May 2007)

Log Message:
-----------
replaced text with icon.

Modified Paths:
--------------
    wiki/trunk/src/main/java/jp/sf/pal/wiki/util/WikiUtil.java
    wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java
    wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java
    wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayContentPage.java
    wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayListPage.java
    wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java
    wiki/trunk/src/main/webapp/view/viewer/createNewContent.html
    wiki/trunk/src/main/webapp/view/viewer/createNewName.html
    wiki/trunk/src/main/webapp/view/viewer/displayContent.html
    wiki/trunk/src/main/webapp/view/viewer/displayList.html
    wiki/trunk/src/main/webapp/view/viewer/editContent.html

Added Paths:
-----------
    wiki/trunk/NOTICE.txt
    wiki/trunk/src/main/webapp/images/
    wiki/trunk/src/main/webapp/images/icons/
    wiki/trunk/src/main/webapp/images/icons/arrow_turn_left.png
    wiki/trunk/src/main/webapp/images/icons/folder_page.png
    wiki/trunk/src/main/webapp/images/icons/page.png
    wiki/trunk/src/main/webapp/images/icons/page_add.png
    wiki/trunk/src/main/webapp/images/icons/page_edit.png


-------------- next part --------------
Added: wiki/trunk/NOTICE.txt
===================================================================
--- wiki/trunk/NOTICE.txt	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/NOTICE.txt	2007-05-14 08:02:24 UTC (rev 139)
@@ -0,0 +1,13 @@
+Web Content Management Portlet
+Copyright 2005-2007 Portal Application Laboratory Project
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+This software contains codes and resources derived from:
+
+ Silk icon set 1.3
+ Mark James
+ http://www.famfamfam.com/lab/icons/silk/
+ Creative Commons Attribution 2.5 License
+


Property changes on: wiki/trunk/NOTICE.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Modified: wiki/trunk/src/main/java/jp/sf/pal/wiki/util/WikiUtil.java
===================================================================
--- wiki/trunk/src/main/java/jp/sf/pal/wiki/util/WikiUtil.java	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/java/jp/sf/pal/wiki/util/WikiUtil.java	2007-05-14 08:02:24 UTC (rev 139)
@@ -68,4 +68,33 @@
         }
         return "UTF-8";
     }
+
+    public static String getRequestContextPath() {
+        FacesContext context = FacesContext.getCurrentInstance();
+        if (context == null) {
+            throw new IllegalStateException(
+                    "Could not find FacesContext instance.");
+        }
+        return context.getExternalContext().getRequestContextPath();
+    }
+
+    public static String getCreateNewPageIconPath() {
+        return getRequestContextPath() + "/images/icons/page_add.png";
+    }
+
+    public static String getEditPageIconPath() {
+        return getRequestContextPath() + "/images/icons/page_edit.png";
+    }
+
+    public static String getDisplayListPageIconPath() {
+        return getRequestContextPath() + "/images/icons/folder_page.png";
+    }
+
+    public static String getDisplayContentPageIconPath() {
+        return getRequestContextPath() + "/images/icons/page.png";
+    }
+
+    public static String getBackToPageIconPath() {
+        return getRequestContextPath() + "/images/icons/arrow_turn_left.png";
+    }
 }

Modified: wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java
===================================================================
--- wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewContentPage.java	2007-05-14 08:02:24 UTC (rev 139)
@@ -20,6 +20,7 @@
 
 import jp.sf.pal.wiki.WikiConstants;
 import jp.sf.pal.wiki.service.WikiContentService;
+import jp.sf.pal.wiki.util.WikiUtil;
 
 import org.seasar.framework.container.S2Container;
 
@@ -136,4 +137,7 @@
         this.pageName = pageName;
     }
 
+    public String getDisplayContentPageIconSrc() {
+        return WikiUtil.getBackToPageIconPath();
+    }
 }

Modified: wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java
===================================================================
--- wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/CreateNewNamePage.java	2007-05-14 08:02:24 UTC (rev 139)
@@ -17,6 +17,7 @@
 
 import jp.sf.pal.wiki.WikiConstants;
 import jp.sf.pal.wiki.service.WikiContentService;
+import jp.sf.pal.wiki.util.WikiUtil;
 
 import org.seasar.framework.container.S2Container;
 
@@ -99,4 +100,7 @@
         this.container = container;
     }
 
+    public String getDisplayContentPageIconSrc() {
+        return WikiUtil.getBackToPageIconPath();
+    }
 }

Modified: wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayContentPage.java
===================================================================
--- wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayContentPage.java	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayContentPage.java	2007-05-14 08:02:24 UTC (rev 139)
@@ -16,6 +16,7 @@
 package jp.sf.pal.wiki.web.viewer;
 
 import jp.sf.pal.wiki.service.WikiContentService;
+import jp.sf.pal.wiki.util.WikiUtil;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -128,4 +129,15 @@
         this.wikiContentService = wikiContentService;
     }
 
+    public String getCreateNewPageIconSrc() {
+        return WikiUtil.getCreateNewPageIconPath();
+    }
+
+    public String getEditContentPageIconSrc() {
+        return WikiUtil.getEditPageIconPath();
+    }
+
+    public String getDisplayListPageIconSrc() {
+        return WikiUtil.getDisplayListPageIconPath();
+    }
 }

Modified: wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayListPage.java
===================================================================
--- wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayListPage.java	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/DisplayListPage.java	2007-05-14 08:02:24 UTC (rev 139)
@@ -18,6 +18,7 @@
 import java.util.List;
 
 import jp.sf.pal.wiki.service.WikiContentService;
+import jp.sf.pal.wiki.util.WikiUtil;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -100,4 +101,12 @@
     public void setPageName(String title) {
         this.pageName = title;
     }
+
+    public String getCreateNewPageIconSrc() {
+        return WikiUtil.getCreateNewPageIconPath();
+    }
+
+    public String getDisplayContentPageIconSrc() {
+        return WikiUtil.getDisplayContentPageIconPath();
+    }
 }

Modified: wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java
===================================================================
--- wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/java/jp/sf/pal/wiki/web/viewer/EditContentPage.java	2007-05-14 08:02:24 UTC (rev 139)
@@ -20,6 +20,7 @@
 
 import jp.sf.pal.wiki.WikiConstants;
 import jp.sf.pal.wiki.service.WikiContentService;
+import jp.sf.pal.wiki.util.WikiUtil;
 
 import org.seasar.framework.container.S2Container;
 
@@ -141,4 +142,7 @@
         this.container = container;
     }
 
+    public String getDisplayContentPageIconSrc() {
+        return WikiUtil.getBackToPageIconPath();
+    }
 }

Added: wiki/trunk/src/main/webapp/images/icons/arrow_turn_left.png
===================================================================
(Binary files differ)


Property changes on: wiki/trunk/src/main/webapp/images/icons/arrow_turn_left.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: wiki/trunk/src/main/webapp/images/icons/folder_page.png
===================================================================
(Binary files differ)


Property changes on: wiki/trunk/src/main/webapp/images/icons/folder_page.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: wiki/trunk/src/main/webapp/images/icons/page.png
===================================================================
(Binary files differ)


Property changes on: wiki/trunk/src/main/webapp/images/icons/page.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: wiki/trunk/src/main/webapp/images/icons/page_add.png
===================================================================
(Binary files differ)


Property changes on: wiki/trunk/src/main/webapp/images/icons/page_add.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Added: wiki/trunk/src/main/webapp/images/icons/page_edit.png
===================================================================
(Binary files differ)


Property changes on: wiki/trunk/src/main/webapp/images/icons/page_edit.png
___________________________________________________________________
Name: svn:mime-type
   + image/png

Modified: wiki/trunk/src/main/webapp/view/viewer/createNewContent.html
===================================================================
--- wiki/trunk/src/main/webapp/view/viewer/createNewContent.html	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/webapp/view/viewer/createNewContent.html	2007-05-14 08:02:24 UTC (rev 139)
@@ -10,8 +10,8 @@
       <div>
         <table>
           <tr>
-            <td>
-              <a id="goDisplayContent" href="displayContent.html">Back</a>
+            <td style="text-align:center;font-size:9px;">
+              <a id="goDisplayContentPage" href="displayContent.html" style="font-size:9px;text-decoration:none;"><img id="displayContentPageIcon" src="none.png" alt="Back" border="0"/><br/>Back</a>
             </td>
           </tr>
         </table>

Modified: wiki/trunk/src/main/webapp/view/viewer/createNewName.html
===================================================================
--- wiki/trunk/src/main/webapp/view/viewer/createNewName.html	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/webapp/view/viewer/createNewName.html	2007-05-14 08:02:24 UTC (rev 139)
@@ -10,8 +10,8 @@
       <div>
         <table>
           <tr>
-            <td>
-              <a id="goDisplayContent" href="displayContent.html">Back</a>
+            <td style="text-align:center;font-size:9px;">
+              <a id="goDisplayContentPage" href="displayContent.html" style="font-size:9px;text-decoration:none;"><img id="displayContentPageIcon" src="none.png" alt="Back" border="0"/><br/>Back</a>
             </td>
           </tr>
         </table>

Modified: wiki/trunk/src/main/webapp/view/viewer/displayContent.html
===================================================================
--- wiki/trunk/src/main/webapp/view/viewer/displayContent.html	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/webapp/view/viewer/displayContent.html	2007-05-14 08:02:24 UTC (rev 139)
@@ -10,14 +10,14 @@
       <div>
         <table summary="menu">
           <tr>
-            <td>
-              <a id="goCreateNewName" href="createNewName.html">New</a>
+            <td style="text-align:center;">
+              <a id="goCreateNewPage" href="createNewName.html" style="font-size:9px;text-decoration:none;"><img id="createNewPageIcon" src="none.png" alt="New" border="0"/><br/>New</a>
             </td>
-            <td>
-              <a id="goEditContent" href="editContent.html">Edit</a>
+            <td style="text-align:center;">
+              <a id="goEditContentPage" href="editContent.html" style="font-size:9px;text-decoration:none;"><img id="editContentPageIcon" src="none.png" alt="Edit" border="0"/><br/>Edit</a>
             </td>
-            <td>
-              <a id="goDisplayList" href="displayList.html">List</a>
+            <td style="text-align:center;">
+              <a id="goDisplayListPage" href="displayList.html" style="font-size:9px;text-decoration:none;"><img id="displayListPageIcon" src="none.png" alt="List" border="0"/><br/>List</a>
             </td>
           </tr>
         </table>

Modified: wiki/trunk/src/main/webapp/view/viewer/displayList.html
===================================================================
--- wiki/trunk/src/main/webapp/view/viewer/displayList.html	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/webapp/view/viewer/displayList.html	2007-05-14 08:02:24 UTC (rev 139)
@@ -8,13 +8,13 @@
   <body>
     <form id="displayListForm">
       <div>
-        <table summary="menu">
+        <table summary="menu" style="padding:0px 2px;">
           <tr>
-            <td>
-              <a id="goCreateNewPage" href="createNewName.html">New</a>
+            <td style="text-align:center;">
+              <a id="goCreateNewPage" href="createNewName.html" style="font-size:9px;text-decoration:none;"><img id="createNewPageIcon" src="none.png" alt="New" border="0"/><br/>New</a>
             </td>
-            <td>
-              <a id="goDisplayContentPage" href="displayContent.html">Content</a>
+            <td style="text-align:center;font-size:9px;">
+              <a id="goDisplayContentPage" href="displayContent.html" style="font-size:9px;text-decoration:none;"><img id="displayContentPageIcon" src="none.png" alt="Content" border="0"/><br/>Content</a>
             </td>
           </tr>
         </table>

Modified: wiki/trunk/src/main/webapp/view/viewer/editContent.html
===================================================================
--- wiki/trunk/src/main/webapp/view/viewer/editContent.html	2007-05-14 06:07:56 UTC (rev 138)
+++ wiki/trunk/src/main/webapp/view/viewer/editContent.html	2007-05-14 08:02:24 UTC (rev 139)
@@ -10,8 +10,8 @@
       <div>
         <table>
           <tr>
-            <td>
-              <a id="goDisplayContent" href="displayContent.html">Back</a>
+            <td style="text-align:center;font-size:9px;">
+              <a id="goDisplayContentPage" href="displayContent.html" style="font-size:9px;text-decoration:none;"><img id="displayContentPageIcon" src="none.png" alt="Back" border="0"/><br/>Back</a>
             </td>
           </tr>
         </table>


pal-cvs メーリングリストの案内