[med-svn] r1980 - in trunk/community: infrastructure/scripts website

[hanska-guest at alioth.debian.org]

Author: hanska-guest
Date: 2008-06-06 09:11:41 +0000 (Fri, 06 Jun 2008)
New Revision: 1980

Modified:
   trunk/community/infrastructure/scripts/update-tasks
   trunk/community/website/tasks.tmpl
   trunk/community/website/tasks_idx.tmpl
Log:
Improving "generalization" for other CDDs. Test will follow.


Modified: trunk/community/infrastructure/scripts/update-tasks
===================================================================
--- trunk/community/infrastructure/scripts/update-tasks	2008-06-06 07:44:14 UTC (rev 1979)
+++ trunk/community/infrastructure/scripts/update-tasks	2008-06-06 09:11:41 UTC (rev 1980)
@@ -77,8 +77,9 @@
 def renderTasks(node, task, packages, details):
 	global cdeps
 	
-	node.CDD.content = PRINTEDNAME[CDD]
-        node.CDDmail.content = '<a href="mailto:%s">%s mailing list</a>' % (EMAILLIST[CDD], PRINTEDNAME[CDD])
+#	node.CDD.content = PRINTEDNAME[CDD]
+#	node.CDDmail.content = '<a href="mailto:%s">%s mailing list</a>' % (EMAILLIST[CDD], PRINTEDNAME[CDD])
+	node.CDD.raw = '<?php $CDD = "%s"; $CDDmail = "%s" ?>' % (PRINTEDNAME[CDD], EMAILLIST[CDD])
 	node.task.content = details['Task']
 	node.shortdesc.content = details['ShortDesc']
 	node.heading.content = details['ShortDesc']

Modified: trunk/community/website/tasks.tmpl
===================================================================
--- trunk/community/website/tasks.tmpl	2008-06-06 07:44:14 UTC (rev 1979)
+++ trunk/community/website/tasks.tmpl	2008-06-06 09:11:41 UTC (rev 1980)
@@ -2,6 +2,7 @@
 ini_set("include_path", ini_get("include_path").":../");
 require_once("inc/header.inc.php");
 ?>
+<div node="-con:CDD"></div>
 <table class="columns">
 <tr>
 	<td class="left">
@@ -15,23 +16,20 @@
 			</div>
 			<div class="row">
 				<p>
-					<?=sprintf(_("The list to the right includes various software projects which are of some interest for %s."), 'con:CDD')?>
+					<?=sprintf(_("The list to the right includes various software projects which are of some interest for %s."), $CDD)?>
 					<?=_("Currently, only a few of them are available as Debian packages.")?>
-					<?=_("It is our goal, however, to include all software in")?> <em node="con:CDD"></em>
-					<?=_(" which can sensibly add to a high quality Custom Debian Distribution.")?>
+					<?=sprintf(_("It is our goal, however, to include all software in %s, which can sensibly add to a high quality Custom Debian Distribution."), $CDD) ?>
 				</p>
 				<p>
 					<?=_("For a better overview of the project's availability as a Debian package, each head row has a color code according to this scheme:")?>
 				</p>
 				<ul>
 					<li><?= sprintf(_("Green: The project is %savailable as an official Debian package%s"), '<a href="#official-debs">', '</a>'); ?></li>
-					<li><?= sprintf(_("Yellow: The project is %savailable as an inofficial Debian package%s"), '<a href="#inofficial-debs">', '</a>'); ?></li>
+					<li><?= sprintf(_("Yellow: The project is %savailable as an unofficial Debian package%s"), '<a href="#unofficial-debs">', '</a>'); ?></li>
 					<li><?= sprintf(_("Red: The project is %snot (yet) available as a Debian package%s"), '<a href="#debs-not-available">', '</a>'); ?></li>
 				</ul>
 				<p>
-					<?=_("If you discover a project which looks like a good candidate for")?> <em node="con:CDD"></em> 
-					<?=_("to you, or if you have prepared an inofficial Debian package, please do not hesitate to send a description of that project to the")?> 
-					<em node="con:CDDmail"></em>.
+					<?=sprintf(_("If you discover a project which looks like a good candidate for %s to you, or if you have prepared an unofficial Debian package, please do not hesitate to send a description of that project to the %s%s mailing list%s."), $CDD, sprintf('<a href="mailto:%s">', $CDDmail), $CDD, '</a>') ?>
 				</p>
 			</div>
 		</div>
@@ -65,7 +63,7 @@
 			<p node="-con:unofficial_head"></p>
 			<div node="-rep:unofficial"><p node="-con:project"></p>
 				<tbody>
-					<tr class="deb-inofficial">
+					<tr class="deb-unofficial">
 						<td class="project-name">
 							<a node="con:anchor" name="" id=""></a>
 							<strong node="con:name"></strong><p node="-con:wnpp"></p><br />

Modified: trunk/community/website/tasks_idx.tmpl
===================================================================
--- trunk/community/website/tasks_idx.tmpl	2008-06-06 07:44:14 UTC (rev 1979)
+++ trunk/community/website/tasks_idx.tmpl	2008-06-06 09:11:41 UTC (rev 1980)
@@ -2,6 +2,7 @@
 ini_set("include_path", ini_get("include_path").":../");
 require_once("inc/header.inc.php");
 ?>
+<div node="-con:CDD"></div>
 <table class="columns">
 <tr>
 	<td class="left">
@@ -16,9 +17,7 @@
 	<td class="main">
 		<div class="pageBody">
 			<h1><?=_("Tasks page")?></h1>
-			<p>
-				This is a list of the Tasks <span node="con:CDD"></span> is made of:
-			</p>
+			<p><?=sprintf(_("This is a list of the Tasks %s is made of:"), $CDD)?></p>
 			<ul>
 				<div node="-rep:tasks"><li><p node="-con:task"></p></li></div>
 			</ul>