[LON-CAPA-cvs] cvs: loncom /interface londocs.pm
bisitz
bisitz@source.lon-capa.org
Fri, 05 Feb 2010 12:46:40 -0000
bisitz Fri Feb 5 12:46:40 2010 EDT
Modified files:
/loncom/interface londocs.pm
Log:
- Corrected wording: "Recover Deleted ..." actually allows to recover all kind of documents, not only resources.
- Consistent wording: Course Editor
- Consistent wording: Course Documents (Don't use "DOCS" anymore)
- Optimized mt usage (spacing, HTML tags)
- Consistent styles ("Done")
- Separate footer from content ("Verify Content", "Symb List")
- XHTML (<p>)
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.418 loncom/interface/londocs.pm:1.419
--- loncom/interface/londocs.pm:1.418 Tue Feb 2 01:28:10 2010
+++ loncom/interface/londocs.pm Fri Feb 5 12:46:40 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Documents
#
-# $Id: londocs.pm,v 1.418 2010/02/02 01:28:10 raeburn Exp $
+# $Id: londocs.pm,v 1.419 2010/02/05 12:46:40 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -120,12 +120,19 @@
my $crstype = &Apache::loncommon::course_type();
if ($home+$other==0) { return ''; }
if ($home) {
- my $link = "<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \"".&mt('Dump '.$crstype.' DOCS to Construction Space')."\")'>".&mt('Dump '.$crstype.' DOCS to Construction Space')."</a>";
- return $link.' '.
- &Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs').'<br />';
+ my $link =
+ "<a onclick='javascript:injectData(document.courseverify, \"dummy\", \"dumpcourse\", \""
+ .&mt('Dump '.$crstype.' Documents to Construction Space')
+ ."\")'>"
+ .&mt('Dump '.$crstype.' Documents to Construction Space')
+ .'</a>';
+ return
+ $link.' '
+ .&Apache::loncommon::help_open_topic('Docs_Dump_Course_Docs')
+ .'<br />';
} else {
- return &mt('Dump '.$crstype.
- ' DOCS to Construction Space: available on other servers');
+ return
+ &mt('Dump '.$crstype.' Documents to Construction Space: available on other servers');
}
}
@@ -140,9 +147,9 @@
sub dumpcourse {
my ($r) = @_;
my $crstype = &Apache::loncommon::course_type();
- $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' DOCS to Construction Space').
+ $r->print(&Apache::loncommon::start_page('Dump '.$crstype.' Documents to Construction Space').
'<form name="dumpdoc" action="" method="post">');
- $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' DOCS to Construction Space'));
+ $r->print(&Apache::lonhtmlcommon::breadcrumbs('Dump '.$crstype.' Documents to Construction Space'));
my ($home,$other,%outhash)=&authorhosts();
unless ($home) { return ''; }
my $origcrsid=$env{'request.course.id'};
@@ -253,7 +260,7 @@
$r->print(&Apache::loncommon::end_data_table());
&untiehash();
$r->print(
- '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype DOCS").'" /></p></form>');
+ '<p><input type="submit" name="dumpcourse" value="'.&mt("Dump $crstype Documents").'" /></p></form>');
}
}
@@ -2242,11 +2249,11 @@
} else {
$r->print("<pre>\n");
foreach my $res ($navmap->retrieveResources()) {
- $r->print($res->compTitle()."\t".$res->symb()."\n");
+ $r->print($res->compTitle()."\t".$res->symb()."\n");
}
$r->print("\n</pre>\n");
}
- $r->print('<a href="/adm/coursedocs">'.&mt('Return to DOCS').'</a>');
+ $r->print('<hr /><a href="/adm/coursedocs">'.&mt('Back to Course Editor').'</a>');
}
@@ -2265,9 +2272,9 @@
if ($hash{$key}=~/\.(page|sequence)$/) {
if (($key=~/^src_/) && ($alreadyseen{&unescape($hash{$key})})) {
$r->print('<hr /><span class="LC_error">'.
- &mt('The following sequence or page is included more than once in your '.$crstype.': ').
+ &mt('The following sequence or page is included more than once in your '.$crstype.':').' '.
&unescape($hash{$key}).'</span><br />'.
- &mt('Note that grading records for problems included in this sequence or folder will overlap.<hr />'));
+ &mt('Note that grading records for problems included in this sequence or folder will overlap.').'<hr />');
}
}
if (($key=~/^src\_(.+)$/) && (!$alreadyseen{&unescape($hash{$key})})) {
@@ -2275,8 +2282,13 @@
}
}
&untiehash();
- $r->print('<h1>'.&mt('Done').'.</h1>'.'<a href="/adm/coursedocs">'.
- &mt('Return to DOCS').'</a>');
+ $r->print(
+ '<p class="LC_success">'.&mt('Done').'</p>'
+ .'<hr />'
+ .'<p><a href="/adm/coursedocs">'
+ .&mt('Back to Course Editor')
+ .'</a></p>'
+ );
}
@@ -2526,7 +2538,7 @@
}
}
$r->print('</table></form>');
- $r->print('<h1>'.&mt('Done').'.</h1>');
+ $r->print('<p class="LC_success">'.&mt('Done').'</p>');
&untiehash();
}
@@ -2650,7 +2662,7 @@
&init_breadcrumbs('versions','Check/Set Resource Versions');
&checkversions($r);
} elsif ($allowed && $env{'form.dumpcourse'}) {
- &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' DOCS to Construction Space');
+ &init_breadcrumbs('dumpcourse','Dump '.&Apache::loncommon::course_type().' Documents to Construction Space');
&dumpcourse($r);
} elsif ($allowed && $env{'form.exportcourse'}) {
&init_breadcrumbs('exportcourse','IMS Export');
@@ -2897,7 +2909,7 @@
'book' => 'Import Bookmarks',
'selm' => 'Select Map',
'load' => 'Load Map',
- 'reco' => 'Recover Deleted Resources',
+ 'reco' => 'Recover Deleted Documents',
'newf' => 'New Folder',
'newp' => 'New Composite Page',
'extr' => 'External Resource',
@@ -3472,7 +3484,7 @@
'ls' => 'List Symbs',
'sl' => 'Show Log',
'imse' => 'IMS Export',
- 'dcd' => 'Dump Course DOCS to Construction Space: available on other servers'
+ 'dcd' => 'Dump Course Documents to Construction Space: available on other servers'
);
my %help = %{$help_ref};
my %env = %{$env_ref};