Update of
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question
In directory james.mmbase.org:/tmp/cvs-serv32546
Modified Files:
fillquestions.xml fillselectquestions-origin.xml
fillselectquestions.xml hotspotquestions-origin.xml
hotspotquestions.xml opennumeralquestions.xml
openquestions-origin.xml openquestions.xml
Log Message:
cleaning
See also:
http://cvs.mmbase.org/viewcvs/contributions/didactor2/src/education/templates/editwizards/data/config/question
Index: fillquestions.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/fillquestions.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fillquestions.xml 29 Feb 2008 12:49:30 -0000 1.5
+++ fillquestions.xml 28 Mar 2008 10:45:26 -0000 1.6
@@ -11,12 +11,8 @@
<action type="create">
- <object type="fillquestions">
- <field name="showtitle">1</field>
- <field name="layout">0</field>
- <field name="impos">0</field>
- <field name="flashOrText">0</field>
- </object>
+ <object type="fillquestions" />
+
</action>
<action type="load">
@@ -40,7 +36,6 @@
<lists>
- <optionlist include="config/option_list/boolean.xml" />
<optionlist include="config/option_list/flashOrText.xml" />
<optionlist name="imagepos">
<option id="0">
@@ -62,38 +57,17 @@
<form-schema id="step1">
<title xml:lang="en">Enter fill in the gaps question</title>
<title xml:lang="nl">Invulvraag editor</title>
- <field name="title" >
- <prompt xml:lang="nl">Invulvraag titel</prompt>
- <prompt xml:lang="en">Title</prompt>
- </field>
-
+ <field name="title" />
<field name="showtitle" />
-
-
- <!-- INSERT FLASH/TEXT -->
<field name="flashOrText" ftype="enum">
<prompt xml:lang="en">Choose flash or text</prompt>
<prompt xml:lang="nl">Kies flash of tekst </prompt>
<optionlist select="flashOrText" />
</field>
- <!-- END INSERT FLASH/TEXT -->
-
- <!-- INSERT TEXT -->
- <field name="text" ftype="html" dtminlength="0">
- <prompt xml:lang="nl">Tekst</prompt>
- <prompt xml:lang="en">Text</prompt>
- </field>
- <!-- END INSERT TEXT -->
-
- <!-- INSERT FLASH -->
+ <field name="text" ftype="html" dtminlength="0" />
<list minoccurs="0" maxoccurs="1" role="related"
extends="config/attachment/attachments.xml" />
- <!-- END INSERT FLASH -->
-
-
-
- <!-- INSERT IMAGE -->
<list role="posrel" destination="images" minoccurs="0" maxoccurs="*">
<title xml:lang="nl">Bijbehorende afbeeldingen</title>
@@ -118,26 +92,18 @@
</action>
</list>
- <!-- END INSERT IMAGE -->
-
- <!-- INSERT IMAGE POSITION-->
-
<field name="impos" ftype="enum">
<prompt xml:lang="en">Image position</prompt>
<prompt xml:lang="nl">Afbeeldingen positie</prompt>
<optionlist select="imagepos" />
</field>
- <!-- END INSERT IMAGE POSITION-->
-
<field name="textFirst" ftype="line" dtminlength="0">
<prompt xml:lang="nl">Eerste deel van de zin </prompt>
<prompt xml:lang="en">The first part of the sentence </prompt>
</field>
- <!-- INSERT ANSWER -->
-
<list destination="openanswers" role="related" ordertype="number"
orderby="number" >
<title xml:lang="nl">Bijbehorende antwoorden (niet verplicht)</title>
<title xml:lang="en">Associated answer (not obligatory)</title>
@@ -182,25 +148,13 @@
<command name="insert" />
</list>
- <!-- END INSERT ANSWER -->
-
-
-
-
-
<field name="textSecond" ftype="line" dtminlength="0">
<prompt xml:lang="nl">Tweede deel van de zin</prompt>
<prompt xml:lang="en">The second part of the sentence </prompt>
</field>
-
-
-
- <!-- FEEDBACK -->
<list role="related" extends="config/feedback/feedback-list.xml" />
- <!-- END FEEDBACK -->
-
</form-schema>
Index: fillselectquestions-origin.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/fillselectquestions-origin.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- fillselectquestions-origin.xml 29 Feb 2008 12:49:30 -0000 1.4
+++ fillselectquestions-origin.xml 28 Mar 2008 10:45:26 -0000 1.5
@@ -34,14 +34,12 @@
<lists>
- <optionlist include="config/option_list/boolean.xml" />
<optionlist include="config/option_list/flashOrText.xml" />
<optionlist name="imagepos">
<option id="0">Above</option>
<option id="1">Under</option>
<option id="2">Next</option>
</optionlist>
- <optionlist include="config/option_list/boolean_inverse.xml" />
<optionlist name="layout">
<option id="2">Pulldown menu (geschud)</option>
<option id="5">Pulldown menu (vaste volgorde)</option>
@@ -52,45 +50,19 @@
<form-schema id="step1">
<title xml:lang="en">Enter fill select in the gaps question</title>
<title xml:lang="nl">Invul-selectievraag invoeren</title>
- <field name="title" >
- <prompt xml:lang="en">Title</prompt>
- <prompt xml:lang="nl">Invul-selectievraag titel</prompt>
- </field>
-
-
- <!-- INSERT SELECT TITLE -->
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel laten zien</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
- <!-- END INSERT SELECT TITLE -->
+ <field name="title" />
+ <field name="showtitle" />
- <!-- INSERT FLASH/TEXT -->
<field name="flashOrText" ftype="enum">
<prompt xml:lang="en">Choose flash or text</prompt>
<prompt xml:lang="nl">Kies flash of tekst </prompt>
<optionlist select="flashOrText" />
</field>
- <!-- END INSERT FLASH/TEXT -->
- <!-- INSERT TEXT -->
- <field name="text" ftype="html" dtminlength="0">
- <prompt xml:lang="en">Tekst</prompt>
- <prompt xml:lang="nl">Tekst</prompt>
- </field>
- <!-- END INSERT TEXT -->
-
- <!-- INSERT FLASH -->
+ <field name="text" ftype="html" dtminlength="0" />
<list minoccurs="0" maxoccurs="1" role="related"
extends="config/attachment/attachments.xml" />
- <!-- END INSERT FLASH -->
-
-
-
- <!-- INSERT IMAGE -->
-
<list role="posrel" destination="images" minoccurs="0" maxoccurs="*">
<title xml:lang="nl">Related images</title>
<title xml:lang="nl">Bijbehorende afbeeldingen</title>
@@ -113,10 +85,6 @@
</action>
</list>
- <!-- END INSERT IMAGE -->
-
- <!-- INSERT IMAGE POSITION-->
-
<field name="impos" ftype="enum">
<prompt xml:lang="en">Image position</prompt>
<prompt xml:lang="nl">Positie afbeelding </prompt>
@@ -133,9 +101,6 @@
-
- <!--INSERT LAYOUT -->
-
<field name="layout" ftype="enum">
<prompt>Layout</prompt>
<optionlist select="layout" />
@@ -155,10 +120,7 @@
<description>De antwoord tekst</description>
</field>
<field fdatapath="[EMAIL PROTECTED]'pos']"
ftype="line"><prompt>Positie</prompt></field>
- <field name="correct" ftype="enum">
- <prompt>Correct</prompt>
- <optionlist select="boolean_inverse" />
- </field>
+ <field name="correct" />
<field wizardname="config/answer/mcanswers"
ftype="startwizard"/>
</item>
@@ -169,7 +131,7 @@
</action>
-<!-- <action type="add">
+ <!-- <action type="add">
<relation role="posrel" destinationtype="mcanswers">
<field name="pos">{sum(//[EMAIL PROTECTED]'posrel' and
@lastitem='true']/[EMAIL PROTECTED]'pos'])+{$pos}}</field>
<!-<object type="mcanswers">
Index: fillselectquestions.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/fillselectquestions.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- fillselectquestions.xml 29 Feb 2008 12:49:30 -0000 1.5
+++ fillselectquestions.xml 28 Mar 2008 10:45:26 -0000 1.6
@@ -66,27 +66,15 @@
<form-schema id="step1">
<title xml:lang="en">Enter fill select in the gaps question</title>
<title xml:lang="nl">Invul-selectievraag invoeren</title>
- <field name="title" >
- <prompt xml:lang="en">Title</prompt>
- <prompt xml:lang="nl">Invul-selectievraag titel</prompt>
- </field>
-
+ <field name="title" />
- <!-- INSERT SELECT TITLE -->
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel tonen</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
- <!-- END INSERT SELECT TITLE -->
+ <field name="showtitle" />
- <!-- INSERT FLASH/TEXT -->
<field name="flashOrText" ftype="enum">
<prompt xml:lang="en">Choose flash or text</prompt>
<prompt xml:lang="nl">Kies flash of tekst </prompt>
<optionlist select="flashOrText" />
</field>
- <!-- END INSERT FLASH/TEXT -->
<!-- INSERT TEXT -->
<field name="text" ftype="html" dtminlength="0">
@@ -195,7 +183,7 @@
</action>
-<!-- <action type="add">
+ <!-- <action type="add">
<relation role="posrel" destinationtype="mcanswers">
<field name="pos">{sum(//[EMAIL PROTECTED]'posrel' and
@lastitem='true']/[EMAIL PROTECTED]'pos'])+{$pos}}</field>
<!-<object type="mcanswers">
@@ -218,11 +206,6 @@
</list>
- <!-- END INSERT SELECT -->
-
-
-
-
<field name="textSecond" ftype="line" dtminlength="0">
<prompt xml:lang="nl">Tweede deel van de zin </prompt>
@@ -230,12 +213,7 @@
</field>
-
-
-
- <!-- FEEDBACK -->
<list role="related" extends="config/feedback/feedback-list.xml" />
- <!-- END FEEDBACK -->
Index: hotspotquestions-origin.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/hotspotquestions-origin.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- hotspotquestions-origin.xml 29 Feb 2008 12:49:30 -0000 1.6
+++ hotspotquestions-origin.xml 28 Mar 2008 10:45:26 -0000 1.7
@@ -11,8 +11,6 @@
<action type="create">
<object type="hotspotquestions">
<relation destination="$origin" role="posrel" createdir="source"/>
- <field name="showtitle">1</field>
- <field name="layout">0</field>
</object>
</action>
@@ -25,11 +23,6 @@
<action type="delete" />
- <lists>
- <optionlist include="config/option_list/boolean.xml" />
- <optionlist include="config/option_list/boolean_inverse.xml" />
- </lists>
-
<form-schema id="step1">
<title xml:lang="nl">Hotspot vraag invoeren</title>
@@ -38,11 +31,7 @@
<prompt xml:lang="nl">Titel</prompt>
<prompt xml:lang="en">Title</prompt>
</field>
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel laten zien</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
+ <field name="showtitle" />
<field name="text" ftype="html" dtminlength="0">
<prompt xml:lang="nl">Tekst</prompt>
<prompt xml:lang="en">Text</prompt>
Index: hotspotquestions.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/hotspotquestions.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- hotspotquestions.xml 29 Feb 2008 12:49:30 -0000 1.7
+++ hotspotquestions.xml 28 Mar 2008 10:45:26 -0000 1.8
@@ -15,7 +15,7 @@
</object>
</action>
-<action type="load">
+ <action type="load">
<relation destination="hotspotanswers" role="related">
<object>
<relation destination="feedback" role="related">
@@ -32,11 +32,6 @@
<action type="delete" />
- <lists>
- <optionlist include="config/option_list/boolean.xml" />
- <optionlist include="config/option_list/boolean_inverse.xml" />
- </lists>
-
<form-schema id="step1">
<title xml:lang="nl">Hotspot vraag invoeren</title>
<title xml:lang="en">Enter hotspot question</title>
@@ -44,11 +39,7 @@
<prompt xml:lang="nl">Titel</prompt>
<prompt xml:lang="en">Title</prompt>
</field>
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel laten zien</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
+ <field name="showtitle" />
<field name="text" ftype="html" dtminlength="0">
<prompt xml:lang="nl">Tekst</prompt>
<prompt xml:lang="en">Text</prompt>
Index: opennumeralquestions.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/opennumeralquestions.xml,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- opennumeralquestions.xml 29 Feb 2008 12:49:30 -0000 1.3
+++ opennumeralquestions.xml 28 Mar 2008 10:45:26 -0000 1.4
@@ -1,8 +1,8 @@
<?xml version="1.0"?>
<!DOCTYPE wizard-schema PUBLIC "-//MMBase/DTD editwizard 1.0//EN"
"http://www.mmbase.org/dtd/wizard-schema_1_0.dtd";
[
- <!ENTITY extra_loads SYSTEM "extra_loads.xml">
- <!ENTITY extra_schemas SYSTEM "extra_schemas.xml">
+<!ENTITY extra_loads SYSTEM "extra_loads.xml">
+<!ENTITY extra_schemas SYSTEM "extra_schemas.xml">
]>
<wizard-schema id="empty">
<title>Open numeral vraag Editor</title>
@@ -45,34 +45,13 @@
<form-schema id="step1">
<title>Open numeral vraag invoeren</title>
- <field name="title" >
- <prompt>Titel</prompt>
- </field>
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel laten zien</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
-
- <!-- INSERT DESCRIPTION -->
- <field name="description" rows="8" ftype="html" dtminlength="0">
- <prompt>Description</prompt>
- </field>
- <!-- END INSERT DESCRIPTION -->
-
- <field name="layout" ftype="enum">
- <prompt>Layout</prompt>
- <optionlist select="layout" />
- </field>
+ <field name="title" />
+ <field name="showtitle" ftype="enum" />
- <!-- INSERT TEXT -->
- <field name="text" ftype="html" dtminlength="0">
- <prompt>Tekst</prompt>
- </field>
- <!-- END INSERT TEXT -->
+ <field name="description" rows="8" ftype="html" dtminlength="0" />
-
- <!-- INSERT VARIABLES -->
+ <field name="layout" />
+ <field name="text" ftype="html" dtminlength="0" />
<list destination="variables" role="related" ordertype="number"
orderby="number">
<title>Variables</title>
@@ -157,8 +136,6 @@
<command name="insert" />
</list>
- <!-- END INSERT ANSWER -->
-
<list role="related" extends="config/feedback/feedback-list.xml" />
</form-schema>
Index: openquestions-origin.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/openquestions-origin.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- openquestions-origin.xml 11 Feb 2008 13:35:40 -0000 1.10
+++ openquestions-origin.xml 28 Mar 2008 10:45:26 -0000 1.11
@@ -12,9 +12,6 @@
<action type="create">
<object type="openquestions">
<relation destination="$origin" role="posrel" createdir="source"/>
- <field name="showtitle">1</field>
- <field name="layout">0</field>
- <field name="type_of_score">0</field>
</object>
</action>
@@ -27,27 +24,11 @@
<action type="delete" />
- <lists>
- <optionlist include="config/option_list/boolean.xml" />
- <optionlist name="layout">
- <option id="0">Groot veld</option>
- <option id="1">Klein veld</option>
- </optionlist>
- </lists>
-
-
<form-schema id="step1">
<title xml:lang="nl">Open vraag invoeren</title>
<title xml:lang="en">Enter open question</title>
- <field name="title" >
- <prompt xml:lang="nl">Titel</prompt>
- <prompt xml:lang="en">Title</prompt>
- </field>
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel laten zien</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
+ <field name="title" />
+ <field name="showtitle" />
<field name="text" ftype="html" dtminlength="0" />
<field name="layout" />
<field name="type_of_score" />
Index: openquestions.xml
===================================================================
RCS file:
/var/cvs/contributions/didactor2/src/education/templates/editwizards/data/config/question/openquestions.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- openquestions.xml 11 Feb 2008 13:35:40 -0000 1.11
+++ openquestions.xml 28 Mar 2008 10:45:26 -0000 1.12
@@ -10,11 +10,7 @@
<title xml:lang="en">Open question Editor</title>
<action type="create">
- <object type="openquestions">
- <field name="showtitle">1</field>
- <field name="layout">0</field>
- <field name="type_of_score">0</field>
- </object>
+ <object type="openquestions" />
</action>
<action type="load">
@@ -29,15 +25,8 @@
<form-schema id="step1">
<title xml:lang="nl">Open vraag invoeren</title>
<title xml:lang="en">Enter open question</title>
- <field name="title" >
- <prompt xml:lang="nl">Open vraag titel</prompt>
- <prompt xml:lang="en">Open question title</prompt>
- </field>
- <field name="showtitle" ftype="enum">
- <prompt xml:lang="nl">Titel laten zien</prompt>
- <prompt xml:lang="en">Show title</prompt>
- <optionlist select="boolean" />
- </field>
+ <field name="title" />
+ <field name="showtitle" />
<field name="text" ftype="html" dtminlength="0" />
<field name="layout" />
<field name="type_of_score" />
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
