Author: nico
Date: 2010-04-03 17:05:44 +0200 (Sat, 03 Apr 2010)
New Revision: 41759
Modified:
CMSContainer/branches/b1_7/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
Log:
Move javascript lower in the header.
The lighbox has tp be after the editresources
Modified:
CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
2010-04-03 15:04:54 UTC (rev 41758)
+++
CMSContainer/branches/b1_7/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
2010-04-03 15:05:44 UTC (rev 41759)
@@ -4,12 +4,6 @@
<link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
<link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:protected inverse="true">
- <script src="<cmsc:staticurl page='/js/prototype.js"
type="text/javascript'/>"></script>
- <script src="<cmsc:staticurl
page='/js/scriptaculous/scriptaculous.js?load=effects,builder'/>"
type="text/javascript"></script>
- </cmsc:protected>
- <%...@include file="/WEB-INF/templates/layout/cmsc/richtext/lightbox.jsp" %>
-
<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}">
@@ -22,10 +16,16 @@
</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" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
+
<cmsc:feeds />
- <cmscf:editresources />
\ No newline at end of file
+
+ <cmsc:protected inverse="true">
+ <script src="<cmsc:staticurl page='/js/prototype.js"
type="text/javascript'/>"></script>
+ <script src="<cmsc:staticurl
page='/js/scriptaculous/scriptaculous.js?load=effects,builder'/>"
type="text/javascript"></script>
+ </cmsc:protected>
+ <cmscf:editresources />
+ <%...@include file="/WEB-INF/templates/layout/cmsc/richtext/lightbox.jsp" %>
\ No newline at end of file
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-04-03 15:04:54 UTC (rev 41758)
+++
CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/layout/demo/includes/header.jsp
2010-04-03 15:05:44 UTC (rev 41759)
@@ -4,27 +4,28 @@
<link rel="icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
<link rel="shortcut icon" href="<cmsc:staticurl page='/favicon.ico' />"
type="image/x-icon" />
- <cmsc:protected inverse="true">
- <script src="<cmsc:staticurl page='/js/prototype.js"
type="text/javascript'/>"></script>
- <script src="<cmsc:staticurl
page='/js/scriptaculous/scriptaculous.js?load=effects,builder'/>"
type="text/javascript"></script>
- </cmsc:protected>
- <%...@include file="/WEB-INF/templates/layout/cmsc/richtext/lightbox.jsp" %>
-
<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}">
- <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: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" />
<![endif]-->
<link rel="stylesheet" type="text/css" href="<cmsc:staticurl
page='/css/print.css'/>" media="print" />
+
<cmsc:feeds />
- <cmscf:editresources />
\ No newline at end of file
+
+ <cmsc:protected inverse="true">
+ <script src="<cmsc:staticurl page='/js/prototype.js"
type="text/javascript'/>"></script>
+ <script src="<cmsc:staticurl
page='/js/scriptaculous/scriptaculous.js?load=effects,builder'/>"
type="text/javascript"></script>
+ </cmsc:protected>
+ <cmscf:editresources />
+ <%...@include file="/WEB-INF/templates/layout/cmsc/richtext/lightbox.jsp" %>
\ No newline at end of file
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
