--- loncom/interface/londocs.pm	2009/08/13 12:29:04	1.383
+++ loncom/interface/londocs.pm	2009/10/04 10:27:55	1.388
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.383 2009/08/13 12:29:04 tempelho Exp $
+# $Id: londocs.pm,v 1.388 2009/10/04 10:27:55 tempelho Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1719,7 +1719,7 @@ sub process_file_upload {
             return 'failed';
         } else {
             if ($parseaction eq 'parse') {
-                my $total_embedded = keys(%{$allfiles});
+                my $total_embedded = scalar(keys(%{$allfiles}));
                 if ($total_embedded > 0) {
                     my $num = 0;
 		    my $state = '
@@ -2744,11 +2744,19 @@ sub create_form_ul {
               .$script."\n"
               .'// ]]>'."\n"
               .'</script>'."\n";
-    my $brcrum = [{href=>"/adm/createuser",text=>"$type Documents"}];
+
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    &Apache::lonhtmlcommon::add_breadcrumb({
+        href=>"/adm/createuser",text=>"$type Documents"});
+
     $r->print(&Apache::loncommon::start_page("$type Documents", $script,
-				    {'force_register' => $showdoc,
-                                     'bread_crumbs' => $brcrum}).
-	      &Apache::loncommon::help_open_menu('','',273,'RAT'));
+				    {'force_register' => $showdoc,})
+             .&Apache::loncommon::help_open_menu('','',273,'RAT')
+             .&Apache::lonhtmlcommon::breadcrumbs(
+                  'Editing the Table of Contents for your '.$type,
+                  'Docs_Adding_Course_Doc')
+    );
 
   my %allfiles = ();
   my %codebase = ();
@@ -2892,7 +2900,7 @@ FIUP
 CHBO
 
         my @fileuploada = (
-        { pic01 => "<a onclick='document.uploaddocument.submit()'>$lt{'upld'}</a> $help{'Uploading_From_Harddrive'}" },
+        { '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic01" />' => "<input type='submit' value='".$lt{'upld'}."' /> $help{'Uploading_From_Harddrive'}" },
         );
 	my $fileuploadform=(<<FUFORM);
 	<form name="uploaddocument" action="/adm/coursedocs" method="post" enctype="multipart/form-data">
@@ -2918,9 +2926,9 @@ FUFORM
 	<input type="hidden" name="active" value="bb" />
 SEDFFORM
 	my @simpleeditdefaultforma = ( 
-	{ pic03 => "$uploadtag<a onclick='javascript:groupsearch()'>$lt{'srch'}</a>" },
-	{ pic04 => "<a onclick='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
-	{ pic05 => "<a onclick='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic03" />' => "$uploadtag<a onclick='javascript:groupsearch()'>$lt{'srch'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic04" />' => "<a onclick='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
+	{ '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic05" />' => "<a onclick='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },
 	);
 	$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
 	$simpleeditdefaultform .=(<<SEDFFORM);
@@ -3174,7 +3182,7 @@ NPFORM
 	</form>
 NFFORM
 	my @newfolderforma= (
-	{ pic02 => "$newfolderform" }
+	{ '<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic02" />' => "$newfolderform" }
         );
 
 
@@ -3203,37 +3211,37 @@ NSYLFORM
 	</form>
 NGFFORM
 	@specialdocumentsforma=(
-	{pic06=>$newpageform},
-	{pic07=>$newsylform},
-	{pic08=>$newgroupfileform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic06" />'=>$newpageform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic07" />'=>$newsylform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic08" />'=>$newgroupfileform},
 	); 
 	
       }
-	push @specialdocumentsforma, ({pic09=>$newnavform},
-	{pic10=>$newsmppageform},
-	{pic11=>$newsmpproblemform},
-	{pic12=>$newdropboxform},
-	{pic13=>$newexuploadform},
-	{pic14=>$newbulform},
-	{pic15=>$newaboutmeform},
-	{pic16=>$newaboutsomeoneform},
-	{pic17=>$newrosterform},);
+	push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic09" />'=>$newnavform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic10" />'=>$newsmppageform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic11" />'=>$newsmpproblemform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic12" />'=>$newdropboxform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic13" />'=>$newexuploadform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic14" />'=>$newbulform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic15" />'=>$newaboutmeform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic16" />'=>$newaboutsomeoneform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic17" />'=>$newrosterform},);
 
 	$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
 
 if($env{'form.pagepath'}) {
 	
 	@specialdocumentsforma=(
-	{pic32=>$newsmpproblemform},
-	{pic33=>$newexuploadform}
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic32" />'=>$newsmpproblemform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic33" />'=>$newexuploadform}
 	);
 	$specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
 }
 
 my @tools = (
-	{pic18=>$extresourcesform},
-	{pic19=>$imspform},
-	{pic20=>$recoverform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic18" />'=>$extresourcesform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic19" />'=>$imspform},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic20" />'=>$recoverform},
 	);
 
 my %orderhash = (
@@ -3256,8 +3264,6 @@ $r->print(&generate_edit_table($tid,$var
        }
 
        &changewarning($r,'');
- $r->print(&Apache::loncommon::help_open_topic('Docs_Adding_Course_Doc',
-                     &mt('Editing the Table of Contents for your '.$type)));
 $r->print('</div>');
 	}
        if ($env{'form.pagepath'}) {
@@ -3288,7 +3294,7 @@ $r->print('</div>');
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
 	my @supupdocform = (
-		{pic27=>"<a onclick='document.supuploaddocument.submit()'>$lt{'upld'}</a>$help{'Uploading_From_Harddrive'}"},
+		{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic27" />'=>"<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}"},
 		);
 	my $supupdocform=(<<SUPDOCFORM);
 	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
@@ -3318,7 +3324,7 @@ SUPDOCFORM
 	</form>
 SNFFORM
 	
-	my @supnewfolderforma = ({pic28=>$supnewfolderform});
+	my @supnewfolderforma = ({'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic28" />'=>$supnewfolderform});
 	$supnewfolderform = create_form_ul(create_list_elements(@supnewfolderforma));
 
 
@@ -3355,9 +3361,9 @@ SNAMFORM
 
 
 my @specialdocs = (
-		{pic29=>$supnewextform},
-		{pic30=>$supnewsylform},
-		{pic31=>$supnewaboutmeform},
+		{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic29" />'=>$supnewextform},
+		{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic30" />'=>$supnewsylform},
+		{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic31" />'=>$supnewaboutmeform},
 		);
 my %suporderhash = (
                 'ee' => ['Upload Document',$supupdocform.' '.$supnewfolderform],
@@ -3415,15 +3421,15 @@ sub generate_admin_options {
   my $dumpbut=&dumpbutton();
   my $exportbut=&exportbutton();
   my @list = (
-	{pic21=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"},
-	{pic22=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic21" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic22" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"},
 	);
   if($dumpbut ne ''){
-  push @list, {pic23=>$dumpbut};
+  push @list, {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic23" />'=>$dumpbut};
   }
-  push @list, ({pic24=>$exportbut},
-	{pic25=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},
-	{pic26=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
+  push @list, ({'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic24" />'=>$exportbut},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic25" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"listsymbs\", \"$lt{'ls'}\")'>$lt{'ls'}</a><input type='hidden' name='folder' value='$env{'form.folder'}' />"},
+	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/docspacer.gif" alt="pic26" />'=>"<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"docslog\", \"$lt{'sl'}\")'>$lt{'sl'}</a>"},
 	);
   return '<form action="/adm/coursedocs" method="post" name="courseverify"><input type="hidden" id="dummy" />'.create_form_ul(create_list_elements(@list)).'</form>';
 
@@ -3442,14 +3448,7 @@ sub generate_edit_table {
     $form = '<div class="LC_Box">';
     $form .= '<ul id="navigation'.$tid.'" class="LC_TabContent">';
     foreach my $name (sort(keys(%orderhash))){
-        if($name eq 'zz'){
-            if($activetab ne ''){
-               $active = 'class="right"';
-            }else{
-               $active = 'class="right active"';
-            }
-            $form .= '<li onclick="javascript:hideAll(this, \'navigation'.$tid.'\' ,\'content'.$tid.'\');" '.$active.'>'.&mt(${$orderhash{$name}}[0]).'</li>';
-        }else{
+        if($name ne 'zz'){
             if($activetab eq '' || $activetab ne $name){
                $active = '';
             }elsif($activetab eq $name){