[Cdd-commits] r1186 - in cdd/trunk/webtools: . inc templates

[CDD Subversion Commit]

Author: tille
Date: Sat Nov  1 14:23:58 2008
New Revision: 1186

Modified:
   cdd/trunk/webtools/bugs.py
   cdd/trunk/webtools/inc/style.css
   cdd/trunk/webtools/templates/bugs.xhtml
Log:
Remove debugging / old code; different style between dependent, suggested package bugs and done bugs


Modified: cdd/trunk/webtools/bugs.py
==============================================================================
--- cdd/trunk/webtools/bugs.py	(original)
+++ cdd/trunk/webtools/bugs.py	Sat Nov  1 14:23:58 2008
@@ -190,7 +190,6 @@
 else:
 	data['projectadvertising'] = None
 
-allbugs = {}
 nbugs   = {}
 ndone   = {}
 buglist = {}
@@ -221,37 +220,28 @@
 		nbugs[task] += pkgbug_oad.open.nbugs
 		ndone[task] += pkgbug_oad.done.nbugs
 
-	print "task = %s: nbugs = %i, ndone = %i" % (task, nbugs[task], ndone[task])
-
-	allbugs[task] = []
 	for cat in BUGLISTCAT:
 		if len(buglist[task][cat].pkgbugs) > 0:
 			# sort lists of PkgBug objects inside the three categories
 			buglist[task][cat].pkgbugs.sort()
-			print "type(buglist[%s][%s]) = %s" % \
-			    (task, cat, type(buglist[task][cat]))
-			print "isinstance(buglist[%s][%s]) = %s" % \
-			    (task, cat, isinstance(buglist[task][cat], BugList))
-			allbugs[task].append(buglist[task][cat])
-			print "type(allbugs[%s]) = %s" % \
-			    (task, type(allbugs[task]))
+
+data['headings'] = {DEPENDENT : 'Open bugs in dependent packages',
+                    SUGGESTED : 'Open bugs in suggested packages',
+                    DONE      : 'Done bugs'
+                   }
+data['cssclass'] = {DEPENDENT : 'bugsdependent',
+                    SUGGESTED : 'bugssuggested',
+                    DONE      : 'bugsdone'
+                   }
 
 for task in packages.keys():
 	data['task']       = task
-	data['allbugs']    = allbugs[task]
 	data['nbugs']      = nbugs
 	data['ndone']      = ndone
 	data['buglist']    = buglist[task]
 	data['buglistcat'] = BUGLISTCAT
 
-	print "Ende: task = %s: nbugs = %i, ndone = %i" % (task, nbugs[task], ndone[task])
-
 	template = loader.load('bugs.xhtml')
-#	for pkgbugs in data['allbugs':
-#		print str(pkgbugs)
-	for cat in BUGLISTCAT:
-		for pkgbug in buglist[task][cat].pkgbugs:
-			print str(pkgbug)
 	f = open(outputdir + '/' + task + '.html', 'w')
 	print >> f, template.generate(**data).render('xhtml')
 

Modified: cdd/trunk/webtools/inc/style.css
==============================================================================
--- cdd/trunk/webtools/inc/style.css	(original)
+++ cdd/trunk/webtools/inc/style.css	Sat Nov  1 14:23:58 2008
@@ -397,20 +397,52 @@
 	width:100%;
 }
 
-table.bugs{
-	border:1px solid #888;
+table.bugsdependent{
+	border:2px solid #F88;
+	background-color:#EEE;
+	padding:0.25em 0.5em;
+	margin:0em;
+	width:100%;
+}
+
+table.bugssuggested{
+	border:2px solid #FF8;
 	background-color:#DDD;
 	padding:0.25em 0.5em;
 	margin:0em;
 	width:100%;
 }
 
-table.bugs tr{
+table.bugsdone{
+	border:1px solid #888;
+	background-color:#CCC;
+	padding:0.25em 0.5em;
+	margin:0em;
+	width:100%;
+}
+
+table.bugsdependent table.bugssuggested table.bugsdone tr{
 	margin:0em;
 	padding:0em;
 }
                             
-table.bugs td.package{
+table.bugsdependent td.package{
+	margin:0em;
+	padding:0.1em 0.25em;
+	font-weight:bold;
+	text-align:left;
+	white-space:nowrap;
+}
+
+table.bugssuggested td.package{
+	margin:0em;
+	padding:0.1em 0.25em;
+	font-weight:bold;
+	text-align:left;
+	white-space:nowrap;
+}
+
+table.bugsdone td.package{
 	margin:0em;
 	padding:0.1em 0.25em;
 	font-weight:bold;
@@ -418,62 +450,62 @@
 	white-space:nowrap;
 }
 
-table.bugs td.bugid{
+td.bugid{
 	margin:0em;
 	padding:0em;
 	text-align:center;
 }
 
-table.bugs td.summary{
+td.summary{
 	margin:0em;
 	padding:0em;
 	text-align:left;
 	width:100%;
 }
 
-table.bugs td.severity{
+td.severity{
 	margin:0em;
 	padding:0em;
 	text-align:center;
 }
 
-table.bugs td.fixed{
+td.fixed{
 	margin:0em;
 	padding:0em;
 	text-align:center;
 }
 
-table.bugs td.wishlist{
+td.wishlist{
 	background-color:#80efeb;
 }
 
-table.bugs td.minor{
+td.minor{
 	background-color:#80efeb;
 }
 
-table.bugs td.normal{
+td.normal{
 	background-color:#cf9;
 }
 
-table.bugs td.does-not-build{
+td.does-not-build{
 	background-color:#ff9;
 }
 
-table.bugs td.important{
+td.important{
 	background-color:#ff9;
 }
 
-table.bugs td.serious{
+td.serious{
 	background-color:#fc9;
 	font-weight:bold;
 }
 
-table.bugs td.grave{
+td.grave{
 	background-color:#fc9;
 	font-weight:bold;
 }
 
-table.bugs td.critical{
+td.critical{
 	background-color:#fc9;
 	font-weight:bold;
 }

Modified: cdd/trunk/webtools/templates/bugs.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/bugs.xhtml	(original)
+++ cdd/trunk/webtools/templates/bugs.xhtml	Sat Nov  1 14:23:58 2008
@@ -68,8 +68,8 @@
     <py:for each="cat in buglistcat">
       <span py:choose="">
 	<span py:when="buglist[cat].pkgbugs != []">
-	  <h2>Open bugs</h2>
-	  <table class="bugs">
+	  <h2>${headings[cat]}</h2>
+	  <table class="${cssclass[cat]}">
 	    <py:for each="pkgbug in buglist[cat].pkgbugs">
 	      <span py:if="pkgbug.nbugs > 0">
 		<tr>