[LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm

[raeburn]

raeburn		Tue Apr 30 13:25:46 2013 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11
    - Backport 1.1120, 1.1122, 1.1124.
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.33 loncom/interface/loncommon.pm:1.1075.2.34
--- loncom/interface/loncommon.pm:1.1075.2.33	Wed Apr  3 13:48:35 2013
+++ loncom/interface/loncommon.pm	Tue Apr 30 13:25:45 2013
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.33 2013/04/03 13:48:35 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.34 2013/04/30 13:25:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -6445,6 +6445,11 @@
   padding-bottom: 5px;
 }
 
+.LC_edit_opt {
+  padding-left: 1em;
+  white-space: nowrap;
+}
+
 img.stift {
   border-width: 0;
   vertical-align: middle;
@@ -7786,11 +7791,9 @@
     $LCcurrentid=$$.'_'.$LCidcnt;
     my $starting=&mt('Starting');
     my $content=(<<ENDPROGBAR);
-<p>
   <div id="progressbar$LCcurrentid">
     <span class="pblabel">$starting</span>
   </div>
-</p>
 ENDPROGBAR
     &r_print($r,$content.&LCprogressbar_script($LCcurrentid));
 }
@@ -10102,7 +10105,7 @@
             $output .= &mt('Unrecognized file extension ([_1]) - rename the file with a proper extension and re-upload.',$1).'<br />';
             next;
         } elsif ($fname=~/\.(\d+)\.(\w+)$/) {
-            $output .= &mt('File name not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
+            $output .= &mt('Filename not allowed - rename the file to remove the number immediately before the file extension([_1]) and re-upload.',$2).'<br />';
             next;
         }
         $env{'form.embedded_item_'.$i.'.filename'}=$fname;
@@ -10804,8 +10807,8 @@
     my ($docudom,$docuname,$file,$destination,$dir_root,$hiddenelem) = @_;
     my ($dir,$error,$warning,$output);
     if ($file !~ /\.(zip|tar|bz2|gz|tar.gz|tar.bz2|tgz)$/) {
-        $error = &mt('File name not a supported archive file type.').
-                 '<br />'.&mt('File name should end with one of: [_1].',
+        $error = &mt('Filename not a supported archive file type.').
+                 '<br />'.&mt('Filename should end with one of: [_1].',
                               '.zip, .tar, .bz2, .gz, .tar.gz, .tar.bz2, .tgz');
     } else {
         my $docuhome = &Apache::lonnet::homeserver($docuname,$docudom);