--- loncom/interface/lonhtmlcommon.pm	2024/10/21 15:44:06	1.358.2.19.2.12
+++ loncom/interface/lonhtmlcommon.pm	2015/04/01 16:14:46	1.360
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common html routines
 #
-# $Id: lonhtmlcommon.pm,v 1.358.2.19.2.12 2024/10/21 15:44:06 raeburn Exp $
+# $Id: lonhtmlcommon.pm,v 1.360 2015/04/01 16:14:46 damieng Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -78,11 +78,7 @@ sub java_not_enabled {
 sub coursepreflink {
    my ($text,$category)=@_;
    if (&Apache::lonnet::allowed('opa',$env{'request.course.id'})) {
-      my $target =' target="_top"';
-      if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-          $target = '';
-      }
-      return '<a'.$target.' href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
+      return '<a target="_top" href="'.&HTML::Entities::encode("/adm/courseprefs?phase=display&actions=$category",'<>&"').'"><span class="LC_setting">'.$text.'</span></a>';
    } else {
       return '';
    }
@@ -96,7 +92,7 @@ sub raw_href_to_link {
 
 sub entity_encode {
     my ($text)=@_;
-    return &HTML::Entities::encode($text, '\'<>&"');
+    return &HTML::Entities::encode($text, '<>&"');
 }
 
 sub direct_parm_link {
@@ -105,11 +101,7 @@ sub direct_parm_link {
     $filter=&entity_encode($filter);
     $part=&entity_encode($part);
     if (($symb) && (&Apache::lonnet::allowed('opa')) && ($target ne 'tex')) {
-        my $target=' target="_top"';
-        if (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-            $target = '';
-        }
-       return "<a".$target." href='/adm/parmset?symb=$symb&amp;filter=$filter&amp;part=$part'><span class='LC_setting'>$linktext</span></a>";
+       return "<a target='_top' href='/adm/parmset?symb=$symb&amp;filter=$filter&amp;part=$part'><span class='LC_setting'>$linktext</span></a>";
     } else {
        return $linktext;
     }
@@ -415,7 +407,7 @@ sub textbox {
 ##############################################
 ##############################################
 sub checkbox {
-    my ($name,$checked,$value,$special) = @_;
+    my ($name,$checked,$value) = @_;
     my $Str = '<input type="checkbox" name="'.$name.'" ';
     if (defined($value)) {
         $Str .= 'value="'.$value.'"';
@@ -423,7 +415,7 @@ sub checkbox {
     if ($checked) {
         $Str .= ' checked="checked"';
     }
-    $Str .= $special.' />';
+    $Str .= ' />';
     return $Str;
 }
 
@@ -490,36 +482,7 @@ the date/time fields are left empty.
 =item $state
 
 Specifies the initial state of the form elements.  Either 'disabled' or empty.
-Defaults to empty, which indicates the form elements are not disabled.
-
-=item $no_hh_mm_ss
-
-If true, text boxes for hours, minutes and seconds are omitted.
-
-=item $defhour
-
-Default value for hours (a default of 0 is used otherwise).
-
-=item $defmin
-
-Default value for minutes (a default of 0 is used otherwise).
-
-=item defsec
-
-Default value for seconds (a default of 0 is used otherwise).
-
-=item $nolink
-
-If true, a "Select calendar" link (to pop-up a calendar) is not displayed
-to the right of the items.
-
-=item $no_mm_ss
-
-If true, text boxes for minutes and seconds are omitted.
-
-=item $no_ss
-
-If true, text boxes for seconds are omitted.
+Defaults to empty, which indiciates the form elements are not disabled. 
 
 =back
 
@@ -533,7 +496,7 @@ The method used to restrict user input w
 ##############################################
 sub date_setter {
     my ($formname,$dname,$currentvalue,$special,$includeempty,$state,
-        $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink,$no_mm_ss,$no_ss) = @_;
+        $no_hh_mm_ss,$defhour,$defmin,$defsec,$nolink) = @_;
     my $now = time;
 
     my $tzname;
@@ -542,8 +505,6 @@ sub date_setter {
 
     if (! defined($state) || $state ne 'disabled') {
         $state = '';
-    } else {
-        $state = 'disabled="disabled"';
     }
     if (! defined($no_hh_mm_ss)) {
         $no_hh_mm_ss = 0;
@@ -679,7 +640,7 @@ ENDJS
     my $minuteselector = qq{<input type="text" name="$dname\_minute" $special $state value="$min" size="3" />};
     my $secondselector= qq{<input type="text" name="$dname\_second" $special $state value="$sec" size="3" />};
     my $cal_link;
-    unless (($nolink) || ($state eq 'disabled')) {
+    if (!$nolink) {
         $cal_link = qq{<a href="javascript:$dname\_opencalendar()">};
     }
     #
@@ -688,24 +649,17 @@ ENDJS
         $result .= &mt('[_1] [_2] [_3] ',
                        $monthselector,$dayselector,$yearselector).
                    $tzone;
-    } elsif ($no_mm_ss) {
-        $result .= &mt('[_1] [_2] [_3] [_4]',
-                      $monthselector,$dayselector,$yearselector,
-                      $hourselector).
-                   $tzone;
-    } elsif ($no_ss) {
-        $result .= &mt('[_1] [_2] [_3] [_4] [_5]m',
-                      $monthselector,$dayselector,$yearselector,
-                      $hourselector,$minuteselector).
-                   $tzone;
+        if (!$nolink) {
+            $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+        }
     } else {
         $result .= &mt('[_1] [_2] [_3] [_4] [_5]m [_6]s ',
                       $monthselector,$dayselector,$yearselector,
                       $hourselector,$minuteselector,$secondselector).
                    $tzone;
-    }
-    unless (($nolink) || ($state eq 'disabled')) {
-        $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+        if (!$nolink) {
+            $result .= &mt('[_1]Select Date[_2]',$cal_link,'</a>');
+        }
     }
     $result .= "</span>\n<!-- end $dname date setting form -->\n";
     return $result;
@@ -856,14 +810,13 @@ parameter setting wizard.
 ##############################################
 sub pjump_javascript_definition {
     my $Str = <<END;
-    function pjump(type,dis,value,marker,ret,call,hour,min,sec,extra) {
+    function pjump(type,dis,value,marker,ret,call,hour,min,sec) {
         openMyModal("/adm/rat/parameter.html?type="+escape(type)
                  +"&value="+escape(value)+"&marker="+escape(marker)
                  +"&return="+escape(ret)
                  +"&call="+escape(call)+"&name="+escape(dis)
                  +"&defhour="+escape(hour)+"&defmin="+escape(min)
-                 +"&defsec="+escape(sec)+"&extra="+escape(extra)
-                 +"&modal=1",350,350,'no');
+                 +"&defsec="+escape(sec)+"&modal=1",350,350,'no');
     }
 END
     return $Str;
@@ -1018,13 +971,10 @@ Inputs
 
 =item $number_to_do The total number of items being processed.
 
-=item $preamble Optional HTML to display before the progress bar.
-
 =back
 
 Returns a hash containing the progress state data structure.
-If $number_to_do is zero or null, an indeterminate progress bar will
-be used.
+
 
 =item &Update_PrgWin()
 
@@ -1094,20 +1044,20 @@ Returns: none
 
 # Create progress
 sub Create_PrgWin {
-    my ($r,$number_to_do,$preamble)=@_;
+    my ($r,$number_to_do)=@_;
     my %prog_state;
     $prog_state{'done'}=0;
     $prog_state{'firststart'}=&Time::HiRes::time();
     $prog_state{'laststart'}=&Time::HiRes::time();
     $prog_state{'max'}=$number_to_do;
-    &Apache::loncommon::LCprogressbar($r,$prog_state{'max'},$preamble); 
+    &Apache::loncommon::LCprogressbar($r); 
     return %prog_state;
 }
 
 # update progress
 sub Update_PrgWin {
     my ($r,$prog_state,$displayString)=@_;
-    &Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString,$$prog_state{'max'});
+    &Apache::loncommon::LCprogressbarUpdate($r,undef,$displayString);
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
@@ -1157,7 +1107,7 @@ sub Increment_PrgWin {
     if ($$prog_state{'max'}) {
        $percent=int(100.*$current/$$prog_state{'max'});
     }
-    &Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo,$$prog_state{'max'});
+    &Apache::loncommon::LCprogressbarUpdate($r,$percent,$timeinfo);
     $$prog_state{'laststart'}=&Time::HiRes::time();
 }
 
@@ -1172,9 +1122,9 @@ sub Close_PrgWin {
 # ------------------------------------------------------- Puts directory header
 
 sub crumbs {
-    my ($uri,$target,$prefix,$form,$skiplast,$onclick)=@_;
+    my ($uri,$target,$prefix,$form,$skiplast)=@_;
 # You cannot crumbnify uploaded or adm resources
-    if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Community Content)'); }
+    if ($uri=~/^\/*(uploaded|adm)\//) { return &mt('(Internal Course/Group Content)'); }
     if ($target) {
         $target = ' target="'.
                   &Apache::loncommon::escape_single($target).'"';
@@ -1194,19 +1144,13 @@ sub crumbs {
             } else {
                 $path.='/'; 
             }
-            if ($path eq '/res/') {
-                unless (&Apache::lonnet::allowed('bre',$path)) {
-                    $output.="$dir/";
-                    next;
-                }
-            }
             my $href_path = &HTML::Entities::encode($path,'<>&"');
             &Apache::loncommon::inhibit_menu_check(\$href_path);
             if ($form) {
                 my $href = 'javascript:'.$form.".action='".$href_path."';".$form.'.submit();';
-                $output.=qq{<a href="$href"$onclick$target>$dir</a>/};
+                $output.=qq{<a href="$href"$target>$dir</a>/};
             } else {
-                $output.=qq{<a href="$href_path"$onclick$target>$dir</a>/};
+                $output.=qq{<a href="$href_path"$target>$dir</a>/};
             }
         }
     } else {
@@ -1277,9 +1221,9 @@ sub htmlareaheaders {
 ENDEDITOR
 	}
     $s.=(<<ENDJQUERY);
-<script type="text/javascript" src="/adm/jQuery/js/jquery-3.7.1.min.js"></script>
-<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.13.3.custom.min.js"></script>
-<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.13.3.custom.min.css" />
+<script type="text/javascript" src="/adm/jQuery/js/jquery-1.6.2.min.js"></script>
+<script type="text/javascript" src="/adm/jQuery/js/jquery-ui-1.8.16.custom.min.js"></script>
+<link rel="stylesheet" type="text/css" href="/adm/jQuery/css/smoothness/jquery-ui-1.8.16.custom.css" />
 <script type="text/javascript" src="/adm/jpicker/js/jpicker-1.1.6.min.js" >
 </script>
 <link rel="stylesheet" type="text/css" href="/adm/jpicker/css/jPicker-1.1.6.min.css" />
@@ -1687,29 +1631,13 @@ sub show_return_link {
     unless ($env{'request.course.id'}) { return 0; }
     if ($env{'request.noversionuri'}=~m{^/priv/} ||
         $env{'request.uri'}=~m{^/priv/}) { return 1; }
-    return if (($env{'request.noversionuri'} eq '/adm/supplemental') &&
-               ($env{'form.folder'} ne 'supplemental'));
-    return if (($env{'form.folderpath'} ne '') &&
-               (($env{'request.noversionuri'} =~ m{^/adm/$match_domain/$match_username/aboutme$}) ||
-                ($env{'request.noversionuri'} =~ m{^/public/$match_domain/$match_courseid/syllabus$})));
-    if (($env{'request.noversionuri'} =~ m{^/adm/viewclasslist($|\?)})
+    return if ($env{'request.noversionuri'} eq '/adm/supplemental');
+
+    if (($env{'request.noversionuri'} =~ m{^/adm/(viewclasslist|navmaps)($|\?)})
         || ($env{'request.noversionuri'} =~ m{^/adm/.*/aboutme($|\?)})) {
 
         return if ($env{'form.register'});
     }
-    if ((($env{'request.symb'} ne '') || ($env{'form.folderpath'} ne '')) &&
-         ($env{'request.noversionuri'} =~m{^/adm/coursedocs/showdoc/uploaded/($match_domain)/($match_courseid)/(docs|supplemental)/})) {
-        my ($cdom,$cnum,$area) =  ($1,$2,$3);
-        if (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom) &&
-            ($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum)) {
-            if (($env{'request.symb'}) && ($area eq 'docs')) {
-                my ($map,$resid,$url) = &Apache::lonnet::decode_symb($env{'request.symb'});
-                return if ($env{'request.noversionuri'} eq '/adm/coursedocs/showdoc/'.$url);
-            } elsif (($env{'form.folderpath'}) && ($area eq 'supplemental')) {
-                return;
-            }
-        }
-    }
     return (($env{'request.noversionuri'}=~m{^/(res|public)/} &&
              $env{'request.symb'} eq '')
             ||
@@ -1718,7 +1646,7 @@ sub show_return_link {
             (($env{'request.noversionuri'}=~/^\/adm\//) &&
              ($env{'request.noversionuri'}!~/^\/adm\/wrapper\//) &&
              ($env{'request.noversionuri'}!~
-              m{^/adm/.*/(smppg|bulletinboard|ext\.tool)($|\?)})
+              m{^/adm/.*/(smppg|bulletinboard)($|\?)})
            ));
 }
 
@@ -1778,54 +1706,6 @@ clientTime = (new Date()).getTime();
 END
 }
 
-##
-# Client-side javascript to convert any dashes in text pasted
-# into textbox(es) for numericalresponse item(s) to a standard
-# minus, i.e., - . Calls to dash_to_minus_js() in end_problem()
-# and in loncommon::endbodytag() for a .page (arg: dashjs => 1)
-#
-# Will apply to any input tag with class: LC_numresponse_text.
-# Currently set in start_textline for numericalresponse items.
-#
-
-sub dash_to_minus_js {
-    return <<'ENDJS';
-
-<script type="text/javascript">
-//<![CDATA[
-//<!-- BEGIN LON-CAPA Internal
-document.addEventListener("DOMContentLoaded", (event) => {
-    const numresp = document.querySelectorAll("input.LC_numresponse_text");
-    if (numresp.length > 0) {
-        Array.from(numresp).forEach((el) => {
-            el.addEventListener("paste", (e) => {
-                e.preventDefault();
-                e.stopPropagation();
-                let p = (e.clipboardData || window.clipboardData).getData("text");
-                p.toString();
-                var regex;
-                try
-                {
-                    regex = new RegExp ("\\p{Dash}", "gu");
-                }
-                catch (e) { regex = new RegExp ("[\\u058A\\u05BE\\u1400\\u1806\\u2010-\\u2015\\u2212\\u2E3A\\u2E3B\\u2E5D\\u301C\\uFE58\\uFE63\\uFF0D]","g"); }
-                p = p.replace(regex,'-');
-                putInText(p);
-            });
-        });
-    }
-    const putInText = (newText, el = document.activeElement) => {
-        const [start, end] = [el.selectionStart, el.selectionEnd];
-        el.setRangeText(newText, start, end, 'end');
-    }
-});
-// END LON-CAPA Internal -->
-//]]>
-</script>
-
-ENDJS
-}
-
 ############################################################
 ############################################################
 
@@ -1841,21 +1721,12 @@ A link to help for the component will be
 All inputs can be undef without problems.
 
 Inputs: $component (the text on the right side of the breadcrumbs trail),
-        $component_help (the help item filename (without .tex extension).
+        $component_help
         $menulink (boolean, controls whether to include a link to /adm/menu)
         $helplink (if 'nohelp' don't include the orange help link)
-        $crumbs_style (optional style attribute for div containing breadcrumbs
-           unless called from docs_breadcrumbs)
+        $css_class (optional name for the class to apply to the table for CSS)
         $no_mt (optional flag, 1 if &mt() is _not_ to be applied to $component
            when including the text on the right.
-        $CourseBreadcrumbs (optional flag, 1 if &breadcrumbs called from &docs_breadcrumbs,
-           because breadcrumbs are being)
-        $topic_help (optional help item to be displayed on right side of the breadcrumbs 
-           row, using loncommon::help_open_topic() to generate the link.
-        $topic_help_text (text to include in the link in the optional help item 
-           on the right side of the breadcrumbs row.
-        $links_target optionally includes the target (_top, _parent or _self)
-
 Returns a string containing breadcrumbs for the current page.
 
 =item &clear_breadcrumbs()
@@ -1882,9 +1753,11 @@ returns: nothing
     my %tools = ();
     
     sub breadcrumbs {
-        my ($component,$component_help,$menulink,$helplink,$crumbs_style,$no_mt, 
-            $CourseBreadcrumbs,$topic_help,$topic_help_text,$links_target) = @_;
+        my ($component,$component_help,$menulink,$helplink,$css_class,$no_mt, 
+            $CourseBreadcrumbs) = @_;
         #
+        $css_class ||= 'LC_breadcrumbs';
+
         # Make the faq and bug data cascade
         my $faq  = '';
         my $bug  = '';
@@ -1897,16 +1770,6 @@ returns: nothing
         # The first one should be the course or a menu link
         if (!defined($menulink)) { $menulink=1; }
         if ($menulink) {
-            if ($env{'request.course.id'}) {
-                my ($menucoll,$deeplinkmenu,$menuref) = &Apache::loncommon::menucoll_in_effect();
-                if (($menucoll) && (ref($menuref) eq 'HASH')) {
-                    if ($menuref->{'main'} eq 'n') {
-                       undef($menulink);
-                    }
-                }
-            }
-        }
-        if ($menulink) {
             my $description = 'Menu';
             my $no_mt_descr = 0;
             if ((exists($env{'request.course.id'})) && 
@@ -1916,7 +1779,7 @@ returns: nothing
                     $env{'course.'.$env{'request.course.id'}.'.description'};
                 $no_mt_descr = 1;
                 if ($env{'request.noversionuri'} =~ 
-                    m{^/?public/($match_domain)/($match_courseid)/syllabus$}) {
+                    m{^/public/($match_domain)/($match_courseid)/syllabus$}) {
                     unless (($env{'course.'.$env{'request.course.id'}.'.domain'} eq $1) &&
                             ($env{'course.'.$env{'request.course.id'}.'.num'} eq $2)) {
                         $description = 'Menu';
@@ -1924,15 +1787,9 @@ returns: nothing
                     }
                 }
             }
-            my $target = '_top';
-            if ($links_target) {
-                $target = $links_target;
-            } elsif (($env{'request.deeplink.login'}) && ($env{'request.deeplink.target'} eq '_self')) {
-                $target = '';
-            }
             $menulink =  {  href   =>'/adm/menu',
                             title  =>'Go to main menu',
-                            target =>$target,
+                            target =>'_top',
                             text   =>$description,
                             no_mt  =>$no_mt_descr, };
             if($last) {
@@ -1950,8 +1807,8 @@ returns: nothing
                             title => &mt('Back to most recent content resource'),
                             class => 'LC_menubuttons_link',
                           };
-            if ($links_target) {
-                $hashref->{'target'} = $links_target;
+            if ($env{'request.noversionuri'} eq '/adm/searchcat') {
+                $hashref->{'target'} = '_top'; 
             }
             $links=&htmltag( 'a','<img src="/res/adm/pages/tolastloc.png" alt="'.$alttext.'" class="LC_icon" />',
                              $hashref);
@@ -2002,12 +1859,7 @@ returns: nothing
         if ($faq ne '' || $component_help ne '' || $bug ne '') {
             $icons .= &Apache::loncommon::help_open_menu($component,
                                                          $component_help,
-                                                         $faq,$bug,'','','','',
-                                                         $links_target);
-        }
-        if ($topic_help && $topic_help_text) {
-           $icons .= ' '.&Apache::loncommon::help_open_topic($topic_help,&mt($topic_help_text),'',
-                                                             undef,600,'',$links_target);
+                                                         $faq,$bug);
         }
         #
 
@@ -2021,7 +1873,7 @@ returns: nothing
         }
 
 
-        if (($component) || ($topic_help && $topic_help_text)) {
+        if ($component) {
             $links = &htmltag('span', 
                              ( $no_mt ? $component : mt($component) ).
                              ( $icons ? $icons : '' ),
@@ -2037,13 +1889,8 @@ returns: nothing
         }
         if (($links ne '') || ($nav_and_tools)) {
             &render_tools(\$links);
-            unless ($CourseBreadcrumbs) {
-                my $args = { id => 'LC_breadcrumbs' };
-                if ($crumbs_style ne '') {
-                    $args->{'style'} = $crumbs_style;
-                }
-                $links = &htmltag('div', $links, $args);
-            }
+            $links = &htmltag('div', $links, 
+                              { id => "LC_breadcrumbs" }) unless ($CourseBreadcrumbs) ;
         }
         my $adv_tools = 0;
         if (ref($tools{'advtools'}) eq 'ARRAY') {
@@ -2129,16 +1976,6 @@ returns: nothing
         undef(%tools);
     }
 
-=item &current_breadcrumb_tools()
-
-returns: a hash containing the current breadcrumb tools.
-
-=cut
-
-    sub current_breadcrumb_tools {
-        return %tools;
-    }
-
 =item &render_tools(\$breadcrumbs)
 
 Creates html for breadcrumb tools (categories navigation and tools) and inserts 
@@ -2190,7 +2027,7 @@ returns: nothing
 } # End of scope for @Crumbs
 
 sub docs_breadcrumbs {
-    my ($allowed,$crstype,$contenteditor,$title,$precleared,$checklinkprot)=@_;
+    my ($allowed,$crstype,$contenteditor,$title,$precleared)=@_;
     my ($folderpath,@folders,$supplementalflag);
     @folders = split('&',$env{'form.folderpath'});
     if ($env{'form.folderpath'} =~ /^supplemental/) {
@@ -2205,21 +2042,19 @@ sub docs_breadcrumbs {
         my $foldername=shift(@folders);
         if ($folderpath) {$folderpath.='&';}
         $folderpath.=$folder.'&'.$foldername;
-        my $url = $env{'request.use_absolute'};
+        my $url;
         if ($allowed) {
-            $url .= '/adm/coursedocs?folderpath=';
+            $url = '/adm/coursedocs?folderpath=';
         } else {
-            $url .= '/adm/supplemental?folderpath=';
+            $url = '/adm/supplemental?folderpath=';
         }
         $url .= &escape($folderpath);
         my $name=&unescape($foldername);
 # each of randompick number, hidden, encrypted, random order, is_page 
 # are appended with ":"s to the foldername
         $name=~s/\:(\d*)\:(\w*)\:(\w*):(\d*)\:?(\d*)$//;
-        if ($contenteditor) {
-            if ($supplementalflag) {
-                if ($2) { $ishidden=1; }
-            } else {
+        unless ($supplementalflag) {
+            if ($contenteditor) { 
                 if ($1 ne '') {
                     $randompick=$1;
                 } else {
@@ -2260,17 +2095,9 @@ sub docs_breadcrumbs {
             $plain=~s/\&gt\;\s*$//;
         }
         my $menulink = 0;
-        if (!$allowed && !$contenteditor && !$supplementalflag) {
+        if (!$allowed && !$contenteditor) {
             $menulink = 1;
         }
-        if ($checklinkprot) {
-            if ($env{'request.deeplink.login'}) {
-                my $linkprotout = &Apache::lonmenu::linkprot_exit();
-                if ($linkprotout) {
-                    &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$linkprotout);
-                }
-            }
-        }
         return (&breadcrumbs(undef,undef,$menulink,'nohelp',undef,undef,
                              $contenteditor),
                              $randompick,$ishidden,$isencrypted,$plain,
@@ -2511,7 +2338,7 @@ sub course_selection {
     if ($totcodes > 0) {
         my $numtitles = @$codetitles;
         if ($numtitles > 0) {
-            $output .= '<label><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&html_escape(&mt('Choose categories, from left to right'))."'".')" />'.&mt('Pick courses by category:').'</label><br />';
+            $output .= '<label><input type="radio" name="coursepick" value="category" onclick="coursePick(this.form);alert('."'".&mt('Choose categories, from left to right')."'".')" />'.&mt('Pick courses by category:').'</label><br />';
             $output .= '<table><tr><td>'.$$codetitles[0].'<br />'."\n".
                '<select name="'.$standardnames->[0].
                '" onchange="setPick(this.form);courseSet('."'$$codetitles[0]'".')">'."\n".
@@ -2644,9 +2471,9 @@ sub course_custom_roles {
 
 
 sub resource_info_box {
-   my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp,$divforres)=@_;
+   my ($symb,$onlyfolderflag,$stuvcurrent,$stuvdisp)=@_;
    my $return='';
-   if (($stuvcurrent ne '') || ($divforres)) {
+   if ($stuvcurrent ne '') {
        $return = '<div class="LC_left_float">';
    }
    if ($symb) {
@@ -2675,7 +2502,7 @@ sub resource_info_box {
     } else {
        $return='<p><span class="LC_error">'.&mt('No context provided.').'</span></p>';
     }
-    if (($stuvcurrent ne '') || ($divforres)) {
+    if ($stuvcurrent ne '') {
         $return .= '</div>';
     }
     return $return;
@@ -2690,9 +2517,9 @@ sub resource_info_box {
 #
 
 sub display_usage {
-    my ($current_disk_usage,$disk_quota,$context) = @_;
-    my $usage = $current_disk_usage/1024;
-    my $quota = $disk_quota/1024;
+    my ($current_disk_usage,$disk_quota) = @_;
+    my $usage = $current_disk_usage/1000;
+    my $quota = $disk_quota/1000;
     my $percent;
     if ($disk_quota == 0) {
         $percent = 100.0;
@@ -2716,13 +2543,9 @@ sub display_usage {
     if ($prog_width > 100) {
         $prog_width = 100;
     }
-    my $display = 'block';
-    if ($context eq 'authoring') {
-        $display = 'inline';
-    }
     return '
-  <div id="meter1" align="left" style="display:'.$display.'" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
-'   <div id="meter2" style="display:block; margin-top:3px; margin-bottom:3px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
+  <div id="meter1" align="left" '.$cssclass.'>'.&mt('Currently using [_1] of the [_2] available.',$usage.' MB <span style="font-weight:bold;">('.$percent.'%)</span>',$quota.' MB')."\n".
+'   <div id="meter2" style="display:block; margin-top:5px; margin-bottom:5px; margin-left:0px; margin-right:0px; width:400px; border:1px solid #000000; height:10px;">'."\n".
 '    <div id="meter3" style="display:block; background-color:'.$color.'; width:'.$prog_width.'%; height:10px; color:#000000; margin:0px;"></div>'."\n".
 '   </div>'."\n".
 '  </div>';
@@ -2972,12 +2795,10 @@ sub set_form_elements {
 
 sub file_submissionchk_js {
     my ($turninpaths,$multiples) = @_;
-    my $overwritewarn = &mt('File(s) you uploaded for your submission will overwrite existing file(s) submitted for this item')."\n".
+    my $overwritewarn = &mt('File(s) you uploaded for your submission will overwrite existing file(s) submitted for this item').'\\n'.
                       &mt('Continue submission and overwrite the file(s)?');
-    &js_escape(\$overwritewarn);
-    my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.')."\n".
+    my $delfilewarn = &mt('You have indicated you wish to remove some files previously included in your submission.').'\\n'.
                       &mt('Continue submission with these files removed?');
-    &js_escape(\$delfilewarn);
     my ($turninpathtext,$multtext,$arrayindexofjs);
     if (ref($turninpaths) eq 'HASH') {
         foreach my $key (sort(keys(%{$turninpaths}))) {
@@ -3406,18 +3227,12 @@ PARAMSONE
         if (itemid != null) {
             itemh = itemid.offsetHeight;
         }
-        var primaryheight = 0;
-        if (document.getElementById('LC_nav_bar') != null) {
-            primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
-        }
-        var secondaryheight = 0;
+        var primaryheight = document.getElementById('LC_nav_bar').offsetHeight;
+        var secondaryheight;
         if (document.getElementById('LC_secondary_menu') != null) { 
             secondaryheight = document.getElementById('LC_secondary_menu').offsetHeight;
         }
-        var crumbsheight = 0;
-        if (document.getElementById('LC_breadcrumbs') != null) {
-            crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;
-        }
+        var crumbsheight = document.getElementById('LC_breadcrumbs').offsetHeight;
         var dccidheight = 0;
         if (document.getElementById('dccid') != null) {
             dccidheight = document.getElementById('dccid').offsetHeight;
@@ -3488,39 +3303,21 @@ THIRD
 ##############################################
 
 sub javascript_jumpto_resource {
-    my $confirm_switch = &mt("Editing requires switching to the resource's home server.")."\n".
+    my $confirm_switch = &mt("Editing requires switching to the resource's home server.").'\n'.
                          &mt('Switch server?');
-    my $confirm_new_tab = &mt("Editing requires using the resource's home server.")."\n".
-                          &mt('Open a new browser tab?');
-    &js_escape(\$confirm_switch);
-    &js_escape(\$confirm_new_tab);
     return (<<ENDUTILITY)
 
 function go(url) {
    if (url!='' && url!= null) {
        currentURL = null;
        currentSymb= null;
-       var lcHostname = setLCHost();
-       if (lcHostname!='' && lcHostname!= null) {
-           var RegExp = /^https?\:/;
-           if (RegExp.test(url)) {
-               window.location.href=url;
-           } else {
-               window.location.href=lcHostname+url;
-           }
-       } else {
-           window.location.href=url;
-       }
+       window.location.href=url;
    }
 }
 
-function need_switchserver(url,target) {
+function need_switchserver(url) {
     if (url!='' && url!= null) {
-        if (target == '_blank') {
-            if (confirm("$confirm_new_tab")) {
-                window.open(url,target);
-            }
-        } else if (confirm("$confirm_switch")) {
+        if (confirm("$confirm_switch")) {
             go(url);
         }
     }
@@ -3532,31 +3329,15 @@ ENDUTILITY
 }
 
 sub jump_to_editres {
-    my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$shownsymb,
-        $folderpath,$title,$hostname,$idx,$suppurl,$todocs,$suppanchor) = @_;
-    my ($jscall,$anchor,$usehttp,$usehttps,$is_ext,$target);
+    my ($cfile,$home,$switchserver,$forceedit,$forcereg,$symb,$folderpath,
+        $title,$idx,$suppurl,$todocs) = @_;
+    my $jscall;
     if ($switchserver) {
         if ($home) {
-            my $resedit;
-            if ($cfile =~ m{^/priv/($match_domain)/($match_username)/}) {
-                my ($audom,$auname) = ($1,$2);
-                unless (&Apache::lonnet::is_course($audom,$auname)) {
-                    if (($symb ne '') && ($env{'request.course.id'}) &&
-                        (&Apache::lonnet::allowed('mdc',$env{'request.course.id'}))) {
-                        unless (&Apache::lonnet::can_switchserver($env{'user.domain'},$home)) {
-                            $target = '_blank';
-                            $resedit = 1;
-                        }
-                    }
-                }
-            }
             $cfile = '/adm/switchserver?otherserver='.$home.'&amp;role='.
                      &HTML::Entities::encode($env{'request.role'},'"<>&');
-            if ($shownsymb) {
-                $cfile .= '&amp;symb='.&HTML::Entities::encode($shownsymb,'"<>&');
-                if ($resedit) {
-                    $cfile .= '&amp;edit=1';
-                }
+            if ($symb) {
+                $cfile .= '&amp;symb='.&HTML::Entities::encode($symb,'"<>&');
             } elsif ($folderpath) {
                 $cfile .= '&amp;folderpath='.&HTML::Entities::encode($folderpath,'"<>&');
             }
@@ -3566,48 +3347,11 @@ sub jump_to_editres {
             if ($forcereg) {
                 $cfile .= '&amp;register=1';
             }
-            $jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."','$target')";
+            $jscall = "need_switchserver('".&Apache::loncommon::escape_single($cfile)."');";
         }
     } else {
         unless ($cfile =~ m{^/priv/}) {
-            if ($cfile =~ m{^(/adm/wrapper/ext/([^#]+))(?:|#([^#]+))$}) {
-                $cfile = $1;
-                my $extlink = $2;
-                $anchor = $3;
-                $is_ext = 1;
-                if (($extlink !~ /^https:/) && ($ENV{'SERVER_PORT'} == 443)) {
-                    unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                        $usehttp = 1;
-                    }
-                } elsif ($env{'request.use_absolute'}) {
-                    if ($env{'request.use_absolute'} =~ m{^https://}) {
-                        $usehttps = 1;
-                    }
-                }
-            } elsif ($cfile =~ m{^/?public/($match_domain)/($match_courseid)/syllabus}) {
-                if ($ENV{'SERVER_PORT'} == 443) {
-                    my ($cdom,$cnum) = ($1,$2);
-                    if (($env{'request.course.id'}) &&
-                        ($env{'course.'.$env{'request.course.id'}.'.num'} eq $cnum) &&
-                        ($env{'course.'.$env{'request.course.id'}.'.domain'} eq $cdom)) {
-                        if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ m{^http://}) {
-                            unless ((&Apache::lonnet::uses_sts()) || (&Apache::lonnet::waf_allssl($hostname))) {
-                                $usehttp = 1;
-                            }
-                        }
-                    }
-                } elsif ($env{'request.use_absolute'}) {
-                    if ($env{'request.use_absolute'} =~ m{^https://}) {
-                        $usehttps = 1;
-                    }
-                }
-            }
             if ($symb) {
-                if ($anchor ne '') {
-                    if ($symb =~ m{^([^#]+)\Q#$anchor\E$}) {
-                        $symb = $1.&escape(&escape('#')).$anchor;
-                    }
-                }
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?')."symb=$symb";
             } elsif ($folderpath) {
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?').
@@ -3626,30 +3370,13 @@ sub jump_to_editres {
             }
             if ($forceedit) {
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?').'forceedit=1';
-                if ($usehttps) {
-                    $cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile;
-                }
-            } elsif ($usehttp) {
-                if ($hostname ne '') {
-                    $cfile = 'http://'.$hostname.(($cfile =~ /^\//)? '':'/').$cfile;
-                }
-                $cfile .= (($cfile=~/\?/)?'&amp;':'?').'usehttp=1';
-            } elsif ($usehttps) {
-                $cfile = $env{'request.use_absolute'}.(($cfile =~ /^\//)? '':'/').$cfile;
             }
             if ($forcereg) {
                 $cfile .= (($cfile=~/\?/)?'&amp;':'?').'register=1';
             }
             if ($todocs) {
-                $cfile .= (($cfile=~/\?/)?'&amp;':'?').'todocs=1';
+               $cfile .= (($cfile=~/\?/)?'&amp;':'?').'todocs=1';
             }
-            if ($suppanchor ne '') {
-                $cfile .= (($cfile=~/\?/)?'&amp;':'?').'anchor='.
-                          &HTML::Entities::encode($suppanchor,'"<>&');
-            }
-        }
-        if ($anchor ne '') {
-            $cfile .= '#'.$anchor;
         }
         $jscall = "go('".&Apache::loncommon::escape_single($cfile)."')";
     }
@@ -3662,18 +3389,15 @@ sub jump_to_editres {
 # javascript_valid_email
 #
 # Generates javascript to validate an e-mail address.
-# Returns a javascript function which accepts a form field as argument, and
+# Returns a javascript function which accetps a form field as argumnent, and
 # returns false if field.value does not satisfy two regular expression matches
 # for a valid e-mail address.  Backwards compatible with old browsers without
 # support for javascript RegExp (just checks for @ in field.value in this case). 
 
 sub javascript_valid_email {
     my $scripttag .= <<'END';
-function validmail(field,suffix) {
+function validmail(field) {
     var str = field.value;
-    if (suffix != '' && suffix != undefined) {
-        str += suffix;
-    }
     if (window.RegExp) {
         var reg1str = "(@.*@)|(\\.\\.)|(@\\.)|(\\.@)|(^\\.)";
         var reg2str = "^.+\\@(\\[?)[a-zA-Z0-9\\-\\.]+\\.([a-zA-Z]{2,3}|[0-9]{1,3})(\\]?)$"; //"
@@ -3984,7 +3708,6 @@ add_item_funclist
 Inputs: ./.
 
 Returns: HTML code with function list end
-
 =cut
 
 sub end_funclist {
@@ -4028,8 +3751,6 @@ sub funclist_from_array {
 
 =pod
 
-=over
-
 =item &actionbox( \@array )
 
 Constructs a XHTML list from \@array with the first item being visually
@@ -4047,7 +3768,7 @@ A reference to the array containing text
 
 =back
  
-Returns: XHTML div as string.
+Returns: XHTML div as string. 
 
 =back