svnno****@sourc*****
svnno****@sourc*****
2008年 9月 5日 (金) 11:04:20 JST
Revision: 1124 http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1124 Author: shinsuke Date: 2008-09-05 11:04:20 +0900 (Fri, 05 Sep 2008) Log Message: ----------- put timestamp. removed unused code. Modified Paths: -------------- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/jetspeed_macros.vm -------------- next part -------------- Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/jetspeed_macros.vm =================================================================== --- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/jetspeed_macros.vm 2008-09-05 02:02:16 UTC (rev 1123) +++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/jetspeed_macros.vm 2008-09-05 02:04:20 UTC (rev 1124) @@ -26,16 +26,9 @@ #set($layoutDecoration = $theme.getDecoration($rootFragment)) #end -#* Adds javascript for PortletSelector on HTML *# +#* Adds javascript *# #macro (includeJavaScriptForHead) - <script type="text/javascript"><!-- - function openWindow(pipeline) - { - var vWinUsers = window.open(pipeline, 'PortletSelector', 'status=no,resizable=yes,width=500,height=600,scrollbars=yes'); - vWinUsers.opener = self; - vWinUsers.focus(); - } - //--></script> +## #end #* @@ -75,7 +68,6 @@ *# #macro (IncludeStylesheets) #foreach($style in $theme.styleSheets) - <link rel="stylesheet" type="text/css" media="screen, projection" href="$request.contextPath/$style" /> #end #end @@ -148,7 +140,7 @@ #set($_actions = $_decoration.actions) <div class="PActionBar"> #foreach ($_action in $_actions) - <a href="${_action.Action}#${f.id}" title="${_action.Name}" class="action portlet-action ${_action.actionName}" #if($_action.target)target="$_action.target"#end><img src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0" /></a> + <a href="${_action.Action}?t=${jetspeed.timestamp}#${f.id}" title="${_action.Name}" class="action portlet-action ${_action.actionName}" #if($_action.target)target="$_action.target"#end><img src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0" /></a> #end #if($portalMode == "standard") <a href="${f.id}" class="action portlet-action close"><img src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0" /></a>