Author: billyxie Date: 2010-01-27 11:41:42 +0100 (Wed, 27 Jan 2010) New Revision: 40741
Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp Log: CMSC-1614 - Groups on syncronise on user logg in Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-27 09:24:26 UTC (rev 40740) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-27 10:41:42 UTC (rev 40741) @@ -1,8 +1,9 @@ <%...@page language="java" contentType="text/html;charset=UTF-8"%> +<%...@page import="com.finalist.cmsc.portalImpl.SecureUtil" %> <%...@include file="../globals.jsp"%> <mm:haspage page="/editors/community"> <%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> - <community:useSSO var="sso" /> + <c:set var="sso"><%= SecureUtil.getEnvironment("useSSO")%></c:set> </mm:haspage> <mm:content type="text/html" encoding="UTF-8" expires="0"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> @@ -49,9 +50,8 @@ </li> </mm:haspage> - <mm:haspage page="/editors/community"> - <community:useSSO var="sso" /> - <c:if test="${!sso}" > + <c:if test="${!sso}" > + <mm:haspage page="/editors/community"> <li class="users"> <c:url var="communityManagement" value="/editors/community/SearchConditionalUser.do"/> <a href="${communityManagement}" target="rightpane"><fmt:message key="modules.community" /></a> @@ -60,8 +60,16 @@ <c:url var="communityUrl" value="/editors/community/ReferenceImportExportAction.do?action=listGroups"/> <a href="${communityUrl}" target="rightpane"><fmt:message key="modules.community.data" /></a> </li> - </c:if> - </mm:haspage> + </mm:haspage> + </c:if> + <c:if test="${sso}" > + <mm:haspage page="/editors/community/syncronizeGroups.jsp"> + <li class="groups"> + <c:url var="syncronizeGroups" value="/editors/community/syncronizeGroups.jsp"/> + <a href="${syncronizeGroups}" target="rightpane"><fmt:message key="modules.groups" /></a> + </li> + </mm:haspage> + </c:if> <mm:haspage page="/editors/community/preferencesearch.jsp"> <li class="community"> @@ -69,14 +77,6 @@ <a href="${communityUrl}" target="rightpane"><fmt:message key="modules.community.reference" /></a> </li> </mm:haspage> - <c:if test="${sso}" > - <mm:haspage page="/editors/community"> - <li class="groups"> - <c:url var="syncronizeGroups" value="/editors/community/syncronizeGroups.jsp"/> - <a href="${syncronizeGroups}" target="rightpane"><fmt:message key="modules.groups" /></a> - </li> - </mm:haspage> - </c:if> <mm:haspage page="/editors/subsite/module-subsite.jsp"> <li class="versioning"><a href="<mm:url page="../subsite/SubSiteAction.do"/>" target="rightpane"> <fmt:message key="modules.subsite" /> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
