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

Diff for /loncom/interface/londocs.pm between versions 1.434.2.3 and 1.440

version 1.434.2.3, 2010/12/25 04:40:15 version 1.440, 2010/11/28 00:04:05
Line 1721  sub process_file_upload { Line 1721  sub process_file_upload {
         $destination .= $newidx;          $destination .= $newidx;
         my $url=&Apache::lonnet::userfileupload('uploaddoc','coursedoc',$destination,          my $url=&Apache::lonnet::userfileupload('uploaddoc','coursedoc',$destination,
  $parseaction,$allfiles,   $parseaction,$allfiles,
                                                 $codebase,undef,undef,undef,undef,   $codebase,undef,undef,undef,undef,
                                                 undef,undef,\$mimetype);                                                  undef,undef,\$mimetype);
         if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E.*/([^/]+)$}) {          if ($url =~ m{^/uploaded/\Q$coursedom\E/\Q$coursenum\E.*/([^/]+)$}) {
             my $stored = $1;              my $stored = $1;
Line 1729  sub process_file_upload { Line 1729  sub process_file_upload {
                           $stored.'</span>').'</p>';                            $stored.'</span>').'</p>';
         } else {          } else {
             my ($filename) = ($env{'form.uploaddoc.filename'} =~ m{([^/]+)$});              my ($filename) = ($env{'form.uploaddoc.filename'} =~ m{([^/]+)$});
               
             $$upload_output = '<p><span class="LC_error">'.&mt('Unable to save file [_1].','<span class="LC_filename">'.$filename.'</span>').'</span></p>';              $$upload_output = '<p><span class="LC_error">'.&mt('Unable to save file [_1].','<span class="LC_filename">'.$filename.'</span>').'</span></p>';
             return;              return;
         }          }
Line 1758  sub process_file_upload { Line 1758  sub process_file_upload {
                 if ($total_embedded > 0) {                  if ($total_embedded > 0) {
                     my $uploadphase = 'upload_embedded';                      my $uploadphase = 'upload_embedded';
                     my $primaryurl = &HTML::Entities::encode($url,'<>&"');                      my $primaryurl = &HTML::Entities::encode($url,'<>&"');
                     my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx);      my $state = &embedded_form_elems($uploadphase,$primaryurl,$newidx); 
                     my ($embedded,$num) =                      my ($embedded,$num) = 
                         &Apache::loncommon::ask_for_embedded_content(                          &Apache::loncommon::ask_for_embedded_content(
                             '/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});                              '/adm/coursedocs',$state,$allfiles,$codebase,{'docs_url' => $url});
                     if ($embedded) {                      if ($embedded) {
                         if ($num) {                          if ($num) {
                             $$upload_output .=                              $$upload_output .=
                                  '<p>'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'</p>'.$embedded;           '<p>'.&mt('This file contains embedded multimedia objects, which need to be uploaded.').'</p>'.$embedded;
                             $nextphase = $uploadphase;                              $nextphase = $uploadphase;
                         } else {                          } else {
                             $$upload_output .= $embedded;                              $$upload_output .= $embedded;
Line 2825  sub create_form_ul { Line 2825  sub create_form_ul {
   if ($allowed) {    if ($allowed) {
       if (($env{'form.uploaddoc.filename'}) &&        if (($env{'form.uploaddoc.filename'}) &&
   ($env{'form.cmd'}=~/^upload_(\w+)/)) {    ($env{'form.cmd'}=~/^upload_(\w+)/)) {
           my $context = $1;            my $context = $1; 
           # Process file upload - phase one - upload and parse primary file.            # Process file upload - phase one - upload and parse primary file.
           undef($hadchanges);    undef($hadchanges);
           $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,            $uploadphase = &process_file_upload(\$upload_output,$coursenum,$coursedom,
                                               \%allfiles,\%codebase,$context);                                                \%allfiles,\%codebase,$context);
   if ($hadchanges) {    if ($hadchanges) {
Line 2835  sub create_form_ul { Line 2835  sub create_form_ul {
   }    }
           $r->print($upload_output);            $r->print($upload_output);
       } elsif ($env{'form.phase'} eq 'upload_embedded') {        } elsif ($env{'form.phase'} eq 'upload_embedded') {
           # Process file upload - phase two - upload embedded objects            # Process file upload - phase two - upload embedded objects 
           $uploadphase = 'check_embedded';            $uploadphase = 'check_embedded';
           my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');            my $primaryurl = &HTML::Entities::encode($env{'form.primaryurl'},'<>&"');   
           my $state = &embedded_form_elems($uploadphase,$primaryurl,            my $state = &embedded_form_elems($uploadphase,$primaryurl,
                                            $env{'form.newidx'});                                             $env{'form.newidx'});
           my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};            my $docuname=$env{'course.'.$env{'request.course.id'}.'.num'};
Line 2845  sub create_form_ul { Line 2845  sub create_form_ul {
           my ($destination,$dir_root) = &embedded_destination();            my ($destination,$dir_root) = &embedded_destination();
           my $url_root = '/uploaded/'.$docudom.'/'.$docuname;            my $url_root = '/uploaded/'.$docudom.'/'.$docuname;
           my $actionurl = '/adm/coursedocs';            my $actionurl = '/adm/coursedocs';
           my ($result,$flag) =            my ($result,$flag) = 
               &Apache::loncommon::upload_embedded('coursedoc',$destination,                &Apache::loncommon::upload_embedded('coursedoc',$destination,
                   $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,                    $docuname,$docudom,$dir_root,$url_root,undef,undef,undef,$state,
                   $actionurl);                    $actionurl);
Line 2863  sub create_form_ul { Line 2863  sub create_form_ul {
       }        }
   }    }
   
   unless ($showdoc || $uploadphase) {    unless ($showdoc || $uploadphase) {  
 # -----------------------------------------------------------------------------  # -----------------------------------------------------------------------------
        my %lt=&Apache::lonlocal::texthash(         my %lt=&Apache::lonlocal::texthash(
                 'uplm' => 'Upload a new main '.lc($crstype).' document',                  'uplm' => 'Upload a new main '.lc($crstype).' document',
Line 2873  sub create_form_ul { Line 2873  sub create_form_ul {
                 'upld' => 'Import Document',                  'upld' => 'Import Document',
                 'srch' => 'Search',                  'srch' => 'Search',
                 'impo' => 'Import',                  'impo' => 'Import',
  'book' => 'Import Bookmarks',   'wish' => 'Import from Wishlist',
                 'selm' => 'Select Map',                  'selm' => 'Select Map',
                 'load' => 'Load Map',                  'load' => 'Load Map',
                 'reco' => 'Recover Deleted Documents',                  'reco' => 'Recover Deleted Documents',
Line 2946  SEDFFORM Line 2946  SEDFFORM
  my @simpleeditdefaultforma = (    my @simpleeditdefaultforma = ( 
  { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },   { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/src.png" alt="'.$lt{srch}.'"  onclick="javascript:groupsearch()" />' => "$uploadtag<a class='LC_menubuttons_link' href='javascript:groupsearch()'>$lt{'srch'}</a>" },
  { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },   { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/res.png" alt="'.$lt{impo}.'"  onclick="javascript:groupimport();"/>' => "<a class='LC_menubuttons_link' href='javascript:groupimport();'>$lt{'impo'}</a>$help{'Importing_LON-CAPA_Resource'}" },
  { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/vbkm.png" alt="'.$lt{book}.'" onclick="javascript:groupopen(0,1,1);" />' => "<a class='LC_menubuttons_link' href='javascript:groupopen(0,1,1);'>$lt{'book'}</a>" },   { '<img class="LC_noBorder LC_middle" src="/res/adm/pages/wishlist.png" alt="'.$lt{wish}.'" onclick="javascript:open_Wishlist_Import();" />' => "<a class='LC_menubuttons_link' href='javascript:open_Wishlist_Import();'>$lt{'wish'}</a>" },
  );   );
  $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));   $simpleeditdefaultform .= create_form_ul(create_list_elements(@simpleeditdefaultforma));
  $simpleeditdefaultform .=(<<SEDFFORM);   $simpleeditdefaultform .=(<<SEDFFORM);
Line 3072  HIDDENFORM Line 3072  HIDDENFORM
   
  my $recoverform=(<<RFORM);   my $recoverform=(<<RFORM);
  <form action="/adm/groupsort" method="post" name="recover">   <form action="/adm/groupsort" method="post" name="recover">
  <a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1,0)">$lt{'reco'}</a>   <a class="LC_menubuttons_link" href="javascript:groupopen('$readfile',1)">$lt{'reco'}</a>
  </form>   </form>
 RFORM  RFORM
   
Line 3261  if($env{'form.pagepath'}) { Line 3261  if($env{'form.pagepath'}) {
 my @tools = (  my @tools = (
 # {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},  # {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/extres.png" alt="'.$lt{extr}.'" />'=>$extresourcesform},
 # {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},  # {'<img class="LC_noBorder LC_middle" align="left" src="/res/adm/pages/ims.png" alt="'.$lt{imsf}.'" />'=>$imspform},
  {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1,0)" />'=>$recoverform},   {'<img class="LC_noBorder LC_middle" src="/res/adm/pages/recover.png" alt="'.$lt{reco}.'" onclick="javascript:groupopen(\''.$readfile.'\',1)" />'=>$recoverform},
  );   );
   
 my %orderhash = (  my %orderhash = (
Line 3464  sub embedded_destination { Line 3464  sub embedded_destination {
   
 sub return_to_editor {  sub return_to_editor {
     my $actionurl = '/adm/coursedocs';      my $actionurl = '/adm/coursedocs';
     return '<p><form name="backtoeditor" method="post" action="'.$actionurl.'" />'."\n".      return '<p><form name="backtoeditor" method="post" action="'.$actionurl.'" />'."\n". 
            '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /></form>'."\n".             '<input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" /></form>'."\n".
            '<a href="javascript:document.backtoeditor.submit();">'.&mt('Return to Editor').             '<a href="javascript:document.backtoeditor.submit();">'.&mt('Return to Editor').
            '</a></p>';             '</a></p>';
Removed from v.1.434.2.3  
changed lines
  Added in v.1.440

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