--- loncom/interface/lonhtmlcommon.pm	2009/08/10 12:32:34	1.229
+++ loncom/interface/lonhtmlcommon.pm	2009/11/06 18:32:42	1.240
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.229 2009/08/10 12:32:34 droeschl Exp $
+# $Id: lonhtmlcommon.pm,v 1.240 2009/11/06 18:32:42 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);
@@ -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;
@@ -1461,7 +1453,7 @@ returns: nothing
     }
 
     sub add_breadcrumb {
-        push (@Crumbs,@_);
+        push(@Crumbs,@_);
     }
 
 } # End of scope for @Crumbs
@@ -1598,6 +1590,10 @@ ENDTWO
 
 sub role_select_row {
     my ($roles,$title,$css_class,$show_separate_custom,$cdom,$cnum) = @_;
+    my $crstype = 'Course';
+    if ($cdom ne '' && $cnum ne '') {
+        $crstype = &Apache::loncommon::course_type($cdom.'_'.$cnum);
+    }
     my $output;
     if (defined($title)) {
         $output = &row_title($title,$css_class);
@@ -1622,7 +1618,7 @@ sub role_select_row {
                 $plrole = &mt('Custom Role');
             }
         } else {
-            $plrole=&Apache::lonnet::plaintext($role);
+            $plrole=&Apache::lonnet::plaintext($role,$crstype);
         }
         if (($role ne 'cr') || (!$show_separate_custom)) {
             $output .= '  <option value="'.$role.'">'.$plrole.'</option>';
@@ -1637,15 +1633,15 @@ sub role_select_row {
 
 sub course_select_row {
     my ($title,$formname,$totcodes,$codetitles,$idlist,$idlist_titles,
-	$css_class) = @_;
+	$css_class,$crstype) = @_;
     my $output = &row_title($title,$css_class);
-    $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles);
+    $output .= &course_selection($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype);
     $output .= &row_closure();
     return $output;
 }
 
 sub course_selection {
-    my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles) = @_;
+    my ($formname,$totcodes,$codetitles,$idlist,$idlist_titles,$crstype) = @_;
     my $output = qq|
 <script type="text/javascript">
 // <![CDATA[
@@ -1674,9 +1670,19 @@ sub course_selection {
 // ]]>
 </script>
     |;
+
+    my ($allcrs,$pickspec);
+    if ($crstype eq 'Community') {
+        $allcrs = &mt('All communities');
+        $pickspec = &mt('Pick specific communities:');
+    } else {
+        $allcrs = &mt('All courses');
+        $pickspec = &mt('Pick specific course(s):');
+    }
+
     my $courseform='<b>'.&Apache::loncommon::selectcourse_link
-                     ($formname,'pickcourse','pickdomain','coursedesc','',1).'</b>';
-        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.&mt('All courses').'<br />';
+                     ($formname,'pickcourse','pickdomain','coursedesc','',1,$crstype).'</b>';
+        $output .= '<input type="radio" name="coursepick" value="all" onclick="coursePick(this.form)" />'.$allcrs.'<br />';
     if ($totcodes > 0) {
         my $numtitles = @$codetitles;
         if ($numtitles > 0) {
@@ -1721,7 +1727,7 @@ sub course_selection {
             $output .= '</tr></table><br />';
         }
     }
-    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1'".')" />'.&mt('Pick specific course(s):').' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
+    $output .= '<input type="radio" name="coursepick" value="specific" onclick="coursePick(this.form);opencrsbrowser('."'".$formname."','dccourse','dcdomain','coursedesc','','1','$crstype'".')" />'.$pickspec.' '.$courseform.'&nbsp;&nbsp;<input type="text" value="0" size="4" name="coursetotal" /><input type="hidden" name="courselist" value="" />selected.<br />'."\n";
     return $output;
 }
 
@@ -1809,16 +1815,22 @@ sub course_custom_roles {
 
 # topic_bar
 #
-# Generates a div containing a numbered (static image) followed by a title
-# with a background color defined in the corresponding CSS: LC_topic_bar
-#
+# Generates a div containing an (optional) numbered (static) image followed by a 
+# title with a background color defined in the corresponding CSS: LC_topic_bar
+# Inputs:
+# 1. number to display (corresponding static image should exist).
+#    img tag will be included if arg is an integer in the range 1 to 9. 
+# 2. title text to display.
+# Outputs - a scalar containing html mark-up for the div.
+
 sub topic_bar {
     my ($imgnum,$title) = @_;
-    return '<div class="LC_topic_bar">'
-          .'<img src="/res/adm/pages/bl_step'.$imgnum.'.gif"'
-          .' alt="'.&mt('Step [_1]',$imgnum).'" />'
-          .' '.$title
-          .'</div>';
+    my $imgtag;
+    if ($imgnum =~ /^[1-9]$/) {
+        $imgtag = '<img src="/res/adm/pages/bl_step'.$imgnum.'.gif"'. 
+                  ' alt="'.&mt('Step [_1]',$imgnum).'" /> ';
+    }
+    return '<div class="LC_topic_bar">'.$imgtag.$title.'</div>';
 }
 
 ##############################################
@@ -1953,7 +1965,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 +2000,8 @@ sub set_form_elements {
                     $output .= qq|
       if (courseForm.elements['$name'].value == "$value") {
           courseForm.elements['$name'].checked = true;
+      } else {
+          courseForm.elements['$name'].checked = false;
       }|;
                 }
             }
@@ -2029,6 +2043,7 @@ sub set_form_elements {
         }
     }
     $output .= "
+    return;
 }\n";
     return $output;
 }
@@ -2117,22 +2132,38 @@ sub inittags {
 }
 
 
-# USAGE: scripttag(scriptcode, true/false);
+# USAGE: scripttag(scriptcode, [start|end|both]);
 #
 # EXAMPLES: 
-#  - scripttag("alert('Hello World!')") 
+#  - 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 evaluates to true)
+# OUTPUT: 
+# Scriptcode properly enclosed in <script> and CDATA tags (and LC
+# Internal markers if 2nd argument is given)
 sub scripttag {
-    my ($content, $internal) = @_;
-    $content = "// BEGIN LON-CAPA Internal\n$content\n// END LON-CAPA Internal" if $internal;
+    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";
-    htmltag("script", $content, {type => "text/javascript"});
-    return htmltag("script", $content, {type => "text/javascript"});
+
+    return htmltag('script', $content, {type => 'text/javascript'});
 };
 
 
@@ -2186,7 +2217,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",
@@ -2204,7 +2235,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 
@@ -2214,10 +2245,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)