--- loncom/interface/londocs.pm	2009/07/10 17:05:05	1.377
+++ loncom/interface/londocs.pm	2010/03/29 12:34:47	1.425
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.377 2009/07/10 17:05:05 bisitz Exp $
+# $Id: londocs.pm,v 1.425 2010/03/29 12:34:47 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -35,6 +35,7 @@ use Apache::Constants qw(:common :http);
 use Apache::imsexport;
 use Apache::lonnet;
 use Apache::loncommon;
+use Apache::lonhtmlcommon;
 use LONCAPA::map();
 use Apache::lonratedt();
 use Apache::lonxml;
@@ -116,17 +117,22 @@ sub authorhosts {
 
 sub dumpbutton {
     my ($home,$other,%outhash)=&authorhosts();
-    my $type = &Apache::loncommon::course_type();
+    my $crstype = &Apache::loncommon::course_type();
     if ($home+$other==0) { return ''; }
     if ($home) {
-	return '<input type="submit" name="dumpcourse" value="'.
-	    &mt('Dump '.$type.' DOCS to Construction Space').'" />'.
-	    &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
-    } else {
-	return '<div>'.
-     &mt('Dump '.$type.
-	 ' DOCS to Construction Space: available on other servers').
-	 '</div>';
+        my $link =
+            "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \""
+           .&mt('Dump '.$crstype.' Documents to Construction Space')
+           ."\")'>"
+           .&mt('Dump '.$crstype.' Documents to Construction Space')
+           .'</a>';
+        return
+            $link.' '
+           .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
+           .'<br />';
+    } else {
+        return
+            &mt('Dump '.$crstype.' Documents to Construction Space: available on other servers');
     }
 }
 
@@ -140,10 +146,10 @@ sub clean {
 
 sub dumpcourse {
     my ($r) = @_;
-    my $type = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page('Dump '.$type.' DOCS to Construction Space').
+    my $crstype = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Documents to Construction Space').
 	      '<form name="dumpdoc" action="" method="post">');
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$type.' DOCS to Construction Space'));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Documents to Construction Space'));
     my ($home,$other,%outhash)=&authorhosts();
     unless ($home) { return ''; }
     my $origcrsid=$env{'request.course.id'};
@@ -254,17 +260,15 @@ sub dumpcourse {
 	$r->print(&Apache::loncommon::end_data_table());
 	&untiehash();
 	$r->print(
-  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $type DOCS").'" /></p></form>');
+  '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
     }
 }
 
 
 
 sub exportbutton {
-    my $type = &Apache::loncommon::course_type();
-    return '<input type="submit" name="exportcourse"'
-          .' value="'.&mt('IMS Export').'"'
-          .' title="'.&mt('Export '.$type.' to IMS Package').'" />'.
+    my $crstype = &Apache::loncommon::course_type();
+    return "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"exportcourse\", \"".&mt('IMS Export')."\")'>".&mt('IMS Export')."</a>".
     &Apache::loncommon::help_open_topic('Docs_Export_Course_Docs').'<br />';
 }
 
@@ -272,18 +276,28 @@ sub exportbutton {
 
 sub exportcourse {
     my $r=shift;
-    my $type = &Apache::loncommon::course_type();
+    my $crstype = &Apache::loncommon::course_type();
     my %discussiontime = &Apache::lonnet::dump('discussiontimes',
                                                $env{'course.'.$env{'request.course.id'}.'.domain'}, $env{'course.'.$env{'request.course.id'}.'.num'});
     my $numdisc = keys(%discussiontime);
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
-        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package').
+        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package').
                   '<h2>'.&mt('IMS Export Failed').'</h2>'.
-                  '<div class="LC_error">'.
-                  &mt('Unable to retrieve information about course contents').
-                  '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
-        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+                  '<div class="LC_error">');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('Unable to retrieve information about community contents'));
+        } else {
+            $r->print(&mt('Unable to retrieve information about course contents'));
+        }
+        $r->print('</div><a href="/adm/coursedocs">');
+        if ($crstype eq 'Community') {
+            $r->print(&mt('Return to Community Editor'));
+        } else {
+            $r->print(&mt('Return to Course Editor'));
+        }
+        $r->print('</a>');
+        &Apache::lonnet::logthis('IMS export failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
         return;
     }
     my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
@@ -332,20 +346,20 @@ sub exportcourse {
                 open(OUTPUT, "zip -r $imszip *  2> /dev/null |");
                 close(OUTPUT);
                 chdir $cwd;
+                $outcome .= '<p>'
+                           .&mt('[_1]Your IMS package[_2] is ready for download.'
+                               ,'<a href="'.$imszipfile.'">','</a>')
+                           .'</p>';
                 if ($copyresult) {
                     $outcome .= '<p class="LC_error">'
                                .&mt('The following errors occurred during export - [_1]'
                                    ,$copyresult)
                                .'</p>';
                 }
-                $outcome .= '<p>'
-                           .&mt('[_1]Your IMS package[_2] is ready for download.'
-                               ,'<a href="'.$imszipfile.'">','</a>')
-                           .'</p>';
             } else {
                 $outcome = '<p class="LC_error">'
                           .&mt('Unfortunately you will not be able to retrieve'
-                              .' an IMS archive of this posts at this time,'
+                              .' an IMS archive of your course at this time,'
                               .' because there was a problem creating a'
                               .' manifest file.')
                           .'</p>'
@@ -354,29 +368,31 @@ sub exportcourse {
                           .'</a></p>';
             }
         }
-        $r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package'));
+        $r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package'));
 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
         $r->print($outcome);
         $r->print(&Apache::loncommon::end_page());
     } else {
-        my $display;
-        $display = '<form name="exportdoc" action="" method="post">'."\n";
-        $display .= '<p>'
-                   .&mt('Choose which items you wish to export from your '.$type.'.')
-                   .'</p>';
-        $display .= '<div class="LC_columnSection"><fieldset>'.
+        my $display='<form name="exportdoc" action="" method="post">'."\n".
+                    '<p>'.
+                    &mt('Choose which items you wish to export from your '.$crstype.'.').
+                    '</p>'.
+                    '<div class="LC_columnSection"><fieldset>'.
                     '<legend>'.&mt('Content items').'</legend>'.
                     '<input type="button" value="'.&mt('check all').'" '.
                     'onclick="javascript:checkAll(document.exportdoc.archive)" />'.
                     '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>'.
-                    '<fieldset>'.
-                    '<legend>'.&mt('Discussion posts').'</legend>'.
-                    '<input type="button" value="'.&mt('check all').'"'.
-                    ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
-                    '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
-                    ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
-                    '</fieldset></div>';
+                    ' onclick="javascript:uncheckAll(document.exportdoc.archive)" /></fieldset>';
+        if ($numdisc > 0) {
+            $display .= '<fieldset>'.
+                        '<legend>'.&mt('Discussion posts').'</legend>'.
+                        '<input type="button" value="'.&mt('check all').'"'.
+                        ' onclick="javascript:checkAll(document.exportdoc.discussion)" />'.
+                        '&nbsp;&nbsp;<input type="button" value="'.&mt('uncheck all').'"'.
+                        ' onclick="javascript:uncheckAll(document.exportdoc.discussion)" />'.
+                        '</fieldset>';
+        }
+        $display .= '</div>';
         my $curRes;
         my $depth = 0;
         my $count = 0;
@@ -387,15 +403,11 @@ sub exportcourse {
         my $lastcontainer = $startcount;
         $display .= &Apache::loncommon::start_data_table()
                    .&Apache::loncommon::start_data_table_header_row()
-                   .'<th>'.&mt('Export content item?').'</th>'
-                   .'<th>';
+                   .'<th>'.&mt('Export content item?').'</th>';
         if ($numdisc > 0) {
-            $display .= &mt('Export discussion posts?');
-        } else {
-             $display .= '&nbsp;';
+            $display .= '<th>'.&mt('Export discussion posts?').'</th>';
         }
-        $display .= '</th>'
-                   .&Apache::loncommon::end_data_table_header_row();
+        $display .= &Apache::loncommon::end_data_table_header_row();
         while ($curRes = $it->next()) {
             if (ref($curRes)) {
                 $count ++;
@@ -416,37 +428,33 @@ sub exportcourse {
                         $ressymb = 'bulletin___'.$3.'___adm/wrapper/adm/'.$1.'/'.$2.'/'.$3.'/bulletinboard';
                     }
                 }
+                my $currelem = $count+$boards+$startcount;
                 $display .= &Apache::loncommon::start_data_table_row()
                            .'<td>'."\n"
                            .'<input type="checkbox" name="archive" value="'.$count.'" ';
                 if (($curRes->is_sequence()) || ($curRes->is_page())) {
-                    my $checkitem = $count + $boards + $startcount;
-                    $display .= 'onclick="javascript:propagateCheck('."'$checkitem'".')"';
+                    $lastcontainer = $currelem;
+                    $display .= 'onclick="javascript:propagateCheck('."'$currelem'".')"';
                 }
                 $display .= ' />'."\n";
                 for (my $i=0; $i<$depth; $i++) {
-                    $display .= '<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'
-                               .'<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />'."\n";
+                    $display .= ('<img src="/adm/lonIcons/whitespace1.gif" class="LC_docs_spacer" alt="" />' x2)."\n";
                 }
                 if ($curRes->is_sequence()) {
                     $display .= '<img src="/adm/lonIcons/navmap.folder.open.gif" alt="" />&nbsp;'."\n";
-                    $lastcontainer = $count + $startcount + $boards;
                 } elsif ($curRes->is_page()) {
                     $display .= '<img src="/adm/lonIcons/navmap.page.open.gif" alt="" />&nbsp;'."\n";
-                    $lastcontainer = $count + $startcount + $boards;
                 }
-                my $currelem = $count+$boards+$startcount;
                 $children{$parent{$depth}} .= $currelem.':';
                 $display .= '&nbsp;'.$curRes->title().'</td>'."\n";
 
                 # Existing discussion posts?
                 if ($discussiontime{$ressymb} > 0) {
                     $boards ++;
-                    $currelem = $count+$boards+$startcount;
                     $display .= '<td align="right">'
                                .'<input type="checkbox" name="discussion" value="'.$count.'" />'
                                .'</td>'."\n";
-                } else {
+                } elsif ($numdisc > 0) {
                     $display .= '<td>&nbsp;</td>'."\n";
                 }
                 $display .= &Apache::loncommon::end_data_table_row();
@@ -508,7 +516,7 @@ function containerCheck(item) {
 // ]]>
 </script>
         |;
-	$r->print(&Apache::loncommon::start_page('Export '.$type.' to IMS Package',
+	$r->print(&Apache::loncommon::start_page('Export '.$crstype.' to IMS Package',
 						 $scripttag));
 	$r->print(&Apache::lonhtmlcommon::breadcrumbs('IMS Export'));
 	$r->print($display.
@@ -999,7 +1007,7 @@ sub group_import {
 }
 
 sub breadcrumbs {
-    my ($where,$allowed,$type)=@_;
+    my ($allowed,$crstype)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     my (@folders);
     if ($env{'form.pagepath'}) {
@@ -1014,6 +1022,15 @@ sub breadcrumbs {
     my $isencrypted=0;
     my $ishidden=0;
     my $is_random_order=0;
+    if (!$allowed) {
+        my $description = $env{'course.'.$env{'request.course.id'}.'.description'};
+        &Apache::lonhtmlcommon::add_breadcrumb(
+                                               {'href' => '/adm/menu',
+                                                'title'=> 'Go to main menu',
+                                                'text' => $description,
+                                               });
+        $plain .= $description.' &gt;';
+    }
     while (@folders) {
 	my $folder=shift(@folders);
     	my $foldername=shift(@folders);
@@ -1033,11 +1050,7 @@ sub breadcrumbs {
             if ($3) { $isencrypted=1; }
 	    if ($4 ne '') { $is_random_order = 1; }
             if ($folder eq 'supplemental') {
-                if ($allowed) {
-                    $name = &mt('Supplemental '.$type.' Documents');
-                } else {
-                    $name = &mt($type.' Documents');
-                }
+                $name = &mt('Supplemental '.$crstype.' Documents');
             }
 	    &Apache::lonhtmlcommon::add_breadcrumb(
 		      {'href'=>$url.$cpinfo,
@@ -1049,7 +1062,7 @@ sub breadcrumbs {
     }
     $plain=~s/\&gt\;\s*$//;
     return (&Apache::lonhtmlcommon::breadcrumbs(undef,undef,0,'nohelp',
-					       'LC_docs_path', undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+					       undef, undef, 1 ),$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
 }
 
 sub log_docs {
@@ -1273,10 +1286,11 @@ sub print_paste_buffer {
     my ($r,$container) = @_;
     return if (!defined($env{'docs.markedcopy_url'}));
 
-    $r->print(<<ENDPASTE);
-<form name="pasteform" action="/adm/coursedocs" method="post"><p>
-ENDPASTE
-    $r->print('<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> ');
+    $r->print('<fieldset>'
+             .'<legend>'.&mt('Clipboard').'</legend>'
+             .'<form name="pasteform" action="/adm/coursedocs" method="post">'
+             .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
+    );
 
     my $type;
     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
@@ -1290,7 +1304,7 @@ ENDPASTE
 	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 .= '/navmap.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'})));
@@ -1305,7 +1319,7 @@ ENDPASTE
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
     }
-    $r->print('</p></form>');
+    $r->print('</form></fieldset>');
 }
 
 sub do_paste_from_buffer {
@@ -1492,8 +1506,7 @@ sub handle_edit_cmd {
 }
 
 sub editor {
-    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$type)=@_;
-
+    my ($r,$coursenum,$coursedom,$folder,$allowed,$upload_output,$crstype)=@_;
     my $container= ($env{'form.pagepath'}) ? 'page'
 		                           : 'sequence';
 
@@ -1508,9 +1521,14 @@ sub editor {
         $LONCAPA::map::resources[$idx]='';
     }
 
-    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order)=
-	&breadcrumbs($folder,$allowed,$type);
-    $r->print($breadcrumbtrail);
+    my ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order);
+    if ($allowed) {
+        ($breadcrumbtrail,$randompick,$ishidden,$isencrypted,$plain,$is_random_order) =
+	    &breadcrumbs($allowed,$crstype);
+        $r->print($breadcrumbtrail);
+    } else {
+        $randompick = -1;
+    }
 
 # ------------------------------------------------------------ Process commands
 
@@ -1588,34 +1606,74 @@ sub editor {
     my $idx=0;
     my $shown=0;
     if (($ishidden) || ($isencrypted) || ($randompick>=0) || ($is_random_order)) {
-	$r->print('<p>'.&mt('Parameters').':<ul>'.
-		  ($randompick>=0?'<li>'.&mt('randomly pick [_1] resources',$randompick).'</li>':'').
+	$r->print('<div class="LC_Box">'.
+          '<p>'.&mt('Parameters:').
+          '<ul>'.
+		  ($randompick>=0?'<li>'.&mt('randomly pick [quant,_1,resource]',$randompick).'</li>':'').
 		  ($ishidden?'<li>'.&mt('contents hidden').'</li>':'').
 		  ($isencrypted?'<li>'.&mt('URLs hidden').'</li>':'').
+		  ($is_random_order?'<li>'.&mt('random order').'</li>':'').
 		  '</ul></p>');
+        if ($randompick>=0) {
+            $r->print('<p class="LC_warning">'
+                 .&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 class="LC_warning">'
+                 .&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('</div>');
     }
-    if ($randompick>=0) {
-	$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.').'</p>');
-    }
-    $r->print('<table class="LC_docs_editor">');
+
+    my $output;  
+
+    &Apache::loncommon::start_data_table_count(); #setup a row counter 
     foreach my $res (@LONCAPA::map::order) {
-	my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
-	$name=&LONCAPA::map::qtescape($name);
-	$url=&LONCAPA::map::qtescape($url);
-	unless ($name) {  $name=(split(/\//,$url))[-1]; }
-	unless ($name) { $idx++; next; }
-	$r->print(&entryline($idx,$name,$url,$folder,$allowed,$res,
-			     $coursenum));
-	$idx++;
-	$shown++;
+        my ($name,$url)=split(/\:/,$LONCAPA::map::resources[$res]);
+        $name=&LONCAPA::map::qtescape($name);
+        $url=&LONCAPA::map::qtescape($url);
+        unless ($name) {  $name=(split(/\//,$url))[-1]; }
+        unless ($name) { $idx++; next; }
+        $output .= &entryline($idx,$name,$url,$folder,$allowed,$res,
+                              $coursenum,$crstype);
+        $idx++;
+        $shown++;
     }
-    unless ($shown) {
-	$r->print('<tr><td>'.&mt('Currently no documents.').'</td></tr>');
+    &Apache::loncommon::end_data_table_count();
+    
+    if ($shown) {
+        $r->print(&Apache::loncommon::start_data_table());
+        if ($allowed) {
+            $r->print(&Apache::loncommon::start_data_table_header_row()
+                     .'<th colspan="2">'.&mt('Move').'</th>'
+                     .'<th>'.&mt('Actions').'</th>'
+                     .'<th colspan="2">'.&mt('Document').'</th>');
+            if ($folder !~ /^supplemental/) {
+                $->print('<th colspan="4">'.&mt('Settings').'</th>');
+            }
+            $r->print(&Apache::loncommon::end_data_table_header_row());
+        }
+        $r->print($output
+                 .&Apache::loncommon::end_data_table()
+        );
+    } else {
+        $r->print('<p class="LC_info">'
+                 .&mt('Currently no documents.')
+                 .'</p>'
+        );
     }
-    $r->print("\n</table>\n");
     if ($allowed) {
         &print_paste_buffer($r,$container);
     }
@@ -1686,7 +1744,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 = '
@@ -1747,6 +1805,7 @@ sub parse_supplemental_title {
 	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
 	my $name =  &Apache::loncommon::plainname($uname,$udom);
 	$name = &HTML::Entities::encode($name,'"<>&\'');
+        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
 	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
 	    $name.': <br />'.$foldertitle;
     }
@@ -1759,8 +1818,7 @@ sub parse_supplemental_title {
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
-    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum)=@_;
-
+    my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
 	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
@@ -1778,7 +1836,7 @@ sub entryline {
     $renametitle=~s/\\/\\\\/g;
     $renametitle=~s/\&quot\;/\\\"/g;
     $renametitle=~s/ /%20/g;
-    my $line='<tr>';
+    my $line=&Apache::loncommon::start_data_table_row();
     my ($form_start,$form_end);
 # Edit commands
     my ($container, $type, $esc_path, $path, $symb);
@@ -1881,18 +1939,16 @@ END
         $form_end = '</form>';
 	$line.=(<<END);
 <td>
-   <table class="LC_docs_entry_move">
-      <tr>
-         <td>
-            <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" /></a>
-         </td>
-      </tr>
-      <tr>
-        <td>
-           <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'><img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" /></a>
-        </td>
-      </tr>
-    </table>
+<div class="LC_docs_entry_move">
+  <a href='/adm/coursedocs?cmd=up_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
+    <img src="${iconpath}move_up.gif" alt='$lt{'up'}' class="LC_icon" />
+  </a>
+</div>
+<div class="LC_docs_entry_move">
+  <a href='/adm/coursedocs?cmd=down_$index&amp;${type}path=$esc_path&amp;${type}symb=$symb$cpinfo'>
+    <img src="${iconpath}move_down.gif" alt='$lt{'dw'}' class="LC_icon" />
+  </a>
+</div>
 </td>
 <td>
    $form_start
@@ -1919,7 +1975,7 @@ END
     my $pagefile;
     if ($uploaded) {
 	if ($extension eq 'sequence') {
-	    $icon=$iconpath.'/folder_closed.gif';
+	    $icon=$iconpath.'/navmap.folder.closed.gif';
 	    $url=~/\Q$coursenum\E\/([\/\w]+)\.sequence$/;
 	    $url='/adm/coursedocs?';
 	    $folderarg=$1;
@@ -2019,18 +2075,24 @@ END
 	$url.='pagepath='.&escape($pagepath).
 	    '&amp;pagesymb='.&escape($symb).$cpinfo;
     }
-    if ($external) {
+    if (($external) && ($allowed)) {
 	my $form = ($folder =~ /^default/)? 'newext' : 'supnewext';
 	$external = '&nbsp;<a class="LC_docs_ext_edit" href="javascript:edittext(\''.$form.'\',\''.$residx.'\',\''.&escape($title).'\',\''.&escape($orig_url).'\');" >'.&mt('Edit').'</a>';
     } else {
 	undef($external);
     }
+    my $reinit;
+    if ($crstype eq 'Community') {
+        $reinit = &mt('(re-initialize community to access)');
+    } else {
+        $reinit = &mt('(re-initialize course to access)');
+    }  
     $line.='
-  <td class="LC_docs_entry_icon">
+  <td>
     '.($url?'<a href="'.$url.'">':'').'<img src="'.$icon.'" alt="" class="LC_icon" />'.($url?'</a>':'').'
   </td>
-  <td class="LC_docs_entry_title">
-    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.&mt('(re-initialize course to access)').'</span>').$external."
+  <td>
+    '.($url?"<a href=\"$url\">":'').$title.($url?'</a>':' <span class="LC_docs_reinit_warn">'.$reinit.'</span>').$external."
   </td>";
     if (($allowed) && ($folder!~/^supplemental/)) {
  	my %lt=&Apache::lonlocal::texthash(
@@ -2055,7 +2117,7 @@ END
   <td class="LC_docs_entry_parameter">$form_start $parameterset $form_end</td>
 ENDPARMS
     }
-    $line.="</tr>";
+    $line.=&Apache::loncommon::end_data_table_row();
     return $line;
 }
 
@@ -2178,7 +2240,7 @@ List Symbs
 sub list_symbs {
     my ($r) = @_;
 
-    my $type = &Apache::loncommon::course_type();
+    my $crstype = &Apache::loncommon::course_type();
     $r->print(&Apache::loncommon::start_page('Symb List'));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Symb List'));
     my $navmap = Apache::lonnavmaps::navmap->new();
@@ -2187,25 +2249,25 @@ sub list_symbs {
                   '<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
                   '</div>');
-        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($type).':'.$env{'request.course.id'});
+        &Apache::lonnet::logthis('Symb list failed - could not create navmap object in '.lc($crstype).':'.$env{'request.course.id'});
     } else {
         $r->print("<pre>\n");
         foreach my $res ($navmap->retrieveResources()) {
-	    $r->print($res->compTitle()."\t".$res->symb()."\n");
+            $r->print($res->compTitle()."\t".$res->symb()."\n");
         }
         $r->print("\n</pre>\n");
     }
-    $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
+    $r->print('<hr /><a href="/adm/coursedocs">'.&mt('Back to Course Editor').'</a>');
 }
 
 
 sub verifycontent {
     my ($r) = @_;
-    my $type = &Apache::loncommon::course_type();
+    my $crstype = &Apache::loncommon::course_type();
    my $loaderror=&Apache::lonnet::overloaderror($r);
    if ($loaderror) { return $loaderror; }
-   $r->print(&Apache::loncommon::start_page('Verify '.$type.' Documents'));
-   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$type.' Documents'));
+   $r->print(&Apache::loncommon::start_page('Verify '.$crstype.' Documents'));
+   $r->print(&Apache::lonhtmlcommon::breadcrumbs('Verify '.$crstype.' Documents'));
    $hashtied=0;
    undef %alreadyseen;
    %alreadyseen=();
@@ -2214,9 +2276,9 @@ sub verifycontent {
        if ($hash{$key}=~/\.(page|sequence)$/) {
 	   if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
 	       $r->print('<hr /><span class="LC_error">'.
-			 &mt('The following sequence or page is included more than once in your '.$type.': ').
+			 &mt('The following sequence or page is included more than once in your '.$crstype.':').' '.
 			 &unescape($hash{$key}).'</span><br />'.
-			 &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
+			 &mt('Note that grading records for problems included in this sequence or folder will overlap.').'<hr />');
 	   }
        }
        if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
@@ -2224,8 +2286,13 @@ sub verifycontent {
        }
    }
    &untiehash();
-   $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
-	     &mt('Return to DOCS').'</a>');
+   $r->print(
+       '<p class="LC_success">'.&mt('Done').'</p>'
+      .'<hr />'
+      .'<p><a href="/adm/coursedocs">'
+	  .&mt('Back to Course Editor')
+      .'</a></p>'
+   );
 }
 
 
@@ -2237,9 +2304,9 @@ sub devalidateversioncache {
 
 sub checkversions {
     my ($r) = @_;
-    my $type = &Apache::loncommon::course_type();
-    $r->print(&Apache::loncommon::start_page("Check $type Document Versions"));
-    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $type Document Versions"));
+    my $crstype = &Apache::loncommon::course_type();
+    $r->print(&Apache::loncommon::start_page("Check $crstype Document Versions"));
+    $r->print(&Apache::lonhtmlcommon::breadcrumbs("Check $crstype Document Versions"));
     my $header='';
     my $startsel='';
     my $monthsel='';
@@ -2300,7 +2367,7 @@ sub checkversions {
     &changewarning($r,'');
     if ($env{'form.timerange'} eq 'all') {
 # show all documents
-	$header=&mt('All Documents in '.$type);
+	$header=&mt('All Documents in '.$crstype);
 	$allsel=1;
 	foreach my $key (keys(%hash)) {
 	    if ($key=~/^ids\_(\/res\/.+)$/) {
@@ -2345,7 +2412,7 @@ sub checkversions {
 			  $env{'course.'.$env{'request.course.id'}.'.domain'},
 			  $env{'course.'.$env{'request.course.id'}.'.num'});
     my %lt=&Apache::lonlocal::texthash
-	      ('st' => 'Version changes since start of '.$type,
+	      ('st' => 'Version changes since start of '.$crstype,
 	       'lm' => 'Version changes since last Month',
 	       'lw' => 'Version changes since last Week',
 	       'sy' => 'Version changes since Yesterday',
@@ -2354,9 +2421,9 @@ sub checkversions {
 	       'fi' => 'File',
 	       'md' => 'Modification Date',
                'mr' => 'Most recently published Version',
-	       've' => 'Version used in '.$type,
-               'vu' => 'Set Version to be used in '.$type,
-'sv' => 'Set Versions to be used in '.$type.' according to Selections below',
+	       've' => 'Version used in '.$crstype,
+               'vu' => 'Set Version to be used in '.$crstype,
+'sv' => 'Set Versions to be used in '.$crstype.' according to Selections below',
 'sm' => 'Keep all Resources up-to-date with most recent Versions (default)',
 'sc' => 'Set all Resource Versions to current Version (Fix Versions)',
 	       'di' => 'Differences');
@@ -2403,7 +2470,7 @@ ENDHEADERS
                       '<td title="'.$lt{'mr'}.'"><span class="LC_nobreak">Most Recent: '.
                       '<font size="+1">'.$currentversion.'</font>'.
                       '</span></td>'.
-                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$type.': '.
+                      '<td title="'.$lt{'ve'}.'"><span class="LC_nobreak">In '.$crstype.': '.
                       '<font size="+1">');
 # Used in course
 	    my $usedversion=$hash{'version_'.$linkurl};
@@ -2420,7 +2487,7 @@ ENDHEADERS
 						      ('select_form_order' =>
 						       ['',1..$currentversion,'mostrecent'],
 						       '' => '',
-						       'mostrecent' => 'most recent',
+						       'mostrecent' => &mt('most recent'),
 						       map {$_,$_} (1..$currentversion))));
 	    $r->print('</span></td></tr><tr><td></td>');
 	    my $lastold=1;
@@ -2475,7 +2542,7 @@ ENDHEADERS
 	}
     }
     $r->print('</table></form>');
-    $r->print('<h1>'.&mt('Done').'.</h1>');
+    $r->print('<p class="LC_success">'.&mt('Done').'</p>');
 
     &untiehash();
 }
@@ -2540,7 +2607,7 @@ sub init_breadcrumbs {
     my ($form,$text)=@_;
     &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({href=>"/adm/coursedocs",
-					    text=>"Edit ".&Apache::loncommon::course_type(),
+					    text=>&Apache::loncommon::course_type().' Editor',
 					    faq=>273,
 					    bug=>'Instructor Interface',
                                             help => 'Docs_Adding_Course_Doc'});
@@ -2558,7 +2625,7 @@ sub handler {
     &Apache::loncommon::content_type($r,'text/html');
     $r->send_http_header;
     return OK if $r->header_only;
-    my $type = &Apache::loncommon::course_type();
+    my $crstype = &Apache::loncommon::course_type();
 
 
 # --------------------------------------------- Initialize help topics for this
@@ -2599,7 +2666,7 @@ sub handler {
       &init_breadcrumbs('versions','Check/Set Resource Versions');
       &checkversions($r);
   } elsif ($allowed && $env{'form.dumpcourse'}) {
-      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
+      &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
       &dumpcourse($r);
   } elsif ($allowed && $env{'form.exportcourse'}) {
       &init_breadcrumbs('exportcourse','IMS Export');
@@ -2624,7 +2691,12 @@ sub handler {
         &Apache::loncommon::restore_course_settings('docs_folderpath',
                                               {'folderpath' => 'scalar'});
     }
-    if (!$env{'form.folderpath'}) {
+    if (!$allowed) {
+        unless($env{'form.folderpath'} =~ /^supplemental/) {
+            $env{'form.folderpath'} = '';
+        }
+    }
+    if (!$env{'form.folderpath'} && $allowed) {
         &Apache::loncommon::restore_course_settings('docs_folderpath',
                                               {'pagepath' => 'scalar'});
     }
@@ -2633,7 +2705,7 @@ sub handler {
     }
     if ($env{'form.folderpath'} =~ /^supplemental_\d+/) {
         $env{'form.folderpath'} = 'supplemental&'.
-                                  &escape(&mt('Supplemental '.$type.' Documents')).'&'.
+                                  &escape(&mt('Supplemental '.$crstype.' Documents')).'&'.
                                   $env{'form.folderpath'};
     }
     &Apache::loncommon::store_course_settings('docs_folderpath',
@@ -2656,7 +2728,9 @@ sub handler {
     if ($r->uri=~/^\/adm\/coursedocs\/showdoc\/(.*)$/) {
        $showdoc='/'.$1;
     }
-    unless ($showdoc) { # got called from remote
+    if ($showdoc) { # got called in sequence from course
+	$allowed=0; 
+    } else {
        if (($env{'form.folder'}=~/^(?:group|default)_/) ||
           ($env{'form.folder'} =~ m:^\d+/(pages|sequences)/:)) {
            $forcestandard = 1;
@@ -2667,10 +2741,28 @@ sub handler {
          &Apache::loncommon::get_unprocessed_cgi($ENV{'QUERY_STRING'},['cmd']);
          $script=&Apache::lonratedt::editscript('simple');
        }
-    } else { # got called in sequence from course
-       $allowed=0;
     }
 
+# subroutine to list form elements
+sub create_list_elements {
+   my @formarr = @_; 
+   my $list = '';
+   for my $button (@formarr){
+	for my $picture(keys %$button) {
+		#my $link = Apache::lonhtmlcommon::htmltag('a' ,$button->{$picture}, {href => "test"}); 
+		$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});	
+	}
+   }
+   return $list;
+}
+
+# subroutine to create ul from list elements
+sub create_form_ul {
+   my $list = shift;
+   my $ul = Apache::lonhtmlcommon::htmltag('ul',$list, {class => 'LC_ListStyleNormal'});
+   return $ul;
+}
+
 # get course data
     my $coursenum=$env{'course.'.$env{'request.course.id'}.'.num'};
     my $coursedom=$env{'course.'.$env{'request.course.id'}.'.domain'};
@@ -2693,11 +2785,33 @@ sub handler {
               .$script."\n"
               .'// ]]>'."\n"
               .'</script>'."\n";
-    my $brcrum = [{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'));
+
+    # Breadcrumbs
+    &Apache::lonhtmlcommon::clear_breadcrumbs();
+    if ($allowed) {
+        &Apache::lonhtmlcommon::add_breadcrumb({
+            href=>"/adm/coursedocs",text=>"$crstype Editor"});
+
+        $r->print(&Apache::loncommon::start_page("$crstype Editor", $script,
+                                                 {'force_register' => $showdoc,})
+                 .&Apache::loncommon::help_open_menu('','',273,'RAT')
+                 .&Apache::lonhtmlcommon::breadcrumbs(
+                     'Editing the Table of Contents for your '.$crstype,
+                     'Docs_Adding_Course_Doc')
+        );
+    } elsif ($showdoc) {
+        $r->print(&Apache::loncommon::start_page("$crstype documents",undef,
+                                                {'force_register' => $showdoc,}));
+    } else {
+        my $folder=$env{'form.folder'};
+        if ($folder eq '' || $folder eq 'supplemental') {
+            $env{'form.folderpath'} = 'supplemental&'.
+                                      &escape(&mt('Supplemental '.$crstype.' Documents'));
+        }
+        my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
+        $r->print(&Apache::loncommon::start_page("Supplemental documents").
+                  $breadcrumbtrail);
+    }
 
   my %allfiles = ();
   my %codebase = ();
@@ -2789,22 +2903,22 @@ sub handler {
   unless ($showdoc ||  $upload_result eq 'phasetwo') {
 # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(
-                'uplm' => 'Upload a new main '.lc($type).' document',
-                'upls' => 'Upload a new supplemental '.lc($type).' document',
+                'uplm' => 'Upload a new main '.lc($crstype).' document',
+                'upls' => 'Upload a new supplemental '.lc($crstype).' document',
                 'impp' => 'Import a document',
 		'copm' => 'All documents out of a published map into this folder',
-                'upld' => 'Upload Document',
+                'upld' => 'Import Document',
                 'srch' => 'Search',
                 'impo' => 'Import',
 		'book' => 'Import Bookmarks',
                 'selm' => 'Select Map',
                 'load' => 'Load Map',
-                'reco' => 'Recover Deleted Resources',
+                'reco' => 'Recover Deleted Documents',
                 'newf' => 'New Folder',
                 'newp' => 'New Composite Page',
                 'extr' => 'External Resource',
                 'syll' => 'Syllabus',
-                'navc' => 'Navigate Contents',
+                'navc' => 'Table of Contents',
                 'sipa' => 'Simple Course Page',
                 'sipr' => 'Simple Problem',
                 'drbx' => 'Drop Box',
@@ -2819,7 +2933,7 @@ sub handler {
                 'file' =>  'File',
                 'title' => 'Title',
                 'comment' => 'Comment',
-                'parse' => 'Upload embedded images/multimedia files if HTML file!',
+                'parse' => 'Upload embedded images/multimedia files if HTML file',
 		'nd' => 'Upload Document',
 		'pm' => 'Published Map',
 		'sd' => 'Special Document',
@@ -2840,6 +2954,7 @@ FIUP
 	</label>
 CHBO
 
+    my $fileuploada = "<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">
 	<input type="hidden" name="active" value="aa" />
@@ -2853,27 +2968,25 @@ CHBO
 	<span class="LC_nobreak">
 	$checkbox
 	</span>
-	<br />
-	<br />
-	<span class="LC_nobreak">
-	<input type="submit" value="$lt{'upld'}" />
-	 $help{'Uploading_From_Harddrive'}
-	</span>
+FUFORM
+    #$list .= Apache::lonhtmlcommon::htmltag('li', $picture.' '.$button->{$picture}, {class => 'LC_menubuttons_inline_text'});	
+    #$fileuploadform .= create_form_ul(create_list_elements(@fileuploada));
+    $fileuploadform .= create_form_ul(Apache::lonhtmlcommon::htmltag('li',$fileuploada,{class => 'LC_menubuttons_inline_text'}));
+	$fileuploadform .= (<<FUFORM);
 	</form>
 FUFORM
 
 	my $simpleeditdefaultform=(<<SEDFFORM);
 	<form action="/adm/coursedocs" method="post" name="simpleeditdefault">
 	<input type="hidden" name="active" value="bb" />
-	$uploadtag
-	<input type="button" onclick="javascript:groupsearch()" value="$lt{'srch'}" />
-	<br />
-	<span class="LC_nobreak">
-	<input type="button" onclick="javascript:groupimport();" value="$lt{'impo'}" />
-	$help{'Importing_LON-CAPA_Resource'}
-	</span>
-	<br />
-	<input type="button" onclick="javascript:groupopen(0,1,1);" value="$lt{'book'}" />
+SEDFFORM
+	my @simpleeditdefaultforma = ( 
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
+	{ '<img class="LC_noBorder LC_middle" src="/res/adm/pages/vbkm.png" alt="'.$lt{book}.'" onclick="javascript:groupopen(0,1,1);" />' => "<a class='LC_menubuttons_link' href='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },
+	);
+	$simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
+	$simpleeditdefaultform .=(<<SEDFFORM);
 	<hr />
 	<p>
 	$lt{'copm'}<br />
@@ -2890,10 +3003,7 @@ SEDFFORM
 	<form action="/adm/coursedocs" method="post" name="newext">
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newext" type="button" onclick="javascript:makenewext('newext');"
-	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makenewext('newext');">$lt{'extr'}</a>$help{'Adding_External_Resource'}
 	</form>
 ERFORM
 
@@ -2911,7 +3021,7 @@ ERFORM
 	   if ($env{'form.folder'} eq '' ||
 	       $env{'form.folder'} eq 'supplemental') {
 	       $folderpath='default&'.
-		   &escape(&mt('Main '.$type.' Documents'));
+		   &escape(&mt('Main '.$crstype.' Documents'));
 	   }
        }
        unless ($env{'form.pagepath'}) {
@@ -2933,38 +3043,54 @@ ERFORM
 HIDDENFORM
     }
 # --------------------------------------------------------- Main tab structure
+ 
     my $activeClass = 1;
     my $active = '';
-    $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
-    if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || ($env{'form.pagepath'}))) {
-        if($activeClass == 1){
-           $active = 'class="active"';
-	   $activeClass = 0;
-	}
-    }
-    $r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Main Course Documents').'</li>');
-    $active = '';
-    if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
-        if($activeClass == 1){
-           $active = 'class="active"';
-        }
-    }
-    $r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
-    $r->print('</ul>'
-             .'<div class="LC_Box" style="clear:both;margin:0;">'
+    my %tabtitles = (
+                       main => {
+                                 Course => &mt('Main Course Documents'),
+                                 Community => &mt('Main Community Documents'),
+                               },
+                       supplemental => {
+                                 Course => &mt('Supplemental Course Documents'),        
+                                 Community => &mt('Supplemental Community Documents'),
+                               },
+                    );
+    if ($allowed) {
+        $r->print('<ul class="LC_TabContentBigger" id="mainnav">');
+        if (($standard) && ($allowed) && (!$forcesupplement) && (($env{'form.folderpath'}=~/^default/) || $env{'form.folderpath'}eq"" || ($env{'form.pagepath'}))) {
+            if($activeClass == 1){
+                $active = 'class="active"';
+	        $activeClass = 0;
+	    }
+        }
+        $r->print('<li '.$active.' onclick="javascript:showPage(this,\'mainCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'main'}{$crstype}.'</b></a></li>');
+        $active = '';
+        if (!$forcestandard || ($env{'form.folderpath'}=~/^supplemental/)) {
+            if($activeClass == 1){
+                $active = 'class="active"';
+            }
+        }
+        $r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');"><a href="#"><b>'.$tabtitles{'supplemental'}{$crstype}.'</b></a></li>');
+        $r->print('</ul>');
+    } else {
+        $r->print('<br />');
+    }
+    $r->print('<div class="LC_Box" style="clear:both;margin:0;">'
              .'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
 # --------------------------------------------------------- Standard documents
        my $savefolderpath;
-       my $active = 'style="display: none;"';
+       $active = 'style="display: none;"';
        if($activeClass == 0){
           $active = 'style="display: block;"';
        }
+       if ($allowed) {
        $r->print('<div class="LC_ContentBox" id="mainCourseDocuments" '.$active.'>');
        my $folder=$env{'form.folder'};
        if ($folder eq '' || $folder=~/^supplemental/) {
            $folder='default';
 	   $savefolderpath = $env{'form.folderpath'};
-	   $env{'form.folderpath'}='default&'.&escape(&mt('Main '.$type.' Documents'));
+	   $env{'form.folderpath'}='default&'.&escape($tabtitles{'main'}{$crstype});
            $uploadtag = '<input type="hidden" name="folderpath" value="'.
 	       &HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />';
        }
@@ -2993,14 +3119,14 @@ HIDDENFORM
 
 	my $recoverform=(<<RFORM);
 	<form action="/adm/groupsort" method="post" name="recover">
-	<input type="button" name="recovermap" onclick="javascript:groupopen('$readfile',1,0)" value="$lt{'reco'}" />
+	<a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1,0)">$lt{'reco'}</a>
 	</form>
 RFORM
 
 	my $imspform=(<<IMSPFORM);
 	<form action="/adm/imsimportdocs" method="post" name="ims">
 	<input type="hidden" name="folder" value="$folder" />
-	<input name="imsimport" type="button" value="$lt{'imsf'}" title="$lt{imsl}"  onclick="javascript:makeims();" />
+	<a class="LC_menubuttons_link" href="javascript:makeims();">$lt{'imsf'}</a>
 	</form>
 IMSPFORM
 
@@ -3010,10 +3136,8 @@ IMSPFORM
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'navc'}=/adm/navmaps" />
-	<span class="LC_nobreak">
-	<input name="newnav" type="submit" value="$lt{'navc'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.newnav.submit()">$lt{'navc'}</a>
 	$help{'Navigate_Content'}
-	</span>
 	</form>
 NNFORM
 	my $newsmppageform=(<<NSPFORM);
@@ -3021,10 +3145,8 @@ NNFORM
 	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newsmppg" type="button" value="$lt{'sipa'}"
-	onclick="javascript:makesmppage();" /> $help{'Simple Page'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makesmppage();"> $lt{'sipa'}</a>
+	$help{'Simple Page'}
 	</form>
 NSPFORM
 
@@ -3033,10 +3155,8 @@ NSPFORM
 	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newsmpproblem" type="button" value="$lt{'sipr'}"
-	onclick="javascript:makesmpproblem();" />$help{'Simple Problem'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makesmpproblem();">$lt{'sipr'}</a>
+	$help{'Simple Problem'}
 	</form>
 
 NSPROBFORM
@@ -3046,10 +3166,7 @@ NSPROBFORM
 	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newdropbox" type="button" value="$lt{'drbx'}"
-	onclick="javascript:makedropbox();" />
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makedropbox();">$lt{'drbx'}</a>
 	</form>
 NDBFORM
 
@@ -3058,11 +3175,8 @@ NDBFORM
 	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newexamupload" type="button" value="$lt{'scuf'}"
-	onclick="javascript:makeexamupload();" />
+	<a class="LC_menubuttons_link" href="javascript:makeexamupload();">$lt{'scuf'}</a>
 	$help{'Score_Upload_Form'}
-	</span>
 	</form>
 NEXUFORM
 
@@ -3071,11 +3185,8 @@ NEXUFORM
 	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newbulletin" type="button" value="$lt{'bull'}"
-	onclick="javascript:makebulboard();" />
+	<a class="LC_menubuttons_link" href="javascript:makebulboard();" >$lt{'bull'}</a>
 	$help{'Bulletin Board'}
-	</span>
 	</form>
 NBFORM
 
@@ -3085,10 +3196,8 @@ NBFORM
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<span class="LC_nobreak">
-	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.newaboutme.submit()">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
-	</span>
 	</form>
 NAMFORM
 
@@ -3097,10 +3206,7 @@ NAMFORM
 	<input type="hidden" name="active" value="cc" />
 	$uploadtag
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newaboutsomeone" type="button" value="$lt{'abou'}" 
-	onclick="javascript:makeabout();" />
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makeabout();">$lt{'abou'}</a>
 	</form>
 NASOFORM
 
@@ -3111,42 +3217,36 @@ NASOFORM
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'rost'}=/adm/viewclasslist" />
-	<span class="LC_nobreak">
-	<input name="newroster" type="submit" value="$lt{'rost'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.newroster.submit()">$lt{'rost'}</a>
 	$help{'Course Roster'}
-	</span>
 	</form>
 NROSTFORM
 
 my $specialdocumentsform;
+my @specialdocumentsforma;
 my $newfolderform;
+my $newfolderb;
 
        unless ($env{'form.pagepath'}) {
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
-
+	
 	my $newpageform=(<<NPFORM);
 	<form action="/adm/coursedocs" method="post" name="newpage">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
 	<input type="hidden" name="active" value="cc" />
-	<span class="LC_nobreak">
-	<input name="newpage" type="button"
-	onclick="javascript:makenewpage(this.form,'$pageseq');"
-	value="$lt{'newp'}" />$help{'Adding_Pages'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makenewpage(document.newpage,'$pageseq');">$lt{'newp'}</a>
+	$help{'Adding_Pages'}
 	</form>
 NPFORM
 
+
 	$newfolderform=(<<NFFORM);
 	<form action="/adm/coursedocs" method="post" name="newfolder">
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
 	<input type="hidden" name="active" value="aa" />
-	<span class="LC_nobreak">
-	<input name="newfolder" type="button"
-	onclick="javascript:makenewfolder(this.form,'$folderseq');"
-	value="$lt{'newf'}" />$help{'Adding_Folders'}
-	</span>
+	<a href="javascript:makenewfolder(document.newfolder,'$folderseq');">$lt{'newf'}</a>$help{'Adding_Folders'}
 	</form>
 NFFORM
 
@@ -3156,10 +3256,9 @@ NFFORM
 	$uploadtag
 	<input type="hidden" name="importdetail" 
 	value="$lt{'syll'}=/public/$coursedom/$coursenum/syllabus" />
-	<span class="LC_nobreak">
-	<input name="newsyl" type="submit" value="$lt{'syll'}" /> 
+	<a class="LC_menubuttons_link" href="javascript:document.newsyl.submit()">$lt{'syll'}</a>
 	$help{'Syllabus'}
-	</span>
+
 	</form>
 NSYLFORM
 
@@ -3169,36 +3268,59 @@ NSYLFORM
 	$uploadtag
 	<input type="hidden" name="importdetail"
 	value="$lt{'grpo'}=/adm/$coursedom/$coursenum/aboutme" />
-	<span class="LC_nobreak">
-	<input name="newgroupfiles" type="submit" value="$lt{'grpo'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.newgroupfiles.submit()">$lt{'grpo'}</a>
 	$help{'Group Portfolio'}
-	</span>
 	</form>
 NGFFORM
-
-	$specialdocumentsform="<br />$newpageform<br />$newsylform<br />$newgroupfileform";
+	@specialdocumentsforma=(
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/page.png" alt="'.$lt{newp}.'"  onclick="javascript:makenewpage(document.newpage,\''.$pageseq.'\');" />'=>$newpageform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.newsyl.submit()" />'=>$newsylform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/groupportfolio.png" alt="'.$lt{grpo}.'" onclick="document.newgroupfiles.submit()" />'=>$newgroupfileform},
+	); 
+	
       }
-	$specialdocumentsform.="<br />$newnavform<br />$newsmppageform
-				<br />$newsmpproblemform<br />$newdropboxform
-       				<br />$newexuploadform<br />$newbulform
-       				<br />$newaboutmeform<br />$newaboutsomeoneform
-       				<br />$newrosterform";
-if($env{'form.pagepath'}) {
-	$specialdocumentsform="<br />$newsmpproblemform<br />$newexuploadform";
-}
+	push @specialdocumentsforma, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/navigation.png" alt="'.$lt{navc}.'" onclick="document.newnav.submit()" />'=>$newnavform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simple.png" alt="'.$lt{sipa}.'" onclick="javascript:makesmppage();" />'=>$newsmppageform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.$lt{sipr}.'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dropbox.png" alt="'.$lt{drbx}.'" onclick="javascript:makedropbox();" />'=>$newdropboxform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.$lt{scuf}.'" onclick="javascript:makeexamupload();" />'=>$newexuploadform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/bchat.png" alt="'.$lt{bull}.'" onclick="javascript:makebulboard();" />'=>$newbulform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="javascript:makebulboard();" />'=>$newaboutmeform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/aboutme.png" alt="'.$lt{abou}.'" onclick="javascript:makeabout();" />'=>$newaboutsomeoneform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/chrt.png" alt="'.$lt{rost}.'" onclick="document.newroster.submit()" />'=>$newrosterform},);
+
+	$specialdocumentsform = create_form_ul(create_list_elements(@specialdocumentsforma));
 
+if($env{'form.pagepath'}) {
+	
+	@specialdocumentsforma=(
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/simpprob.png" alt="'.&mt('Simple Problem').'" onclick="javascript:makesmpproblem();" />'=>$newsmpproblemform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/scoreupfrm.png" alt="'.&mt('Score Upload Form').'" onclick="javascript:makeexamupload();" />'=>$newexuploadform}
+	);
+	$specialdocumentsform= create_form_ul(create_list_elements(@specialdocumentsforma));
+}
+
+my @tools = (
+#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
+#	{'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1,0)" />'=>$recoverform},
+	);
+
+my @importdoc = (
+    {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'newext\');" />'=>$extresourcesform},
+    {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" onclick="javascript:makeims();" />'=>$imspform}, 
+);
+$fileuploadform =  create_form_ul(create_list_elements(@importdoc)) . '<hr/>' . $fileuploadform;
 my %orderhash = (
-                'aa' => ['Upload Document',$fileuploadform.'<br />'.$newfolderform],
+		'00' => ['Newfolder',$newfolderform],
+                'aa' => ['Import Documents',$fileuploadform],
                 'bb' => ['Published Resources',$simpleeditdefaultform],
                 'cc' => ['Special Documents',$specialdocumentsform],
-		'dd' => ['Tools',$extresourcesform.'<br />'.$imspform.'<br />'.$recoverform.'<br />'.&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
-                'zz' => ['Hide'],
+		'dd' => ['Tools', create_form_ul(create_list_elements(@tools)).&generate_admin_options($containertag,$uploadtag,\%help,\%env)],
                 );
 my $tid='1';
-my $varcd = 'Main Course Documents';
-$r->print(&generate_edit_table($tid,$varcd,\%orderhash));
  $hadchanges=0;
-        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
        if ($error) {
            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
        }
@@ -3207,13 +3329,14 @@ $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(&generate_edit_table($tid,\%orderhash));
+
 $r->print('</div>');
+	}
        if ($env{'form.pagepath'}) {
        }
 # ----------------------------------------------------- Supplemental documents
-       my $active = 'style="display: none;"';
+       $active = 'style="display: none;"';
        if($activeClass == 1){
           $active = 'style="display: block;"';
        }
@@ -3225,8 +3348,8 @@ $r->print('</div>');
        if ($folder =~ /^supplemental$/ &&
 	   (($env{'form.folderpath'} =~ /^default\&/) || ($env{'form.folderpath'} eq ''))) {
           $env{'form.folderpath'} = 'supplemental&'.
-                                    &escape(&mt('Supplemental '.$type.' Documents'));
-       }else{
+                                    &escape(&mt('Supplemental '.$crstype.' Documents'));
+       } elsif ($allowed) {
 	  $env{'form.folderpath'} = $savefolderpath;
        }
        $env{'form.pagepath'} = '';
@@ -3237,8 +3360,9 @@ $r->print('</div>');
 
 	   my $path = &HTML::Entities::encode($env{'form.folderpath'},'<>&"');
 
+	my $supupdocformbtn = "<input type='submit' value='".$lt{'upld'}."' />$help{'Uploading_From_Harddrive'}";
 	my $supupdocform=(<<SUPDOCFORM);
-	<form action="/adm/coursedocs" method="post" enctype="multipart/form-data">
+	<form action="/adm/coursedocs" method="post" name="supuploaddocument" enctype="multipart/form-data">
 	<input type="hidden" name="active" value="ee" />	
 	$fileupload
 	<br />
@@ -3248,42 +3372,30 @@ $r->print('</div>');
 	</span>
 	<br /><br />
 	$lt{'comment'}:<br />
-	<textarea cols="50" rows="4" name="comment">
-	</textarea>
+	<textarea cols="50" rows="4" name="comment"></textarea>
 	<br />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="cmd" value="upload_supplemental" />
-	<span class="LC_nobreak">
-	<input type="submit" value="$lt{'upld'}" />
-	 $help{'Uploading_From_Harddrive'}
-	</span>
-	</form>
 SUPDOCFORM
+	$supupdocform .=  create_form_ul(Apache::lonhtmlcommon::htmltag('li',$supupdocformbtn,{class => 'LC_menubuttons_inline_text'}))."</form>";
 
 	my $supnewfolderform=(<<SNFFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewfolder">
 	<input type="hidden" name="active" value="ee" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newfolder" type="button"
-	onclick="javascript:makenewfolder(this.form,'$folderseq');"
-	value="$lt{'newf'}" /> $help{'Adding_Folders'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makenewfolder(document.supnewfolder,'$folderseq');">$lt{'newf'}</a> 
+	$help{'Adding_Folders'}
 	</form>
 SNFFORM
-
+	
 
 	my $supnewextform=(<<SNEFORM);
 	<form action="/adm/coursedocs" method="post" name="supnewext">
 	<input type="hidden" name="active" value="ff" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" value="" />
-	<span class="LC_nobreak">
-	<input name="newext" type="button" 
-	onclick="javascript:makenewext('supnewext');"
-	value="$lt{'extr'}" /> $help{'Adding_External_Resource'}
-	</span>
+	<a class="LC_menubuttons_link" href="javascript:makenewext('supnewext');">$lt{'extr'}</a> $help{'Adding_External_Resource'}
 	</form>
 SNEFORM
 
@@ -3293,45 +3405,58 @@ SNEFORM
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="Syllabus=/public/$coursedom/$coursenum/syllabus" />
-	<span class="LC_nobreak">
-	<input name="newsyl" type="submit" value="$lt{'syll'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.supnewsyl.submit()">$lt{'syll'}</a>
 	$help{'Syllabus'}
-	</span>
 	</form>
 SNSFORM
 
 	my $supnewaboutmeform=(<<SNAMFORM);
-	<form action="/adm/coursedocs" method="post" name="subnewaboutme">
+	<form action="/adm/coursedocs" method="post" name="supnewaboutme">
 	<input type="hidden" name="active" value="ff" />
 	<input type="hidden" name="folderpath" value="$path" />
 	<input type="hidden" name="importdetail" 
 	value="$plainname=/adm/$udom/$uname/aboutme" />
-	<span class="LC_nobreak">
-	<input name="newaboutme" type="submit" value="$lt{'mypi'}" />
+	<a class="LC_menubuttons_link" href="javascript:document.supnewaboutme.submit()">$lt{'mypi'}</a>
 	$help{'My Personal Information Page'}
-	</span>
 	</form>
 SNAMFORM
 
 
-
+my @specialdocs = (
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/syllabus.png" alt="'.$lt{syll}.'" onclick="document.supnewsyl.submit()" />'
+            =>$supnewsylform},
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/myaboutme.png" alt="'.$lt{mypi}.'" onclick="document.supnewaboutme.submit()" />'
+            =>$supnewaboutmeform},
+		);
+my @supimportdoc = (
+		{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" onclick="javascript:makenewext(\'supnewext\');" />'
+            =>$supnewextform},
+        );
+$supupdocform =  create_form_ul(create_list_elements(@supimportdoc)) . '<hr/>' . $supupdocform;
 my %suporderhash = (
-                'ee' => ['Upload Document',$supupdocform.'<br />'.$supnewfolderform],
-                'ff' => ['Special Documents',$supnewextform.'<br />'.$supnewsylform.'<br />'.$supnewaboutmeform],
-                'zz' => ['Hide'],
+		'00' => ['Supnewfolder', $supnewfolderform],
+                'ee' => ['Import Documents',$supupdocform],
+                'ff' => ['Special Documents',create_form_ul(create_list_elements(@specialdocs))]
                 );
 
-my $tid='2';
-my $varscd = 'Supplemental Course Documents';
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+        if ($error) {
+            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+        }
+        my $tid='2';
+        $r->print(&generate_edit_table($tid,\%suporderhash));
+    } else {
+        my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$crstype);
+        if ($error) {
+            $r->print('<p><span class="LC_error">'.$error.'</span></p>');
+        }
+    }
+
 
-$r->print(&generate_edit_table($tid,$varscd,\%suporderhash));
-my $error = &editor($r,$coursenum,$coursedom,$folder,$allowed,'',$type);
-       if ($error) {
-           $r->print('<p><span class="LC_error">'.$error.'</span></p>');
-       }
-$r->print('</div>');
-	}
 $r->print('</div>');
+$r->print('</div></div>');
+
+
     if ($allowed) {
 	$r->print('
 <form method="post" name="extimport" action="/adm/coursedocs">
@@ -3361,29 +3486,38 @@ sub generate_admin_options {
                                          'vc' => 'Verify Content',
                                          'cv' => 'Check/Set Resource Versions',
                                          'ls' => 'List Symbs',
-                                         'sl' => 'Show Log'
+                                         'sl' => 'Show Log',
+                                         'imse' => 'IMS Export',
+                                         'dcd' => 'Dump Course Documents to Construction Space: available on other servers'
                                           );
   my %help = %{$help_ref};
   my %env = %{$env_ref};
   my $dumpbut=&dumpbutton();
   my $exportbut=&exportbutton();
-  return (<<ENDOPTIONFORM);
- <form action="/adm/coursedocs" method="post" name="courseverify">
-           <input type="submit" name="verify" value="$lt{'vc'}" />$help{'Verify_Content'}<br />
-           <input type="submit" name="versions" value="$lt{'cv'}" />$help{'Check_Resource_Versions'}<br />
-           $dumpbut
-           $exportbut
-          <input type="submit" name="listsymbs" value="$lt{'ls'}" />
-          <input type="hidden" name="folder" value="$env{'form.folder'}" /><br />
-          <input type="submit" name="docslog" value="$lt{'sl'}" />
- </form>
-ENDOPTIONFORM
+  my @list = (
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/verify.png" alt="'.$lt{vc}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "verify", "'.$lt{'vc'}.'")\' />' 
+        => "<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"verify\", \"$lt{'vc'}\")'>$lt{'vc'}</a>$help{'Verify_Content'}"},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/resversion.png" alt="'.$lt{cv}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "versions", "'.$lt{'cv'}.'")\' />'
+        =>"<a class='LC_menubuttons_link' href='javascript:injectData(document.courseverify, \"dummy\", \"versions\", \"$lt{'cv'}\")'>$lt{'cv'}</a>$help{'Check_Resource_Versions'}"},
+	);
+  if($dumpbut ne ''){
+  push @list, {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/dump.png" alt="'.$lt{dcd}.'" />'=>$dumpbut};
+  }
+  push @list, ({'<img class="LC_noBorder LC_middle" src="/res/adm/pages/imsexport.png" alt="'.$lt{imse}.'" class="LC_menubuttons_link" href=\'javascript:injectData(document.courseverify, "dummy", "exportcourse", "'.&mt('IMS Export').'")\' />'
+          =>$exportbut},
+	{'<img class="LC_noBorder LC_middle" src="/res/adm/pages/symbs.png" alt="'.$lt{ls}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "listsymbs", "'.$lt{'ls'}.'")\'  />'
+        =>"<a class='LC_menubuttons_link' href='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" src="/res/adm/pages/log.png" alt="'.$lt{sl}.'"  onclick=\'javascript:injectData(document.courseverify, "dummy", "docslog", "'.$lt{'sl'}.'")\'  />'
+        =>"<a class='LC_menubuttons_link' href='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>';
 
 }
 
 
 sub generate_edit_table {
-    my ($tid,$varcd,$orderhash_ref) = @_;
+    my ($tid,$orderhash_ref) = @_;
+    return unless(ref($orderhash_ref) eq 'HASH');
     my %orderhash = %{$orderhash_ref};
     my $form;
     my $activetab;
@@ -3391,37 +3525,33 @@ sub generate_edit_table {
     if($env{'form.active'} ne ''){
         $activetab = $env{'form.active'};
     }
-    $form = '<div class="LC_Box"><h4 class="LC_hcell">'.&mt($varcd).'</h4>';
+    $form = '<div class="LC_Box" style="margin-right:0">';
     $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 '00'){
             if($activetab eq '' || $activetab ne $name){
                $active = '';
             }elsif($activetab eq $name){
                $active = 'class="active"';
             }
-            $form .= '<li '.$active.' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');">'.&mt(${$orderhash{$name}}[0]).'</li>';
-        }
+            $form .= '<li '.$active.' onclick="javascript:showPage(this, \''.$name.$tid.'\', \'navigation'.$tid.'\',\'content'.$tid.'\');"><a href="javascript:;"><b>'.&mt(${$orderhash{$name}}[0]).'</b></a></li>';
+        } else {
+	    $form .= '<li '.$active.'>'.${$orderhash{$name}}[1].'</li>';
+
+	}
     }
     $form .= '</ul>';
-    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0;">';
+    $form .= '<div id="content'.$tid.'" style="padding: 0 0; margin: 0 0; clear: both;">';
     foreach my $field (keys(%orderhash)){
-	if($field ne 'zz'){
-        if($activetab eq '' || $activetab ne $field){
+	if($field ne '00'){
+            if($activetab eq '' || $activetab ne $field){
                 $active = 'style="display: none;"';
-        }elsif($activetab eq $field){
+            }elsif($activetab eq $field){
                 $active = 'style="display:block;"';
-        }
-           $form .= '<div id="'.$field.$tid.'"'
-                   .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
-                   .'</div>';
+            }
+            $form .= '<div id="'.$field.$tid.'"'
+                    .' class="LC_ContentBox" '.$active.'>'.${$orderhash{$field}}[1]
+                    .'</div>';
         }
     }
     $form .= '</div></div>';
@@ -3660,13 +3790,16 @@ for (i = 0; i < currentDivs.length; i++)
 
 function openTabs(pageId) {
 	tabnav = document.getElementById(pageId).getElementsByTagName('UL');	
-	if(tabnav.length > 0 ){
-		currentNav = document.getElementById(tabnav[0].id);
+	if(tabnav.length > 2 ){
+		currentNav = document.getElementById(tabnav[1].id);
 		currentLis = currentNav.getElementsByTagName('LI');
 		for(i = 0; i< currentLis.length; i++){
 			if(currentLis[i].className == 'active') {
 				funcString = currentLis[i].onclick.toString();
 				tab = funcString.split('"');
+                                if(tab.length < 2) {
+                                   tab = funcString.split("'");
+                                }
 				currentData = document.getElementById(tab[1]);
         			currentData.style.display = 'block';
 			}	
@@ -3684,6 +3817,13 @@ function showPage(current, pageId, nav,
 	return false;
 }
 
+function injectData(current, hiddenField, name, value) {
+	currentElement = document.getElementById(hiddenField);
+	currentElement.name = name;
+	currentElement.value = value;
+	current.submit();
+}
+
 ENDNEWSCRIPT
 }
 1;