svnno****@sourc*****
svnno****@sourc*****
2008年 8月 5日 (火) 11:58:24 JST
Revision: 1077
http://svn.sourceforge.jp/cgi-bin/viewcvs.cgi?root=pal&view=rev&rev=1077
Author: shinsuke
Date: 2008-08-05 11:58:24 +0900 (Tue, 05 Aug 2008)
Log Message:
-----------
keep a position when clicking edit button
Modified Paths:
--------------
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/decorations/portlet/decorator.vm
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/decorator.vm
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/metal/decorator.vm
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/minty-blue/decorator.vm
pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/nextgen/decorator.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-08-05 02:42:27 UTC (rev 1076)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/WEB-INF/jetspeed_macros.vm 2008-08-05 02:58:24 UTC (rev 1077)
@@ -142,7 +142,7 @@
#set($_actions = $_decoration.actions)
<div class="PActionBar">
#foreach ($_action in $_actions)
- <a href="${_action.Action}" 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}#${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>
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/decorator.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/decorator.vm 2008-08-05 02:42:27 UTC (rev 1076)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/decorator.vm 2008-08-05 02:58:24 UTC (rev 1077)
@@ -26,7 +26,7 @@
#set($actions = $decoration.actions)
<!-- Begin: Fragment: ${f.id} Decoration: ${decoration.Name} -->
-
+<a name="${f.id}"/>
<div id="${f.id}" class="portlet ${decoration.baseCSSClass}">
#set($solo = $jetspeed.MappedWindowState.toString()=="solo")
#set($hidePortlet = $renderRequest.getAttribute("js_${jetspeed.CurrentFragment.Id}_HideDecorator"))
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/decorator.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/decorator.vm 2008-08-05 02:42:27 UTC (rev 1076)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/default/decorator.vm 2008-08-05 02:58:24 UTC (rev 1077)
@@ -19,6 +19,7 @@
#set($solo = $jetspeed.MappedWindowState.toString()=="solo")
#set($hidePortlet = $renderRequest.getAttribute("js_${jetspeed.CurrentFragment.Id}_HideDecorator"))
<!-- Begin: Fragment: ${f.id} Decoration: ${decoration.Name} -->
+<a name="${f.id}"/>
<div id="${f.id}" class="portlet ${decoration.baseCSSClass}">
#if (!$solo && !$hidePortlet)
<div class="PTitle" >
@@ -29,7 +30,7 @@
#set($_actions = $decoration.actions)
<div class="PActionBar">
#foreach ($_action in $_actions)
- <a href="${_action.Action}" 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}#${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
<a onclick="closePortlet('${f.id}');return false;" href="#" class="action portlet-action close"><img src="$request.contextPath/decorations/portlet/default/images/close.gif" border="0" /></a>
</div>
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/metal/decorator.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/metal/decorator.vm 2008-08-05 02:42:27 UTC (rev 1076)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/metal/decorator.vm 2008-08-05 02:58:24 UTC (rev 1077)
@@ -1,90 +1,90 @@
-#*
+#*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-
-#set($decoration = $f.decoration)
-#set($actions = $decoration.actions)
-
-<!-- $decoration.template -->
-
-<div id="portlet-${f.id}" class="#BaseCSSClass($decoration)" >
-<table border="0" cellpadding="0" cellspacing="0" width="100%" >
-##
-## Portlet Title Bar
-##
-#set ($cspan = 2)
-
- <tr>
- <td class="PTitleLeft" style="font-size:1pt;" nowrap="true"> </td>
-
- <td align="left" valign="middle" class="PTitle" >
- $!jetspeed.getTitle($jetspeed.getPortletEntity($f), $f)
- </td>
- <td align="right" valign="middle" class="PTitle" >
- <table border="0" cellpadding="0" cellspacing="0" >
- <tr>
-
- <td align="right" valign="middle" class="PTitle" >
- #PortletActionBar($decoration)
- <td/>
-
- </tr>
- </table>
- </td>
-
- <td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
- </tr>
-
-
-##
-## Portlet Content
-##
- #if (!$jetspeed.isHidden($f) || $jetspeed.WindowState != "minimized")
- <tr>
- <td nowrap="nowrap" class="PContentLeft" > </td>
-
- <td class="PContent" colspan="2">
- $f.renderedContent
- </td>
-
- <td class="PContentRight" ><div class="PContentRight" > </div></td>
-
- </tr>
-#end
-
-
-##
-## Portlet Bottom
-##
- <tr>
- <td class="PBottomLeft" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottomRight" style="font-size:1pt;" nowrap="true"> </td>
- </tr>
-</table>
-</div>
-
-<!-- $decoration.template -->
-
-
-
-
-
-
-
-
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+
+#set($decoration = $f.decoration)
+#set($actions = $decoration.actions)
+
+<!-- $decoration.template -->
+<a name="${f.id}"/>
+<div id="portlet-${f.id}" class="#BaseCSSClass($decoration)" >
+<table border="0" cellpadding="0" cellspacing="0" width="100%" >
+##
+## Portlet Title Bar
+##
+#set ($cspan = 2)
+
+ <tr>
+ <td class="PTitleLeft" style="font-size:1pt;" nowrap="true"> </td>
+
+ <td align="left" valign="middle" class="PTitle" >
+ $!jetspeed.getTitle($jetspeed.getPortletEntity($f), $f)
+ </td>
+ <td align="right" valign="middle" class="PTitle" >
+ <table border="0" cellpadding="0" cellspacing="0" >
+ <tr>
+
+ <td align="right" valign="middle" class="PTitle" >
+ #PortletActionBar($decoration)
+ <td/>
+
+ </tr>
+ </table>
+ </td>
+
+ <td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
+ </tr>
+
+
+##
+## Portlet Content
+##
+ #if (!$jetspeed.isHidden($f) || $jetspeed.WindowState != "minimized")
+ <tr>
+ <td nowrap="nowrap" class="PContentLeft" > </td>
+
+ <td class="PContent" colspan="2">
+ $f.renderedContent
+ </td>
+
+ <td class="PContentRight" ><div class="PContentRight" > </div></td>
+
+ </tr>
+#end
+
+
+##
+## Portlet Bottom
+##
+ <tr>
+ <td class="PBottomLeft" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottomRight" style="font-size:1pt;" nowrap="true"> </td>
+ </tr>
+</table>
+</div>
+
+<!-- $decoration.template -->
+
+
+
+
+
+
+
+
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/minty-blue/decorator.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/minty-blue/decorator.vm 2008-08-05 02:42:27 UTC (rev 1076)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/minty-blue/decorator.vm 2008-08-05 02:58:24 UTC (rev 1077)
@@ -1,86 +1,86 @@
-#*
+#*
Licensed to the Apache Software Foundation (ASF) under one or more
contributor license agreements. See the NOTICE file distributed with
this work for additional information regarding copyright ownership.
The ASF licenses this file to You under the Apache License, Version 2.0
(the "License"); you may not use this file except in compliance with
-the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*#
-
-#set($decoration = $f.decoration)
-#set($actions = $decoration.actions)
-
-<!-- $decoration.template -->
-
-<div id="portlet-${myF.id}" class="portlet-MintyBlue" >
-<table border="0" cellpadding="0" cellspacing="0" width="100%" >
-##
-## Portlet Title Bar
-##
-#set ($cspan = 2)
-
- <tr>
- <td class="PTitleLeft" style="font-size:1pt;" nowrap="true"> </td>
-
- <td align="left" valign="middle" class="PTitle" >
- $!jetspeed.getTitle($jetspeed.getPortletEntity($f), $f)
- </td>
- <td align="right" valign="middle" class="PTitle" >
- <table border="0" cellpadding="0" cellspacing="0" >
- <tr>
- <td align="right" valign="middle" class="PTitle" >
- #PortletActionBar($decoration)
- <td/>
- </tr>
- </table>
- </td>
-
- <td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
- </tr>
-
-##
-## Portlet Content
-##
-#if (!$jetspeed.isHidden($f) || $jetspeed.WindowState != "minimized")
- <tr>
- <td nowrap="nowrap" class="PContentLeft" > </td>
-
- <td class="PContent" colspan="2">
- $f.renderedContent
- </td>
-
- <td class="PContentRight" ><div class="PContentRight" > </div></td>
-
- </tr>
-#end
-
-
-##
-## Portlet Bottom
-##
- <tr>
- <td class="PBottomLeft" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
- <td class="PBottomRight" style="font-size:1pt;" nowrap="true"> </td>
- </tr>
-</table>
-</div>
-
-<!-- $decoration.template -->
-
-
-
-
-
-
-
-
+the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*#
+
+#set($decoration = $f.decoration)
+#set($actions = $decoration.actions)
+
+<!-- $decoration.template -->
+<a name="${f.id}"/>
+<div id="portlet-${myF.id}" class="portlet-MintyBlue" >
+<table border="0" cellpadding="0" cellspacing="0" width="100%" >
+##
+## Portlet Title Bar
+##
+#set ($cspan = 2)
+
+ <tr>
+ <td class="PTitleLeft" style="font-size:1pt;" nowrap="true"> </td>
+
+ <td align="left" valign="middle" class="PTitle" >
+ $!jetspeed.getTitle($jetspeed.getPortletEntity($f), $f)
+ </td>
+ <td align="right" valign="middle" class="PTitle" >
+ <table border="0" cellpadding="0" cellspacing="0" >
+ <tr>
+ <td align="right" valign="middle" class="PTitle" >
+ #PortletActionBar($decoration)
+ <td/>
+ </tr>
+ </table>
+ </td>
+
+ <td class="PTitleRight" style="font-size:1pt;" nowrap="true"> </td>
+ </tr>
+
+##
+## Portlet Content
+##
+#if (!$jetspeed.isHidden($f) || $jetspeed.WindowState != "minimized")
+ <tr>
+ <td nowrap="nowrap" class="PContentLeft" > </td>
+
+ <td class="PContent" colspan="2">
+ $f.renderedContent
+ </td>
+
+ <td class="PContentRight" ><div class="PContentRight" > </div></td>
+
+ </tr>
+#end
+
+
+##
+## Portlet Bottom
+##
+ <tr>
+ <td class="PBottomLeft" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottom" style="font-size:1pt;" nowrap="true"> </td>
+ <td class="PBottomRight" style="font-size:1pt;" nowrap="true"> </td>
+ </tr>
+</table>
+</div>
+
+<!-- $decoration.template -->
+
+
+
+
+
+
+
+
Modified: pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/nextgen/decorator.vm
===================================================================
--- pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/nextgen/decorator.vm 2008-08-05 02:42:27 UTC (rev 1076)
+++ pal-portal/branches/pal-portal-1.x/portal/jetspeed-2/src/webapp/decorations/portlet/nextgen/decorator.vm 2008-08-05 02:58:24 UTC (rev 1077)
@@ -19,6 +19,7 @@
#set($solo = $jetspeed.MappedWindowState.toString()=="solo")
#set($hidePortlet = $renderRequest.getAttribute("js_${jetspeed.CurrentFragment.Id}_HideDecorator"))
<!-- Begin: Fragment: ${f.id} Decoration: ${decoration.Name} -->
+<a name="${f.id}"/>
<div id="${f.id}" class="portlet ${decoration.baseCSSClass}">
#if (!$solo && !$hidePortlet)
<div class="PTitle" >
@@ -29,7 +30,7 @@
#set($_actions = $decoration.actions)
<div class="PActionBar">
#foreach ($_action in $_actions)
- <a href="${_action.Action}" 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}#${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
<a onclick="closePortlet('${f.id}');return false;" href="#" class="action portlet-action close"><img src="$request.contextPath/decorations/portlet/nextgen/images/close.gif" border="0" /></a>
</div>