--- loncom/interface/londocs.pm	2007/07/19 00:08:04	1.293.2.1
+++ loncom/interface/londocs.pm	2008/05/22 17:47:33	1.306
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.293.2.1 2007/07/19 00:08:04 albertel Exp $
+# $Id: londocs.pm,v 1.306 2008/05/22 17:47:33 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1205,8 +1205,8 @@ sub update_paste_buffer {
     }
     $url=~s{http(:|:)//https(:|:)//}{https$2//};
 
-    &Apache::lonnet::appenv('docs.markedcopy_title' => $title,
-			    'docs.markedcopy_url'   => $url);
+    &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
+			    'docs.markedcopy_url'   => $url});
     delete($env{'form.markcopy'});
 }
 
@@ -1227,9 +1227,13 @@ ENDPASTE
 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
     }  else {
 	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
-	my $type = &Apache::loncommon::filedescription($extension);
-	my $icon = '<img src="'.&Apache::loncommon::icon($extension).
-	    '" alt="" class="LC_icon" />';
+	my $icon = &Apache::loncommon::icon($extension);
+	if ($extension eq 'sequence' &&
+	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
+	    $icon = &Apache::loncommon::lonhttpdurl($r->dir_config('lonIconsURL'));
+	    $icon .= '/folder_closed.gif';
+	}
+	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
 	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
     }
     if ($container eq 'page') {
@@ -1467,7 +1471,7 @@ sub editor {
 	$r->print('<p>'.&mt('Caution: this folder is set to randomly pick a subset of resources. Adding or removing resources from this folder will change the set of resources that the students see, resulting in spurious or missing credit for completed problems, not limited to ones you modify. Do not modify the contents of this folder if it is in active student use.').'</p>');
     }
     if ($is_random_order) {
-	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown. Do not modify the contents of this folder if it is in active student use.').'</p>');
+	$r->print('<p>'.&mt('Caution: this folder is set to randomly order its contents. Adding or removing resources from this folder will change the order of resources shown.').'</p>');
     }
     $r->print('<table class="LC_docs_editor">');
     foreach my $res (@LONCAPA::map::order) {
@@ -1698,7 +1702,6 @@ sub entryline {
     my $line='<tr>';
     my ($form_start,$form_end);
 # Edit commands
-    my $container;
     my ($container, $type, $esc_path, $path, $symb);
     if ($env{'form.folderpath'}) {
 	$type = 'folder';
@@ -1751,7 +1754,7 @@ sub entryline {
 		# no copy for published maps
 		$nocopy = 1;
 	    } else {
-		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url))) {
+		foreach (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
 		    my ($title,$url,$ext,$type)=split(/\:/,$_);
 		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
 			$nocopy=1;
@@ -2436,7 +2439,7 @@ sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>&Apache::loncommon::course_type()." Documents",
+					    text=>"Edit ".&Apache::loncommon::course_type(),
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2571,9 +2574,13 @@ sub handler {
       if (($env{'form.uploaddoc.filename'}) &&
 	  ($env{'form.cmd'}=~/^upload_(\w+)/)) {
 # Process file upload - phase one - upload and parse primary file.  
+	  undef($hadchanges);
           $upload_result = &process_file_upload(\$upload_output,$coursenum,
 						$coursedom,\%allfiles,
 						\%codebase,$1);
+	  if ($hadchanges) {
+	      &mark_hash_old();
+	  }
           if ($upload_result eq 'phasetwo') {
               $r->print($upload_output);
           }
@@ -2675,6 +2682,7 @@ sub handler {
                 'bull' => 'Bulletin Board',
                 'mypi' => 'My Personal Info',
                 'grpo' => 'Group Files',
+                'rost' => 'Course Roster',
 		'abou' => 'About User',
                 'imsf' => 'Import IMS package',
                 'file' =>  'File',
@@ -2803,7 +2811,7 @@ $uploadtag
 <br />
 <span class="LC_nobreak">
 <label>$lt{'parse'}?
-<input type="checkbox" name="parserflag" />
+<input type="checkbox" name="parserflag" checked="checked" />
 </label>
 </span>
 <br />
@@ -2883,7 +2891,7 @@ value="$lt{'newp'}" />$help{'Adding_Page
 <br /><form action="/adm/coursedocs" method="post" name="newsyl">
 $uploadtag
 <input type="hidden" name="importdetail" 
-value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
+value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
 <span class="LC_nobreak">
 <input name="newsyl" type="submit" value="$lt{'syll'}" /> 
  $help{'Syllabus'}
@@ -2892,7 +2900,7 @@ value="Syllabus=/public/$coursedom/$cour
 <br /><form action="/adm/coursedocs" method="post" name="newnav">
 $uploadtag
 <input type="hidden" name="importdetail" 
-value="Navigate Content=/adm/navmaps" />
+value="$lt{'navc'}=/adm/navmaps" />
 <span class="LC_nobreak">
 <input name="newnav" type="submit" value="$lt{'navc'}" />
 $help{'Navigate_Content'}
@@ -2960,12 +2968,21 @@ onClick="javascript:makeabout();" />
 <br /><form action="/adm/coursedocs" method="post" name="newgroupfiles">
 $uploadtag
 <input type="hidden" name="importdetail"
-value="Group Files=/adm/$coursedom/$coursenum/aboutme" />
+value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
 <span class="LC_nobreak">
 <input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
 $help{'Group Files'}
 </span>
 </form>
+<br /><form action="/adm/coursedocs" method="post" name="newroster">
+$uploadtag
+<input type="hidden" name="importdetail" 
+value="$lt{'rost'}=/adm/viewclasslist" />
+<span class="LC_nobreak">
+<input name="newroster" type="submit" value="$lt{'rost'}" />
+$help{'Course Roster'}
+</span>
+</form>
 ENDFORM
        }
        if ($env{'form.pagepath'}) {
@@ -3115,10 +3132,33 @@ ENDSUPFORM
 sub editing_js {
     my ($udom,$uname) = @_;
     my $now = time();
+    my %lt = &Apache::lonlocal::texthash(
+                                          p_mnf => 'Name of New Folder',
+                                          t_mnf => 'New Folder',
+                                          p_mnp => 'Name of New Page',
+                                          t_mnp => 'New Page',
+                                          p_mxu => 'Title for the Uploaded Score',
+                                          p_msp => 'Title for the Page',
+                                          p_msb => 'Title for the Problem',
+                                          p_mdb => 'Title for the Drop Box',
+                                          p_mbb => 'Title for the Bulletin Board',
+                                          p_mab => "Enter user:domain for User's 'About Me' Page",
+                                          p_mab2 => "About [_99]",
+                                          p_mab_alrt1 => 'Not a valid user:domain',
+                                          p_mab_alrt2 => 'Please enter both user and domain in the format user:domain',
+                                          p_chn => 'New Title',
+                                          p_rmr1 => 'WARNING: Removing a resource makes associated grades and scores inaccessible!',
+                                          p_rmr2a => 'Remove[_99]',
+                                          p_rmr2b => '?[_99]',
+                                          p_ctr1a => 'WARNING: Cutting a resource makes associated grades and scores inaccessible!',
+                                          p_ctr1b => 'Grades remain inaccessible if resource is pasted into another folder.',
+                                          p_ctr2a => 'Cut[_98]',
+                                          p_ctr2b => '?[_98]'
+                                        );
 
     return <<ENDNEWSCRIPT;
 function makenewfolder(targetform,folderseq) {
-    var foldername=prompt('Name of New Folder','New Folder');
+    var foldername=prompt('$lt{"p_mnf"}','$lt{"t_mnf"}');
     if (foldername) {
        targetform.importdetail.value=escape(foldername)+"="+folderseq;
         targetform.submit();
@@ -3126,7 +3166,7 @@ function makenewfolder(targetform,folder
 }
 
 function makenewpage(targetform,folderseq) {
-    var pagename=prompt('Name of New Page','New Page');
+    var pagename=prompt('$lt{"p_mnp"}','$lt{"t_mnp"}');
     if (pagename) {
         targetform.importdetail.value=escape(pagename)+"="+folderseq;
         targetform.submit();
@@ -3150,7 +3190,7 @@ function edittext(targetname,residx,titl
 }
 
 function makeexamupload() {
-   var title=prompt('Listed Title for the Uploaded Score');
+   var title=prompt('$lt{"p_mxu"}');
    if (title) { 
     this.document.forms.newexamupload.importdetail.value=
 	escape(title)+'=/res/lib/templates/examupload.problem';
@@ -3159,7 +3199,7 @@ function makeexamupload() {
 }
 
 function makesmppage() {
-   var title=prompt('Listed Title for the Page');
+   var title=prompt('$lt{"p_msp"}');
    if (title) { 
     this.document.forms.newsmppg.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/$now/smppg';
@@ -3168,7 +3208,7 @@ function makesmppage() {
 }
 
 function makesmpproblem() {
-   var title=prompt('Listed Title for the Problem');
+   var title=prompt('$lt{"p_msb"}');
    if (title) { 
     this.document.forms.newsmpproblem.importdetail.value=
 	escape(title)+'=/res/lib/templates/simpleproblem.problem';
@@ -3177,7 +3217,7 @@ function makesmpproblem() {
 }
 
 function makedropbox() {
-   var title=prompt('Listed Title for the Drop Box');
+   var title=prompt('$lt{"p_mdb"}');
    if (title) { 
     this.document.forms.newdropbox.importdetail.value=
         escape(title)+'=/res/lib/templates/DropBox.problem';
@@ -3186,7 +3226,7 @@ function makedropbox() {
 }
 
 function makebulboard() {
-   var title=prompt('Listed Title for the Bulletin Board');
+   var title=prompt('$lt{"p_mbb"}');
    if (title) {
     this.document.forms.newbul.importdetail.value=
 	escape(title)+'=/adm/$udom/$uname/$now/bulletinboard';
@@ -3195,20 +3235,20 @@ function makebulboard() {
 }
 
 function makeabout() {
-   var user=prompt("Enter user:domain for User's 'About Me' Page");
+   var user=prompt("$lt{'p_mab'}");
    if (user) {
        var comp=new Array();
        comp=user.split(':');
        if ((typeof(comp[0])!=undefined) && (typeof(comp[1])!=undefined)) {
 	   if ((comp[0]) && (comp[1])) {
 	       this.document.forms.newaboutsomeone.importdetail.value=
-		   'About '+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
+		   '$lt{"p_mab2"}'+escape(user)+'=/adm/'+comp[1]+'/'+comp[0]+'/aboutme';
 	       this.document.forms.newaboutsomeone.submit();
 	   } else {
-               alert("Not a valid user:domain");
+               alert("$lt{'p_mab_alrt1'}");
            }
        } else {
-           alert("Please enter both user and domain in the format user:domain"); 
+           alert("$lt{'p_mab_alrt2'}");
        }
    }
 }
@@ -3230,7 +3270,7 @@ function finishpick() {
 }
 
 function changename(folderpath,index,oldtitle,container,pagesymb) {
-    var title=prompt('New Title',oldtitle);
+    var title=prompt('$lt{"p_chn"}',oldtitle);
     if (title) {
 	this.document.forms.renameform.markcopy.value=-1;
 	this.document.forms.renameform.title.value=title;
@@ -3247,7 +3287,7 @@ function changename(folderpath,index,old
 }
 
 function removeres(folderpath,index,oldtitle,container,pagesymb,skip_confirm) {
-    if (skip_confirm || confirm('WARNING: Removing a resource makes associated grades and scores inaccessible!\\nRemove "'+oldtitle+'"?')) {
+    if (skip_confirm || confirm('$lt{"p_rmr1"}\\n\\n$lt{"p_rmr2a"} "'+oldtitle+'" $lt{"p_rmr2b"}')) {
 	this.document.forms.renameform.markcopy.value=-1;
 	this.document.forms.renameform.cmd.value='del_'+index;
         if (container == 'sequence') {
@@ -3262,7 +3302,7 @@ function removeres(folderpath,index,oldt
 }
 
 function cutres(folderpath,index,oldtitle,container,pagesymb,folder,skip_confirm) {
-    if (skip_confirm || confirm('WARNING: Cutting a resource makes associated grades and scores inaccessible!\\nGrades remain inaccessible if resource is pasted into another folder.\\nCut "'+oldtitle+'"?')) {
+    if (skip_confirm || confirm('$lt{"p_ctr1a"}\\n$lt{"p_ctr1b"}\\n\\n$lt{"p_ctr2a"} "'+oldtitle+'" $lt{"p_ctr2b"}')) {
 	this.document.forms.renameform.cmd.value='cut_'+index;
 	this.document.forms.renameform.markcopy.value=index;
 	this.document.forms.renameform.copyfolder.value=folder+'.'+container;