--- loncom/interface/lonwhatsnew.pm	2009/11/19 14:05:46	1.97
+++ loncom/interface/lonwhatsnew.pm	2009/12/14 22:24:31	1.98.2.1
@@ -1,5 +1,5 @@
 #
-# $Id: lonwhatsnew.pm,v 1.97 2009/11/19 14:05:46 bisitz Exp $
+# $Id: lonwhatsnew.pm,v 1.98.2.1 2009/12/14 22:24:31 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -42,6 +42,7 @@ use Time::Local;
 use GDBM_File;
 use lib '/home/httpd/lib/perl/';
 use LONCAPA;
+use HTML::Entities;
 
 #----------------------------
 # handler
@@ -281,6 +282,7 @@ END
 sub display_actions_box {
     my ($r,$command,$refpage,$threshold_titles,$interval_titles,$initpage,
         $cdom,$crs,$checkallowed) = @_;
+    my $custommenu = &Apache::loncommon::needs_gci_custom();
     my $udom = $env{'user.domain'};
     my $uname = $env{'user.name'};
     my $cid = $env{'request.course.id'};
@@ -342,16 +344,17 @@ sub display_actions_box {
     }
 
     my $header = '';
-    if ($refpage eq 'start') {
+    if (($refpage eq 'start') && (!$custommenu)) {
         if (tie(my %bighash,'GDBM_File',$env{'request.course.fn'}.'.db',
             &GDBM_READER(),0640)) {
-            my $furl=$bighash{'first_url'};
+            my $furl=&HTML::Entities::encode($bighash{'first_url'},'"<>&');
             untie(%bighash);
             $header .= '<b><a href="'.$furl.'">'.$lt{'gtfr'}.
                   '</a></b><br />';
         }
     }
-    $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
+    unless ($custommenu) {
+        $header .= &mt('Page set to be displayed after you have selected a role in this '.$lctype).'.'
               .' <span class="LC_nobreak">'
               .&mt('Currently: [_1].','<i>'.$currinit.'</i>')
               .'&nbsp;&nbsp;'
@@ -364,7 +367,8 @@ sub display_actions_box {
                   ,'</a>')
               .' </span>';
 
-    $r->print(&Apache::loncommon::head_subbox($header));
+        $r->print(&Apache::loncommon::head_subbox($header));
+    }
 
     if ($command eq 'reset') {
         $result = &process_reset($cdom,$crs);
@@ -473,7 +477,12 @@ sub display_actions_box {
 	    $threshold{'av_attempts'},$threshold{'degdiff'},
 	    '<br />',$threshold{'numstudents'});
 
-    my @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
+    my @actionorder;
+    if ($custommenu) {
+        @actionorder = ('coursenormalmail','coursecritmail','newroles','oldroles');
+    } else {
+        @actionorder = ('handgrading','haserrors','abovethreshold','versionchanges','coursediscussion','coursenormalmail','coursecritmail','newroles','oldroles');
+    }
 
     foreach my $key (keys(%{$checkallowed})) {
 	if ($key =~ /_section$/) { next; }
@@ -534,6 +543,9 @@ sub display_actions_box {
     }
     my $halfway = 4;
 #    my $halfway = int($totalboxes/2) + $totalboxes%2;
+    if ($custommenu) {
+        $halfway = 2;
+    }
     foreach my $actionitem (@actionorder) {
         if ($$checkallowed{$actionitem}) {
             if ($displayed == $halfway) {
@@ -1957,35 +1969,35 @@ sub start_box {
          if ($$show{$caller}) {
              $r->print('
               <tr>
-                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgthreshold&refpage='.$refpage.'">'.$lt{'chth'}.'</a></td>
+                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgthreshold&amp;refpage='.$refpage.'">'.$lt{'chth'}.'</a></td>
               </tr>');
          }
      } elsif (($caller eq 'versionchanges') && ($$show{$caller})) {
          if ($$show{$caller}) {
              $r->print('
               <tr>
-                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chginterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chginterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
               </tr>');
          }
      } elsif ($caller eq 'coursediscussion') {
          if ($$show{$caller}) {
              $r->print('
               <tr>
-                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgdisc&refpage='.$refpage.'">'.$lt{'chop'}.'</a></td>
+                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgdisc&amp;refpage='.$refpage.'">'.$lt{'chop'}.'</a></td>
               </tr>');
          }
      } elsif (($caller eq 'newroles') && ($$show{$caller})) {
          if ($$show{$caller}) {
              $r->print('
               <tr>
-                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgnewroleinterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgnewroleinterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
               </tr>');
          }
      } elsif (($caller eq 'oldroles') && ($$show{$caller})) {
          if ($$show{$caller}) {
              $r->print('
               <tr>
-                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
+                <td class="LC_subheader" colspan="2"><a href="/adm/whatsnew?command=chgoldroleinterval&amp;refpage='.$refpage.'">'.$lt{'chin'}.'</a></td>
               </tr>');
          }
      }