--- loncom/interface/lonpickcourse.pm	2011/05/27 14:39:53	1.102
+++ loncom/interface/lonpickcourse.pm	2014/03/11 21:42:18	1.110
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Pick a course
 #
-# $Id: lonpickcourse.pm,v 1.102 2011/05/27 14:39:53 bisitz Exp $
+# $Id: lonpickcourse.pm,v 1.110 2014/03/11 21:42:18 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -31,6 +31,7 @@ package Apache::lonpickcourse;
 use strict;
 use Apache::Constants qw(:common);
 use Apache::loncommon;
+use Apache::lonhtmlcommon;
 use Apache::loncoursedata;
 use Apache::lonnet;
 use Apache::lonlocal;
@@ -105,7 +106,7 @@ sub handler {
 
     if ((($env{'form.form'} eq 'cu') || ($env{'form.form'} eq 'studentform')) && 
         ($env{'form.pickedcourse'})) {
-        $loaditem{'onload'} .= 'setRoles();setSections();';
+        $loaditem{'onload'} .= 'setDefaultCredits();setRoles();setSections();';
     }
     my $js = &js_changer();
     $r->print(&Apache::loncommon::start_page($title,$js,
@@ -133,8 +134,7 @@ sub handler {
         $onlyown) {
         $r->print(&gochoose_javascript($type,$multiple,$autosubmit,$lastaction));
     }
-    $r->print('<script type="text/javascript" language="Javascript">'.$jscript.
-              '</script>');
+    $r->print(&Apache::lonhtmlcommon::scripttag($jscript));
     $r->print($submitopener);
 
 # ------------------------------------------ Display of filters to limit search
@@ -207,20 +207,19 @@ sub handler {
 }
 
 sub js_changer {
-    return <<"ENDJS";
+    return <<ENDJS;
 <script type="text/javascript">
-
+// <![CDATA[
 function updateFilters(caller) {
     if (typeof(caller) != "undefined") {
         document.filterpicker.updater.value = caller.name;
     }
     document.filterpicker.submit();
 }
-
+// ]]>
 </script>
 
 ENDJS
-
 }
 
 sub processpick {
@@ -282,6 +281,13 @@ sub create_user_javascript {
         my $cdom = $coursedescription{'domain'};
         my $cnum = $coursedescription{'num'};
         my $crstype = $coursedescription{'type'};
+        my %domdefs = &Apache::lonnet::get_domain_defaults($cdom);
+        my ($showcredits,$credits);
+        if (($crstype ne 'Community') &&
+            (($domdefs{'officialcredits'} || $domdefs{'unofficialcredits'} || $domdefs{'textbookcredits'}))) {
+            $showcredits = 1; 
+            $credits = $coursedescription{'internal.defaultcredits'};
+        }
         my $sec_element = 'currsec';
         my $grplist_element = 'groups';
         my ($sections,$groups) =
@@ -292,6 +298,7 @@ sub create_user_javascript {
         my $groupslist = join(',',@{$groups});
         $output = qq|
 <script type="text/javascript">
+// <![CDATA[
 function setSections() {
     opener.document.$env{"form.form"}.$grplist_element.value='$groupslist';
     window.opener.setSect('$seclist');
@@ -300,9 +307,18 @@ function setSections() {
 function setRoles() {
     window.opener.setRole('$crstype');
 }
+|;
+        if ($showcredits) {
+            $output .= qq|
+function setDefaultCredits() {
+    window.opener.setCredits('$credits');
+}
+|;
+        }
+        $output .= qq|
+// ]]>
 </script>
 |;
-;
     }
     return $output;
 }
@@ -325,9 +341,10 @@ sub display_matched_courses {
             my $ccrolechk = ' ';
             my $menuchk = ' checked="checked" ';
             $r->print(
-                '<fieldset>'
-               .'<legend>'.&mt('Action').'</legend>'
-               .'<div class="LC_nobreak"><label>'
+                '<div class="LC_left_float">'
+               .'<fieldset>'
+               .'<legend>'.&mt('Pick action').'</legend>'
+               .'<span class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="ccrole"'.$ccrolechk.'/>'
                .'&nbsp;');
             if ($type eq 'Community') {
@@ -335,17 +352,17 @@ sub display_matched_courses {
             } else {
                 $r->print(&mt('Enter the course with the role of [_1].',$cctitle));
             }
-            $r->print('</label></div>'
-               .'<div class="LC_nobreak"><label>'
+            $r->print('</label></span><br />'
+               .'<span class="LC_nobreak"><label>'
                .'<input type="radio" name="phase" value="menu"'.$menuchk.'/>&nbsp;');
             if ($type eq 'Community') {
                 $r->print(&mt('View or modify community settings which only a [_1] may modify.',$dctitle));
             } else {
                 $r->print(&mt('View or modify course settings which only a [_1] may modify.',$dctitle));
             }
-            $r->print('</label></div>'
-               .'</fieldset>'
-               .'<br />'
+            $r->print('</label></span>'
+               .'</fieldset></div>'
+               .'<br clear="all" />'
             );
         }
     }
@@ -364,9 +381,9 @@ sub display_matched_courses {
     }
  
     if ($numcourses > 1 && $multiple) {
-        $r->print('<input type="button" value="check all"
+        $r->print('<input type="button" value="'.&mt('check all').'"
                   onclick="javascript:checkAll(document.courselist.course_id)" />
-                  &nbsp;&nbsp;<input type="button" value="uncheck all"
+                  &nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"
                   onclick="javascript:uncheckAll(document.courselist.course_id)" />
                   <br /><br />');
     }
@@ -494,9 +511,9 @@ sub display_matched_courses {
     }
 
     if (!%courses) {
-        $r->print(&mt('None found'));
+        $r->print('<p class="LC_info">'.&mt('None found').'</p>');
     } elsif ($multiple) {
-        $r->print('<input type="button" value="Submit" onClick="gochoose('."'','','')".'" />');
+        $r->print('<input type="button" value="'.&mt('Submit').'" onclick="gochoose('."'','','')".'" />');
     }
     $r->print('<input type="hidden" name="form" value="'.$env{'form.form'}.'" />'.
               "\n".'<input type="hidden" name="pickedcourse" value="" />'."\n".
@@ -645,7 +662,7 @@ sub build_filters {
     } else {
         $typeselectform =  '<select name="type" size="1"';
         if ($onchange) {
-            $typeselectform .= 'onchange="'.$onchange.'"';
+            $typeselectform .= ' onchange="'.$onchange.'"';
         }
         $typeselectform .= '>'."\n";
         foreach my $posstype ('Course','Community') {
@@ -677,7 +694,8 @@ sub build_filters {
                 || ($formname eq 'modifycourse')) {
                 $officialjs = 1;
                 ($instcodeform,$jscript,$$numtitlesref) = 
-                    &instcode_selectors($codedom,'filterpicker',$officialjs,$codetitlesref);
+                    &Apache::courseclassifier::instcode_selectors($codedom,'filterpicker',
+                                                                  $officialjs,$codetitlesref);
                 if ($jscript) {
                     $jscript = '<script type="text/javascript" language="Javascript">'.
                                $jscript.'</script>'."\n";
@@ -800,7 +818,7 @@ $typeelement
             $output .= '<input type="hidden" name="cc_clone" value="'.$coord_cloneable.'" />';
         }
     }
-    $output .= '<input type="hidden" name="updater" value="">'."\n".
+    $output .= '<input type="hidden" name="updater" value="" />'."\n".
                '<input type="submit" name="gosearch" value="'. 
                &mt('Search').'" /></p>'."\n".'</form>'."\n".'<hr />'."\n";
     return $jscript.$warning.$output;
@@ -856,33 +874,6 @@ sub get_coordinator_cloneable {
     }
 }
 
-sub instcode_selectors {
-    my ($codedom,$formname,$officialjs,$codetitles) = @_;
-    my ($output,%cat_titles,%cat_order,%cat_items);
-    my ($jscript,$totcodes,$numtitles,$lasttitle) =
-        &Apache::courseclassifier::instcode_selectors_data($codedom,$formname,
-                           \%cat_items,$codetitles,\%cat_titles,\%cat_order,$officialjs);
-    if ($numtitles > 0) {
-        my $official = ' checked="checked" ';
-        my $unofficial = '';
-        if ($env{'form.official'} eq 'off') {
-            $unofficial = $official;
-            $official = '';
-        }
-        $output .= '<span class="LC_nobreak">'.&mt('Official course:').'&nbsp;<label>'.
-                   '<input type="radio" name="official" value="on"'.$official.' />'.
-                   &mt('Yes').'</label>'.('&nbsp;'x3).'<label>'.
-                   '<input type="radio" name="official" value="off"'.$unofficial.
-                   ' onclick="toggleOfficial();" />'.&mt('No').'</label></span><br />'.
-                   &Apache::courseclassifier::build_instcode_selectors($numtitles,
-                   $lasttitle,\%cat_items,$codetitles,\%cat_titles,\%cat_order)."\n".
-                   '<input type="hidden" name="numtitles" value="'.$numtitles.'" />'."\n".
-                   '<input type="hidden" name="state" value="listing" />'."\n";
- 
-    }
-    return ($output,$jscript,$numtitles);
-}
-
 sub search_courses {
     my ($r,$type,$onlyown,$filter,$numtitles,$cloneruname,$clonerudom,$domcloner,$codetitles) = @_;
     my (%courses,%showcourses,$cloner,$ccrole);
@@ -892,7 +883,7 @@ sub search_courses {
         $ccrole = 'cc';
     }
     if (!$onlyown) {
-        $r->print(&mt('Searching ...').'<br />&nbsp;<br />');
+        $r->print('<div id="searching">'.&mt('Searching ...').'</div>');
         $r->rflush();
         if (($filter->{'ownerfilter'} ne '') ||
             ($filter->{'ownerdomfilter'} ne '')) {
@@ -991,7 +982,7 @@ sub course_chooser {
             $output = &mt('No rights to clone')."\n";
         }
     } else {
-        $output = '<input type="button" value="'.&mt('Select').'" onClick="gochoose('.
+        $output = '<input type="button" value="'.&mt('Select').'" onclick="gochoose('.
                   "'".$cnum."','".$cdom."','".$cleandesc."')".'" />'."\n";
     }
     return $output;
@@ -1011,8 +1002,7 @@ sub gochoose_javascript {
                                  list  => 'courselist',
                               },
                     );
-    my $output .= qq|
-<script type="text/javascript">
+    my $output = qq|
 function gochoose(cname,cdom,cdesc) {
     var openerForm = "$env{'form.form'}";
     courseCount = 0;
@@ -1061,8 +1051,13 @@ ENDSCRIPT
     } else {
         my ($name_code,$type_code);
         if ($env{'form.cnameelement'} ne '') {
-            $name_code = 'opener.document.'.$env{'form.form'}.'.'.
-                          $env{'form.cnameelement'}.'.value=cdesc;';
+            $name_code = <<ENDNAMECODE;  
+var showcdesc = cdesc;
+if (cdesc.length > 25) {
+    showcdesc = cdesc.substr(0,25)+' ...'; 
+}
+opener.document.$env{'form.form'}.$env{'form.cnameelement'}.value=showcdesc;
+ENDNAMECODE
         }
         if ($env{'form.typeelement'} ne '') {
             $type_code = 'opener.document.'.$env{'form.form'}.'.'.
@@ -1093,9 +1088,8 @@ ENDSCRIPT
     $autosubmit
     $lastaction
 }
-</script>
 |;
-    return $output;
+    return &Apache::lonhtmlcommon::scripttag($output);
 }
 
 1;