--- loncom/interface/lonwishlist.pm 2012/05/15 01:41:27 1.12 +++ loncom/interface/lonwishlist.pm 2014/01/29 16:25:44 1.19 @@ -1,7 +1,7 @@ # The LearningOnline Network with CAPA # Utility-routines for wishlist # -# $Id: lonwishlist.pm,v 1.12 2012/05/15 01:41:27 raeburn Exp $ +# $Id: lonwishlist.pm,v 1.19 2014/01/29 16:25:44 bisitz Exp $ # # Copyright Michigan State University Board of Trustees # @@ -50,7 +50,7 @@ use Apache::lonnet; use Apache::loncommon(); use Apache::lonhtmlcommon; use Apache::lonlocal; -use LONCAPA; +use LONCAPA qw(:DEFAULT :match); use Tree; @@ -466,11 +466,13 @@ sub getNodesToArray { Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level). -=item * &wishlistImport(nodes) +=item * &wishlistImport(nodes, numskipped) Returns the table-HTML-markup for the wishlist in mode "import". - Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level). - + Recursive call starting with all children of the root of the tree (parameter nodes is reference to an array containing the nodes of the current level). + Side effect: increments the scalar ref: numskipped with a count of items in + Stored Links unavailable for selection, (e.g., now marked obsolete or + inaccessible in Community context). =item * &makePage(mode, marked) @@ -528,14 +530,16 @@ sub JSforWishlist { # that means that it is checked wether a path contains .problem, .quiz, .exam etc. # this is good for most cases but crashes as soon as a real external website contains one of this pattern in its URL. # so maybe there's a better way to find out wether a given URL belongs to a LON-CAPA-server or not ...? - my $warningLinkNotAllowed1 = &mt('You can only insert links to LON-CAPA resources from the resource-pool '. - 'or to external websites. Paths to LON-CAPA resources must be of the form /res/dom/usr... . '. - 'Paths to external websites must contain the network protocol (e.g. http://...).'); - my $warningLinkNotAllowed2 = &mt('The following link is not allowed: '); + my $warningLinkNotAllowed1 = + &mt('You can only insert links to LON-CAPA resources from the resource-pool'. + ' or to external websites.'. + ' 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://...'); + 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 $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 $warningMoveD = &mt('You must select a destination folder!'); $foldersOption = ''; @@ -808,7 +812,9 @@ sub JSforWishlist { function setChecked(row,checked) { var childCHECK = document.getElementById(row.id.replace('row','check')); - childCHECK.checked = checked; + if (!childCHECK.disabled) { + childCHECK.checked = checked; + } } function getPreviousFolderRows(row) { @@ -1008,14 +1014,18 @@ sub JSforWishlist { function checkAll() { var checkboxes = document.getElementsByName('check'); for (var i = 0; i < checkboxes.length; i++) { - checkboxes[i].checked = "checked"; + if (!checkboxes[i].disabled) { + checkboxes[i].checked = "checked"; + } } } function uncheckAll() { var checkboxes = document.getElementsByName('check'); for (var i = 0; i < checkboxes.length; i++) { - checkboxes[i].checked = ""; + if (!checkboxes[i].disabled) { + checkboxes[i].checked = ""; + } } } @@ -1088,7 +1098,7 @@ JAVASCRIPT # HTML-Markup for table if in view-mode my $wishlistHTMLview; -my $indent = $indentConst; +my $indent_view = $indentConst; sub wishlistView { my $nodes = shift; @@ -1107,7 +1117,7 @@ sub wishlistView { # entry is a folder if ($n->value()->path() eq '') { - $wishlistHTMLview .= ''. + $wishlistHTMLview .= ''. ''. ''. 'folder'. @@ -1115,7 +1125,7 @@ sub wishlistView { } # entry is a link else { - $wishlistHTMLview .= ''. + $wishlistHTMLview .= ''. 'value()->path()."'".');">'. 'link'. $n->value()->title().''; @@ -1145,9 +1155,9 @@ sub wishlistView { # if the entry is a folder, it could have other entries as content. if it has, call wishlistView for those entries my @children = $n->children(); if ($#children >=0) { - $indent += 20; + $indent_view += 20; &wishlistView(\@children); - $indent -= 20; + $indent_view -= 20; } } } @@ -1155,7 +1165,7 @@ sub wishlistView { # HTML-Markup for table if in edit-mode my $wishlistHTMLedit; -my $indent = $indentConst; +my $indent_edit = $indentConst; sub wishlistEdit { my $nodes = shift; my $curNode = 1; @@ -1190,7 +1200,7 @@ sub wishlistEdit { if ($n->value()->path() eq '') { $wishlistHTMLedit .= ''. - ''. + ''. ''. ''. 'folder'. @@ -1202,7 +1212,7 @@ sub wishlistEdit { else { $wishlistHTMLedit .= ''. - ''. + ''. 'link'. ''. ''; @@ -1232,9 +1242,9 @@ sub wishlistEdit { # if the entry is a folder, it could have other entries as content. if it has, call wishlistEdit for those entries my @children = $n->children(); if ($#children >=0) { - $indent += 20; + $indent_edit += 20; &wishlistEdit(\@children); - $indent -= 20; + $indent_edit -= 20; } } } @@ -1244,7 +1254,7 @@ sub wishlistEdit { # HTML-Markup for table if in move-mode my $wishlistHTMLmove =''. ''.&mt('Top level').''; -my $indent = $indentConst; +my $indent_move = $indentConst; sub wishlistMove { my $nodes = shift; my $marked = shift; @@ -1268,12 +1278,12 @@ sub wishlistMove { # display a radio-button, if the folder was not selected to be moved if (!$isIn) { $wishlistHTMLmove .= ''. - ''; + ''; } - # higlight the title, if the folder was selected to be moved + # highlight the title, if the folder was selected to be moved else { $wishlistHTMLmove .= ''. - ''; } #arrow- and folder-image, all folders are open, and title @@ -1290,7 +1300,7 @@ sub wishlistMove { } # link-image and title $wishlistHTMLmove .= ''. - ''. + ''. 'value()->path()."'".');" '.$highlight.'>'. 'link'. $n->value()->title().''; @@ -1320,9 +1330,9 @@ sub wishlistMove { # if the entry is a folder, it could have other entries as content. if it has, call wishlistMove for those entries my @children = $n->children(); if ($#children >=0) { - $indent += 20; + $indent_move += 20; &wishlistMove(\@children, $marked); - $indent -= 20; + $indent_move -= 20; } } } @@ -1331,13 +1341,33 @@ sub wishlistMove { # HTML-Markup for table if in import-mode my $wishlistHTMLimport; -my $indent = $indentConst; +my $indent_imp = $indentConst; my $form = 1; sub wishlistImport { - my $nodes = shift; + my ($nodes,$numskipped) = @_; + + my ($is_community,%nopick); + if ($env{'request.course.id'}) { + if (&Apache::loncommon::course_type() eq 'Community') { + $is_community = 1; + } + } foreach my $n (@$nodes) { my $index = $n->value()->nindex(); + if ($n->value()->path() =~ m{^(/res/$match_domain/$match_username/)}) { + if ($is_community) { + unless (&Apache::lonnet::allowed('bro',$n->value()->path())) { + $nopick{$n->value()->path()} = $n->value()->title(); + $$numskipped ++; + } + } else { + unless (&Apache::lonnet::allowed('bre',$n->value()->path())) { + $nopick{$n->value()->path()} = $n->value()->title(); + $$numskipped ++; + } + } + } # start row, use data_table routines to set class to LC_even or LC_odd automatically. this row contains a checkbox, the title and the note-icon. # only display the top level entries on load @@ -1346,17 +1376,26 @@ sub wishlistImport { # checkboxes - $wishlistHTMLimport .= ''. - ''. + $wishlistHTMLimport .= ''; + my ($disabled,$onclick,$image,$style); + if ($nopick{$n->value()->path()}) { + $disabled = ' disabled="disabled"'; + $image = 'wishlist-link-lighter.png'; + $style = 'style="color:#808080;"'; + } else { + $onclick = ' onclick="selectAction('."'row".$index."'".')"'; + $image = 'wishlist-link.png'; + } + $wishlistHTMLimport .= ''. ''. ''. - ''. - ''; + ''; + $wishlistHTMLimport .= ''; # entry is a folder if ($n->value()->path() eq '') { - $wishlistHTMLimport .= ''. + $wishlistHTMLimport .= ''. ''. ''. 'folder'. @@ -1364,10 +1403,12 @@ sub wishlistImport { } # entry is a link else { - $wishlistHTMLimport .= ''. - 'value()->path()."'".');">'. - 'link'. - $n->value()->title().''; + $wishlistHTMLimport .= ''; + unless ($nopick{$n->value()->path()}) { + $wishlistHTMLimport .= 'value()->path()."'".');">'; + } + $wishlistHTMLimport .= 'link'. + ''.$n->value()->title().''; $form++; } @@ -1395,11 +1436,12 @@ sub wishlistImport { # if the entry is a folder, it could have other entries as content. if it has, call wishlistImport for those entries my @children = $n->children(); if ($#children >=0) { - $indent += 20; - &wishlistImport(\@children); - $indent -= 20; + $indent_imp += 20; + &wishlistImport(\@children,$numskipped); + $indent_imp -= 20; } } + return; } # Returns the HTML-Markup for wishlist @@ -1421,7 +1463,7 @@ sub makePage { 'onload' => 'javascript:onLoadAction('."'".$mode."'".');', 'onunload' => 'javascript:window.name = '."'loncapaclient'"}}); - my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist')); + my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links'),'Wishlist'); # get javascript-code for wishlist-interactions my $js = &JSforWishlist(); @@ -1513,7 +1555,7 @@ sub makePage { $inner .= &Apache::loncommon::end_data_table(); } else { - $inner .= ''.&mt("Your Store Links list is currently empty.").''; + $inner .= ''.&mt("Your Stored Links list is currently empty.").''; } $wishlistHTMLedit = ''; } @@ -1591,9 +1633,11 @@ sub makePopUpNewLink { 'bgcolor' => '#FFFFFF',}); my $warningLink = &mt('You must insert a title!'); - my $warningLinkNotAllowed1 = &mt('You can only insert links to LON-CAPA resources from the resource-pool '. - 'or to external websites. Paths to LON-CAPA resources must be of the form /res/dom/usr... . '. - 'Paths to external websites must contain the network protocol (e.g. http://...).'); + my $warningLinkNotAllowed1 = + &mt('You can only insert links to LON-CAPA resources from the resource-pool'. + ' or to external websites.'. + ' 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://...'); my $inPageWishlistlink1 = '

'.&mt('Save to Stored Links').'

'; # If no title is delivered, 'New Link' is called up from the wishlist-interface, so after @@ -1623,7 +1667,7 @@ sub makePopUpNewLink { ''. - ''. + ''. ''; $options = ''; @@ -1742,25 +1786,28 @@ SCRIPT # Returns the HTML-Markup for the page, shown when a link was set sub makePageSet { - # start_page - my $startPage = &Apache::loncommon::start_page('Stored Links',undef, - {'only_body' => 1}); + my $title = 'Stored Links'; + + # start_page + my $output = + &Apache::loncommon::start_page($title,undef, + {'only_body' => 1}) + .'

'.&mt($title).'

'; # confirm success and offer link to wishlist - my $message = &Apache::lonhtmlcommon::confirm_success(&mt('Link successfully saved!')); - $message = &Apache::loncommon::confirmwrapper($message); - - my $inner .= '
'.$message.'

'. - ''.&mt('Go to Stored Links').''.(' ' x 3). - ''.&mt('Close this window').''; + $output .= + &Apache::loncommon::confirmwrapper( + &Apache::lonhtmlcommon::confirm_success( + &mt('Link successfully saved!'))) + .&Apache::lonhtmlcommon::actionbox( + [''.&mt('Go to Stored Links').'', + ''.&mt('Close this window').'' + ]); # end_page - my $endPage = &Apache::loncommon::end_page(); - - # put all page-elements together - my $page = $startPage.$inner.$endPage; + $output .= &Apache::loncommon::end_page(); - return $page; + return $output; } @@ -1781,14 +1828,21 @@ sub makePageImport { my $inner = '

'.&mt('Import Resources from Stored Links').'

'; if (!$rat) { - $inner .= '

'.&mt("Please note that you can use the checkboxes corresponding to a folder to ". - "easily check all links within this folder. The folder structure itself can't be imported. ". - "All checked links will be imported into the current folder of your course.").'

'; + $inner .= + ''; } else { - $inner .= '

'.&mt("Please note that you can use the checkboxes corresponding to a folder to ". - "easily check all links within this folder. The folder structure itself can't be imported. ") - .'

'; + $inner .= + ''; } my %wishlist = &getWishlist(); @@ -1813,13 +1867,17 @@ sub makePageImport { # wishlist-table - &wishlistImport(\@childrenRt); + my $numskipped = 0; + &wishlistImport(\@childrenRt,\$numskipped); if ($wishlistHTMLimport ne '') { $inner .= ''.$wishlistHTMLimport.'
'; } else { $inner .= ''.&mt("Your Stored Links list is currently empty.").''; } + if ($numskipped > 0) { + $inner .= '

'.&mt('Note: where a Stored Link is unavailable for import in the current context it is grayed out.').'

'; + } $wishlistHTMLimport = ''; $inner .= ''; @@ -1839,14 +1897,14 @@ sub makeErrorPage { # breadcrumbs and start_page &Apache::lonhtmlcommon::add_breadcrumb( { href => '/adm/wishlist', - text => 'Wishlist'}); + text => 'Stored Links'}); my $startPage = &Apache::loncommon::start_page('Stored Links'); - my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist')); + my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links'),'Wishlist'); &Apache::lonhtmlcommon::clear_breadcrumbs(); # error-message - my $inner .= ''.&mt('An error occurred! Please try again later.').''; + my $inner .= '

'.&mt('An error occurred! Please try again later.').'

'; # end_page my $endPage = &Apache::loncommon::end_page();