--- loncom/xml/lonxml.pm	2008/08/01 16:31:26	1.482
+++ loncom/xml/lonxml.pm	2008/09/05 12:11:45	1.485
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.482 2008/08/01 16:31:26 bisitz Exp $
+# $Id: lonxml.pm,v 1.485 2008/09/05 12:11:45 onken Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -486,10 +486,10 @@ sub inner_xmlparse {
 	    while ($token->[1] ne $$stack['-1'] && ($#$stack > -1)) {
 		my $lasttag=$$stack[-1];
 		if ($token->[1] =~ /^\Q$lasttag\E$/i) {
-		    &Apache::lonxml::warning('Using tag </'.$token->[1].'> on line '.$token->[3].' as end tag to <'.$$stack[-1].'>');
+		    &Apache::lonxml::warning(&mt('Using tag [_1] on line [_2] as end tag to [_3]','</'.$token->[1].'>','.$token->[3].','<'.$$stack[-1].'>'));
 		    last;
 		} else {
-		    &Apache::lonxml::warning('Found tag </'.$token->[1].'> on line '.$token->[3].' when looking for </'.$$stack[-1].'> in file');
+                    &Apache::lonxml::warning(&mt('Found tag [_1] on line [_2] when looking for [_3] in file.','</'.$token->[1].'>',$token->[3],'</'.$$stack[-1].'>'));
 		    &end_tag($stack,$parstack,$token);
 		}
 	    }
@@ -1519,7 +1519,7 @@ sub renderingoptions {
        &mt('Math Rendering:').' '.
        &Apache::loncommon::select_form($env{'form.texengine'},'texengine',
                                                      ('' => '',
-                                                      'tth' => 'tth (Tex-to-HTML)',
+                                                      'tth' => 'tth (TeX to HTML)',
                                                       'jsMath' => 'jsMath',
                                                       'mimetex' => 'mimetex (Convert to Images)')).'
      </span>';
@@ -1844,8 +1844,10 @@ sub error {
     if ( &show_error_warn_msg() ) {
 	# If printing in construction space, put the error inside <pre></pre>
 	push(@Apache::lonxml::error_messages,
-	     $Apache::lonxml::warnings_error_header.
-             "<b>".&mt('ERROR:')."</b>".join("<br />\n",@errors)."<br />\n");
+	     $Apache::lonxml::warnings_error_header
+             .'<div class="LC_error">'
+             .'<b>'.&mt('ERROR:').' </b>'.join("<br />\n",@errors)
+             ."</div>\n");
 	$Apache::lonxml::warnings_error_header='';
     } else {
 	my $errormsg;
@@ -1906,10 +1908,10 @@ sub warning {
     if ($env{'form.grade_target'} ne 'tex') {
 	if ( &show_error_warn_msg() ) {
 	    push(@Apache::lonxml::warning_messages,
-		 $Apache::lonxml::warnings_error_header.
-                 '<span class="LC_warning">'.
-                 &mt('[_1]W[_2]ARNING','<b>','</b>')."<b>:</b> ".join('<br />',@_)."<br />\n".
-                 '</span>'
+		 $Apache::lonxml::warnings_error_header
+                .'<div class="LC_warning">'
+                .&mt('[_1]W[_2]ARNING','<b>','</b>')."<b>:</b> ".join('<br />',@_)
+                ."</div>\n"
                 );
 	    $Apache::lonxml::warnings_error_header='';
 	}
@@ -2135,7 +2137,109 @@ sub get_tag {
     return $insertlist{"$tagnum.tag"};
 }
 
+############################################################
+#                                           PDF-FORM-METHODS
+
+=pod
+
+=item &print_pdf_radiobutton(fieldname, value,  text)
+
+Returns a latexline to generate a PDF-Form-Radiobutton with Text.
+
+$fieldname: PDF internalname of the radiobutton
+$value:     Value of radiobutton (read when dumping the PDF data)
+$text:      Text on the rightside of the radiobutton
+
+=cut
+sub print_pdf_radiobutton {
+    my $result = '';
+    my ($fieldName, $value, $text) = @_;
+    $result .= '\begin{tabularx}{\textwidth}{p{0cm}X}'."\n";
+    $result .= '\radioButton[\symbolchoice{circle}]{'. 
+               $fieldName.'}{10bp}{10bp}{'.$value.'}&'.$text."\n";
+    $result .= '\end{tabularx}' . "\n";
+    $result .= '\hspace{2mm}' . "\n";
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_start_combobox(fieldname)
+
+Starts a latexline to generate a PDF-Form-Combobox with text.
+
+$fieldname: PDF internal name of the Combobox
+
+=cut
+sub print_pdf_start_combobox {
+    my $result;
+    my ($fieldName) = @_;
+    $result .= '\begin{tabularx}{\textwidth}{p{2.5cm}X}'."\n";
+    $result .= '\comboBox[]{'.$fieldName.'}{2.3cm}{14bp}{'; # 
+
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_add_combobox_option(options)
+
+Generates a latexline to add Options to a PDF-Form-ComboBox.
+
+$option: PDF internal name of the Combobox-Option
+
+=cut
+sub print_pdf_add_combobox_option {
+
+    my $result;
+    my ($option) = @_;  
+
+    $result .= '('.$option.')';
+    
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_end_combobox(text) {
+
+Returns latexcode to end a PDF-Form-Combobox with text.
+
+=cut
+sub print_pdf_end_combobox {
+    my $result;
+    my ($text) = @_;
+
+    $result .= '}&'.$text."\\\\\n";
+    $result .= '\end{tabularx}' . "\n";
+    $result .= '\hspace{2mm}' . "\n";
+    return $result;
+}
+
+
+=pod
+
+=item &print_pdf_hiddenField(fieldname, user, domain)
+
+Returns a latexline to generate a PDF-Form-hiddenField with userdata.
+
+$fieldname label for hiddentextfield
+$user:    name of user
+$domain:  domain of user
+
+=cut
+sub print_pdf_hiddenfield {
+    my $result;
+    my ($fieldname, $user, $domain) = @_;
+
+    $result .= '\textField [\F{\FHidden}\F{-\FPrint}\V{'.$domain.'&'.$user.'}]{'.$fieldname.'}{0in}{0in}'."\n";
+
+    return $result;
+}
+
 1;
 __END__
 
-