[LON-CAPA-cvs] cvs: loncom /homework structuretags.pm /interface loncommon.pm
bisitz
bisitz@source.lon-capa.org
Thu, 09 Jul 2009 17:17:49 -0000
bisitz Thu Jul 9 17:17:49 2009 EDT
Modified files:
/loncom/homework structuretags.pm
/loncom/interface loncommon.pm
Log:
Corrected translation and nowrap behavior for display of problems, e.g. Browse Resources:
- Removed line break from script code to correct &mt call for "Browsing resource..."
- Optimized nowrap behavior for "Show All Foils" which also corrects &mt call
- Removed unused and not fitting help icon (was added this way in rev. 1.159)
loncommon.pm:
- Allow LC_nobreak for all tags
Index: loncom/homework/structuretags.pm
diff -u loncom/homework/structuretags.pm:1.456 loncom/homework/structuretags.pm:1.457
--- loncom/homework/structuretags.pm:1.456 Wed Jul 8 18:36:29 2009
+++ loncom/homework/structuretags.pm Thu Jul 9 17:17:45 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# definition of tags that give a structure to a document
#
-# $Id: structuretags.pm,v 1.456 2009/07/08 18:36:29 droeschl Exp $
+# $Id: structuretags.pm,v 1.457 2009/07/09 17:17:45 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -257,12 +257,11 @@
&& ($target eq 'web' || $target eq 'webgrade')) {
my ($symb,undef,undef,undef,$publicuser)= &Apache::lonnet::whichuser();
- if ($symb eq '' && !$publicuser) {
- my $help = &Apache::loncommon::help_open_topic("Ambiguous_Reference");
- $help="<p class='LC_info'>".&mt("Browsing resource, all submissions
- are temporary.")."</p>";
- $page_start .= $help;
- }
+ if ($symb eq '' && !$publicuser) {
+ $page_start .= '<p class="LC_info">'
+ .&mt('Browsing resource, all submissions are temporary.')
+ .'</p>';
+ }
}
if (!defined($found{'body'}) && $env{'request.state'} ne 'construct') {
@@ -922,13 +921,14 @@
value="'.$env{'form.username'}.'" />';
}
if ($env{'request.role.adv'}) {
- $form_tag_start.=
- ' <label><input type="checkbox" name="showallfoils"';
+ $form_tag_start.= ' <label class="LC_nobreak">'
+ .'<input type="checkbox" name="showallfoils"';
if (defined($env{'form.showallfoils'})) {
$form_tag_start.=' checked="checked"';
}
- $form_tag_start.= ' />'.&mt(' Show All Foils').
- '</label>';
+ $form_tag_start.= ' /> '
+ .&mt('Show All Foils')
+ .'</label>';
}
if ($Apache::lonhomework::type eq 'practice') {
$form_tag_start.=&practice_problem_header();
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.854 loncom/interface/loncommon.pm:1.855
--- loncom/interface/loncommon.pm:1.854 Thu Jul 9 12:53:28 2009
+++ loncom/interface/loncommon.pm Thu Jul 9 17:17:49 2009
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.854 2009/07/09 12:53:28 kalberla Exp $
+# $Id: loncommon.pm,v 1.855 2009/07/09 17:17:49 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5546,8 +5546,7 @@
border: 1px solid #000000;
}
-td.LC_nobreak,
-span.LC_nobreak {
+.LC_nobreak {
white-space: nowrap;
}