[LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm mydesk.tab

matthew lon-capa-cvs@mail.lon-capa.org
Thu, 08 Aug 2002 19:33:09 -0000


matthew		Thu Aug  8 15:33:09 2002 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm mydesk.tab 
  Log:
  Towards bug 263.  Added $requested_domain variable interpolation to 
  mydesk.tab.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.24 loncom/interface/lonmenu.pm:1.25
--- loncom/interface/lonmenu.pm:1.24	Mon Jul 15 15:45:18 2002
+++ loncom/interface/lonmenu.pm	Thu Aug  8 15:33:09 2002
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.24 2002/07/15 19:45:18 www Exp $
+# $Id: lonmenu.pm,v 1.25 2002/08/08 19:33:09 matthew Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -79,6 +79,8 @@
     return qq(swmenu.clearbut($row,$col););
 }
 
+# Switch acts on the javascript that is executed when a button is clicked.  
+# The javascript is usually similar to "go('/adm/roles')" or "cstrgo(..)".
 sub switch {
     my ($uname,$udom,$row,$col,$img,$top,$bot,$act)=@_;
     $act=~s/\$uname/$uname/g;
@@ -127,11 +129,13 @@
     my $pub=($ENV{'request.state'} eq 'published');
     my $con=($ENV{'request.state'} eq 'construct');
     my $rol=$ENV{'request.role'};
+    my $requested_domain = $ENV{'request.role.domain'};
     foreach (@desklines) {
         my ($row,$col,$pro,$prt,$img,$top,$bot,$act)=split(/\:/,$_);
         $prt=~s/\$uname/$uname/g;
         $prt=~s/\$udom/$udom/g;
         $prt=~s/\$crs/$crs/g; 
+        $prt=~s/\$requested_domain/$requested_domain/g;
         if ($pro eq 'clear') {
 	    $output.=&clear($row,$col);
         } elsif ($pro eq 'any') {
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.24 loncom/interface/mydesk.tab:1.25
--- loncom/interface/mydesk.tab:1.24	Thu Aug  8 14:07:44 2002
+++ loncom/interface/mydesk.tab	Thu Aug  8 15:33:09 2002
@@ -29,10 +29,10 @@
 5:1:pcst:$crs:enrl.gif:course:enroll:go('/adm/dropadd');:Drop/Add Students
 5:2:clear
 5:2:pcst:$crs:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
-5:2:pcca:$udom:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
-5:2:pmau:$udom:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
+5:2:pcca:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
+5:2:pmau:$requested_domain:cprv.gif:user:roles:go('/adm/createuser');:Change User Roles
 5:3:clear
-5:3:pccc:$udom:ccrs.gif:create:course:go('/adm/createcourse');:Create New Course
+5:3:pccc:$requested_domain:ccrs.gif:create:course:go('/adm/createcourse');:Create New Course
 5:3:popa:$crs:parm.gif:course:parms:go('/adm/parmset');:Set Parameters/Deadlines/etc
 6:1:clear
 6:1:author:any:cstr.gif:con-:struct:cstrgo(currentURL,'/priv/$uname/');:Enter Construction Space