--- loncom/interface/lonparmset.pm 2009/05/06 16:19:34 1.444
+++ loncom/interface/lonparmset.pm 2009/05/08 22:47:01 1.445
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.444 2009/05/06 16:19:34 bisitz Exp $
+# $Id: lonparmset.pm,v 1.445 2009/05/08 22:47:01 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1321,12 +1321,8 @@ sub parmmenu {
ENDSCRIPT
- $r->print();
- $r->print('
');
- $r->print('');
- $r->print(''.&mt('Select Parameters to View').' ');
- $r->print(' | ');
- $r->print('');
+ $r->print();
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameters to View')));
$r->print("\n".''
);
- $r->print(' |
');
}
sub partmenu {
- my ($r,$allparts,$psprt)=@_;
- $r->print('');
- $r->print('');
- $r->print(''. &mt('Select Parts to View').' ');
- $r->print(' | ');
- $r->print('');
+ my ($r,$allparts,$psprt)=@_;
+
$r->print('');
- $r->print(' |
');
+ $r->print('');
}
sub usermenu {
@@ -1495,50 +1485,36 @@ function group_or_section(caller) {
$groups.='';
}
- if (%sectionhash || %grouphash) {
- $r->print('');
- $r->print('');
- $r->print(''.&mt('Group/Section').' ');
- $r->print(' | ');
- $r->print('');
- $r->print($sections.$groups);
- $r->print(' |
');
- }
- $r->print('');
- $r->print('');
- $r->print(''. &mt('User').' ');
- $r->print(' | ');
- $r->print('');
-
+ if (%sectionhash || %grouphash) {
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Group/Section')));
+ $r->print($sections.$groups);
+ }
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('User')));
$r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
,''
,' '
- ,$chooseopt));
-
- $r->print(' |
');
+ ,$chooseopt));
}
sub displaymenu {
my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
$r->print('');
$r->print('
Step 2
');
- $r->print('
');
- $r->print('');
-
- #$r->print(''.&mt('Select Parameters to View').' | '. &mt('Select Parts to View').' |
---|
');
+ $r->print(' ' );
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+
&parmmenu($r,$allparms,$pscat,$keyorder);
-
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parts to View')));
&partmenu($r,$allparts,$psprt);
- $r->print(' |
');
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print('');
}
-sub mapmenu {##
+sub mapmenu {
my ($r,$allmaps,$pschp,$maptitles)=@_;
- $r->print('');
- $r->print('');
- $r->print(''.&mt('Select Enclosing Map or Folder').' ');
- $r->print(' | ');
- $r->print('');
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Enclosing Map or Folder')));
$r->print('");
- $r->print(' |
');
+
}
sub levelmenu {
my ($r,$alllevs,$parmlev)=@_;
- $r->print('');
- $r->print('');
- $r->print(''.&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels').' ');
- $r->print(' | ');
- $r->print('');
+
+ $r->print(&Apache::lonhtmlcommon::row_title(&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels')));
$r->print('");
- $r->print(' |
');
+ $r->print("");
}
@@ -1889,21 +1861,22 @@ sub assessparms {
'" name="recent_'.$_.'" />');
}
- if (!$pssymb) {
+ if (!$pssymb) {
+
$r->print('');
$r->print('
Step 1
');
- $r->print('
');
- $r->print('');
+ $r->print('' );
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+
&levelmenu($r,\%alllevs,$parmlev);
- if ($parmlev ne 'general') {
-
- &mapmenu($r,\%allmaps,$pschp,\%maptitles);
-
+ if ($parmlev ne 'general') {
+ &mapmenu($r,\%allmaps,$pschp,\%maptitles);
}
- $r->print('
');
- $r->print('
');
- $r->print('
');
+
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print('');
+
&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
} else {
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
@@ -1915,12 +1888,12 @@ sub assessparms {
}
$r->print('');
$r->print('
Step 3
');
- $r->print('
');
- $r->print('');
- &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
- $r->print('
');
- $r->print('
');
- $r->print('
');
+ $r->print('' );
+ $r->print(&Apache::lonhtmlcommon::start_pick_box());
+ &usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+
+ $r->print(&Apache::lonhtmlcommon::end_pick_box());
+ $r->print('
');
$r->print(''.$message.'
');
@@ -3630,21 +3603,32 @@ ENDOVER
}
# Menu to select levels, etc
- $r->print('