[BACK]Return to lonratedt.pm CVS log [TXT] [DIR] Up to [LON-CAPA] / rat

Diff for /rat/lonratedt.pm between versions 1.104 and 1.110

version 1.104, 2011/11/14 00:20:46 version 1.110, 2014/02/26 18:52:13
Line 72  ENDDOCUMENT Line 72  ENDDOCUMENT
   
 sub buttons {  sub buttons {
     my $adv=shift;      my $adv=shift;
     my $output='<form method="post">';           my $output='<form method="post" action="">';     
     if ($adv==1) {      if ($adv==1) {
         $output.=          $output.=
             '<input type="submit" name="forceadv"'              '<input type="submit" name="forceadv"'
Line 229  sub smpedt { Line 229  sub smpedt {
        my ($errtext,$fatal)=         my ($errtext,$fatal)=
    &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');     &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
        unless ($fatal) {         unless ($fatal) {
    $targetmsg='<b>'.&mt('Saved.').'</b><br />';     $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Saved'));
        } else {         } else {
    $targetmsg='<b>'.&mt('An error occurred while saving.').'</b><br />';     $targetmsg=&Apache::lonhtmlcommon::confirm_success(
                             &mt('An error occurred while saving.'),1);
        }         }
    }     }
    if ($env{'form.revert'}) {     if ($env{'form.revert'}) {
        $targetmsg='<b>'.&mt('Reverted.').'</b><br />';         $targetmsg=&Apache::lonhtmlcommon::confirm_success(&mt('Reverted'));
        unlink($tmpfn);         unlink($tmpfn);
        my ($errtext,$fatal)=         my ($errtext,$fatal)=
    &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');     &LONCAPA::map::mapread(&Apache::lonnet::filelocation('',$url),'');
    }     }
      $targetmsg = &Apache::loncommon::confirmwrapper($targetmsg) if ($targetmsg);
    if (-e $tmpfn) {     if (-e $tmpfn) {
       $targetmsg=        $targetmsg=
         '<span class="LC_warning">'.&mt('You are working with an unsaved version of your map.').'</span><br />';          '<p class="LC_warning">'
          .&mt('You are working with an unsaved version of your map.')
          .'</p>';
       my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');        my ($errtext,$fatal)=&LONCAPA::map::mapread($tmpfn,'');
    }     }
      $errtext = '<p class="LC_error">'.$errtext.'</p>' if ($errtext);
 # ---------------------------------------------------------- Process form input  # ---------------------------------------------------------- Process form input
   
    my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');     my @importselect=&Apache::loncommon::get_env_multiple('form.importsel');
Line 487  sub smpedt { Line 492  sub smpedt {
    my $editscript=&editscript('simple');     my $editscript=&editscript('simple');
   
    my %lt=&Apache::lonlocal::texthash(     my %lt=&Apache::lonlocal::texthash(
         'sm' => 'Select Map',
       'sa' => 'Save',        'sa' => 'Save',
       'nt' => 'New Title',        'nt' => 'New Title',
       'se' => 'Search',        'se' => 'Search',
       'im' => 'Import',        'im' => 'Import',
                                       'wl' => 'Import from Wishlist',                                        'wl' => 'Import from Stored Links',
       'vi' => 'View',        'vi' => 'View',
       'lm' => 'Load Map',        'lm' => 'Load Map',
       'ds' => 'Discard Selected',        'ds' => 'Discard Selected',
Line 508  sub smpedt { Line 514  sub smpedt {
                                       'pas' => 'Paste after selected',                                        'pas' => 'Paste after selected',
                                       'reco' => 'Recover Deleted'                                        'reco' => 'Recover Deleted'
       );        );
    my $js=<<ENDJS;     my $js=&Apache::lonhtmlcommon::scripttag("
 <script type="text/javascript">  
   
    $editscript     $editscript
   
    function openview(entry) {     function openview(entry) {
Line 542  sub smpedt { Line 546  sub smpedt {
    document.forms.simpleedit.submit();     document.forms.simpleedit.submit();
        }         }
    }     }
   ");
 </script>  
 ENDJS  
   
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({      &Apache::lonhtmlcommon::add_breadcrumb({
         text  => 'Construction Space',          text  => 'Authoring Space',
         href  => &Apache::loncommon::authorspace($url),          href  => &Apache::loncommon::authorspace($url),
         faq   => 6,          faq   => 6,
         bug   => 'RAT',          bug   => 'RAT',
Line 563  ENDJS Line 565  ENDJS
         href  => '',});          href  => '',});
   
     # Breadcrumbs are included by &start_page      # Breadcrumbs are included by &start_page
     my $start_page = &Apache::loncommon::start_page('Construction Space',$js)      my $start_page = &Apache::loncommon::start_page('Authoring Space',$js)
                     .&Apache::loncommon::head_subbox(                      .&Apache::loncommon::head_subbox(
                          &Apache::loncommon::CSTR_pageheader()                           &Apache::loncommon::CSTR_pageheader()
                         .&buttons(2));                          .&buttons(2));
     my $end_page = &Apache::loncommon::end_page();      my $end_page = &Apache::loncommon::end_page();
   
       my $filetext = &mt('File: [_1]','<span class="LC_filename">'.$url.'</span>');
     $r->print(<<ENDSMPHEAD);      $r->print(<<ENDSMPHEAD);
 $start_page  $start_page
 <span class="LC_error">$errtext</span>  $targetmsg
 <form name="simpleedit" method="post">  $errtext
   <form name="simpleedit" method="post" action="">
 <input type="hidden" name="forcesmp" value="1" />  <input type="hidden" name="forcesmp" value="1" />
 <input type="hidden" name="renameres" value="0" />  <input type="hidden" name="renameres" value="0" />
 <input type="hidden" name="renametitle" value="" />  <input type="hidden" name="renametitle" value="" />
Line 580  $start_page Line 584  $start_page
 <table>  <table>
     <tr><th width="40%">$lt{'ta'}</th>      <tr><th width="40%">$lt{'ta'}</th>
 <th>&nbsp;</th>  <th>&nbsp;</th>
 <th width="40%">File: $url</th></tr>  <th width="40%">$filetext</th></tr>
 <tr><td bgcolor="#FFFFCC">  <tr><td bgcolor="#FFFFCC">
 <input type="button" onClick="javascript:groupsearch()" value="$lt{'se'}" />  <input type="button" onclick="javascript:groupsearch()" value="$lt{'se'}" />
 <input type="button" onClick="javascript:groupimport();" value="$lt{'im'}" />  <input type="button" onclick="javascript:groupimport();" value="$lt{'im'}" />
 $lt{'as'}  $lt{'as'}
 <hr />  <hr />
 <input type="text" size="20" name="importmap" />  <input type="text" size="20" name="importmap" />
 <input type="button"   <input type="button" 
 onClick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"  onclick="javascript:openbrowser('simpleedit','importmap','sequence,page','')"
 value="Select Map" /><input type="submit" name="loadmap" value="$lt{'lm'}" /><hr />  value="$lt{'sm'}" /><input type="submit" name="loadmap" value="$lt{'lm'}" /><hr />
 <input type="submit" name="discard" value="$lt{'ds'}" />  <input type="submit" name="discard" value="$lt{'ds'}" />
 <input type="submit" name="clear" value="$lt{'ca'}" />  <input type="submit" name="clear" value="$lt{'ca'}" />
 <input type="button" onClick="javascript:viewimport()" value="$lt{'vi'}" />  <input type="button" onclick="javascript:viewimport()" value="$lt{'vi'}" />
   
     </td><td>&nbsp;</td><td bgcolor="#FFFFCC">      </td><td>&nbsp;</td><td bgcolor="#FFFFCC">
   
 <input type="button" onClick=  <input type="button" onclick=
 "javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}" />  "javascript:impfortarget.value=1;groupsearch()" value="$lt{'se'}" />
 <input type="button" onClick=  <input type="button" onclick=
 "javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}" />  "javascript:impfortarget.value=1;groupimport();" value="$lt{'im'}" />
 <input type="button" onClick=  <input type="button" onclick=
 "javascript:impfortarget.value=1;open_Wishlist_Import('simple');" value="$lt{'wl'}" />  "javascript:impfortarget.value=1;open_StoredLinks_Import('simple');" value="$lt{'wl'}" />
 <input type="button" onClick=  <input type="button" onclick=
 "javascript:impfortarget.value=1;groupopen('$url',1);" value="$lt{'reco'}" />  "javascript:impfortarget.value=1;groupopen('$url',1);" value="$lt{'reco'}" />
 $lt{'as'}  $lt{'as'}
 <hr />  <hr />
 <input type="submit" name="moveup" value="$lt{'mu'}" />  <input type="submit" name="moveup" value="$lt{'mu'}" />
 <input type="submit" name="movedown" value="$lt{'md'}" />  <input type="submit" name="movedown" value="$lt{'md'}" />
 <input type="button" onClick="javascript:renametarget()" value="$lt{'re'}" />  <input type="button" onclick="javascript:renametarget()" value="$lt{'re'}" />
 <hr />$targetmsg  <hr />
 <input type="submit" name="revert" value="$lt{'rv'}" />  <input type="submit" name="revert" value="$lt{'rv'}" />
 <input type="submit" name="save" value="$lt{'sa'}" />  <input type="submit" name="save" value="$lt{'sa'}" />
 <input type="button" onClick="javascript:viewtarget()" value="$lt{'vi'}" />  <input type="button" onclick="javascript:viewtarget()" value="$lt{'vi'}" />
 </td></tr>  </td></tr>
   
 <tr><td bgcolor="#FFFFCC"><select name="importsel" size="10" multiple="multiple">  <tr><td bgcolor="#FFFFCC"><select name="importsel" size="10" multiple="multiple">
Line 621  $importwindow Line 625  $importwindow
 </td>  </td>
 <td bgcolor="#FFFFAA" align="center">  <td bgcolor="#FFFFAA" align="center">
 $lt{'cs'}<br />  $lt{'cs'}<br />
 <input type="submit" name="cut" value="<<<" /><p>  <input type="submit" name="cut" value="&lt;&lt;&lt;" />
 <hr />  <hr />
 $lt{'ps'}<br />  $lt{'ps'}<br />
 <input type="submit" name="copy" value="<--" /><p>  <input type="submit" name="copy" value="&lt;--" />
 <h /r>  <hr />
 $lt{'pas'}<br />  $lt{'pas'}<br />
 <input type="submit" name="paste" value="-->" />  <input type="submit" name="paste" value="--&gt;" />
 </td>  </td>
 <td bgcolor="#FFFFCC"><select name="target" size="10" multiple="multiple">  <td bgcolor="#FFFFCC"><select name="target" size="10" multiple="multiple">
 $targetwindow  $targetwindow
 </select>  </select>
   </td></tr>
 </table>  </table>
 <input type="hidden" name="importdetail" value="" />  <input type="hidden" name="importdetail" value="" />
 <input type="hidden" name="curimpdetail" value="$importdetail" />  <input type="hidden" name="curimpdetail" value="$importdetail" />
Line 649  sub nodir { Line 654  sub nodir {
    my ($path) = ($dir =~ m{^\Q$londocroot\E?(/priv/[^/]+/[^/]+/)});     my ($path) = ($dir =~ m{^\Q$londocroot\E?(/priv/[^/]+/[^/]+/)});
    $dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};     $dir=~s{^\Q$londocroot/priv/\E[^/]+/[^/]+}{};
    my $brcrum = [{'href' => &Apache::loncommon::authorspace($path),     my $brcrum = [{'href' => &Apache::loncommon::authorspace($path),
                   'text' => 'Construction Space'}];                    'text' => 'Authoring Space'}];
 #                 {'href' => '',  #                 {'href' => '',
 #                  'text' => 'No such directory'}];  #                  'text' => 'No such directory'}];
    $r->print(&Apache::loncommon::start_page('Construction Space',     $r->print(&Apache::loncommon::start_page('Authoring Space',
                                             undef,                                              undef,
                                             {'bread_crumbs' => $brcrum,})                                              {'bread_crumbs' => $brcrum,})
             .&Apache::loncommon::head_subbox(              .&Apache::loncommon::head_subbox(
Line 671  sub viewmap { Line 676  sub viewmap {
   
     &Apache::lonhtmlcommon::clear_breadcrumbs();      &Apache::lonhtmlcommon::clear_breadcrumbs();
     &Apache::lonhtmlcommon::add_breadcrumb({      &Apache::lonhtmlcommon::add_breadcrumb({
         text  => 'Construction Space',          text  => 'Authoring Space',
         href  => &Apache::loncommon::authorspace($url),          href  => &Apache::loncommon::authorspace($url),
         faq   => 6,          faq   => 6,
         bug   => 'RAT',          bug   => 'RAT',
Line 708  sub viewmap { Line 713  sub viewmap {
              .'<th>'.&mt('Title in map').'</th>'               .'<th>'.&mt('Title in map').'</th>'
              .'<th>'.&mt('Filename of resource').'</th>'               .'<th>'.&mt('Filename of resource').'</th>'
              .'<th>'.&mt('Link to published resource').'</th>'               .'<th>'.&mt('Link to published resource').'</th>'
              .'<th>'.&mt('Link to resource in Construction Space').'</th>'               .'<th>'.&mt('Link to resource in Authoring Space').'</th>'
              .&Apache::loncommon::end_data_table_header_row()               .&Apache::loncommon::end_data_table_header_row()
     );      );
     foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) {      foreach (&LONCAPA::map::attemptread(&Apache::lonnet::filelocation('',$url))) {
Line 727  sub viewmap { Line 732  sub viewmap {
                 $filename = $1;                  $filename = $1;
             }              }
             my $cstrurl = $resurl;              my $cstrurl = $resurl;
             $cstrurl =~ s#^/res/[^/]+/([^/]+)/#/priv/$1/#;              $cstrurl =~ s{^/res/}{/priv/};
             $r->print(&Apache::loncommon::start_data_table_row()              $r->print(&Apache::loncommon::start_data_table_row()
                      .'<td>'                       .'<td>'
                      .'<img src="'.&Apache::loncommon::icon($resfilepath).'" />'                       .'<img src="'.&Apache::loncommon::icon($resfilepath).'" alt="" />'
                      .'</td>'                       .'</td>'
                      .'<td>'                       .'<td>'
                      .&HTML::Entities::encode(&LONCAPA::map::qtescape($title))                       .&HTML::Entities::encode(&LONCAPA::map::qtescape($title))
Line 746  sub viewmap { Line 751  sub viewmap {
             $r->print('</td><td>');              $r->print('</td><td>');
             if ($url) {              if ($url) {
                $r->print('<a href="'.$cstrurl.'">'.                 $r->print('<a href="'.$cstrurl.'">'.
                          &mt('Construction space').'</a>');                           &mt('Authoring space').'</a>');
             } else {              } else {
                 $r->print('&nbsp;');                  $r->print('&nbsp;');
             }              }
Removed from v.1.104  
changed lines
  Added in v.1.110

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