Update of /var/cvs/contributions/didactor2/src/education/templates/education
In directory james.mmbase.org:/tmp/cvs-serv9820
Modified Files:
index.jsp main.jspx navigation.jspx
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education
Index: index.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/index.jsp,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -b -r1.81 -r1.82
--- index.jsp 24 Jan 2008 15:34:48 -0000 1.81
+++ index.jsp 14 Mar 2008 17:37:00 -0000 1.82
@@ -2,12 +2,14 @@
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-t="urn:jsptagdir:/WEB-INF/tags/di/core"
xmlns:di="http://www.didactor.nl/ditaglib_1.0"
>
<di:html
styleClass="education"
title_key="education.learnenvironmenttitle"
- expires="0" component="education" type="text/html">
+ expires="0"
+ component="education" type="text/html">
<!-- wtf -->
<mm:hasnode number="component.drm">
@@ -22,6 +24,11 @@
NO EDUCATION YET
</c:when>
<c:otherwise>
+ <mm:link page="/content/js/open.jsp">
+ <script type="text/javascript" src="${_}">
+ <jsp:text><!-- help IE --> </jsp:text>
+ </script>
+ </mm:link>
<di:include debug="html" page="/education/navigation.jspx" />
<di:include debug="html" page="/education/main.jspx" />
</c:otherwise>
Index: main.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/main.jspx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- main.jspx 4 Feb 2008 13:31:09 -0000 1.2
+++ main.jspx 14 Mar 2008 17:37:00 -0000 1.3
@@ -20,7 +20,7 @@
<mm:import externid="return_to" required="true" />
<mm:import externid="return_to_type" required="true" />
- <div align="right">
+ <div>
<mm:link
referids="$referids,learnobjecttype,class,fb_madetest,[EMAIL PROTECTED],[EMAIL
PROTECTED]" page="index.jsp">
<input type="submit" class="formbutton"
value="${di:translate('assessment.back_to_lession_button')}"
@@ -29,10 +29,13 @@
</mm:link>
</div>
</mm:present>
- <img id="ajax_loader" src="${mm:treelink('/gfx/ajax-loader.gif',
includePath)}" style="display: none;" />
+ <img id="ajax_loader" alt="" src="${mm:treelink('/gfx/ajax-loader.gif',
includePath)}" style="display: none;" />
<div id="contentFrame">
- <jsp:text>...</jsp:text>
+ <mm:import externid="learnobject" />
+ <mm:present referid="learnobject">
+ <mm:include page="/content/" />
+ </mm:present>
</div>
</div>
Index: navigation.jspx
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/navigation.jspx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- navigation.jspx 4 Feb 2008 13:31:09 -0000 1.4
+++ navigation.jspx 14 Mar 2008 17:37:00 -0000 1.5
@@ -9,12 +9,6 @@
-->
<div class="navigationbar">
- <mm:link page="/education/js/frontend_tree.jsp" referids="$referids">
- <script type="text/javascript" src="${_}">
- <jsp:text><!-- help IE --> </jsp:text>
- </script>
- </mm:link>
-
<!-- Open the page marked as 'lastpage'
(todo: does this work?)
-->
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs