[LON-CAPA-cvs] cvs: loncom /interface londocs.pm lonsimplepage.pm

bisitz bisitz@source.lon-capa.org
Fri, 10 Jul 2009 15:05:28 -0000


bisitz		Fri Jul 10 15:05:28 2009 EDT

  Modified files:              
    /loncom/interface	lonsimplepage.pm londocs.pm 
  Log:
  - Replaced special style "clear" by...
      - direct use of style="..." (londocs.pm)
      - LC_clear_float_footer (lonsimplepage.pm)
  
  londocs.pm:
  - Added missing &mt call
  
  lonsimplepage.pm:
  - Removed unneeded <form> tag from "Delete Photo" button
  - XHTML
      - Added dummy action to forms
      - Added alt attribute to image
  
  
  
Index: loncom/interface/lonsimplepage.pm
diff -u loncom/interface/lonsimplepage.pm:1.84 loncom/interface/lonsimplepage.pm:1.85
--- loncom/interface/lonsimplepage.pm:1.84	Thu Jun 11 16:48:33 2009
+++ loncom/interface/lonsimplepage.pm	Fri Jul 10 15:05:28 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Simple Page Editor
 #
-# $Id: lonsimplepage.pm,v 1.84 2009/06/11 16:48:33 bisitz Exp $
+# $Id: lonsimplepage.pm,v 1.85 2009/07/10 15:05:28 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -304,8 +304,8 @@
             &Apache::lonnet::allowuploaded('/adm/smppg',
                     $syllabus{'uploaded.photourl'});
 
-            $image='<img src="'.$syllabus{'uploaded.photourl'}.'"
-                            />';
+            $image='<img src="'.$syllabus{'uploaded.photourl'}
+                  .'" alt="'.&mt('Image').'" />';
             if ($target eq 'tex') {
                 $image=&Apache::lonxml::xmlparse($r,'tex',$image);
             }
@@ -313,19 +313,20 @@
 
         if ($allowed) {
             $r->print(
-                  '<form method="post" enctype="multipart/form-data">'.
+                  '<form method="post" action="" enctype="multipart/form-data">'.
                   '<input type="hidden" name="forceedit" value="edit" />'.
                   '<h3>'.&mt('Upload a Photo').'</h3>'.
                   '<input type="file" name="uploaddoc" size="50" />'.
                   '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
-                  '</form><form method="post">'.
+                  '</form><form method="post" action="">'.
                   '<input type="hidden" name="forceedit" value="edit" />');
             if ($syllabus{'uploaded.photourl'}) {
-                $r->print('<form method="post"><input type="submit" name="delupl" value="'.&mt('Delete Photo').'" />' );
+                $r->print('<input type="submit" name="delupl"'
+                         .' value="'.&mt('Delete Photo').'" />');
             }
         }
         if ($allowed) {
-            $r->print($image.'<div class="clear">&nbsp;</div>');
+            $r->print($image.'<div class="LC_footer_clear">&nbsp;</div>');
         }
 
         foreach my $field (sort(keys(%syllabusfields))) {
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.375 loncom/interface/londocs.pm:1.376
--- loncom/interface/londocs.pm:1.375	Wed Jul  8 07:51:01 2009
+++ loncom/interface/londocs.pm	Fri Jul 10 15:05:28 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.375 2009/07/08 07:51:01 tempelho Exp $
+# $Id: londocs.pm,v 1.376 2009/07/10 15:05:28 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -278,7 +278,7 @@
     my $navmap = Apache::lonnavmaps::navmap->new();
     if (!defined($navmap)) {
         $r->print(&Apache::loncommon::start_page('Export '.lc($type).' to IMS content package').
-                  '<h2>IMS Export Failed</h2>'.
+                  '<h2>'.&mt('IMS Export Failed').'</h2>'.
                   '<div class="LC_error">'.
                   &mt('Unable to retrieve information about course contents').
                   '</div><a href="/adm/coursedocs">'.&mt('Return to Course Editor').'</a>');
@@ -2933,7 +2933,9 @@
         }
     }
     $r->print('<li '.$active.' onclick="javascript:showPage(this,\'supplCourseDocuments\',\'mainnav\',\'maincoursedoc\');">'.&mt('Supplemental Course Documents').'</li>');
-    $r->print('</ul><div class="clear LC_Box"><div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
+    $r->print('</ul>'
+             .'<div class="LC_Box" style="clear:both;margin:0;">'
+             .'<div id="maincoursedoc" style="margin:0 0;padding:0 0;">');
 # --------------------------------------------------------- Standard documents
        my $savefolderpath;
        my $active = 'style="display: none;"';