Update of
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes
In directory james.mmbase.org:/tmp/cvs-serv2036
Modified Files:
tests.jsp
Log Message:
drammaticly tidied up
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/education/wizards/modes
Index: tests.jsp
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/education/wizards/modes/tests.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tests.jsp 29 Feb 2008 09:24:12 -0000 1.2
+++ tests.jsp 3 Mar 2008 15:16:27 -0000 1.3
@@ -8,9 +8,9 @@
<mm:import id="sAltText" />
<mm:cloud rank="basic user">
<jsp:directive.include file="../mode.include.jsp" />
- <di:has role="toetsen"> <!-- WTF, this is dutch, toetsen means 'tests' -->
+ <di:has editcontext="toetsen"> <!-- WTF, this is dutch, toetsen means
'tests' -->
- <a href='javascript:clickNode("tests_0")'>
+ <a href="javascript:clickNode('tests_0')">
<img src='gfx/tree_minlast.gif' width="16" border='0' align='center'
valign='middle' id='img_tests_0'/>
</a>
<img src='gfx/menu_root.gif' border='0' align='center' valign='middle'/>
<span style='width:100px; white-space: nowrap' />
@@ -20,84 +20,55 @@
<mm:param name="fields">name</mm:param>
<mm:param name="orderby">name</mm:param>
<mm:param name="searchfields">name</mm:param>
- ${forbidtemplate} ??
+ <!-- ${forbidtemplate} ??-->
<a href="${_}" target="text"><di:translate key="education.tests" /></a>
</mm:link>
<br />
- <div id='tests_0' >
+ <div id="tests_0" >
- <mm:import id="number_of_tests" reset="true">0</mm:import>
<mm:listnodescontainer type="tests">
<mm:size id="number_of_tests" write="false" />
</mm:listnodescontainer>
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif" width="16px" height="16px"
border="0" align="center" valign="middle"/></td>
- <!-- We have to detect the last element -->
- <mm:isgreaterthan referid="number_of_tests" value="0">
- <td><img src="gfx/tree_vertline-leaf.gif" border="0"
align="middle"/></td>
- </mm:isgreaterthan>
-
- <mm:islessthan referid="number_of_tests" value="1">
- <td><img src="gfx/tree_leaflast.gif" border="0"
align="middle"/></td>
- </mm:islessthan>
-
- <td><img src="gfx/new_education.gif" width="16" border="0"
align="middle" /></td>
- <td><nobr> <a href='<mm:write
referid="wizardjsp"/>&wizard=config/tests/tests&objectnumber=new&path= '
title='<di:translate key="education.createnewtestdescription" />'
target="text"><di:translate key="education.createnewtest" /></a></nobr></td>
- </tr>
- </table>
+ <di:leaf icon="new_education"
+ branchPath=".">
+ <mm:link referid="wizardjsp">
+ <mm:param name="wizard">config/tests/tests</mm:param>
+ <mm:param name="objectnumber">new</mm:param>
+ <a href="${_}"
title="${di:translate('education.createnewtestdescription')}"
+ target="text"><di:translate key="education.createnewtest" /></a>
+ </mm:link>
+ </di:leaf>
<mm:listnodes type="tests" orderby="tests.name">
<mm:import id="testname" jspvar="testname" reset="true"><mm:field
name="name"/></mm:import>
- <[EMAIL PROTECTED] file="../whichimage.jsp"%>
- <mm:field name="number" id="tnumber" write="false" />
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif" width="16px" height="16px"
border="0" align="center" valign="middle"/></td>
- <!-- We have to detect the last element-->
- <mm:last inverse="true">
- <td><a href='javascript:clickNode("<mm:field
name="number"/>")'><img src="gfx/tree_plus.gif" border="0" align="middle"
id='img_<mm:field name="number"/>'/></a></td>
- </mm:last>
-
- <mm:last>
- <td><a href='javascript:clickNode("<mm:field
name="number"/>")'><img src="gfx/tree_pluslast.gif" border="0" align="middle"
id='img_<mm:field name="number"/>'/></a></td>
- </mm:last>
-
- <td><img src="gfx/folder_closed.gif" border="0" align="middle"
id='img2_<mm:field name="number"/>'/></td>
-
- <td><nobr>
- <a href='<mm:write
referid="wizardjsp"/>&wizard=config/tests/tests&objectnumber=<mm:field
name="number" />&path=<mm:write referid="testname"/>' title='<di:translate
key="education.treattest" />' target="text"><mm:field name="name" /></a>
-
- <mm:node number="component.metadata" notfound="skip">
- <a href="metaedit.jsp?number=<mm:write referid="tnumber" />"
target="text"><img id="img_<mm:write referid="tnumber" />" src="<%= imageName
%>" border="0" title="<%= sAltText %>" alt="<%= sAltText %>"></a>
- </mm:node>
- </nobr></td>
- </tr>
- </table>
-
- <mm:import id="the_last_parent" reset="true">false</mm:import>
- <mm:last>
- <mm:import id="the_last_parent" reset="true">true</mm:import>
- </mm:last>
-
- <div id='<mm:field name="number"/>' style="display:none">
-
- <mm:field name="number" jspvar="sID" vartype="String">
- <mm:write referid="wizardjsp" jspvar="sWizardjsp"
vartype="String" write="false">
- <mm:write referid="the_last_parent"
jspvar="sTheLastParent" vartype="String">
- <jsp:include page="newfromtree_tests.jsp">
- <jsp:param name="node" value="<%= sID %>" />
- <jsp:param name="wizardjsp" value="<%= sWizardjsp
%>" />
- <jsp:param name="the_last_parent"
value="${sTheLastParent}" />
- <jsp:param name="testname" value="${testname}" />
- </jsp:include>
- </mm:write>
- </mm:write>
- </mm:field>
+ <jsp:directive.include file="../whichimage.jsp" /> <!-- WTF -->
+ <di:leaf
+ branchPath=". "
+ click="${_node}">
+ <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
+ <mm:param name="wizard">config/tests/tests</mm:param>
+ <mm:param name="path">${testname}</mm:param>
+ <a href="${_}"
+ title="${di:translate('education.treattest')}"
target="text"><mm:field name="name" /></a>
+ </mm:link>
+ <mm:hasnode number="component.metadata">
+ <mm:link page="metaedit.jsp" referids="[EMAIL PROTECTED]">
+ <a href="${_}" target="text"><img id="img_${_node}"
+ src="${imageName}" border="0" title="${sAltText}"
alt="${sAltTex}" /></a>
+ </mm:link>
+ </mm:hasnode>
+ </di:leaf>
+ <div id="${_node}" style="display:none">
+ <mm:include page="../newfromtree_tests.jsp"
referids="wizardjsp,testname">
+ <!--
+ <jsp:param name="the_last_parent" value="${sTheLastParent}"
/>
+ -->
+ </mm:include>
+ <!-- WTF WTF -->
<mm:remove referid="questionamount" />
<mm:import id="mark_error" reset="true"></mm:import>
<mm:field name="questionamount" id="questionamount">
@@ -123,48 +94,43 @@
</mm:field>
</mm:field>
- <mm:related path="posrel,questions" orderby="posrel.pos">
- <mm:node element="questions">
- <table border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
- <mm:compare referid="the_last_parent" value="true"
inverse="true">
- <td><img src="gfx/tree_vertline.gif" border="0"
align="center" valign="middle"/></td>
- </mm:compare>
- <mm:compare referid="the_last_parent" value="true">
- <td><img src="gfx/tree_spacer.gif" width="16px"
height="16px" border="0" align="center" valign="middle"/></td>
- </mm:compare>
- <mm:last inverse="true">
- <td><img src="gfx/tree_vertline-leaf.gif"
border="0" align="center" valign="middle"/></td>
- </mm:last>
- <mm:last>
- <td><img src="gfx/tree_leaflast.gif" border="0"
align="center" valign="middle"/></td>
- </mm:last>
- <td><img src="gfx/edit_learnobject.gif" width="16"
border="0" align="middle" /></td>
-
-
- <mm:remove referid="type_of_node"/>
- <mm:nodeinfo id="type_of_node" type="type"
jspvar="dummyName" vartype="String">
-
- <mm:compare referid="type_of_node"
value="mcquestions">
+ <mm:relatednodes role="posrel" type="questions"
orderby="posrel.pos">
+ <di:leaf
+ icon="edit_learnobject"
+ branchPath=". ">
+ <mm:nodeinfo type="type" id="type_of_node">
+ <mm:compare value="mcquestions">
<mm:import id="mark_error" reset="true">Een
multiple-choice vraag moet minstens 1 goed antwoord hebben</mm:import>
<mm:relatednodes type="mcanswers"
constraints="mcanswers.correct > '0'" max="1">
<mm:import id="mark_error"
reset="true"></mm:import>
</mm:relatednodes>
-
- <td> <nobr><a href='<mm:write
referid="wizardjsp"/>&wizard=config/question/mcquestions&objectnumber=<mm:field
name="number"/>&path=' title='<di:translate key="education.edit" /> <%=
dummyName.toLowerCase() %>' target="text"><mm:field name="title"
/><mm:isnotempty referid="mark_error"></a> <a style='color: red; font-weight:
bold' href='javascript:alert("<mm:write
referid="mark_error"/>");'>!</mm:isnotempty></a></nobr></td>
+ <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
+ <mm:param
name="wizard">config/question/mcquestions</mm:param>
+ <a href="${_}"
+ title="${di:translate('education.edit')}"
+ target="text">
+ <mm:field name="title" />
+ <mm:isnotempty referid="mark_error">
+ <span style="color: red; font-weight: bold"
onclick="alert('${mark_error}')">!</span>
+ </mm:isnotempty>
+ </a>
+ </mm:link>
</mm:compare>
- <mm:compare referid="type_of_node"
valueset="couplingquestions,dropquestions,hotspotquestions,openquestions,rankingquestions,valuequestions,fillquestions,fillselectquestions,essayquestions">
- <td> <nobr><a href='<mm:write
referid="wizardjsp"/>&wizard=config/question/<mm:write
referid="type_of_node"/>&objectnumber=<mm:field name="number"/>&path=<mm:write
referid="testname"/>' title='<di:translate key="education.edit" /> <%=
dummyName.toLowerCase() %>' target="text"><mm:field name="title"
/></a></nobr></td>
+ <mm:compare
valueset="couplingquestions,dropquestions,hotspotquestions,openquestions,rankingquestions,valuequestions,fillquestions,fillselectquestions,essayquestions">
+ <mm:link referid="wizardjsp" referids="[EMAIL PROTECTED]">
+ <mm:param
name="wizard">config/question${type_of_node}</mm:param>
+ <mm:param name="path">${testname}</mm:param>
+ <a href="${_}"
+ title="${di:translate('education.edit')}"
+ target="text"><mm:field name="title" /></a>
+ </mm:link>
</mm:compare>
</mm:nodeinfo>
- </tr>
- </table>
- </mm:node>
- </mm:related>
+ </di:leaf>
+ </mm:relatednodes>
</div>
</mm:listnodes>
</div>
</di:has>
-</mm:cloud>
-
+ </mm:cloud>
+</jsp:root>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
