2006/unicorn/resources/templates xhtml10.error.vm,1.1,1.2 xhtml10.vm,1.1,1.2 index.vm,1.5,1.6

Update of /sources/public/2006/unicorn/resources/templates
In directory hutz:/tmp/cvs-serv8979/resources/templates

Modified Files:
	xhtml10.error.vm xhtml10.vm index.vm 
Log Message:
new templates

Index: xhtml10.error.vm
===================================================================
RCS file: /sources/public/2006/unicorn/resources/templates/xhtml10.error.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xhtml10.error.vm	28 Jul 2009 10:36:31 -0000	1.1
+++ xhtml10.error.vm	31 Jul 2009 11:16:26 -0000	1.2
@@ -1,17 +1,11 @@
-<?xml version="1.0"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    #if($unicorncall.DocumentName)
-      <title>$result_for $unicorncall.DocumentName</title>
-    #else
-      <title>$result_for_upload</title>
-    #end
-    <link rev="start" href="./" title="Home Page" />
-    <style type="text/css" media="all">@import "./style/base.css";</style>
-    <meta name="keywords" content="Unicorn, Observation"/>
-  </head>
+#if($unicorncall.DocumentName)
+  #set ($title = "$result_for $unicorncall.DocumentName")
+#else
+  #set ($title = $result_for_upload)
+#end  
+#set ($css = ['base.css'])
+#parse( 'includes/head.vm' )
+  
   <body>
     <div id="banner">
       <h1 id="title"><a href="http://www.w3.org/"><img height="48" alt="W3C" id="logo" src="http://www.w3.org/Icons/WWW/w3c_home_nb" /></a>
@@ -40,41 +34,4 @@
       </ol>
     </div>
     
-    <ul class="navbar"  id="menu">
-      <li><a href="about" title="About this service">About</a> <span class="hideme">|</span></li>
-      <li><a href="documentation" title="Documentation for the W3C CSS Validation Service">Documentation</a> <span class="hideme">|</span></li>
-      <li><a href="DOWNLOAD" title="Download and install the CSS validator">Download</a> <span class="hideme">|</span></li>
-      <li><a href="Email" title="How to provide feedback on this service">Feedback</a> <span class="hideme">|</span></li>
-      <li><a href="thanks" title="Credits and Acknowlegments">Credits</a><span class="hideme">|</span></li>
-      <li><a href="languages" title="How to use the CSS Validator in your language">Other Languages</a><span class="hideme">|</span></li>
-    </ul>
-
-    <p id="activity_logos">
-      <a href="http://www.w3.org/QA/" title="W3C's Quality Assurance Activity, bringing you free Web quality tools and more"><img src="http://www.w3.org/QA/2002/12/qa-small.png" alt="QA" /></a><a href="http://www.w3.org/Style/CSS/learning" title="Learn more about Cascading Style Sheets"></a>
-    </p>
-    <p id="support_logo">
-      Support this tool, become a<br />
-      <a href="http://www.w3.org/Consortium/supporters"><img src="http://www.w3.org/Consortium/supporter-logos/csupporter.png" alt="W3C Supporter" /></a>
-    </p>
-
-    <p class="copyright">
-      <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2006
-      <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>&reg;
-
-      (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
-      <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
-      <a href="http://www.keio.ac.jp/">Keio</a>),
-      All Rights Reserved.
-      W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
-      <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
-      <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a>
-      and <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-software">software licensing</a>
-
-      rules apply. Your interactions with this site are in accordance
-      with our <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Public">public</a> and
-      <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Members">Member</a> privacy
-      statements.
-    </p>
-
-</body>
-</html>
\ No newline at end of file
+#parse( 'includes/footer.vm' )
\ No newline at end of file

Index: index.vm
===================================================================
RCS file: /sources/public/2006/unicorn/resources/templates/index.vm,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- index.vm	28 Jul 2009 10:56:56 -0000	1.5
+++ index.vm	31 Jul 2009 11:16:26 -0000	1.6
@@ -1,4 +1,9 @@
-<?xml version="1.0" encoding="utf-8"?>
+#set ($title = "Unicorn")
+#set ($css = ['base.css'])
+#set ($js = ['tabtastic/addclasskillclass.js', 'tabtastic/attachevent.js',
+			'tabtastic/addcss.js', 'tabtastic/tabtastic.js', 'en_parameters.js'])
+#parse( 'includes/head.vm' )
+
 #macro(genTasklist $i)
 	<div>
 		$task:
@@ -10,21 +15,6 @@
 	</div>
 #end
 
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-	<head>
-	    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-		<title>Unicorn</title>
-		<link rev="start" href="./" title="Home Page" />
-		<style type="text/css" media="all">@import "style/base.css";</style>
-		<script type="text/javascript" src="tabtastic/addclasskillclass.js"></script>
-		<script type="text/javascript" src="tabtastic/attachevent.js"></script>
-		<script type="text/javascript" src="tabtastic/addcss.js"></script>
-		<script type="text/javascript" src="tabtastic/tabtastic.js"></script>
-		<script type="text/javascript" src="en_parameters.js"></script>
-	</head>
-
 	<body onload="init()">
 
 		<div id="banner">
@@ -155,45 +145,4 @@
 
 <p><strong>Note</strong>: Vous devez activer JavaScript pour pouvoir v&eacute;rifier des documents.</p>
 
-		<ul class="navbar"  id="menu">
-			<li><a href="http://www.w3.org/QA/2006/obs_framework/" title="Documentation about this service and the software behind it">$documentation</a> <span class="hideme">|</span></li>
-			<li><a href="http://dev.w3.org/cvsweb/2006/unicorn/" title="$download_title">$download</a> <span class="hideme">|</span></li>
-			<li><a href="mailto:public-qa-dev@w3.org" title="$feedback_title">$feedback</a> <span class="hideme">|</span></li>
-		</ul>
-
-		<p id="activity_logos">
-			<a href="http://www.w3.org/QA/" title="W3C's Quality Assurance Activity, bringing you free Web quality tools and more">
-				<img src="http://www.w3.org/QA/2002/12/qa.png" alt="QA" />
-			</a>
-			<a href="http://www.w3.org/Style/CSS/learning" title="Learn more about Cascading Style Sheets"></a>
-		</p>
-
-		<p id="support_logo">
-			Support this tool, become a<br />
-			<a href="http://www.w3.org/Consortium/supporters">
-				<img src="http://www.w3.org/Consortium/supporter-logos/csupporter.png" alt="W3C Supporter" />
-			</a>
-		</p>
-
-		<p class="copyright">
-			<a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2008
-			<a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>&reg;
-
-			(<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
-			<a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
-			<a href="http://www.keio.ac.jp/">Keio</a>),
-			All Rights Reserved.
-			W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
-			<a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
-			<a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a>
-			and <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-software">software licensing</a>
-
-			rules apply. Your interactions with this site are in accordance
-			with our <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Public">public</a> and
-			<a href="http://www.w3.org/Consortium/Legal/privacy-statement#Members">Member</a> privacy
-			statements.
-		</p>
-
-	</body>
-
-</html>
+#parse( 'includes/footer.vm' )

Index: xhtml10.vm
===================================================================
RCS file: /sources/public/2006/unicorn/resources/templates/xhtml10.vm,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- xhtml10.vm	28 Jul 2009 10:36:31 -0000	1.1
+++ xhtml10.vm	31 Jul 2009 11:16:26 -0000	1.2
@@ -1,19 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    #if($unicorncall.DocumentName)
-      <title>$result_for $unicorncall.DocumentName</title>
-    #else
-      <title>$result_for_upload</title>
-    #end
-    <link rev="start" href="./" title="Home Page" />
-    <style type="text/css" media="all">@import "./style/base.css";</style>
-    <style type="text/css" media="all">@import "./style/results.css";</style>
-    <meta name="keywords" content="Unicorn, Observation"/>
-  </head>
+#if($unicorncall.DocumentName)
+  #set ($title = "$result_for $unicorncall.DocumentName")
+#else
+  #set ($title = $result_for_upload)
+#end  
+#set ($css = ['base.css', 'results.css'])
+#parse( 'includes/head.vm' )
 
 #macro(error $error)
   <span class="err_type">Error</span>
@@ -110,6 +101,8 @@
     <h1 id="title"><a href="http://www.w3.org/"><img height="48" alt="W3C" id="logo" src="http://www.w3.org/Icons/WWW/w3c_home_nb" /></a>
 <img src="images/unicorn.png" alt="Unicorn" /></h1>
  
+	
+ 
   </div>
   <p id="tagline">
         the Web's Universal Conformance Checker - <strong>ALPHA Test Version</strong>
@@ -164,38 +157,4 @@
 
   </div>
 
-     <ul class="navbar"  id="menu">
-       	<li><a href="http://www.w3.org/QA/2006/obs_framework/" title="Documentation about this service and the software behind it">Documentation</a> <span class="hideme">|</span></li>
-		<li><a href="http://dev.w3.org/cvsweb/2006/unicorn/" title="Download the source for this service">Download</a> <span class="hideme">|</span></li>
-		<li><a href="mailto:public-qa-dev@w3.org" title="send us your thoughts and bug reports on the PUBLIC development mailing-list">Feedback</a> <span class="hideme">|</span></li>
-	      </ul>
-
-   <p id="activity_logos">
-      <a href="http://www.w3.org/QA/" title="W3C's Quality Assurance Activity, bringing you free Web quality tools and more"><img src="http://www.w3.org/QA/2002/12/qa.png" alt="QA" /></a><a href="http://www.w3.org/Style/CSS/learning" title="Learn more about Cascading Style Sheets"></a>
-   </p>
-   <p id="support_logo">
-Support this tool, become a<br />
-<a href="http://www.w3.org/Consortium/supporters"><img src="http://www.w3.org/Consortium/supporter-logos/csupporter.png" alt="W3C Supporter" /></a>
-   </p>
-
-    <p class="copyright">
-      <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/ipr-notice#Copyright">Copyright</a> &copy; 1994-2006
-      <a href="http://www.w3.org/"><acronym title="World Wide Web Consortium">W3C</acronym></a>&reg;
-
-      (<a href="http://www.csail.mit.edu/"><acronym title="Massachusetts Institute of Technology">MIT</acronym></a>,
-      <a href="http://www.ercim.org/"><acronym title="European Research Consortium for Informatics and Mathematics">ERCIM</acronym></a>,
-      <a href="http://www.keio.ac.jp/">Keio</a>),
-      All Rights Reserved.
-      W3C <a href="http://www.w3.org/Consortium/Legal/ipr-notice#Legal_Disclaimer">liability</a>,
-      <a href="http://www.w3.org/Consortium/Legal/ipr-notice#W3C_Trademarks">trademark</a>,
-      <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-documents">document use</a>
-      and <a rel="Copyright" href="http://www.w3.org/Consortium/Legal/copyright-software">software licensing</a>
-
-      rules apply. Your interactions with this site are in accordance
-      with our <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Public">public</a> and
-      <a href="http://www.w3.org/Consortium/Legal/privacy-statement#Members">Member</a> privacy
-      statements.
-    </p>
-
-</body>
-</html>
+#parse( 'includes/footer.vm' )

Received on Friday, 31 July 2009 11:16:37 UTC