--- loncom/publisher/lonpublisher.pm	2008/07/26 16:03:46	1.240
+++ loncom/publisher/lonpublisher.pm	2008/08/01 18:11:19	1.244
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.240 2008/07/26 16:03:46 raeburn Exp $
+# $Id: lonpublisher.pm,v 1.244 2008/08/01 18:11:19 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -123,6 +123,7 @@ use Apache::loncacc;
 use DBI;
 use Apache::lonnet;
 use Apache::loncommon();
+use Apache::lonhtmlcommon;
 use Apache::lonmysql;
 use Apache::lonlocal;
 use Apache::loncfile;
@@ -886,17 +887,21 @@ sub checkonthis {
 					  'return_only_error_and_warning_counts' => 1));
     my ($errorcount,$warningcount)=split(':',$result);
     if (($errorcount) || ($warningcount)) {
-        $r->print('<br /><tt>'.$uri.'</tt>: ');
-	if ($errorcount) {
-	    $r->print('<img src="/adm/lonMisc/bomb.gif" /><span class="LC_error"><b>'.
-		      $errorcount.' '.
-		      &mt('error(s)').'</b></span> ');
-	}
-	if ($warningcount) {
-	    $r->print('<font color="blue">'.
-		      $warningcount.' '.
-		      &mt('warning(s)').'</font>');
-	}
+        $r->print('<h3>'.&mt('Warnings and Errors').'</h3>');
+        $r->print('<tt>'.$uri.'</tt>:');
+        $r->print('<ul>');
+        if ($warningcount) {
+            $r->print('<li><div class="LC_warning">'
+                     .&mt('[quant,_1,warning]',$warningcount)
+                     .'</div></li>');
+        }
+        if ($errorcount) {
+            $r->print('<li><div class="LC_error">'
+                     .&mt('[quant,_1,error]',$errorcount)
+                     .' <img src="/adm/lonMisc/bomb.gif" />'
+                     .'</div></li>');
+        }
+        $r->print('</ul>');
     } else {
 	#$r->print('<font color="green">'.&mt('ok').'</font>');
     }
@@ -1237,10 +1242,13 @@ END
                 .'<input type="button" value="'.&mt('check all').'" onclick="javascript:checkAll(document.pubform.keywords)" />'
                 .'<input type="button" value="'.&mt('uncheck all').'" onclick="javascript:uncheckAll(document.pubform.keywords)" />'
                 .'</p><br />'
-                .'<table border="2"><tr>';
+                .&Apache::loncommon::start_data_table()
+                .&Apache::loncommon::start_data_table_row();
+
     my $colcount=0;
 
     foreach (sort keys %keywords) {
+	$colcount++;
 	$keywordout.='<td><label><input type="checkbox" name="keywords" value="'.$_.'"';
 	if ($metadatafields{'keywords'}) {
 	    if ($metadatafields{'keywords'}=~/\Q$_\E/) {
@@ -1252,15 +1260,24 @@ END
 	    $env{'form.keywords'}.=$_.',';
 	}
 	$keywordout.=' />'.$_.'</label></td>';
-	if ($colcount>10) {
-	    $keywordout.="</tr><tr>\n";
+	if ($colcount>=10) {
+	    $keywordout.=&Apache::loncommon::end_data_table_row()
+                        .&Apache::loncommon::start_data_table_row();
 	    $colcount=0;
 	}
-	$colcount++;
     }
+    # Proper end of started table row:
+    if ($colcount != 0) { # has still to be improved: if amount of keywords mod 10 == 0, then do not start another table row
+        while ($colcount<10) {
+            $keywordout.='<td>&nbsp;</td>';
+            $colcount++;
+        }
+    }
+
     $env{'form.keywords'}=~s/\,$//;
 
-    $keywordout.='</tr></table>'
+    $keywordout.=&Apache::loncommon::end_data_table_row()
+                 .&Apache::loncommon::end_data_table()
                  .&Apache::lonhtmlcommon::row_closure();
 
     $intr_scrout.=$keywordout;