Update of
/var/cvs/contributions/didactor2/src/education/templates/education/learnblocks
In directory james.mmbase.org:/tmp/cvs-serv11937
Modified Files:
index.jsp
Log Message:
removed type specific rendering, and using a generic include to handle that.
Converted to jspx.
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/learnblocks
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/learnblocks/index.jsp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- index.jsp 3 Aug 2007 19:53:00 -0000 1.36
+++ index.jsp 18 Jan 2008 17:18:01 -0000 1.37
@@ -1,48 +1,36 @@
-<[EMAIL PROTECTED] uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"
-%><[EMAIL PROTECTED] uri="http://www.didactor.nl/ditaglib_1.0"; prefix="di"
-%><[EMAIL PROTECTED] uri="http://java.sun.com/jsp/jstl/core"; prefix="c"
-%><%@ page import = "java.io.*,java.util.*"
contentType="application/xml;charset=UTF-8"
-%>
-
-<mm:content
- type="application/xml"
- postprocessor="reducespace">
+<jsp:root version="2.0"
+ xmlns:c="http://java.sun.com/jsp/jstl/core";
+ xmlns:jsp="http://java.sun.com/JSP/Page";
+ xmlns:mm="http://www.mmbase.org/mmbase-taglib-2.0";
+ xmlns:di="http://www.didactor.nl/ditaglib_1.0";
+ >
+ <mm:content
+ type="application/xml" postprocessor="none">
<div class="content">
- <mm:cloud rank="didactor user">
+ <mm:cloud rank="anonymous">
<mm:import externid="learnobject" required="true"/>
<mm:treeinclude page="/education/storebookmarks.jsp"
objectlist="$includePath" referids="$referids,learnobject">
<mm:param name="learnobjecttype">learnblocks</mm:param>
</mm:treeinclude>
+
<div class="learnenvironment">
<mm:node number="$learnobject">
<mm:nodeinfo type="type">
- <%--
- It's a bit ugly that SCORM specify code occurs here.
- But listen, earlier this file was nearly _completely_ dedicated to
scorm stuff....
- --%>
- <c:choose>
- <c:when test="${_ eq 'htmlpages'}">
- <c:if test="${! empty _node.path}">
- <mm:hasnode number="component.scorm" >
- <mm:include page="/scorm/player/index.jspx"
referids="[EMAIL PROTECTED]" />
- </mm:hasnode>
- <mm:hasnode number="component.scorm" inverse="true">
- <di:translate
key="scorm.you_have_to_turn_on_the_scorm_module" />
- </mm:hasnode>
- </c:if>
- <mm:field name="content" escape="none" />
- </c:when>
- <c:otherwise>
+ <mm:treehaspage objectlist="${includePath}"
page="/education/pages/${_}/index.jspx">
+ <mm:treeinclude page="/education/pages/${_}/index.jspx"
+ objectlist="$includePath"
+ referids="$referids,learnobject" />
+ </mm:treehaspage>
+ <mm:treehaspage objectlist="${includePath}"
page="/education/pages/${_}/index.jspx" inverse="true">
<mm:treeinclude page="/education/pages/content.jsp"
objectlist="$includePath"
referids="$referids,learnobject" />
<mm:treeinclude page="/education/paragraph/paragraph.jsp"
objectlist="$includePath" referids="$referids,[EMAIL PROTECTED]">
<mm:param
name="path_segment">${pageContext.request.contextPath}/education/</mm:param>
</mm:treeinclude>
- </c:otherwise>
- </c:choose>
+ </mm:treehaspage>
</mm:nodeinfo>
</mm:node>
@@ -55,4 +43,5 @@
</mm:node>
</mm:cloud>
</div>
-</mm:content>
+ </mm:content>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
