--- loncom/interface/lonparmset.pm 2010/01/10 21:14:14 1.490
+++ loncom/interface/lonparmset.pm 2010/07/29 21:16:44 1.500
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.490 2010/01/10 21:14:14 raeburn Exp $
+# $Id: lonparmset.pm,v 1.500 2010/07/29 21:16:44 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -248,37 +248,6 @@ Variables used (guessed by Jeremy):
=item parse_key()
-=item check_cloners() :
-
-Checks if new users included in list of allowed cloners
-are valid users. Replaces supplied list with
-cleaned list containing only users with valid usernames
-and domains.
-
-Inputs: $clonelist, $oldcloner
-where $clonelist is ref to array of requested cloners,
-and $oldcloner is ref to array of currently allowed
-cloners.
-
-Returns: string - comma separated list of requested
-cloners (username:domain) who do not exist in system.
-
-=item change_clone() :
-
-Modifies the list of courses a user can clone (stored
-in the user's environment.db file), called when a
-change is made to the list of users allowed to clone
-a course.
-
-Inputs: $action,$cloner
-where $action is add or drop, and $cloner is identity of
-user for whom cloning ability is to be changed in course.
-
-
-=item check_cloners()
-
-=item change_clone()
-
=item header()
Output html header for page
@@ -1361,13 +1330,17 @@ ENDSCRIPT
.''
);
}
- $r->print(''
- .'
'
+ );
$r->print(&Apache::lonhtmlcommon::row_closure(1));
}
@@ -1551,45 +1524,33 @@ sub parmboxes {
sub shortCuts {
my ($r,$allparms,$pscat,$keyorder)=@_;
- #part to print out the shortcuts for parmselection
- $r->print('
'
- .'
'
- .''
- .'
'
- .'
'
- .''
- .'
'
- .'
');
+ # Parameter Selection
+ $r->print(
+ &Apache::lonhtmlcommon::start_funclist(&mt('Parameter Selection'))
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Select All').'')
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Select Common Only').'')
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Unselect All').'')
+ .&Apache::lonhtmlcommon::end_funclist()
+ );
+
+ # Add Selection for...
+ $r->print(
+ &Apache::lonhtmlcommon::start_funclist(&mt('Add Selection for...'))
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Problem Dates').'')
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Content Dates').'')
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Discussion Settings').'')
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Visibilities').'')
+ .&Apache::lonhtmlcommon::add_item_funclist(
+ ''.&mt('Part Parameters').'')
+ .&Apache::lonhtmlcommon::end_funclist()
+ );
}
sub partmenu {
@@ -1721,21 +1682,16 @@ sub displaymenu {
&parmmenu($r,$allparms,$pscat,$keyorder);
$r->print(&Apache::lonhtmlcommon::end_pick_box());
&parmboxes($r,$allparms,$pscat,$keyorder);
- $r->print(&Apache::lonhtmlcommon::start_pick_box());
- $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
- &partmenu($r,$allparts,$psprt);
- $r->print(&Apache::lonhtmlcommon::row_closure(1));
- $r->print(&Apache::lonhtmlcommon::end_pick_box());
}
sub mapmenu {
- my ($r,$allmaps,$pschp,$maptitles, $symbp)=@_;
+ my ($r,$allmaps,$pschp,$maptitles,$symbp)=@_;
my %allmaps_inverted = reverse %$allmaps;
my $navmap = Apache::lonnavmaps::navmap->new();
my $tree=[];
my $treeinfo={};
if (defined($navmap)) {
- my $it=$navmap->getIterator(undef,undef,undef,1,undef,undef);
+ my $it=$navmap->getIterator(undef,undef,undef,1,1,undef);
my $curRes;
my $depth = 0;
my %parent = ();
@@ -1780,35 +1736,58 @@ sub mapmenu {
$r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder'),'','',' id="mapmenu"'));
if ((ref($tree) eq 'ARRAY') && (ref($treeinfo) eq 'HASH')) {
my $icon = '';
- $r->print(&Apache::loncommon::start_data_table()
- .&Apache::loncommon::start_data_table_row()
- .'
'.$icon
- .'
'
- .&Apache::loncommon::end_data_table_row()
+ my $whitespace =
+ '';
+
+ # Info about selectable folders/maps
+ $r->print(
+ '
'
+ .&mt('You can only select those maps and folders which can be currently parameterized.')
+ # .' '.&Apache::loncommon::help_open_topic('...') # Later: Add further help
+ .'
'
);
- my $whitespace = '';
+
+
+ $r->print(&Apache::loncommon::start_data_table());
+
+ # Display row: "All Maps or Folders"
+ $r->print(
+ &Apache::loncommon::start_data_table_row()
+ .'