Author: kevinshen
Date: 2010-01-28 04:38:36 +0100 (Thu, 28 Jan 2010)
New Revision: 40744
Removed:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
Log:
CMSC-1626 SS0 - Demo views are depending on community
Deleted:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
2010-01-28 03:38:02 UTC (rev 40743)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/community.jsp
2010-01-28 03:38:36 UTC (rev 40744)
@@ -1 +0,0 @@
-<%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %>
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
2010-01-28 03:38:02 UTC (rev 40743)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp
2010-01-28 03:38:36 UTC (rev 40744)
@@ -1,9 +1,7 @@
<%...@include file="/WEB-INF/templates/portletglobals.jsp" %>
<%...@taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %>
-<mm:haspage page="/editors/community">
- <jsp:include page="community.jsp"/>
- <community:useSSO var="sso" />
-</mm:haspage>
+<%@ page import="com.finalist.cmsc.portalImpl.SecureUtil" %>
+<c:set var="sso"><%= SecureUtil.getEnvironment("useSSO")%></c:set>
<cmsc:location var="cur" sitevar="site" />
<cmsc:path var="listPath" />
<cmsc:list-navigations var="pages" origin="${listPath[0]}" />
@@ -17,15 +15,16 @@
</a>
</li>
<c:forEach var="page" items="${pages}">
-
+ <c:set var="pageId"><c:out value="${page.id}"/></c:set>
+ <c:set
var="readable"><%=SecureUtil.isReadable((String)pageContext.getAttribute("pageId"))%></c:set>
<c:if test="${sso}" >
- <community:pageReadable pageId="${page.id}" >
+ <c:if test="${readable}">
<li <cmsc:onpath
origin="${page}">class="selected"</cmsc:onpath>>
<a href="<cmsc:link dest="${page.id}"/>"
title="<c:out value='${page.description}'/>">
<c:out value='${page.title}'/>
</a>
</li>
- </community:pageReadable>
+ </c:if>
</c:if>
<c:if test="${! sso}" >
<li <cmsc:onpath
origin="${page}">class="selected"</cmsc:onpath>>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
