[pal-cvs 3441] [1175] fixed nexgen decorator

svnno****@sourc***** svnno****@sourc*****
2008年 9月 24日 (水) 17:41:09 JST


Revision: 1175
          http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1175
Author:   sone
Date:     2008-09-24 17:41:09 +0900 (Wed, 24 Sep 2008)

Log Message:
-----------
fixed nexgen decorator

Modified Paths:
--------------
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/decorator-macros.vm
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm

Added Paths:
-----------
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages.properties
    pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages_ja.properties


-------------- next part --------------
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/decorator-macros.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/decorator-macros.vm	2008-09-24 06:10:09 UTC (rev 1174)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/decorator-macros.vm	2008-09-24 08:41:09 UTC (rev 1175)
@@ -1,4 +1,10 @@
 #* define navigation constants *#
+#macro (initMessageResourceBundles)
+  #set($resourceBundleFactory = $request.getAttribute("org.apache.jetspeed.portlets.layout.util.ResourceBundleFactory"))
+  #set($resourcePath = $layoutDecoration.getResource("resources"))
+  #set($msgs= $resourceBundleFactory.getResourceBundle($JS2RequestContext,$resourcePath,"messages",$JS2RequestContext.locale))
+#end
+
 #macro (defineNavigationConstants)
   #set($LEFT_TO_RIGHT = "LeftToRight")
   #set($RIGHT_TO_LEFT = "RightToLeft")

Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm	2008-09-24 06:10:09 UTC (rev 1174)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/header.vm	2008-09-24 08:41:09 UTC (rev 1175)
@@ -23,6 +23,7 @@
 ## Username 
 #set($username = $JS2RequestContext.request.remoteUser)
 #set($servletName = $JS2RequestContext.request.servletPath)##
+#initMessageResourceBundles()##
 <html>
   <head>
     #includeHeaderResource()
@@ -50,13 +51,16 @@
         <div class="info">
 #if($username)
           <div class="action">
-            <a href="#BaseHref()portal/my-account.psml">$messages.getString("portal.loginform.change_password")</a>
-            <a href="#BaseHref()login/logout">$messages.getString("portal.loginform.logout")</a>
+            <a href="#BaseHref()portal/my-account.psml">$msgs.getString("header.body.info.change.password")</a>
+            <a href="#BaseHref()login/logout">$msgs.getString("header.body.info.logout")</a>
           </div>
-          <div>$messages.getString("portal.loginform.username") $username</div>
+          <div>$msgs.getString("header.body.info.username") $username</div>
+  #if($servletName == "/configure")
+          <div class="hello">$msgs.getString("header.body.info.config.mode") <a href="#BaseHref()">$msgs.getString("header.body.info.finish.config.mode")</a></div>
+  #end
 #else
           <div class="action">
-            <a href="#BaseHref()login/proxy?org.apache.jetspeed.login.username=&org.apache.jetspeed.login.password=">$messages.getString("portal.loginform.login")</a>
+            <a href="#BaseHref()login/proxy?org.apache.jetspeed.login.username=&org.apache.jetspeed.login.password=">$msgs.getString("header.body.info.login")</a>
           </div>
 #end
         </div>

Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages.properties
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages.properties	                        (rev 0)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages.properties	2008-09-24 08:41:09 UTC (rev 1175)
@@ -0,0 +1,11 @@
+header.topbar.folder.folder=Folder
+header.topbar.folder.add.folder=Add Folder
+header.body.info.change.password=Change Password
+header.body.info.logout=Logout
+header.body.info.username=Username: 
+header.body.info.login=Login
+header.bottombar.add.page=Add Page
+header.bottombar.add.content=Add Content
+header.bottombar.edit.page=Edit Page
+header.body.info.config.mode=Configuration Mode:
+header.body.info.finish.config.mode=Finish

Added: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages_ja.properties
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages_ja.properties	                        (rev 0)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/layout/nextgen/resources/messages_ja.properties	2008-09-24 08:41:09 UTC (rev 1175)
@@ -0,0 +1,12 @@
+header.topbar.folder.folder=\u30d5\u30a9\u30eb\u30c0
+header.topbar.folder.add.folder=\u30d5\u30a9\u30eb\u30c0\u3092\u8ffd\u52a0
+header.body.info.change.password=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5909\u66f4
+header.body.info.logout=\u30ed\u30b0\u30a2\u30a6\u30c8
+header.body.info.username=\u30e6\u30fc\u30b6\u30fc\u540d: 
+header.body.info.login=\u30ed\u30b0\u30a4\u30f3
+header.bottombar.add.page=\u30da\u30fc\u30b8\u3092\u8ffd\u52a0
+header.bottombar.add.content=\u30b3\u30f3\u30c6\u30f3\u30c4\u3092\u8ffd\u52a0
+header.bottombar.edit.page=\u30da\u30fc\u30b8\u3092\u7de8\u96c6
+header.body.info.config.mode=\u8a2d\u5b9a\u30e2\u30fc\u30c9:
+header.body.info.finish.config.mode=\u7d42\u4e86
+


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