--- loncom/interface/lonhtmlcommon.pm	2009/07/02 17:22:33	1.226
+++ loncom/interface/lonhtmlcommon.pm	2009/08/23 04:02:47	1.234
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.226 2009/07/02 17:22:33 bisitz Exp $
+# $Id: lonhtmlcommon.pm,v 1.234 2009/08/23 04:02:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -82,7 +82,7 @@ sub confirm_success {
             .'</span>'."\n";
    } else {
       return '<span class="LC_success">'."\n"
-            .'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('Ok').'" /> '."\n"
+            .'<img src="/adm/lonIcons/navmap.correct.gif" alt="'.&mt('OK').'" /> '."\n"
             .$message."\n"
             .'</span>'."\n";
    }
@@ -160,8 +160,8 @@ sub authorbombs {
     $url=&Apache::lonnet::declutter($url);
     my ($udom,$uname)=($url=~m{^($LONCAPA::domain_re)/($LONCAPA::username_re)/});
     my %bombs=&Apache::lonmsg::all_url_author_res_msg($uname,$udom);
-    foreach (keys %bombs) {
-	if ($_=~/^$udom\/$uname\//) {
+    foreach my $bomb (keys(%bombs)) {
+	if ($bomb =~ /^$udom\/$uname\//) {
 	    return '<a href="/adm/bombs/'.$url.
 		'"><img src="'.&Apache::loncommon::lonhttpdurl('/adm/lonMisc/bomb.gif').'" alt="'.&mt('Bomb').'" border="0" /></a>'.
 		&Apache::loncommon::help_open_topic('About_Bombs');
@@ -239,7 +239,7 @@ sub get_recent {
 # Begin filling return_hash with any 'always_include' option
     my %time_hash = ();
     my %return_hash = ();
-    foreach my $item (keys %recent) {
+    foreach my $item (keys(%recent)) {
         my ($thistime,$thisvalue)=(split(/\&/,$recent{$item}));
         if ($thistime eq 'always_include') {
             $return_hash{$item} = &unescape($thisvalue);
@@ -505,9 +505,9 @@ ENDJS
     unshift(@Months,'If you can read this an error occurred');
     if ($includeempty) { $monthselector.="<option value=''></option>"; }
     for(my $m = 1;$m <=$#Months;$m++) {
-        $monthselector .= qq{      <option value="$m" };
-        $monthselector .= "selected " if ($m-1 eq $month);
-        $monthselector .= '> '.&mt($Months[$m]).' </option>';
+        $monthselector .= qq{      <option value="$m"};
+        $monthselector .= ' selected="selected"' if ($m-1 eq $month);
+        $monthselector .= '> '.&mt($Months[$m]).' </option>'."\n";
     }
     $monthselector.= '  </select>';
     # Day
@@ -520,8 +520,8 @@ ENDJS
         $hourselector.=qq{<option value=''></option>};
     }
     for (my $h = 0;$h<24;$h++) {
-        $hourselector .= qq{<option value="$h" };
-        $hourselector .= "selected " if (defined($hour) && $hour == $h);
+        $hourselector .= qq{<option value="$h"};
+        $hourselector .= ' selected="selected"' if (defined($hour) && $hour == $h);
         $hourselector .= ">";
         my $timest='';
         if ($h == 0) {
@@ -978,8 +978,7 @@ sub Create_PrgWin {
 
 	#the whole function called through timeout is due to issues
 	#in mozilla Read BUG #2665 if you want to know the whole story
-	&r_print($r,'<script type="text/javascript">'.
-        '// <![CDATA['.
+	&r_print($r,&Apache::lonhtmlcommon::scripttag(
         "var popwin;
          function openpopwin () {
          popwin=open(\'\',\'popwin\',\'width=400,height=100\');".
@@ -990,9 +989,8 @@ sub Create_PrgWin {
 	      &mt('Starting').'" /><\\/form>'.$end_page.
               "\');".
         "popwin.document.close();}".
-        "\nwindow.setTimeout(openpopwin,0)".
-        '// ]]>'.
-        '</script>');
+        "\nwindow.setTimeout(openpopwin,0)"
+    ));
 	$prog_state{'formname'}='popremain';
 	$prog_state{'inputname'}="remaining";
     } elsif ($type eq 'inline') {
@@ -1025,14 +1023,12 @@ sub Create_PrgWin {
 # update progress
 sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;
-    &r_print($r,'<script type="text/javascript">'.
-        '// <![CDATA['.
+    &r_print($r,&Apache::lonhtmlcommon::scripttag(
         $$prog_state{'window'}.'.document.'.
-	     $$prog_state{'formname'}.'.'.
-	     $$prog_state{'inputname'}.'.value="'.
-	     $displayString.'";'.
-        '// ]]>'.
-        '</script>');
+        $$prog_state{'formname'}.'.'.
+        $$prog_state{'inputname'}.'.value="'.
+        $displayString.'";'
+    ));
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
@@ -1085,15 +1081,13 @@ sub Increment_PrgWin {
     if ($user_browser eq 'explorer' && $user_os =~ 'mac') {
         $lasttime = '';
     }
-    &r_print($r,'<script>'.
-        '// <![CDATA['.
+    &r_print($r,&Apache::lonhtmlcommon::scripttag(
         $$prog_state{'window'}.'.document.'.
-	     $$prog_state{'formname'}.'.'.
-	     $$prog_state{'inputname'}.'.value="'.
-	     $$prog_state{'done'}.'/'.$$prog_state{'max'}.
-	     ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'.
-        '// ]]>'.
-        '</script>');
+        $$prog_state{'formname'}.'.'.
+        $$prog_state{'inputname'}.'.value="'.
+        $$prog_state{'done'}.'/'.$$prog_state{'max'}.
+        ': '.$time_est.' '.&mt('remaining').' '.$lasttime.'";'
+    ));
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
@@ -1101,11 +1095,9 @@ sub Increment_PrgWin {
 sub Close_PrgWin {
     my ($r,$prog_state)=@_;
     if ($$prog_state{'type'} eq 'popup') {
-        &r_print($r,'<script>'.
-            '// <![CDATA['.
-            'popwin.close()'.
-            '// ]]>'.
-            '</script>'."\n");
+        &r_print($r,&Apache::lonhtmlcommon::scripttag(
+            'popwin.close()'
+        ));
     } elsif ($$prog_state{'type'} eq 'inline') {
 	&Update_PrgWin($r,$prog_state,&mt('Done'));
     }
@@ -1272,8 +1264,8 @@ sub htmlareaselectactive {
     my @fields=@_;
     unless (&htmlareabrowser()) { return ''; }
     if (&htmlareablocked()) { return '<br />'.&enablelink(@fields); }
-    my $output='<script type="text/javascript" defer="1">'
-              .'// <![CDATA[';
+    my $output='<script type="text/javascript" defer="1">'."\n"
+              .'// <![CDATA['."\n";
     my $lang = &htmlarea_lang();
     foreach my $field (@fields) {
 	$output.="
@@ -1287,7 +1279,7 @@ sub htmlareaselectactive {
 }";
     }
     $output.="\nwindow.status='Activated Editfields';\n"
-            .'// ]]>'
+            .'// ]]>'."\n"
             .'</script><br />'.
 	&disablelink(@fields);
     return $output;
@@ -1435,7 +1427,7 @@ returns: nothing
         unless ($CourseBreadcrumbs) {
             $links = htmltag('ol',  $links, { id => "LC_MenuBreadcrumbs"   });
         } else {
-            $links = htmltag('ul',  $links, { id => "LC_CourseBreadcrumbs" });
+            $links = htmltag('ul',  $links, { class => "LC_CourseBreadcrumbs" });
         }
 
         if ($component) {
@@ -1461,7 +1453,7 @@ returns: nothing
     }
 
     sub add_breadcrumb {
-        push (@Crumbs,@_);
+        push(@Crumbs,@_);
     }
 
 } # End of scope for @Crumbs
@@ -1953,7 +1945,7 @@ sub set_form_elements {
             $values{$name}[$i] =~ s/([\r\n\f]+)/\\n/g;
             $values{$name}[$i] =~ s/"/\\"/g;
         }
-        if ($$elements{$name} eq 'text') {
+        if (($$elements{$name} eq 'text') || ($$elements{$name} eq 'hidden')) {
             my $numvalues = @{$values{$name}};
             if ($numvalues > 1) {
                 my $valuestring = join('","',@{$values{$name}});
@@ -1988,6 +1980,8 @@ sub set_form_elements {
                     $output .= qq|
       if (courseForm.elements['$name'].value == "$value") {
           courseForm.elements['$name'].checked = true;
+      } else {
+          courseForm.elements['$name'].checked = false;
       }|;
                 }
             }
@@ -2117,6 +2111,41 @@ sub inittags {
 }
 
 
+# USAGE: scripttag(scriptcode, [start|end|both]);
+#
+# EXAMPLES: 
+#  - scripttag("alert('Hello World!')", 'both') 
+#    returns:
+#    <script type="text/javascript">
+#    // BEGIN LON-CAPA Internal
+#    alert(Hello World!')
+#    // END LON-CAPA Internal
+#    </script>
+#
+# NOTES:
+# - works currently only for javascripts
+#
+# OUTPUT: 
+# Scriptcode properly enclosed in <script> and CDATA tags (and LC
+# Internal markers if 2nd argument is given)
+sub scripttag {
+    my ( $content, $marker ) = @_;
+    return unless defined $content;
+
+    my $begin = "\n// BEGIN LON-CAPA Internal\n";
+    my $end   = "\n// END LON-CAPA Internal\n";
+
+    if ($marker) {
+        $content  = $begin . $content if $marker eq 'start' or $marker eq 'both';
+        $content .= $end              if $marker eq 'end'   or $marker eq 'both';
+    }
+
+    $content = "\n// <![CDATA[\n$content\n// ]]>\n";
+
+    return htmltag('script', $content, {type => 'text/javascript'});
+};
+
+
 ##############################################
 ##############################################
 
@@ -2167,7 +2196,7 @@ sub generate_menu {
             # create the markup for the current $link and push it into @links.
             # each entry consists of an image and a text optionally followed 
             # by a help link.
-            push @links, $li->(
+            push(@links,$li->(
                         $a->(
                             $img->("", {
                                 class => "LC_noBorder LC_middle",
@@ -2185,7 +2214,7 @@ sub generate_menu {
                             }).
                          (defined($$link{help}) ? 
                          Apache::loncommon::help_open_topic($$link{help}) : ''),
-                         {class => "LC_menubuttons_inline_text"});
+                         {class => "LC_menubuttons_inline_text"}));
         }
 
         # wrap categorytitle in <h3>, concatenate with 
@@ -2195,10 +2224,10 @@ sub generate_menu {
         # such that each element looks like:
         # <div><h3>title</h3><ul><li>...</li>...</ul></div>
         # the category won't be added if there aren't any links
-        push @categories, 
+        push(@categories, 
             $div->($h3->(mt($$category{categorytitle}), {class=>"LC_hcell"}).
             $ul->(join('' ,@links),  {class =>"LC_ListStyleNormal" }),
-            {class=>"LC_Box LC_400Box"}) if scalar(@links);
+            {class=>"LC_Box LC_400Box"})) if scalar(@links);
     }
 
     # wrap the joined @categories in another <div> (column layout)