Author: kevinshen
Date: 2010-01-22 03:39:00 +0100 (Fri, 22 Jan 2010)
New Revision: 40676
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
Log:
CMSC-1565 Extend stylesheet feature with stylesheet data from database
Modified:
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
2010-01-22 02:38:54 UTC (rev 40675)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
2010-01-22 02:39:00 UTC (rev 40676)
@@ -13,7 +13,14 @@
<cmsc:insert-stylesheet var="stylesheet" />
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl.css'/>" media="screen,projection,print" />
<c:forEach var="style" items="${stylesheet}">
- <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
+ <c:choose>
+ <c:when test="${empty style.resource}">
+ <link rel="stylesheet" type="text/css"
href="${pageContext.request.contextPath}/stylesheet/${style.id}.css"
media="${style.media}" />
+ </c:when>
+ <c:otherwise>
+ <link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/${style.resource}'/>" media="${style.media}" />
+ </c:otherwise>
+ </c:choose>
</c:forEach>
<!--[if IE]>
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/stijl_ie.css'/>" media="screen,projection,print" />
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
