loncom/interface/loncommon.pm - diff

Return to loncommon.pm CVS log

Up to [LON-CAPA] / loncom / interface

Diff for /loncom/interface/loncommon.pm between versions 1.302 and 1.307

-version 1.302, 2006/01/09 20:38:52
+version 1.307, 2006/03/16 20:08:42
  Line 2787  table.thinborder { border-collapse: coll
  table.thinborder tr th, table.thinborder tr td { border-style: solid; border-width: 1px}
  form, .inline { display: inline; }
  .center { text-align: center; }
+ .filename {font-family: monospace;}
  </style>
  <body bgcolor="$pgbg" text="$font" alink="$alink" vlink="$vlink" link="$link"
  style="margin-top: 0px;$addstyle" $addentries>
- Line 2892  ENDROLE
+ Line 2893  ENDROLE
          $dc_info.= $cid.' '.$env{'course.'.$cid.'.internal.coursecode'};
          $dc_info = '('.$dc_info.')';
      }
+     # Explicit link to get inline menu
+     my $menu='<br /><font size="2" face="Arial, Helvetica, sans-serif">&nbsp;<a href="/adm/remote?action=collapse">'.&mt('Switch to Inline Menu Mode').'</a></font>';
      #
      return(<<ENDBODY);
  $bodytag
- Line 2902  $upperleft</td>
+ Line 2905  $upperleft</td>
  </tr>
  <tr>
  <td rowspan="3" bgcolor="$tabbg">
- $titleinfo $dc_info
+ $titleinfo $dc_info $menu
  </td><td bgcolor="$tabbg" align="right">
  <font size="2" face="Arial, Helvetica, sans-serif">
      $env{'environment.firstname'}
- Line 2928  ENDBODY
+ Line 2931  ENDBODY
  =back
- =head1 HTTP Helpers
+ =head1 HTML Helpers
  =over 4
- Line 2936  ENDBODY
+ Line 2939  ENDBODY
  Returns a uniform footer for LON-CAPA web pages.
- Inputs:
+ Inputs: none
- =over 4
  =back
- Returns: A uniform footer for LON-CAPA web pages.
  =cut
  sub endbodytag {
- Line 2952  sub endbodytag {
+ Line 2951  sub endbodytag {
      return $endbodytag;
  }
+ =pod
+ =over 4
+ =item * &headtag()
+ Returns a uniform footer for LON-CAPA web pages.
+ Inputs: $title - optional title for the head
+         $head_extra - optional extra HTML to put inside the <head>
+ =back
+ =cut
+ sub headtag {
+     my ($title,$head_extra) = @_;
+     my $result = '<head>';
+     if (!defined($title)) {
+ 	$title = 'The LearningOnline Network with CAPA';
+     }
+     $result .= '<title>'.&mt($title).'</title>'.$head_extra;
+     return $result;
+ }
+ =pod
+ =over 4
+ =item * &endheadtag()
+ Returns a uniform </head> for LON-CAPA web pages.
+ Inputs: none
+ =back
+ =cut
+ sub endheadtag {
+     return '</head>';
+ }
+ =pod
+ =over 4
+ =item * &head()
+ Returns a uniform complete <head>..</head> section for LON-CAPA web pages.
+ Inputs: $title - optional title for the page
+         $head_extra - optional extra HTML to put inside the <head>
+ =back
+ =cut
+ sub head {
+     my ($title,$head_extra) = @_;
+     return &headtag($title,$head_extra).&endheadtag();
+ }
+ =pod
+ =over 4
+ =item * &start_page()
+ Returns a complete <html> .. <body> section for LON-CAPA web pages.
+ Inputs: $title - optional title for the page
+         $head_extra - optional extra HTML to incude inside the <head>
+ =back
+ =cut
+ sub start_page {
+     my ($title,$head_extra) = @_;
+     return
+ 	&Apache::lonxml::xmlbegin().
+ 	&headtag($title,$head_extra).&endheadtag().
+ 	&bodytag($title);
+ }
+ =pod
+ =over 4
+ =item * &head()
+ Returns a complete </body></html> section for LON-CAPA web pages.
+ Inputs: None
+ =back
+ =cut
+ sub end_page {
+     return &endbodytag."\n</html>";
+ }
  ###############################################
  =pod
+ =over 4
  =item get_users_function
  Used by &bodytag to determine the current users primary role.
- Line 3170  times for group members.
+ Line 3277  times for group members.
  Outer hash key is functions.
  Inner hash keys are chat,discussion,email,files,homepage,roster.
  Corresponding values are either on or off, depending on
- whther this type of functionality is available for the group.
+ whether this type of functionality is available for the group.
  =cut
- Line 3181  sub get_group_settings {
+ Line 3288  sub get_group_settings {
      my $parser=HTML::TokeParser->new(\$groupinfo);
      my $token;
      my $tool = '';
+     my $role = '';
      my %content=();
      while ($token=$parser->get_token) {
          if ($token->[0] eq 'S')  {
              my $entry=$token->[1];
-             if ($entry eq 'functions') {
+             if ($entry eq 'functions' || $entry eq 'autosec') {
                  %{$content{$entry}} = ();
                  $tool = $entry;
+             } elsif ($entry eq 'role') {
+                 if ($tool eq 'autosec') {
+                     $role = $token->[2]{id};
+                 }
              } else {
                  my $value=$parser->get_text('/'.$entry);
                  if ($entry eq 'name') {
- Line 3197  sub get_group_settings {
+ Line 3309  sub get_group_settings {
                      }
                  } elsif ($entry eq 'groupname') {
                      $content{$entry}=&Apache::lonnet::unescape($value);
+                 } elsif (($entry eq 'roles') || ($entry eq 'types') ||
+                          ($entry eq 'sectionpick') || ($entry eq 'defpriv')) {
+                     push(@{$content{$entry}},$value);
+                 } elsif ($entry eq 'section') {
+                     if ($tool eq 'autosec'  && $role ne '') {
+                         push(@{$content{$tool}{$role}},$value);
+                     }
                  } else {
                      $content{$entry}=$value;
                  }
              }
          } elsif ($token->[0] eq 'E') {
-             if ($token->[1] eq 'functions') {
+             if ($token->[1] eq 'functions' || $token->[1] eq 'autosec') {
                  $tool = '';
+             } elsif ($token->[1] eq 'role') {
+                 $role = '';
              }
          }
      }
      return %content;

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

Removed from v.1.302
changed lines
	Added in v.1.307