Author: mfranklin
Date: Thu Nov 1 13:47:05 2012
New Revision: 1404591
URL: http://svn.apache.org/viewvc?rev=1404591&view=rev
Log:
Removed widget parameter from rave:region_widget tag and moved context
insertion for widget into the tag
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp?rev=1404591&r1=1404590&r2=1404591&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/regionwidget.jsp
Thu Nov 1 13:47:05 2012
@@ -21,5 +21,5 @@
<%@ include file="/WEB-INF/jsp/includes/taglibs.jsp" %>
<fmt:setBundle basename="messages"/>
<%--@elvariable id="regionWidget"
type="org.apache.rave.portal.model.RegionWidget"--%>
-<rave:region_widget regionWidget="${regionWidget}" widget="${widget}"/>
+<rave:region_widget regionWidget="${regionWidget}" />
<portal:render-script location="${'AFTER_RAVE'}" />
\ No newline at end of file
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag?rev=1404591&r1=1404590&r2=1404591&view=diff
==============================================================================
--- rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag
(original)
+++ rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region.tag
Thu Nov 1 13:47:05 2012
@@ -32,7 +32,6 @@ Template for rendering a Region on a pag
<%--@elvariable id="region" type="org.apache.rave.portal.model.Region"--%>
<div class="region<c:if test="${region.locked || pageUser.editor == false}">
region-locked</c:if> <c:out
value="${region.page.pageLayout.code}"/>_${regionIdx} regionNonDragging"
id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
- <portal:widget var="widget" id="${regionWidget.widgetId}" />
- <rave:region_widget regionWidget="${regionWidget}" widget="${widget}"/>
+ <rave:region_widget regionWidget="${regionWidget}" />
</c:forEach>
</div>
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag?rev=1404591&r1=1404590&r2=1404591&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/tags/region_widget.tag
Thu Nov 1 13:47:05 2012
@@ -25,8 +25,8 @@ Template for rendering a RegionWidget in
<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"; %>
<%@ taglib prefix="portal" uri="http://www.apache.org/rave/tags"; %>
<%@ attribute name="regionWidget"
type="org.apache.rave.portal.model.RegionWidget" required="true"
description="The regionWidget object" %>
-<%@ attribute name="widget" type="org.apache.rave.portal.model.Widget"
required="true" description="The Widget object" %>
+<portal:widget var="widget" id="${regionWidget.widgetId}" />
<c:set var="isLocked" value="${regionWidget.locked}" />
<c:set var="isHideChrome" value="${regionWidget.hideChrome}" />
<fmt:setBundle basename="messages"/>
