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

[wenzelju]

wenzelju		Mon Dec 14 13:42:33 2009 EDT

  Modified files:              
    /loncom/interface	lonbulletin.pm 
  Log:
  Changed the order of 'Upload a Photo' and 'Title'.
  
  
Index: loncom/interface/lonbulletin.pm
diff -u loncom/interface/lonbulletin.pm:1.55 loncom/interface/lonbulletin.pm:1.56
--- loncom/interface/lonbulletin.pm:1.55	Tue Dec  8 13:33:12 2009
+++ loncom/interface/lonbulletin.pm	Mon Dec 14 13:42:33 2009
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Bulletin Board Handler
 #
-# $Id: lonbulletin.pm,v 1.55 2009/12/08 13:33:12 wenzelju Exp $
+# $Id: lonbulletin.pm,v 1.56 2009/12/14 13:42:33 wenzelju Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -236,6 +236,19 @@
 
 # ---------------------------------------------------------------- Get discussion board
     if (($syllabus{'uploaded.lastmodified'}) || ($allowed)) {
+        #Print Topic as Heading
+        my $titletext=$syllabus{'aaa_title'};
+        if ($target ne 'tex') {
+            $r->print('<h2>'.$titletext.'</h2>');
+        } else {
+            $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$titletext).'}\\\\');
+        }
+        #Outputbox and Inputbox for Topic
+        if ($allowed) {
+            $r->print('<form method="post" action="" enctype="multipart/form-data">');
+            &Apache::lontemplate::print_template($r, &mt('Title'), $titletext,$allowed,'LC_Box');
+            &Apache::lontemplate::print_editbox_template($r, $syllabus{'aaa_title'},'aaa_title');
+        }
         if ($syllabus{'uploaded.photourl'}) {
             &Apache::lonnet::allowuploaded('/adm/syllabus',
                                            $syllabus{'uploaded.photourl'});
@@ -244,11 +257,9 @@
         if ($allowed) {
             &Apache::lontemplate::print_template($r, &mt('Upload a Photo'), '<img src="'.$syllabus{'uploaded.photourl'}.'" alt="'.&mt('Image').'"/>',$allowed,'LC_Box');
             $r->print(
-                '<form method="post" enctype="multipart/form-data" action="">'.
                 '<input type="hidden" name="forceedit" value="edit" />'.
                 '<input type="file" name="uploaddoc" size="50" />'.
                 '<input type="submit" name="storeupl" value="'.&mt('Upload').'" />'.
-                '</form><form method="post" action="">'.
                 '<input type="hidden" name="forceedit" value="edit" />');
         }
         #Image in Student view.
@@ -277,19 +288,7 @@
                     if ($allowed) {
                          &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
                     }
-                } else {
-                    #Print Topic as Heading
-                    if ($target ne 'tex') {
-                        $r->print('<h1>'.$message.'</h1>');
-                    } else {
-                        $r->print('\\\\\textbf{'.&Apache::lonxml::xmlparse($r,'tex',$message).'}\\\\');
-                    }
-                    #Outputbox and Inputbox for Topic
-                    if ($allowed) {
-                             &Apache::lontemplate::print_template($r, $syllabusfields{$field}, $message,$allowed,'LC_Box');
-                             &Apache::lontemplate::print_editbox_template($r, $syllabus{$field}, $field);
-                    }
-                }
+                }   
             }
         }
         if ($allowed) {