Diff for /loncom/interface/lonindexer.pm between versions 1.211 and 1.215

version 1.211, 2011/10/17 12:41:30 version 1.215, 2012/07/11 12:51:36
Line 165  sub handler { Line 165  sub handler {
 ENDSUBM  ENDSUBM
        $r->print(&Apache::loncommon::start_page(undef,$js,         $r->print(&Apache::loncommon::start_page(undef,$js,
  {'only_body'   =>1,   {'only_body'   =>1,
                                                    'add_modal' => 1,
                                                    'add_wishlist' => 1,
  'add_entries' =>   'add_entries' =>
      {'onload' => "load();"},}       {'onload' => "load();"},}
  ).   ).
Line 390  function uncheckAll() { Line 392  function uncheckAll() {
         }          }
     }      }
 }  }
   
 function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {  function openWindow(url, wdwName, w, h, toolbar,scrollbar,locationbar) {
     var xpos = (screen.width-w)/2;      var xpos = (screen.width-w)/2;
     xpos = (xpos < 0) ? '0' : xpos;      xpos = (xpos < 0) ? '0' : xpos;
Line 401  function openWindow(url, wdwName, w, h, Line 404  function openWindow(url, wdwName, w, h,
     var newWin = window.open(url, wdwName, options);      var newWin = window.open(url, wdwName, options);
     newWin.focus();      newWin.focus();
 }  }
   
 function gothere(val) {  function gothere(val) {
     window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;      window.location=val+'?acts='+document.forms.fileattr.acts.value$inhibit_menu;
 }  }
Line 413  ENDHEADER Line 417  ENDHEADER
         if ($env{'form.catalogmode'}) {          if ($env{'form.catalogmode'}) {
             # "Popup mode"              # "Popup mode"
             $r->print(&Apache::loncommon::start_page('Browse published resources',$js,              $r->print(&Apache::loncommon::start_page('Browse published resources',$js,
                                                      {'only_body' => 1,                                                       {'only_body' => 1, 'add_wishlist'=>1, 'add_modal' =>1, 
                                                       'domain' => $headerdom,}));                                                        'domain' => $headerdom,}));
         } else {          } else {
             # Only display page header and breadcrumbs in non-popup mode              # Only display page header and breadcrumbs in non-popup mode
             &Apache::lonhtmlcommon::clear_breadcrumbs();              &Apache::lonhtmlcommon::clear_breadcrumbs();
   #
   # FIXME: hard link to fhwfdev?
   #
   #
   
             &Apache::lonhtmlcommon::add_breadcrumb({              &Apache::lonhtmlcommon::add_breadcrumb({
                 'text'  => 'Browse published resources',                  'text'  => 'Browse published resources',
                 'href'  => '/res/fhwfdev/?launch=1',                  'href'  => '/res/fhwfdev/?launch=1',
Line 788  sub get_list { Line 797  sub get_list {
  $hash{'dirlist_timestamp_files_'.$luri} = time;   $hash{'dirlist_timestamp_files_'.$luri} = time;
     }      }
 #Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)  #Checking for error messages associated with empty directories or inaccessible servers (See Bug 4984)
     if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host')) {       if (($listerror eq 'no_such_dir') || ($listerror eq 'no_such_host') || ($listerror eq 'no_host')) { 
         $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");          $r->print("<p class='LC_info'>" . &mt("Directory does not exist."). "</p>");
     } elsif ($listerror eq 'con_lost') {      } elsif ($listerror eq 'con_lost') {
         $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");          $r->print("<p class='LC_info'>" . &mt("Directory temporarily not accessible."). "</p>");
Line 1004  $r->print ('<input type="hidden" name="a Line 1013  $r->print ('<input type="hidden" name="a
         if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }          if (defined($plainname) && $plainname) { $r->print(" ($plainname) "); }
 # Wishlistlink  # Wishlistlink
         $r->print('</form></td><td><a href="javascript:;" '.          $r->print('</form></td><td><a href="javascript:;" '.
                   'title="'.&mt('Set a link for this folder to wishlist').'" '.                    'title="'.&mt('Save a link for this folder in your personal Stored Links repository').'" '.
                   'onclick="set_wishlistlink('."'$plainname','$startdir$listname'".')">'.                    'onclick="set_wishlistlink('."'$plainname','$startdir$listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.                    '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a>'.$tabtag);                    'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a>'.$tabtag);
         $r->print(&Apache::loncommon::end_data_table_row());          $r->print(&Apache::loncommon::end_data_table_row());
         return OK;          return OK;
     }      }
Line 1089  $r->print ('<input type="hidden" name="a Line 1098  $r->print ('<input type="hidden" name="a
  $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");   $r->print("<img alt=\"\" src='$iconname' class='LC_fileicon' />\n");
  my $quotable_filelink = &Apache::loncommon::escape_single($filelink);   my $quotable_filelink = &Apache::loncommon::escape_single($filelink);
   
  $r->print (" <a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" <a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">$listname</a> ");
    "?inhibitmenu=yes','previewfile','450','500','no','yes','yes');\"".  
    " target=\"_self\">$listname</a> ");  
  $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');   $quotable_filelink = &Apache::loncommon::escape_single($filelink.'.meta');
  &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);   &Apache::loncommon::inhibit_menu_check(\$quotable_filelink);
  $r->print (" (<a href=\"javascript:openWindow('".$quotable_filelink.   $r->print (" (<a href=\"javascript:openMyModal('".$quotable_filelink."?inhibitmenu=yes',500,500,'yes');\">".&mt('metadata')."</a>) ");
    "?inhibitmenu=yes','metadatafile','500','550','no','yes','no');\" ".  
    " target=\"_self\">".&mt('metadata')."</a>) ");  
 # Close form to open/close sequence  # Close form to open/close sequence
  if ($filelink=~/\.(page|sequence)$/) {   if ($filelink=~/\.(page|sequence)$/) {
     $r->print('</form>');      $r->print('</form>');
  }   }
  $r->print("</td>\n");   $r->print("</td>\n");
 # Wishlistlink  # Wishlistlink
         $r->print('<td><a href="javascript:;" title="'.&mt('Set a link for this resource to wishlist').'" '.          $r->print('<td><a href="javascript:;" title="'.&mt('Save a link for this resource in your personal Stored Links repository').'" '.
                   'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).                    'onclick="set_wishlistlink('."'".&Apache::lonnet::gettitle($filelink).
                   "','$startdir$listname'".')">'.                    "','$startdir$listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.                    '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a></td>');                    'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
  if ($hash{'display_attrs_0'} == 1) {   if ($hash{'display_attrs_0'} == 1) {
     $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).      $r->print('<td> '.($title eq '' ? '&nbsp;' : $title).
       ' </td>'."\n");        ' </td>'."\n");
Line 1258  $r->print ('<input type="hidden" name="a Line 1263  $r->print ('<input type="hidden" name="a
  $r->print ("$listname</a></form>");   $r->print ("$listname</a></form>");
 # Wishlistlink  # Wishlistlink
         $r->print('</td><td><a href="javascript:;" '.          $r->print('</td><td><a href="javascript:;" '.
                   'title="'.&mt('Set a link for this folder to wishlist').'" '.                    'title="'.&mt('Save a link for this folder in Stored Links').'" '.
                   'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.                    'onclick="set_wishlistlink('."'$listname','$startdir$listname'".')">'.
                   '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.                    '<img class="LC_icon" src="/res/adm/pages/wishlist.png" '.
                   'alt="'.&mt('set wishlistlink').'" style="width:22px;"/></a></td>');                    'alt="'.&mt('save in Stored Links').'" style="width:22px;"/></a></td>');
 # Attributes  # Attributes
  my $filelink = $startdir.$filecom[0].'/default';   my $filelink = $startdir.$filecom[0].'/default';
   

Removed from v.1.211  
changed lines
  Added in v.1.215


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