2006/unicorn/WebContent/WEB-INF/resources/tasklist tasklist.xml,1.4,1.5 tasklist.rdf,1.7,1.8

Update of /sources/public/2006/unicorn/WebContent/WEB-INF/resources/tasklist
In directory hutz:/tmp/cvs-serv9192/WebContent/WEB-INF/resources/tasklist

Modified Files:
	tasklist.xml tasklist.rdf 
Log Message:
improved custom task

Index: tasklist.rdf
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/tasklist/tasklist.rdf,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- tasklist.rdf	22 Sep 2009 08:56:12 -0000	1.7
+++ tasklist.rdf	1 Oct 2009 16:05:40 -0000	1.8
@@ -11,7 +11,8 @@
 	<ucn:Task ucn:reference="conformance" ucn:default="true">
 		<ucn:longName xml:lang="en">General Conformance Check</ucn:longName>
 		<ucn:longName xml:lang="fr">Vérifie la conformité générale</ucn:longName>
-		<ucn:description xml:lang="en">This task will do as much observations as possible.</ucn:description>
+		<ucn:description xml:lang="en">Performs as many checks as possible.</ucn:description>
+		<ucn:description xml:lang="en">Effectue tous les tests possibles.</ucn:description>
 		<!--<ucn:hasParameter>
 			<ucn:Dropdown ucn:reference="profile">
 				<ucn:longName xml:lang="en">CSS Profile</ucn:longName>
@@ -78,6 +79,9 @@
 
 	<ucn:Task ucn:reference="full-css">
 		<ucn:longName xml:lang="en">Global CSS Validation</ucn:longName>
+		<ucn:longName xml:lang="fr">Validation CSS Globale</ucn:longName>		
+		<ucn:description xml:lang="en">Checks validity against CSS 1, CSS 2, CSS 2.1 and CSS 3 profiles</ucn:description>
+		<ucn:description xml:lang="fr">Vérifie la validité pour les profils CSS 1, CSS 2, CSS 2.1 and CSS 3</ucn:description>		
     	<ucn:hasParameter>
 			<ucn:Radio ucn:reference="warning">
 				<ucn:longName xml:lang="en">Warning</ucn:longName>
@@ -134,50 +138,150 @@
 	
 	<ucn:Task ucn:reference="mobileok">
 		<ucn:longName xml:lang="en">MobileOK Checker</ucn:longName>
-		<ucn:longName xml:lang="fr">Validateur MobileOk</ucn:longName>
+		<ucn:description xml:lang="en">Checks mobile-friendliness</ucn:description>
 	</ucn:Task>
 	
 	<ucn:Task ucn:reference="custom">
 		<ucn:longName xml:lang="en">Custom task</ucn:longName>
 		<ucn:longName xml:lang="fr">Tâche personnalisée</ucn:longName>
+		<ucn:description xml:lang="en">Lets you choose which checks to perform</ucn:description>
+		<ucn:description xml:lang="fr">Sélectionnez les tests à effectuer</ucn:description>
 		<ucn:hasParameter>
 			<ucn:CheckBoxList ucn:reference="observers">
 				<ucn:longName xml:lang="en">Observers</ucn:longName>
 				<ucn:longName xml:lang="fr">Observateurs</ucn:longName>
 				<ucn:hasValue>
-					<ucn:Value ucn:reference="css1-validator">
-						<ucn:longName xml:lang="en">W3C CSS Validator (Level 1)</ucn:longName>
-						<ucn:longName xml:lang="fr">W3C Validateur CSS (Niveau 1)</ucn:longName>
+					<ucn:Value ucn:reference="css-validator">
+						<ucn:longName xml:lang="en">CSS</ucn:longName>
 					</ucn:Value>
 				</ucn:hasValue>
 				<ucn:hasValue>
-					<ucn:Value ucn:reference="css2-validator">
-						<ucn:longName xml:lang="en">W3C CSS Validator (Level 2)</ucn:longName>
-						<ucn:longName xml:lang="fr">W3C Validateur CSS (Niveau 2)</ucn:longName>
+					<ucn:Value ucn:reference="appc-checker">
+						<ucn:longName xml:lang="en">XHTML - Appendix C</ucn:longName>
 					</ucn:Value>
 				</ucn:hasValue>
 				<ucn:hasValue>
-					<ucn:Value ucn:reference="css21-validator">
-						<ucn:longName xml:lang="en">W3C CSS Validator (Level 2.1)</ucn:longName>
-						<ucn:longName xml:lang="fr">W3C Validateur CSS (Niveau 2.1)</ucn:longName>
+					<ucn:Value ucn:reference="markup-validator">
+						<ucn:longName xml:lang="en">(X)HTML</ucn:longName>
 					</ucn:Value>
 				</ucn:hasValue>
 				<ucn:hasValue>
-					<ucn:Value ucn:reference="css3-validator">
-						<ucn:longName xml:lang="en">W3C CSS Validator (Level 3)</ucn:longName>
-						<ucn:longName xml:lang="fr">W3C Validateur CSS (Niveau 3)</ucn:longName>
+					<ucn:Value ucn:reference="mobileok">
+						<ucn:longName xml:lang="en">Mobile OK</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+			</ucn:CheckBoxList>
+		</ucn:hasParameter>
+		<ucn:hasParameter>
+			<ucn:Dropdown ucn:reference="profile">
+				<ucn:longName xml:lang="en">CSS Profile</ucn:longName>
+				<ucn:longName xml:lang="fr">Profil CSS</ucn:longName>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="css1">
+						<ucn:longName xml:lang="en">CSS level 1</ucn:longName>
+						<ucn:longName xml:lang="fr">CSS niveau 1</ucn:longName>
 					</ucn:Value>
 				</ucn:hasValue>
 				<ucn:hasValue>
-					<ucn:Value ucn:reference="markup-validator">
-						<ucn:longName xml:lang="en">W3C HTML Validator</ucn:longName>
-						<ucn:longName xml:lang="fr">W3C Validateur HTML</ucn:longName>
+					<ucn:Value ucn:reference="css2">
+						<ucn:longName xml:lang="en">CSS level 2</ucn:longName>
+						<ucn:longName xml:lang="fr">CSS niveau 2</ucn:longName>
 					</ucn:Value>
 				</ucn:hasValue>
 				<ucn:hasValue>
-					<ucn:Value ucn:reference="mobileok">
-						<ucn:longName xml:lang="en">W3C Mobile OK Checker</ucn:longName>
-						<ucn:longName xml:lang="fr">W3C Validateur Mobile OK</ucn:longName>
+					<ucn:Value ucn:reference="css21">
+						<ucn:longName xml:lang="en">CSS level 2.1</ucn:longName>
+						<ucn:longName xml:lang="fr">CSS niveau 2.1</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="css3">
+						<ucn:longName xml:lang="en">CSS level 3</ucn:longName>
+						<ucn:longName xml:lang="fr">CSS niveau 3</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="svg">
+						<ucn:longName xml:lang="en">SVG</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="svgbasic">
+						<ucn:longName xml:lang="en">SVG Basic</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="svgtiny">
+						<ucn:longName xml:lang="en">SVG Tiny</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="mobile">
+						<ucn:longName xml:lang="en">Mobile</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="atsc-tv">
+						<ucn:longName xml:lang="en">ATSC TV Profile</ucn:longName>
+						<ucn:longName xml:lang="fr">Profil ATSC TV</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="tv">
+						<ucn:longName xml:lang="en">TV Profile</ucn:longName>
+						<ucn:longName xml:lang="fr">Profil TV</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+			</ucn:Dropdown>
+		</ucn:hasParameter>
+		<ucn:hasParameter>
+			<ucn:Dropdown ucn:reference="warning">
+				<ucn:longName xml:lang="en">Warning Level</ucn:longName>
+				<ucn:longName xml:lang="fr">Avertissements</ucn:longName>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="0">
+						<ucn:longName xml:lang="en">Most important</ucn:longName>
+						<ucn:longName xml:lang="fr">Les plus importants</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="1">
+						<ucn:longName xml:lang="en">Normal report</ucn:longName>
+						<ucn:longName xml:lang="fr">Rapport normal</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="2">
+						<ucn:longName xml:lang="en">All</ucn:longName>
+						<ucn:longName xml:lang="fr">Tous</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="no">
+						<ucn:longName xml:lang="en">No warnings</ucn:longName>
+						<ucn:longName xml:lang="fr">Aucun avertissement</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+			</ucn:Dropdown>
+		</ucn:hasParameter>
+		<ucn:hasParameter>
+			<ucn:CheckBoxList ucn:reference="usermedium">
+				<ucn:longName xml:lang="en">CSS User Medium</ucn:longName>
+				<ucn:longName xml:lang="fr">CSS Média</ucn:longName>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="all">
+						<ucn:longName xml:lang="en">All</ucn:longName>
+						<ucn:longName xml:lang="fr">Tous</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="tty">
+						<ucn:longName xml:lang="en">TTY</ucn:longName>
+					</ucn:Value>
+				</ucn:hasValue>
+				<ucn:hasValue>
+					<ucn:Value ucn:reference="tv">
+						<ucn:longName xml:lang="en">TV</ucn:longName>
 					</ucn:Value>
 				</ucn:hasValue>
 			</ucn:CheckBoxList>

Index: tasklist.xml
===================================================================
RCS file: /sources/public/2006/unicorn/WebContent/WEB-INF/resources/tasklist/tasklist.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- tasklist.xml	22 Sep 2009 11:58:50 -0000	1.4
+++ tasklist.xml	1 Oct 2009 16:05:40 -0000	1.5
@@ -4,33 +4,6 @@
 	xmlns="http://www.w3.org/unicorn/tasklist">
 
 	<task id="conformance">
-		<conds>
-			<cond id="markup-valid" result="passed"
-				observer="markup-validator" type="xpath">
-				<value>//passed = 'true'</value>
-			</cond>
-			<cond id="is-html" result="passed" type="mimetype">
-				<value>text/html</value>
-			</cond>
-			<cond id="is-css" result="passed" type="mimetype">
-				<value>text/css</value>
-			</cond>
-			<!--
-				<cond id="mathml" result="passed"  type="mimetype">
-				<value>application/mathml+xml</value>
-				</cond>
-				<cond id="smil" result="passed"  type="mimetype">
-				<value>application/smil+xml</value>
-				</cond>
-				
-				<cond id="svg" result="passed" type="mimetype">
-				<value>image/svg+xml</value>
-				</cond>
-				<cond id="xhtml" result="passed" type="mimetype">
-				<value>application/xhtml+xml</value>
-				</cond>
-			-->
-		</conds>
 
 		<routine>
 			<exec id="markup-validator" value="markup-validator" type="observation" />
@@ -261,65 +234,52 @@
 
 	<task id="custom">
 		<conds>
-			<cond id="param_css1" result="passed" type="parameter" parameter="observers">
-				<value>css1-validator</value>
-			</cond>
-			<cond id="param_css2" result="passed" type="parameter" parameter="observers">
-				<value>css2-validator</value>
-			</cond>
-			<cond id="param_css21" result="passed" type="parameter" parameter="observers">
-				<value>css21-validator</value>
-			</cond>
-			<cond id="param_css3" result="passed" type="parameter" parameter="observers">
-				<value>css3-validator</value>
+			<cond id="param_css" result="passed" type="parameter" parameter="observers">
+				<value>css-validator</value>
 			</cond>
 			<cond id="param_html" result="passed" type="parameter" parameter="observers">
 				<value>markup-validator</value>
 			</cond>
+			<cond id="param_appc" result="passed" type="parameter" parameter="observers">
+				<value>appc-checker</value>
+			</cond>
 			<cond id="param_mobile" result="passed" type="parameter" parameter="observers">
 				<value>mobileok</value>
 			</cond>
 		</conds>
 
 		<routine>
-			<if test="param_css1">
-				<then><exec id="css1" value="css1-validator" type="observation" /></then>
-			</if>
-			<if test="param_css2">
-				<then><exec id="css2" value="css2-validator" type="observation" /></then>
-			</if>
-			<if test="param_css21">
-				<then><exec id="css21" value="css21-validator" type="observation" /></then>
-			</if>
-			<if test="param_css3">
-				<then><exec id="css3" value="css3-validator" type="observation" /></then>
-			</if>
 			<if test="param_html">
 				<then><exec id="markup" value="markup-validator" type="observation" /></then>
 			</if>
+			<if test="param_css">
+				<then><exec id="css" value="css-validator" type="observation" /></then>
+			</if>
 			<if test="param_mobile">
 				<then><exec id="mobileok" value="mobileok" type="observation" /></then>
+			</if>						
+			<if test="param_appc">
+				<then><exec id="appc" value="appc-checker" type="observation" /></then>
 			</if>
 		</routine>
 
 		<parameters>
 			<parameter name="observers" type="checkboxlist" default="" ui="simple">
-				<value name="css1-validator"></value>
-				<value name="css2-validator"></value>
-				<value name="css21-validator"></value>
-				<value name="css3-validator"></value>
-				<value name="markup-validator"></value>
+				<value name="markup-validator"></value>			
+				<value name="css-validator"></value>				
+				<value name="appc-checker"></value>
 				<value name="mobileok"></value>
 			</parameter>
+			<parameter name="profile" type="dropdown" ui="advanced" observer="css-validator" default="css21"/>
+			<parameter name="warning" type="dropdown" ui="advanced" observer="css-validator" default="2"/>
+			<parameter name="usermedium" type="checkboxlist" ui="advanced" observer="css-validator" default="screen"/>
 		</parameters>
 
 		<output>
 			<group>
 				<observation>markup-validator</observation>
-				<observation>css1-validator</observation>
-				<observation>css2-validator</observation>
-				<observation>css21-validator</observation>
-				<observation>css3-validator</observation>
+				<observation>appc-checker</observation>				
+				<observation>css-validator</observation>
 				<observation>mobileok</observation>
 			</group>
 		</output>

Received on Thursday, 1 October 2009 16:05:44 UTC