[MMBASE CVS] contributions/didactor2/src/assessment/templates/assessment closelesson.link.jspx student.jspx

[Jelle Katsman]

Update of /var/cvs/contributions/didactor2/src/assessment/templates/assessment
In directory james.mmbase.org:/tmp/cvs-serv27385

Modified Files:
        closelesson.link.jspx student.jspx 
Log Message:



See also: 
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/assessment/templates/assessment


Index: closelesson.link.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/closelesson.link.jspx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- closelesson.link.jspx       14 Jan 2009 19:11:24 -0000      1.8
+++ closelesson.link.jspx       15 Jan 2009 10:27:21 -0000      1.9
@@ -8,9 +8,8 @@
   <jsp:output omit-xml-declaration="true" />
 
   <mm:import id="currentlesson" from="session" 
externid="currentlesson_${user}_${education}" />
-
-       <input type="button" class="educationButton" value="opslaan" 
onclick="window.location.reload()"/><jsp:text> | </jsp:text>
-
+              <form name="closelessonform" action="${_}"   method="post">
+       <input type="button" class="educationButton" value="opslaan" 
onclick="window.location.reload()"/><jsp:text>&amp;nbsp;|&amp;nbsp;</jsp:text>
   <c:if test="${! empty currentlesson}">
     <mm:node referid="currentlesson" id="currentlesson" />
     <mm:node number="$user">
@@ -18,24 +17,17 @@
                    referids="currentles...@lesson">
         <c:choose>
           <c:when test="${_}">
-
             <mm:treefile page="/assessment/closelesson.jsp"
                          objectlist="$includePath"
                          write="false"
                          >
 
-              <form name="closelessonform" action="${_}"   method="post">
                 <input type="hidden" name="coachmode" value="false"  />
                 <input type="hidden" name="lesson" value="${currentlesson}"  />
                 <di:translate key="assessment.close_and_send_to_coach" 
arg0="${currentlesson.name}">
-                  
                   <input type="submit" class="educationButton" value="${_}" 
/><jsp:text> | </jsp:text>
                 </di:translate>
-              </form>
             </mm:treefile>
-                       
-
-
           </c:when>
           <c:otherwise>
             <p><di:translate key="assessment.waitforfeedback" /></p>
@@ -60,4 +52,6 @@
                                                        </c:if>
                                                   <input type="button" 
class="educationButton" value="terug naar de les" 
onclick="window.location='${_}'" name="" />
                                                 </mm:link>
+                   
+              </form>
 </div>


Index: student.jspx
===================================================================
RCS file: 
/var/cvs/contributions/didactor2/src/assessment/templates/assessment/student.jspx,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- student.jspx        14 Jan 2009 19:11:24 -0000      1.42
+++ student.jspx        15 Jan 2009 10:27:21 -0000      1.43
@@ -47,10 +47,7 @@
 
 
   <di:include page="/assessment/${stage}.jspx" />
-       
-
-       <p>
        <di:include page="/assessment/closelesson.link.jspx" />
-       </p>
+
        <p><jsp:text> </jsp:text></p>
 </div>
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs