[LON-CAPA-cvs] cvs: loncom /homework bridgetask.pm /html/res/adm/pages/annotator admannotations.pm /interface lonaboutme.pm slotrequest.pm
bisitz
bisitz@source.lon-capa.org
Fri, 20 Mar 2009 10:05:08 -0000
bisitz Fri Mar 20 10:05:08 2009 EDT
Modified files:
/loncom/html/res/adm/pages/annotator admannotations.pm
/loncom/homework bridgetask.pm
/loncom/interface lonaboutme.pm slotrequest.pm
Log:
Standard texthash calls:
- Direct call
- Keys and values in (single) quotes
- Standard indent
Index: loncom/html/res/adm/pages/annotator/admannotations.pm
diff -u loncom/html/res/adm/pages/annotator/admannotations.pm:1.34 loncom/html/res/adm/pages/annotator/admannotations.pm:1.35
--- loncom/html/res/adm/pages/annotator/admannotations.pm:1.34 Thu Feb 19 22:05:28 2009
+++ loncom/html/res/adm/pages/annotator/admannotations.pm Fri Mar 20 10:04:53 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# This will take annotations and then plug them into a page.
#
-# $Id: admannotations.pm,v 1.34 2009/02/19 22:05:28 schafran Exp $
+# $Id: admannotations.pm,v 1.35 2009/03/20 10:04:53 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -75,10 +75,11 @@
my $get_symb = &js_get_symb();
- my %lt = ( 'close no save' => "Close",
- 'save' => "Save",
- 'cancel' => "Cancel",);
- %lt = &Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'close no save' => 'Close',
+ 'save' => 'Save',
+ 'cancel' => 'Cancel',
+ );
my $js = <<ENDJS;
<script type="text/javascript">
@@ -146,9 +147,10 @@
{'only_body' => 1,});
my $end_page = &Apache::loncommon::end_page();
- my %lt = ( 'close' => "Close",
- 'button' => $button_name,);
- %lt = &Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'close' => 'Close',
+ 'button' => $button_name,
+ );
return(<<END_HTML2)
$start_page
Index: loncom/homework/bridgetask.pm
diff -u loncom/homework/bridgetask.pm:1.244 loncom/homework/bridgetask.pm:1.245
--- loncom/homework/bridgetask.pm:1.244 Mon Mar 9 01:58:47 2009
+++ loncom/homework/bridgetask.pm Fri Mar 20 10:05:00 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: bridgetask.pm,v 1.244 2009/03/09 01:58:47 weissno Exp $
+# $Id: bridgetask.pm,v 1.245 2009/03/20 10:05:00 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -493,13 +493,13 @@
my $file_list = &file_list($Apache::lonhomework::history{"resource.$version.0.bridgetask.portfiles"});
- my %lt=('done' => 'Next Item',
- 'stop' => 'Quit Grading',
- 'fail' => 'Fail Rest',
- 'cancel' => 'Cancel',
- 'submit' => 'Submit Grades',
- );
- %lt=&Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'done' => 'Next Item',
+ 'stop' => 'Quit Grading',
+ 'fail' => 'Fail Rest',
+ 'cancel' => 'Cancel',
+ 'submit' => 'Submit Grades',
+ );
my $result=<<INFO;
<div class="LC_GRADING_maincontrols">
@@ -2983,13 +2983,13 @@
my $link=&link($id);
my $version = &get_version();
my $status = &get_criteria('status',$version,$dim,$id);
- my %lt = ( 'ungraded' => 'Ungraded',
- 'fail' => 'Fail',
- 'pass' => 'Pass',
- 'review' => 'Review',
- 'comment' => 'Additional Comment for Student',
- );
- %lt = &Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'ungraded' => 'Ungraded',
+ 'fail' => 'Fail',
+ 'pass' => 'Pass',
+ 'review' => 'Review',
+ 'comment' => 'Additional Comment for Student',
+ );
my $comment = &get_criteria('comment',$version,$dim,$id);
$comment = &HTML::Entities::encode($comment,'<>"&');
my %checked;
Index: loncom/interface/lonaboutme.pm
diff -u loncom/interface/lonaboutme.pm:1.112 loncom/interface/lonaboutme.pm:1.113
--- loncom/interface/lonaboutme.pm:1.112 Wed Mar 18 16:35:38 2009
+++ loncom/interface/lonaboutme.pm Fri Mar 20 10:05:08 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Personal Information Page
#
-# $Id: lonaboutme.pm,v 1.112 2009/03/18 16:35:38 schualex Exp $
+# $Id: lonaboutme.pm,v 1.113 2009/03/20 10:05:08 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -466,10 +466,10 @@
my $query_string = &build_query_string();
my $output;
my %lt = &Apache::lonlocal::texthash(
- vpfi => 'Viewable portfolio files',
- vgpf => 'Viewable group portfolio files',
- difl => 'Display file listing',
- );
+ 'vpfi' => 'Viewable portfolio files',
+ 'vgpf' => 'Viewable group portfolio files',
+ 'difl' => 'Display file listing',
+ );
if ($filecounts->{'both'} > 0) {
$output = '<div class="LC_ContentBoxSpecial"><h4 class="LC_hcell">';
$output .= ($is_course?$lt{'vgpf'}:$lt{'vpfi'}).'</h4>';
@@ -575,10 +575,11 @@
sub display_portfolio_files {
my ($r,$is_course) = @_;
my ($cdom,$cnum,$name) = &aboutme_info($r,$is_course);
- my %lt = ( withoutpass => 'passphrase not required',
- withpass => 'passphrase protected',
- both => 'all access types ',);
- %lt = &Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'withoutpass' => 'passphrase not required',
+ 'withpass' => 'passphrase protected',
+ 'both' => 'all access types ',
+ );
my $portaccess = 'withoutpass';
if (exists($env{'form.portaccess'})) {
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.89 loncom/interface/slotrequest.pm:1.90
--- loncom/interface/slotrequest.pm:1.89 Sun Mar 1 03:23:18 2009
+++ loncom/interface/slotrequest.pm Fri Mar 20 10:05:08 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler for requesting to have slots added to a students record
#
-# $Id: slotrequest.pm,v 1.89 2009/03/01 03:23:18 raeburn Exp $
+# $Id: slotrequest.pm,v 1.90 2009/03/20 10:05:08 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -397,8 +397,10 @@
'<input type="hidden" name="'.$parm.'" value="'
.&HTML::Entities::encode($env{'form.'.$parm},'"<>&\'').'" />'."\n";
}
- my %lt = &Apache::lonlocal::texthash('yes' => 'Yes',
- 'no' => 'No',);
+ my %lt = &Apache::lonlocal::texthash(
+ 'yes' => 'Yes',
+ 'no' => 'No',
+ );
$r->print(<<"END_CONFIRM");
<p> $msg </p>
<form action="/adm/slotrequest" method="post">
@@ -665,10 +667,11 @@
return 1;
}
- my %lt=('request'=>"Availibility list",
- 'try' =>'Try again?',
- 'or' => 'or');
- %lt=&Apache::lonlocal::texthash(%lt);
+ my %lt = &Apache::lonlocal::texthash(
+ 'request' => 'Availibility list',
+ 'try' => 'Try again?',
+ 'or' => 'or',
+ );
my $extra_input;
if ($conflictable_slot) {