Author: woonsan
Date: Tue Nov 24 13:29:26 2009
New Revision: 883686
URL: http://svn.apache.org/viewvc?rev=883686&view=rev
Log:
JS2-1086: Not to display preview action icon in the portlet window ui.
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorations_portlet_init.jsp
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm?rev=883686&r1=883685&r2=883686&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetspeed_macros.vm
Tue Nov 24 13:29:26 2009
@@ -152,11 +152,13 @@
#macro(PortletActionBar $_decoration)
#set($_actions = $_decoration.actions)
- <div class="PActionBar">
+ <div class="PActionBar">
#foreach ($_action in $_actions)
- <a href="${_action.Action}" title="${_action.Name}" class="action
portlet-action" #if($_action.target)target="$_action.target"#end><img
src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0"
/></a>
+ #if (${_action.ActionName} != "preview")
+ <a href="${_action.Action}" title="${_action.Name}" class="action
portlet-action" #if($_action.target)target="$_action.target"#end><img
src="$request.contextPath/${_action.link}" alt="${_action.Alt}" border="0"
/></a>
+ #end
#end
- </div>
+ </div>
#end
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp?rev=883686&r1=883685&r2=883686&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/WEB-INF/jetui/yui/jetui-portlet.jsp
Tue Nov 24 13:29:26 2009
@@ -50,6 +50,9 @@
{
for(DecoratorAction action :
(List<DecoratorAction>)fragment.getDecoration().getActions())
{
+ if ("preview".equals(action.getActionName()))
+ continue;
+
String target = "target='"+
action.getTarget() + "'";
if (action.getTarget() == null)
target = "";
Modified:
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorations_portlet_init.jsp
URL:
http://svn.apache.org/viewvc/portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorations_portlet_init.jsp?rev=883686&r1=883685&r2=883686&view=diff
==============================================================================
---
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorations_portlet_init.jsp
(original)
+++
portals/jetspeed-2/portal/trunk/applications/jetspeed/src/main/webapp/decorations/portlet/decorations_portlet_init.jsp
Tue Nov 24 13:29:26 2009
@@ -54,12 +54,14 @@
<div class="PActionBar"> <!-- B: div
portal-page-actions -->
<c:forEach var="_action" items="${actions}">
- <a href="<c:out value='${_action.action}'/>"
- title="<c:out value='${_action.name}'/>"
- class="action portlet-action"
- <c:if test="${_action.target}"> target="<c:out
value='${_action.target}'/>"</c:if>>
- <img src="<c:out
value='${requestScope.cPath}/${_action.link}'/>" alt="<c:out
value='${_action.alt}'/>" border="0" />
- </a>
+ <c:if test="${_action.actionName != 'preview'}">
+ <a href="<c:out value='${_action.action}'/>"
+ title="<c:out value='${_action.name}'/>"
+ class="action portlet-action"
+ <c:if test="${_action.target}"> target="<c:out
value='${_action.target}'/>"</c:if>>
+ <img src="<c:out
value='${requestScope.cPath}/${_action.link}'/>" alt="<c:out
value='${_action.alt}'/>" border="0" />
+ </a>
+ </c:if>
</c:forEach>
</div> <!-- E: div portal-page-actions -->
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
