Index: lib.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/lib.php,v
retrieving revision 1.277.2.47
diff -u -r1.277.2.47 lib.php
--- lib.php	16 Feb 2009 13:09:01 -0000	1.277.2.47
+++ lib.php	19 May 2009 10:08:48 -0000
@@ -865,12 +865,19 @@
         echo '}'."\n";
 
         echo '</script>'."\n";
-        echo '<table cellspacing="0" class="feedback '.$subtype.'" >';
+
+        echo '<div class="feedback '.$subtype.'" >';
+        //echo '<table cellspacing="0" class="feedback '.$subtype.'" >';
 
         ///Start of teacher info row
 
-        echo '<tr>';
-        echo '<td class="picture teacher">';
+        //echo '<tr>';
+        // start grading div
+        echo '<div class="grading_div">';
+
+        //echo '<td class="picture teacher">';
+        /*
+        echo     '<div class="picture teacher">';
         if ($submission->teacher) {
             $teacher = get_record('user', 'id', $submission->teacher);
         } else {
@@ -878,53 +885,36 @@
             $teacher = $USER;
         }
         print_user_picture($teacher, $this->course->id, $teacher->picture);
-        echo '</td>';
-        echo '<td class="content">';
-        echo '<form id="submitform" action="submissions.php" method="post">';
-        echo '<div>'; // xhtml compatibility - invisiblefieldset was breaking layout here
-        echo '<input type="hidden" name="offset" value="'.($offset+1).'" />';
-        echo '<input type="hidden" name="userid" value="'.$userid.'" />';
-        echo '<input type="hidden" name="id" value="'.$this->cm->id.'" />';
-        echo '<input type="hidden" name="mode" value="grade" />';
-        echo '<input type="hidden" name="menuindex" value="0" />';//selected menu index
+        //echo '</td>';
+        echo     '</div>';
+         * */
+         
+
+        //echo '<td class="content">';
+        echo     '<form id="submitform" action="submissions.php" method="post">';
+        echo     '<div>'; // xhtml compatibility - invisiblefieldset was breaking layout here
+        echo         '<input type="hidden" name="offset" value="'.($offset+1).'" />';
+        echo         '<input type="hidden" name="userid" value="'.$userid.'" />';
+        echo         '<input type="hidden" name="id" value="'.$this->cm->id.'" />';
+        echo         '<input type="hidden" name="mode" value="grade" />';
+        echo         '<input type="hidden" name="menuindex" value="0" />';//selected menu index
 
         //new hidden field, initialized to -1.
-        echo '<input type="hidden" name="saveuserid" value="-1" />';
+        echo         '<input type="hidden" name="saveuserid" value="-1" />';
 
         if ($submission->timemarked) {
-            echo '<div class="from">';
-            echo '<div class="fullname">'.fullname($teacher, true).'</div>';
-            echo '<div class="time">'.userdate($submission->timemarked).'</div>';
-            echo '</div>';
-        }
-        echo '<div class="grade"><label for="menugrade">'.get_string('grade').'</label> ';
-        choose_from_menu(make_grades_menu($this->assignment->grade), 'grade', $submission->grade, get_string('nograde'), '', -1, false, $disabled);
-        echo '</div>';
-
-        echo '<div class="clearer"></div>';
-        echo '<div class="finalgrade">'.get_string('finalgrade', 'grades').': '.$grading_info->items[0]->grades[$userid]->str_grade.'</div>';
-        echo '<div class="clearer"></div>';
-
-        if (!empty($CFG->enableoutcomes)) {
-            foreach($grading_info->outcomes as $n=>$outcome) {
-                echo '<div class="outcome"><label for="menuoutcome_'.$n.'">'.$outcome->name.'</label> ';
-                $options = make_grades_menu(-$outcome->scaleid);
-                if ($outcome->grades[$submission->userid]->locked) {
-                    $options[0] = get_string('nooutcome', 'grades');
-                    echo $options[$outcome->grades[$submission->userid]->grade];
-                } else {
-                    choose_from_menu($options, 'outcome_'.$n.'['.$userid.']', $outcome->grades[$submission->userid]->grade, get_string('nooutcome', 'grades'), '', 0, false, false, 0, 'menuoutcome_'.$n);
-                }
-                echo '</div>';
-                echo '<div class="clearer"></div>';
-            }
+            echo     '<div class="from">';
+            echo         '<div class="fullname">'.fullname($teacher, true).'</div>';
+            echo         '<div class="time">'.userdate($submission->timemarked).'</div>';
+            echo     '</div>';
         }
+        
 
 
         $this->preprocess_submission($submission);
 
         if ($disabled) {
-            echo '<div class="disabledfeedback">'.$grading_info->items[0]->grades[$userid]->str_feedback.'</div>';
+            echo     '<div class="disabledfeedback">'.$grading_info->items[0]->grades[$userid]->str_feedback.'</div>';
 
         } else {
             print_textarea($this->usehtmleditor, 14, 58, 0, 0, 'submissioncomment', $submission->submissioncomment, $this->course->id);
@@ -941,46 +931,83 @@
         $lastmailinfo = get_user_preferences('assignment_mailinfo', 1) ? 'checked="checked"' : '';
 
         ///Print Buttons in Single View
-        echo '<input type="hidden" name="mailinfo" value="0" />';
-        echo '<input type="checkbox" id="mailinfo" name="mailinfo" value="1" '.$lastmailinfo.' /><label for="mailinfo">'.get_string('enableemailnotification','assignment').'</label>';
-        echo '<div class="buttons">';
-        echo '<input type="submit" name="submit" value="'.get_string('savechanges').'" onclick = "document.getElementById(\'submitform\').menuindex.value = document.getElementById(\'submitform\').grade.selectedIndex" />';
-        echo '<input type="submit" name="cancel" value="'.get_string('cancel').'" />';
+        echo             '<input type="hidden" name="mailinfo" value="0" />';
+        echo             '<input type="checkbox" id="mailinfo" name="mailinfo" value="1" '.$lastmailinfo.' /><label for="mailinfo">'.get_string('enableemailnotification','assignment').'</label>';
+        echo             '<div class="buttons">';
+        echo                 '<input type="submit" name="submit" value="'.get_string('savechanges').'" onclick = "document.getElementById(\'submitform\').menuindex.value = document.getElementById(\'submitform\').grade.selectedIndex" />';
+        echo                 '<input type="submit" name="cancel" value="'.get_string('cancel').'" />';
         //if there are more to be graded.
         if ($nextid) {
-            echo '<input type="submit" name="saveandnext" value="'.get_string('saveandnext').'" onclick="saveNext()" />';
-            echo '<input type="submit" name="next" value="'.get_string('next').'" onclick="setNext();" />';
+            echo             '<input type="submit" name="saveandnext" value="'.get_string('saveandnext').'" onclick="saveNext()" />';
+            echo             '<input type="submit" name="next" value="'.get_string('next').'" onclick="setNext();" />';
         }
+        echo             '</div>'; // end buttons
+      
+
+
+        // adding grade bit here to save space
+        echo         '<div class="grade"><label for="menugrade">'.get_string('grade').'</label> ';
+        choose_from_menu(make_grades_menu($this->assignment->grade), 'grade', $submission->grade, get_string('nograde'), '', -1, false, $disabled);
+        echo         '</div>';
+
+        echo         '<div class="clearer"></div>';
+        echo         '<div class="finalgrade">'.get_string('finalgrade', 'grades').': '.$grading_info->items[0]->grades[$userid]->str_grade.'</div>';
+        echo         '<div class="clearer"></div>';
+
+        if (!empty($CFG->enableoutcomes)) {
+            foreach($grading_info->outcomes as $n=>$outcome) {
+                echo '<div class="outcome"><label for="menuoutcome_'.$n.'">'.$outcome->name.'</label> ';
+                $options = make_grades_menu(-$outcome->scaleid);
+                if ($outcome->grades[$submission->userid]->locked) {
+                    $options[0] = get_string('nooutcome', 'grades');
+                    echo $options[$outcome->grades[$submission->userid]->grade];
+                } else {
+                    choose_from_menu($options, 'outcome_'.$n.'['.$userid.']', $outcome->grades[$submission->userid]->grade, get_string('nooutcome', 'grades'), '', 0, false, false, 0, 'menuoutcome_'.$n);
+                }
+                echo '</div>';
+                echo '<div class="clearer"></div>';
+            }
+        }
+
+        
+        // end xhtml fixing div
+        echo     '</div></form>'; 
+        // end grading div
         echo '</div>';
-        echo '</div></form>';
 
         $customfeedback = $this->custom_feedbackform($submission, true);
         if (!empty($customfeedback)) {
             echo $customfeedback;
         }
 
-        echo '</td></tr>';
+
 
         ///End of teacher info row, Start of student info row
-        echo '<tr>';
-        echo '<td class="picture user">';
-        print_user_picture($user, $this->course->id, $user->picture);
-        echo '</td>';
-        echo '<td class="topic">';
-        echo '<div class="from">';
-        echo '<div class="fullname">'.fullname($user, true).'</div>';
+        echo '<div id="student_info">';
+
+       print_user_picture($user, $this->course->id, $user->picture);
+
+        echo     '<div class="from">';
+        echo         '<div class="fullname">'.fullname($user, true).'</div>';
         if ($submission->timemodified) {
-            echo '<div class="time">'.userdate($submission->timemodified).
-                                     $this->display_lateness($submission->timemodified).'</div>';
+            echo     '<div class="time">'.userdate($submission->timemodified).
+            $this->display_lateness($submission->timemodified).'</div>';
         }
-        echo '</div>';
+        echo     '</div>';
+
+        
+        
+        // this contains the div that should scroll for online text assignments
+        echo     '<div class="user_files">';
         $this->print_user_files($user->id);
-        echo '</td>';
-        echo '</tr>';
+        echo     '<div class="clearer"></div>';
+        echo     '</div>';
 
         ///End of student info row
+        echo '</div>';
 
-        echo '</table>';
+        // end overall feedback div
+        echo '</div>';
 
         if (!$disabled and $this->usehtmleditor) {
             use_html_editor();
Index: styles.php
===================================================================
RCS file: /cvsroot/moodle/moodle/mod/assignment/styles.php,v
retrieving revision 1.16.2.3
diff -u -r1.16.2.3 styles.php
--- styles.php	3 Mar 2008 05:54:43 -0000	1.16.2.3
+++ styles.php	19 May 2009 10:13:27 -0000
@@ -174,3 +174,40 @@
   margin-top: 0.5em;
 }
 
+/* Extra bits added for the CSS feedback pop-up */
+
+#mod-assignment-submissions .from,
+#mod-assignment-submissions .userpicture,
+#mod-assignment-submissions .buttons {
+  float: left;
+}
+#mod-assignment-submissions #wordcount {
+  clear: none;
+}
+#mod-assignment-submissions .user_files {
+  margin-top: 10px;
+  margin-bottom: 10px;
+}
+#mod-assignment-submissions .grading_div .grade, #mod-assignment-submissions #wordcount {
+  float: right;
+}
+#mod-assignment-submissions .from {
+  width: 300px;
+  clear: none;
+}
+#mod-assignment-submissions .userpicture {
+  vertical-align: top;
+}
+#mod-assignment-submissions div.user_files .generalbox {
+  height: 200px;
+  overflow-y: scroll;
+}
+#mod-assignment-submissions #wordcount {
+  width: 100px;
+  clear: none;
+  height: auto;
+  overflow-y: auto;
+}
+#mod-assignment-submissions #student_info {
+  width: 100%;
+}
\ No newline at end of file