[LON-CAPA-cvs] cvs: loncom /interface lonmsgdisplay.pm /interface/statistics lonproblemanalysis.pm lonstudentassessment.pm lonstudentsubmissions.pm lonsurveyreports.pm
bisitz
bisitz@source.lon-capa.org
Thu, 14 Jan 2010 17:20:52 -0000
bisitz Thu Jan 14 17:20:52 2010 EDT
Modified files:
/loncom/interface lonmsgdisplay.pm
/loncom/interface/statistics lonproblemanalysis.pm
lonstudentassessment.pm
lonstudentsubmissions.pm
lonsurveyreports.pm
Log:
Consistent screen ergonomics:
- First checkbox, then option text
- Removed special styles
Index: loncom/interface/lonmsgdisplay.pm
diff -u loncom/interface/lonmsgdisplay.pm:1.141 loncom/interface/lonmsgdisplay.pm:1.142
--- loncom/interface/lonmsgdisplay.pm:1.141 Wed Jan 13 18:23:01 2010
+++ loncom/interface/lonmsgdisplay.pm Thu Jan 14 17:20:44 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines for messaging display
#
-# $Id: lonmsgdisplay.pm,v 1.141 2010/01/13 18:23:01 bisitz Exp $
+# $Id: lonmsgdisplay.pm,v 1.142 2010/01/14 17:20:44 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2229,7 +2229,7 @@
<th>$ltext->{'setb'}</th>
<th>$ltext->{'even'}</th>
<th>$ltext->{'blck'}</th>
- <th>$ltext->{'actn'}?</th>
+ <th>$ltext->{'actn'}</th>
</tr>
END
foreach my $record (sort(keys(%{$records}))) {
@@ -2263,7 +2263,12 @@
}
$r->print(<<"END");
</td>
- <td><label>$lt{'modi'}? <input type="checkbox" name="modify_$parmcount" /></label><br /><label>$lt{'canc'}? <input type="checkbox" name="cancel_$parmcount" /></label>
+ <td><span class="LC_nobreak"><label>
+ <input type="checkbox" name="modify_$parmcount" />$lt{'modi'}
+ </label><br />
+ <label>
+ <input type="checkbox" name="cancel_$parmcount" />$lt{'canc'}
+ </label></span>
END
$r->print(&Apache::loncommon::end_data_table_row());
$parmcount++;
@@ -2300,7 +2305,7 @@
<th>$ltext->{'dura'}</th>
<th>$ltext->{'even'} $lt{'exam'}</th>
<th>$ltext->{'blck'}</th>
- <th>$ltext->{'actn'}?</th>
+ <th>$ltext->{'actn'}</th>
</tr>
END
$r->print(&Apache::loncommon::start_data_table_row());
@@ -2314,7 +2319,9 @@
}
$r->print(<<"END");
</td>
- <td><label>$lt{'addb'}? <input type="checkbox" name="add_$parmcount" value="1" /></label></td>
+ <td><label>
+ <input type="checkbox" name="add_$parmcount" value="1" />$lt{'addb'}
+ </label></td>
END
$r->print(&Apache::loncommon::end_data_table_row());
$r->print(&Apache::loncommon::end_data_table());
Index: loncom/interface/statistics/lonproblemanalysis.pm
diff -u loncom/interface/statistics/lonproblemanalysis.pm:1.137 loncom/interface/statistics/lonproblemanalysis.pm:1.138
--- loncom/interface/statistics/lonproblemanalysis.pm:1.137 Tue Apr 21 13:28:23 2009
+++ loncom/interface/statistics/lonproblemanalysis.pm Thu Jan 14 17:20:51 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonproblemanalysis.pm,v 1.137 2009/04/21 13:28:23 bisitz Exp $
+# $Id: lonproblemanalysis.pm,v 1.138 2010/01/14 17:20:51 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1901,16 +1901,16 @@
#
##
##
- $Str .= '<td align="right" valign="top">';
+ $Str .= '<td valign="top">';
##
my $showprob_checkbox =
- '<input type="checkbox" name="show_prob" value="true" ';
+ '<input type="checkbox" name="show_prob" value="true"';
if ($env{'form.show_prob'} eq 'true') {
- $showprob_checkbox .= 'checked="checked" ';
+ $showprob_checkbox .= ' checked="checked"';
}
$showprob_checkbox.= ' />';
$Str.= '<span class="LC_nobreak"><label>'.
- &mt('Show problem').' '.$showprob_checkbox.
+ $showprob_checkbox.' '.&mt('Show problem').
'</label></span><br />';
##
my $analyze_selector = '<select name="AnalyzeOver" >';
Index: loncom/interface/statistics/lonstudentassessment.pm
diff -u loncom/interface/statistics/lonstudentassessment.pm:1.158 loncom/interface/statistics/lonstudentassessment.pm:1.159
--- loncom/interface/statistics/lonstudentassessment.pm:1.158 Thu Oct 1 16:28:24 2009
+++ loncom/interface/statistics/lonstudentassessment.pm Thu Jan 14 17:20:51 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentassessment.pm,v 1.158 2009/10/01 16:28:24 bisitz Exp $
+# $Id: lonstudentassessment.pm,v 1.159 2010/01/14 17:20:51 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -671,11 +671,12 @@
# If we're showing links, show a checkbox to open in new
# windows.
if ($show_links ne 'no') {
- my $labeltext = &mt('Show links in new window:');
+ my $labeltext = &mt('Show links in new window');
$r->print(<<NEW_WINDOW_CHECKBOX);
<script type="text/javascript">new_window = true;</script>
-<p><label>$labeltext
+<p><label>
<input type="checkbox" checked="checked" onclick="new_window=this.checked" />
+$labeltext
</label></p>
NEW_WINDOW_CHECKBOX
}
Index: loncom/interface/statistics/lonstudentsubmissions.pm
diff -u loncom/interface/statistics/lonstudentsubmissions.pm:1.55 loncom/interface/statistics/lonstudentsubmissions.pm:1.56
--- loncom/interface/statistics/lonstudentsubmissions.pm:1.55 Wed Dec 16 13:01:01 2009
+++ loncom/interface/statistics/lonstudentsubmissions.pm Thu Jan 14 17:20:51 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonstudentsubmissions.pm,v 1.55 2009/12/16 13:01:01 bisitz Exp $
+# $Id: lonstudentsubmissions.pm,v 1.56 2010/01/14 17:20:51 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1145,18 +1145,21 @@
}
$prob_status_checkbox .= 'value="true" />';
#
- $Str .= '<td align="right" valign="top">'.
- '<label><b>'.
- &mt('Show problem').' '.$prob_checkbox.'</b></label><br />'.
- '<label><b>'.
- &mt('Show correct answers').' '.$ans_checkbox.'</b></label><br />'.
- '<label><b>'.
- &mt('Show all submissions').' '.$all_sub_checkbox.
- '</b></label><br />'.
- '<label><b>'.
- &mt('Show problem grading').' '.$prob_status_checkbox.
- '</b></label><br />'.
- '</td>';
+ $Str .=
+ '<td valign="top">'
+ .'<label>'
+ .$prob_checkbox.&mt('Show problem')
+ .'</label><br />'
+ .'<label>'
+ .' '.$ans_checkbox.&mt('Show correct answers')
+ .'</label><br />'
+ .'<label>'
+ .$all_sub_checkbox.&mt('Show all submissions')
+ .'</label><br />'
+ .'<label>'
+ .$prob_status_checkbox.&mt('Show problem grading')
+ .'</label>'
+ .'</td>';
#
$Str .= '<td align="center" valign="top">'.$output_selector.'</td>';
#
Index: loncom/interface/statistics/lonsurveyreports.pm
diff -u loncom/interface/statistics/lonsurveyreports.pm:1.22 loncom/interface/statistics/lonsurveyreports.pm:1.23
--- loncom/interface/statistics/lonsurveyreports.pm:1.22 Fri Dec 12 05:03:39 2008
+++ loncom/interface/statistics/lonsurveyreports.pm Thu Jan 14 17:20:52 2010
@@ -1,6 +1,6 @@
# The LearningOnline Network with CAPA
#
-# $Id: lonsurveyreports.pm,v 1.22 2008/12/12 05:03:39 raeburn Exp $
+# $Id: lonsurveyreports.pm,v 1.23 2010/01/14 17:20:52 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -98,7 +98,7 @@
#
$r->print('<hr />');
$r->print('<h4>'.
- &Apache::lonlocal::locallocaltime(time).','.
+ &Apache::lonlocal::locallocaltime(time).', '.
&Apache::lonstatistics::section_and_enrollment_description().
'</h4>');
$r->rflush();
@@ -658,11 +658,12 @@
$prob_checkbox .= 'checked="checked" ';
}
$prob_checkbox .= 'value="true" />';
- $Str .= '<td align="right" valign="top">'.
- '<label><b>'.
- &mt('Show problem [_1]',$prob_checkbox).'</b></label><br />'.
- '<label><b>'.
- '</td>';
+ $Str .=
+ '<td valign="top">'
+ .'<label>'
+ .$prob_checkbox.&mt('Show problem')
+ .'</label>'
+ .'</td>';
#
$Str .= &Apache::loncommon::end_data_table_row();
$Str .= &Apache::loncommon::end_data_table();