[LON-CAPA-cvs] cvs: loncom /interface lonparmset.pm
neumanie
neumanie@source.lon-capa.org
Tue, 05 May 2009 16:53:25 -0000
This is a MIME encoded message
--neumanie1241542405
Content-Type: text/plain
neumanie Tue May 5 16:53:25 2009 EDT
Modified files:
/loncom/interface lonparmset.pm
Log:
First iteration of design change in the table mode
--neumanie1241542405
Content-Type: text/plain
Content-Disposition: attachment; filename="neumanie-20090505165325.txt"
Index: loncom/interface/lonparmset.pm
diff -u loncom/interface/lonparmset.pm:1.442 loncom/interface/lonparmset.pm:1.443
--- loncom/interface/lonparmset.pm:1.442 Sun Apr 5 17:31:04 2009
+++ loncom/interface/lonparmset.pm Tue May 5 16:53:25 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set parameters for assessments
#
-# $Id: lonparmset.pm,v 1.442 2009/04/05 17:31:04 droeschl Exp $
+# $Id: lonparmset.pm,v 1.443 2009/05/05 16:53:25 neumanie Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1322,6 +1322,11 @@
</script>
ENDSCRIPT
$r->print();
+ $r->print('<tr>');
+ $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+ $r->print('<blockquote>'.&mt('Select Parameters to View').'</blockquote>');
+ $r->print('</td>');
+ $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
$r->print("\n".'<table id="LC_parm_overview_parm_menu"><tr>');
my $cnt=0;
foreach $tempkey (&keysindisplayorder($allparms,$keyorder)) {
@@ -1379,10 +1384,16 @@
.'</td>'
.'</tr></table>'
);
+ $r->print('</blockquote></td></tr>');
}
sub partmenu {
my ($r,$allparts,$psprt)=@_;
+ $r->print('<tr>');
+ $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+ $r->print('<blockquote>'. &mt('Select Parts to View').'</blockquote>');
+ $r->print('</td>');
+ $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
$r->print('<select multiple="multiple" name="psprt" size="8">');
$r->print('<option value="all"');
$r->print(' selected="selected"') unless (@{$psprt});
@@ -1401,6 +1412,7 @@
}
}
$r->print('</select>');
+ $r->print('</blockquote></td></tr>');
}
sub usermenu {
@@ -1417,7 +1429,7 @@
my $g_s_header='';
my $g_s_footer='';
-
+
if (%sectionhash) {
$sections=&mt('Section:').' <select name="csec"';
if (%grouphash && $parmlev ne 'full') {
@@ -1483,39 +1495,50 @@
$groups.='</select>';
}
- if (%sectionhash || %grouphash) {
- $g_s_header='<fieldset><legend>'.&mt('Group/Section').'</legend><div>';
- $g_s_footer='</div></fieldset>';
- }
-
- $r->print('<b>'
- .$g_s_header
- .$sections
- .$groups
- .$g_s_footer
- .'<fieldset><legend>'.&mt('User').'</legend><div>'
- .&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
+ if (%sectionhash || %grouphash) {
+ $r->print('<tr>');
+ $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+ $r->print('<blockquote>'.&mt('Group/Section').'</blockquote>');
+ $r->print('</td>');
+ $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
+ $r->print($sections.$groups);
+ $r->print('</blockquote></td></tr>');
+ }
+ $r->print('<tr>');
+ $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+ $r->print('<blockquote>'. &mt('User').'</blockquote>');
+ $r->print('</td>');
+ $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
+
+ $r->print(&mt('For User [_1] or Student/Employee ID [_2] at Domain [_3]'
,'<input type="text" value="'.$uname.'" size="12" name="uname" />'
,'<input type="text" value="'.$id.'" size="12" name="id" /> '
- ,$chooseopt)
- .'</div></fieldset>'
- .'</b>'
- );
+ ,$chooseopt));
+
+ $r->print('</blockquote></td></tr>');
}
sub displaymenu {
my ($r,$allparms,$allparts,$pscat,$psprt,$keyorder)=@_;
- $r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'.
- &mt('Select Parts to View').'</th></tr><tr><td>');
+ $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<h2 class="LC_hcell">Step 2</h2>');
+ $r->print('<blockquote>');
+ $r->print('<table border="0" style="border-style:solid;border-collapse:seperate;text-align:left;margin-left:auto;margin-right:auto;border-spacing:0pt;">');
+
+ #$r->print('<table border="1"><tr><th>'.&mt('Select Parameters to View').'</th><th>'. &mt('Select Parts to View').'</th></tr><tr><td>');
&parmmenu($r,$allparms,$pscat,$keyorder);
- $r->print('</td><td valign="top" align="center">');
+
&partmenu($r,$allparts,$psprt);
- $r->print('</td></tr></table>');
+ $r->print('</table></blockquote></div>');
}
-sub mapmenu {
- my ($r,$allmaps,$pschp,$maptitles)=@_;
- $r->print('<b>'.&mt('Select Enclosing Map or Folder').'</b> ');
+sub mapmenu {##
+ my ($r,$allmaps,$pschp,$maptitles)=@_;
+ $r->print('<tr>');
+ $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+ $r->print('<blockquote>'.&mt('Select Enclosing Map or Folder').'</blockquote>');
+ $r->print('</td>');
+ $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
$r->print('<select name="pschp">');
$r->print('<option value="all">'.&mt('All Maps or Folders').'</option>');
foreach (sort {$$allmaps{$a} cmp $$allmaps{$b}} keys %{$allmaps}) {
@@ -1524,12 +1547,16 @@
$r->print('>'.$$maptitles{$_}.($$allmaps{$_}!~/^uploaded/?' ['.$$allmaps{$_}.']':'').'</option>');
}
$r->print("</select>");
+ $r->print('</blockquote></td></tr>');
}
sub levelmenu {
- my ($r,$alllevs,$parmlev)=@_;
- $r->print('<b>'.&mt('Select Parameter Level').
- &Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</b> ');
+ my ($r,$alllevs,$parmlev)=@_;
+ $r->print('<tr>');
+ $r->print('<td style="width:350px;border:1pt solid;font-weight:bold;color:#000000;background-color:#ccccff;vertical-align:top;">');
+ $r->print('<blockquote>'.&mt('Select Parameter Level').&Apache::loncommon::help_open_topic('Course_Parameter_Levels').'</blockquote>');
+ $r->print('</td>');
+ $r->print('<td style="width:700px; border:1pt solid;padding-left:10px"><blockquote>');
$r->print('<select name="parmlev">');
foreach (reverse sort keys %{$alllevs}) {
$r->print('<option value="'.$$alllevs{$_}.'"');
@@ -1539,6 +1566,7 @@
$r->print('>'.&mt($_).'</option>');
}
$r->print("</select>");
+ $r->print('</blockquote></td></tr>');
}
@@ -1861,16 +1889,21 @@
'" name="recent_'.$_.'" />');
}
- if (!$pssymb) {
- $r->print('<table border="1"><tr><td>');
+ if (!$pssymb) {
+ $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<h2 class="LC_hcell">Step 1</h2>');
+ $r->print('<blockquote>');
+ $r->print('<table border="0" style="border-style:solid;border-collapse:seperate;text-align:left;margin-left:auto;margin-right:auto;border-spacing:0pt;">');
&levelmenu($r,\%alllevs,$parmlev);
- $r->print('</td>');
+
if ($parmlev ne 'general') {
- $r->print('<td>');
+
&mapmenu($r,\%allmaps,$pschp,\%maptitles);
- $r->print('</td>');
+
}
- $r->print('</tr></table>');
+ $r->print('</table>');
+ $r->print('</blockquote>');
+ $r->print('</div>');
&displaymenu($r,\%allparms,\%allparts,\@pscat,\@psprt,\%keyorder);
} else {
my ($map,$id,$resource)=&Apache::lonnet::decode_symb($pssymb);
@@ -1880,7 +1913,14 @@
'<br /><label><b>'.&mt('Show all parts').': <input type="checkbox" name="psprt" value="all"'.
($env{'form.psprt'}?' checked="checked"':'').' /></b></label><br />');
}
+ $r->print('<div class="LC_ContentBoxSpecial">');
+ $r->print('<h2 class="LC_hcell">Step 3</h2>');
+ $r->print('<blockquote>');
+ $r->print('<table border="0" style="border-style:solid;border-collapse:seperate;text-align:left;margin-left:auto;margin-right:auto;border-spacing:0pt;">');
&usermenu($r,$uname,$id,$udom,$csec,$cgroup,$parmlev,\@usersgroups);
+ $r->print('</table>');
+ $r->print('</blockquote>');
+ $r->print('</div>');
$r->print('<p>'.$message.'</p>');
--neumanie1241542405--