[BACK]Return to loncommon.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.377 and 1.379

version 1.377, 2006/05/30 20:05:05 version 1.379, 2006/06/05 22:05:09
Line 730  sub help_open_menu { Line 730  sub help_open_menu {
     } else {      } else {
         $link = "javascript:helpMenu('display')";          $link = "javascript:helpMenu('display')";
     }      }
     my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";      my $banner_link = "/adm/helpmenu?page=banner&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp&stayonpage=$stayOnPage";
     my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";      my $details_link = "/adm/helpmenu?page=body&color=$color&function=$function&topic=$topic&component_help=$component_help&faq=$faq&bug=$bug&origurl=$origurl&stamp=$timestamp";
     my $template;      my $template;
     if ($text ne "") {      if ($text ne "") {
  $template .=    $template .= 
Line 816  sub help_open_bug { Line 816  sub help_open_bug {
     $topic=~s/\W+/\+/g;      $topic=~s/\W+/\+/g;
     my $link='';      my $link='';
     my $template='';      my $template='';
     my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.      my $url=$Apache::lonnet::perlvar{'BugzillaHost'}.'enter_bug.cgi?product=LON-CAPA&bug_file_loc='.
  &escape($ENV{'REQUEST_URI'}).'&component='.$topic;   &escape($ENV{'REQUEST_URI'}).'&component='.$topic;
     if (!$stayOnPage)      if (!$stayOnPage)
     {      {
  $link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";   $link = "javascript:void(open('$url', 'Bugzilla', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))";
Line 2826  sub bodytag { Line 2826  sub bodytag {
     @$addentries{keys(%design)} = @design{keys(%design)};      @$addentries{keys(%design)} = @design{keys(%design)};
   
  # role and realm   # role and realm
     my ($role,$realm) =      my ($role,$realm) = split(/\./,$env{'request.role'},2);
  &Apache::lonnet::plaintext((split(/\./,$env{'request.role'}))[0]);      if ($role  eq 'ca') {
           my ($rdom,$rname) = ($realm =~ m-^/(\w+)/(\w+)$-);
           $realm = &plainname($rname,$rdom).':'.$rdom;
       } 
 # realm  # realm
     if ($env{'request.course.id'}) {      if ($env{'request.course.id'}) {
         my $type = $env{'course.'.$env{'request.course.id'}.'.type'};          if ($env{'request.role'} !~ /^cr/) {
         if ($type eq 'Group') {              $role = &Apache::lonnet::plaintext($role,&course_type());
             if ($env{'request.role'} !~ /^cr/) { # Change role name if Group          }
                 $role = &convert_role($role,$type);    
             }  
         }   
  $realm = $env{'course.'.$env{'request.course.id'}.'.description'};   $realm = $env{'course.'.$env{'request.course.id'}.'.description'};
       } else {
           $role = &Apache::lonnet::plaintext($role);
     }      }
     if (!$realm) { $realm=' '; }      if (!$realm) { $realm=' '; }
 # Set messages  # Set messages
Line 3131  form, .inline { display: inline; } Line 3133  form, .inline { display: inline; }
   color: green;    color: green;
 }  }
   
 table#LC_top_nav, table#LC_menubuttons, table#LC_nav_location, table#LC_breadcrumbs {  table#LC_top_nav, table#LC_menubuttons, table#LC_nav_location {
   width: 100%;    width: 100%;
   background: $pgbg;    background: $pgbg;
   border: 0px;    border: 0px;
   border-spacing: 2px 1px;    border-spacing: 2px 2px;
   padding: 0px;    padding: 0px;
   margin: 0px;    margin: 0px;
   border-collapse: separate;    border-collapse: separate;
Line 3143  table#LC_top_nav, table#LC_menubuttons, Line 3145  table#LC_top_nav, table#LC_menubuttons,
 table#LC_title_bar {  table#LC_title_bar {
   width: 100%;    width: 100%;
   border: 0;    border: 0;
   border-spacing: 0px 1px;    border-spacing: 0px 0px;
     padding: 0px 2px 0px 2px;
     background: $pgbg;
     font-family: $sans;
     border-collapse: separate;
   }
   table#LC_breadcrumbs {
     width: 100%;
     border: 0;
     border-spacing: 0px;
   padding: 0px 2px 0px 2px;    padding: 0px 2px 0px 2px;
   background: $pgbg;    background: $pgbg;
   font-family: $sans;    font-family: $sans;
Line 4981  sub restore_course_settings { Line 4992  sub restore_course_settings {
 ############################################################  ############################################################
 ############################################################  ############################################################
   
 sub convert_role {  sub course_type {
     my ($rolename,$type) = @_;      my ($cid) = @_;
     if ($type eq 'Group') {      if (!defined($cid)) {
         $rolename =~ s/Course/Group/;          $cid = $env{'request.course.id'};
         $rolename =~ s/Instructor/Leader/;      }
         $rolename =~ s/Teaching Assistant/Assistant Leader/;      if (defined($env{'course.'.$cid.'type'})) {
         $rolename =~ s/Student/Member/;          return $env{'course.'.$cid.'type'};
       } else {
           return 'Course';
     }      }
     return $rolename;  
 }  }
   
 sub icon {  sub icon {
Removed from v.1.377  
changed lines
  Added in v.1.379

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>