Author: cgeer
Date: Tue Oct 30 23:00:46 2012
New Revision: 1403917
URL: http://svn.apache.org/viewvc?rev=1403917&view=rev
Log:
RAVE-839 Fixed the mobile_home.jsp page to use the widgets list to pass the
right widget object to the render tag.
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
Modified:
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
URL:
http://svn.apache.org/viewvc/rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp?rev=1403917&r1=1403916&r2=1403917&view=diff
==============================================================================
---
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
(original)
+++
rave/trunk/rave-portal-resources/src/main/webapp/WEB-INF/jsp/views/mobile_home.jsp
Tue Oct 30 23:00:46 2012
@@ -66,18 +66,22 @@
<c:forEach var="region" items="${page.regions}">
<div class="region-mobile" id="region-${region.id}-id">
<c:forEach var="regionWidget" items="${region.regionWidgets}">
- <div class="widget-wrapper widget-wrapper-mobile"
id="widget-${regionWidget.id}-wrapper">
- <div class="widget-title-bar widget-title-bar-mobile"
onclick="rave.toggleMobileWidget(${regionWidget.id});">
- <span id="widget-${regionWidget.id}-collapse"
class="widget-toolbar-toggle-collapse" title="<fmt:message
key="widget.chrome.toggle"/>"><i class="icon-chevron-down"></i></span>
- <div id="widget-${regionWidget.id}-title"
class="widget-title">
- <c:out value="${regionWidget.widget.title}"/>
+ <c:forEach var="widget" items="${widgets}">
+ <c:if test="${regionWidget.widgetId == widget.id}">
+ <div class="widget-wrapper widget-wrapper-mobile"
id="widget-${regionWidget.id}-wrapper">
+ <div class="widget-title-bar
widget-title-bar-mobile" onclick="rave.toggleMobileWidget(${regionWidget.id});">
+ <span id="widget-${regionWidget.id}-collapse"
class="widget-toolbar-toggle-collapse" title="<fmt:message
key="widget.chrome.toggle"/>"><i class="icon-chevron-down"></i></span>
+ <div id="widget-${regionWidget.id}-title"
class="widget-title">
+ <c:out value="${widget.title}"/>
+ </div>
+ </div>
+ <div class="widget-prefs"
id="widget-${regionWidget.id}-prefs-content"></div>
+ <div class="widget widget-mobile"
id="widget-${regionWidget.id}-body">
+ <portal:render-widget
regionWidget="${regionWidget}" widget="${widget}"/>
+ </div>
</div>
- </div>
- <div class="widget-prefs"
id="widget-${regionWidget.id}-prefs-content"></div>
- <div class="widget widget-mobile"
id="widget-${regionWidget.id}-body">
- <portal:render-widget
regionWidget="${regionWidget}" />
- </div>
- </div>
+ </c:if>
+ </c:forEach>
</c:forEach>
</div>
</c:forEach>
