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

Diff for /loncom/interface/lonwishlist.pm between versions 1.23 and 1.25

version 1.23, 2014/12/15 17:36:22 version 1.25, 2015/06/09 21:22:57
Line 536  sub JSforWishlist { Line 536  sub JSforWishlist {
             ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.              ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.
             ' Paths to external websites must contain the network protocol, e.g. http://...');              ' Paths to external websites must contain the network protocol, e.g. http://...');
     my $warningLinkNotAllowed2 = &mt('The following link is not allowed:').' ';      my $warningLinkNotAllowed2 = &mt('The following link is not allowed:').' ';
     my $warningLink = &mt('You must insert a title and a path!');  
     my $warningFolder = &mt('You must insert a title!');  
     my $warningDelete = &mt('Are you sure you want to delete the selected entries? Deleting a folder also deletes all entries within this folder!');      my $warningDelete = &mt('Are you sure you want to delete the selected entries? Deleting a folder also deletes all entries within this folder!');
     my $warningSave = &mt('You have unsaved changes. You can either save these changes now by clicking "OK" or click "Cancel" if you do not want to save your changes.');      my $warningSave = &mt('You have unsaved changes. You can either save these changes now by clicking "OK" or click "Cancel" if you do not want to save your changes.');
     my $warningMoveS = &mt('You must select at minimum one entry to move!');      my $warningMoveS = &mt('You must select at minimum one entry to move!');
     my $warningMoveD = &mt('You must select a destination folder!');      my $warningMoveD = &mt('You must select a destination folder!');
       &js_escape(\$warningLinkNotAllowed1);
       &js_escape(\$warningLinkNotAllowed2);
       &js_escape(\$warningDelete);
       &js_escape(\$warningSave);
       &js_escape(\$warningMoveS);
       &js_escape(\$warningMoveD);
     $foldersOption = '';      $foldersOption = '';
   
     my $js = &Apache::lonhtmlcommon::scripttag(<<JAVASCRIPT);      my $js = &Apache::lonhtmlcommon::scripttag(<<JAVASCRIPT);
Line 1131  sub wishlistView { Line 1135  sub wishlistView {
         }          }
         # entry is a link          # entry is a link
         else {          else {
               my $quotable_link = &Apache::loncommon::escape_single($n->value()->path());
             $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_view-$indentConst)<=0?$indentConst:$indent_view).'px; min-width: 220px;">'.              $wishlistHTMLview .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_view-$indentConst)<=0?$indentConst:$indent_view).'px; min-width: 220px;">'.
                                  '<a href="javascript:preview('."'".$n->value()->path()."'".');">'.                                   '<a href="javascript:preview('."'".$quotable_link."'".');">'.
                                  '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link" />'.                                   '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link" />'.
                                  $n->value()->title().'</a></td>';                                   $n->value()->title().'</a></td>';
         }          }
Line 1305  sub wishlistMove { Line 1310  sub wishlistMove {
                $highlight = 'style="color:red;"';                 $highlight = 'style="color:red;"';
             }              }
             # link-image and title              # link-image and title
               my $quotable_link = &Apache::loncommon::escape_single($n->value()->path());
             $wishlistHTMLmove .= '<td></td>'.              $wishlistHTMLmove .= '<td></td>'.
                                  '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<=0?$indentConst:$indent_move).'px; min-width: 220px;">'.                                   '<td id="padd'.$index.'" style="padding-left:'.(($indent_move-$indentConst)<=0?$indentConst:$indent_move).'px; min-width: 220px;">'.
                                  '<a href="javascript:preview('."'".$n->value()->path()."'".');" '.$highlight.'>'.                                   '<a href="javascript:preview('."'".$quotable_link."'".');" '.$highlight.'>'.
                                  '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.                                   '<img src="/res/adm/pages/wishlist-link.png" id="img'.$index.'" alt="link"/>'.
                                  $n->value()->title().'</a></td>';                                   $n->value()->title().'</a></td>';
         }          }
Line 1425  sub wishlistImport { Line 1431  sub wishlistImport {
         else {          else {
             $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_imp-$indentConst)<=0?$indentConst:$indent_imp).'px; min-width: 220px;">';              $wishlistHTMLimport .= '<td id="padd'.$index.'" style="padding-left:'.(($indent_imp-$indentConst)<=0?$indentConst:$indent_imp).'px; min-width: 220px;">';
             unless ($nopick{$n->value()->path()}) {              unless ($nopick{$n->value()->path()}) {
                 $wishlistHTMLimport .= '<a href="javascript:preview('."'".$n->value()->path()."'".');">';                  my $quotable_link = &Apache::loncommon::escape_single($n->value()->path());
                   $wishlistHTMLimport .= '<a href="javascript:preview('."'".$quotable_link."'".');">';
             }              }
             $wishlistHTMLimport .= '<img src="/res/adm/pages/'.$image.'" id="img'.$index.'" alt="link" />'.              $wishlistHTMLimport .= '<img src="/res/adm/pages/'.$image.'" id="img'.$index.'" alt="link" />'.
                                    '<span '.$style.'>'.$n->value()->title().'</span></a></td>';                                     '<span '.$style.'>'.$n->value()->title().'</span></a></td>';
Line 1658  sub makePopUpNewLink { Line 1665  sub makePopUpNewLink {
             ' or to external websites.'.              ' or to external websites.'.
             ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.              ' Paths to LON-CAPA resources must be of the form /res/domain/user/...'.
             ' Paths to external websites must contain the network protocol, e.g. http://...');              ' Paths to external websites must contain the network protocol, e.g. http://...');
       &js_escape(\$warningLink);
       &js_escape(\$warningLinkNotAllowed1);
   
     my $inPageWishlistlink1 = '<h1>'.&mt('Save to Stored Links').'</h1>';      my $inPageWishlistlink1 = '<h1>'.&mt('Save to Stored Links').'</h1>';
     # If no title is delivered, 'New Link' is called up from the wishlist-interface, so after      # If no title is delivered, 'New Link' is called up from the wishlist-interface, so after
Line 1761  sub makePopUpNewFolder { Line 1770  sub makePopUpNewFolder {
                                        'bgcolor'   => '#FFFFFF',});                                         'bgcolor'   => '#FFFFFF',});
   
     my $warningFolder = &mt('You must insert a title!');      my $warningFolder = &mt('You must insert a title!');
       &js_escape(\$warningFolder);
   
     my $inPageNewFolder = '<h1>'.&mt('New Folder').'</h1>'.      my $inPageNewFolder = '<h1>'.&mt('New Folder').'</h1>'.
                           '<form method="post" name="newfolder" action="/adm/wishlist" target="wishlist" '.                            '<form method="post" name="newfolder" action="/adm/wishlist" target="wishlist" '.
Removed from v.1.23  
changed lines
  Added in v.1.25

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