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

Diff for /loncom/interface/lonmeta.pm between versions 1.146 and 1.147

version 1.146, 2005/12/19 21:49:12 version 1.147, 2005/12/19 21:56:07
Line 295  sub portfolio_linked_path { Line 295  sub portfolio_linked_path {
     my $result = &Apache::portfolio::make_anchor('portfolio','/');      my $result = &Apache::portfolio::make_anchor('portfolio','/');
     my $fullpath = '/';      my $fullpath = '/';
     my (undef,@tree) = split('/',$path);      my (undef,@tree) = split('/',$path);
       my $filename = pop(@tree);
     foreach my $dir (@tree) {      foreach my $dir (@tree) {
  $fullpath .= $dir.'/';   $fullpath .= $dir.'/';
  $result .= '/';   $result .= '/';
  $result .= &Apache::portfolio::make_anchor($dir,$fullpath);   $result .= &Apache::portfolio::make_anchor($dir,$fullpath);
     }      }
       $result .= "/$filename";
     return $result;      return $result;
 }  }
   
Line 1069  sub present_editable_metadata { Line 1071  sub present_editable_metadata {
     $disuri=~s/^\/\~/\/priv\//;      $disuri=~s/^\/\~/\/priv\//;
     $disuri=~s/\.meta$//;      $disuri=~s/\.meta$//;
     my $meta_uri = $disuri;      my $meta_uri = $disuri;
       my $path;
     if ($disuri =~ m|/portfolio/|) {      if ($disuri =~ m|/portfolio/|) {
  ($disuri, $meta_uri) =  &portfolio_display_uri($disuri,1);   ($disuri, $meta_uri, $path) =  &portfolio_display_uri($disuri,1);
     }      }
     my $target=$uri;      my $target=$uri;
     $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;      $target=~s/^\/\~/\/res\/$env{'request.role.domain'}\//;
Line 1256  ENDEDIT Line 1259  ENDEDIT
   
  $r->print($output.'<br /><input type="submit" name="store" value="'.   $r->print($output.'<br /><input type="submit" name="store" value="'.
                   &mt('Store Catalog Information').'">');                    &mt('Store Catalog Information').'">');
           
            $r->print('</form>
                  <br /><br /><form method="POST" action="/adm/portfolio">'.
                 '<input type="hidden" name="currentpath" value="'.$path.'" />'.
         '<input type="submit" name="cancel" value="'.&mt('Discard Edits and Return to Portfolio').'">');
   
     }      }
     $r->print('</form>');      $r->print('</form>');
   
Removed from v.1.146  
changed lines
  Added in v.1.147

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