--- loncom/interface/loncommon.pm	2008/07/07 15:10:23	1.665
+++ loncom/interface/loncommon.pm	2008/08/28 03:04:41	1.675
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.665 2008/07/07 15:10:23 raeburn Exp $
+# $Id: loncommon.pm,v 1.675 2008/08/28 03:04:41 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -878,7 +878,7 @@ sub help_open_topic {
 
     # Add the graphic
     my $title = &mt('Online Help');
-    my $helpicon=&lonhttpdurl("/res/adm/pages/help.png");
+    my $helpicon=&lonhttpdurl("/adm/help/help.png");
     $template .= <<"ENDTEMPLATE";
  <a target="_top" href="$link" title="$title"><img src="$helpicon" border="0" alt="(Help: $topic)" /></a>
 ENDTEMPLATE
@@ -904,6 +904,9 @@ sub helpLatexCheatsheet {
 	.'</td><td>'.
 	&Apache::loncommon::help_open_topic("Other_Symbols",&mt('Other Symbols'),
 					    undef,undef,600)
+	.'</td><td>'.
+	&Apache::loncommon::help_open_topic("Authoring_Output_Tags",&mt('Output Tags'),
+	                                    undef,undef,600)
 	.'</td></tr></table>';
 }
 
@@ -913,6 +916,8 @@ sub general_help {
 	$helptopic='Authoring_Intro';
     } elsif ($env{'request.role'}=~/^cc/) {
 	$helptopic='Course_Coordination_Intro';
+    } elsif ($env{'request.role'}=~/^dc/) {
+        $helptopic='Domain_Coordination_Intro';
     }
     return $helptopic;
 }
@@ -4569,6 +4574,10 @@ td.LC_menubuttons_img {
   text-align: right;
 }
 
+.LC_roleslog_note {
+  font-size: smaller;
+}
+
 table.LC_aboutme_port {
   border: 0px;
   border-collapse: collapse;
@@ -6799,12 +6808,16 @@ sub instrule_disallow_msg {
             $text{'action'} = 'IDs';
         }
     }
-    $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for <span class=\"LC_cusr_emph\">[_1]</span>, but the $text{'item'} $text{'do'} not exist in the institutional directory.",$domdesc).'<br />';
+    $response = &mt("The $text{'item'} you chose $text{'match'} the format of $text{'items'} defined for [_1], but the $text{'item'} $text{'do'} not exist in the institutional directory.",'<span class="LC_cusr_emph">'.$domdesc.'</span>').'<br />';
     if ($mode eq 'upload') {
         if ($checkitem eq 'username') {
             $response .= &mt("You will need to modify your upload file so it will include $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}.");
         } elsif ($checkitem eq 'id') {
-            $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the ID/Student Number field.");
+            $response .= &mt("Either upload a file which includes $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or when associating fields with data columns, omit an association for the Student/Employee ID field.");
+        }
+    } elsif ($mode eq 'selfcreate') {
+        if ($checkitem eq 'id') {
+            $response .= &mt("You must either choose $text{'action'} with a different format --  $text{'one'} that will not conflict with 'official' institutional $text{'items'}, or leave the ID field blank.");
         }
     } else {
         if ($checkitem eq 'username') {
@@ -6834,7 +6847,7 @@ sub sorted_inst_types {
     my ($usertypes,$order) = &Apache::lonnet::retrieve_inst_usertypes($dom);
     my $othertitle = &mt('All users');
     if ($env{'request.course.id'}) {
-        $othertitle  = 'any';
+        $othertitle  = &mt('Any users');
     }
     my @types;
     if (ref($order) eq 'ARRAY') {
@@ -6847,9 +6860,6 @@ sub sorted_inst_types {
     }
     if (keys(%{$usertypes}) > 0) {
         $othertitle = &mt('Other users');
-        if ($env{'request.course.id'}) {
-            $othertitle = 'other';
-        }
     }
     return ($othertitle,$usertypes,\@types);
 }
@@ -7238,7 +7248,6 @@ sub check_for_upload {
             }
         }
     }
-    my $getpropath = 1;
     if (($current_disk_usage + $filesize) > $disk_quota){
         my $msg = '<span class="LC_error">'.
                 &mt('Unable to upload [_1]. (size = [_2] kilobytes). Disk quota will be exceeded.','<span class="LC_filename">'.$fname.'</span>',$filesize).'</span>'.
@@ -8502,9 +8511,10 @@ sub assign_categories_table {
                             $checked = ' checked="checked" ';
                         }
                     }
-                    $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'
-                               .'<input type="checkbox" name="usecategory" value="'.
-                               $item.'"'.$checked.' />'.&escape($parent).'</span></td>';
+                    $output .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
+                               '<input type="checkbox" name="usecategory" value="'.
+                               $item.'"'.$checked.' />'.$parent.'</span>'.
+                               '<input type="hidden" name="catname" value="'.$parent.'" /></td>';
                     my $depth = 1;
                     push(@path,$parent);
                     $output .= &assign_category_rows($itemcount,\@cats,$depth,$parent,\@path,\@currcategories);
@@ -8570,7 +8580,9 @@ sub assign_category_rows {
                     }
                     $text .= '<tr><td><span class="LC_nobreak"><label>'.
                              '<input type="checkbox" name="usecategory" value="'.
-                             $item.'"'.$checked.' />'.$name.'</label></span></td><td>';
+                             $item.'"'.$checked.' />'.$name.'</label></span>'.
+                             '<input type="hidden" name="catname" value="'.$name.'" />'.
+                             '</td><td>';
                     if (ref($path) eq 'ARRAY') {
                         push(@{$path},$name);
                         $text .= &assign_category_rows($itemcount,$cats,$deeper,$name,$path,$currcategories);