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

[www]

www		Wed Jan  4 00:08:30 2012 EDT

  Modified files:              
    /loncom/interface	loncommon.pm lonfeedback.pm 
  Log:
  Trying to make the discussion look more like the rest of LON-CAPA
  
  
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1049 loncom/interface/loncommon.pm:1.1050
--- loncom/interface/loncommon.pm:1.1049	Tue Jan  3 22:36:36 2012
+++ loncom/interface/loncommon.pm	Wed Jan  4 00:08:29 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1049 2012/01/03 22:36:36 www Exp $
+# $Id: loncommon.pm,v 1.1050 2012/01/04 00:08:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -5127,35 +5127,36 @@
 }
 
 .LC_discussion {
-  background: $tabbg;
+  background: $data_table_dark;
   border: 1px solid black;
   margin: 2px;
 }
 
-.LC_disc_action_links_bar {
-  background: $tabbg;
-  border: none;
-  margin: 4px;
-}
-
 .LC_disc_action_left {
+  background: $sidebg;
   text-align: left;
+  padding: 4px;
+  margin: 2px;
 }
 
 .LC_disc_action_right {
+  background: $sidebg;
   text-align: right;
+  padding: 4px;
+  margin: 2px;
 }
 
 .LC_disc_new_item {
   background: white;
   border: 2px solid red;
-  margin: 2px;
+  margin: 4px;
+  padding: 4px;
 }
 
 .LC_disc_old_item {
   background: white;
-  border: 1px solid black;
-  margin: 2px;
+  margin: 4px;
+  padding: 4px;
 }
 
 table.LC_pastsubmission {
Index: loncom/interface/lonfeedback.pm
diff -u loncom/interface/lonfeedback.pm:1.315 loncom/interface/lonfeedback.pm:1.316
--- loncom/interface/lonfeedback.pm:1.315	Tue Jan  3 18:21:58 2012
+++ loncom/interface/lonfeedback.pm	Wed Jan  4 00:08:29 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.315 2012/01/03 18:21:58 www Exp $
+# $Id: lonfeedback.pm,v 1.316 2012/01/04 00:08:29 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -441,7 +441,7 @@
    }
             |);
 	    $discussion.='<form name="readchoices" method="post" action="/adm/feedback?chgreads='.$ressymb.'" >'.
-                         "\n".'<table class="LC_discussion">';
+                         "\n".'<table width="100%" class="LC_discussion">';
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
                                              $prevread,$markondisp);
@@ -562,17 +562,12 @@
 	unless ($outputtarget eq 'tex' || $outputtarget eq 'export') {
             my $colspan=$maxdepth+1;
             $discussion .= <<END;
-            <tr bgcolor="#FFFFFF">
-             <td colspan="$colspan" class="LC_disc_action_links_bar">
-              <table class="LC_disc_action_table">
+            <tr>
+             <td colspan="$colspan">
+              <table width="100%">
                <tr>
-                <td align="left">
-                 <table border="0" cellpadding="0" cellspacing="4">
-                  <tr>
-                   <td>
-                    <font size="-1"><b>$lt{'cuse'}</b>:</font></td>
-                   <td> </td>
-                   <td><font size="-1">
+                <td class="LC_disc_action_left">
+                    <font size="-1"><b>$lt{'cuse'}</b>: 
 END
             if ($newpostsflag) {
                 $discussion .= 
@@ -589,13 +584,7 @@
                 }
             }
             $discussion .= <<END;
-                   </font></td>
-                   <td> </td>
-                   <td align="left">
-                    <font size="-1"><b><a href="$chglink">$lt{'chgt'}</a>?</b></font>
-                   </td>
-                  </tr>
-                 </table>
+                     <b><a href="$chglink">$lt{'chgt'}</a></b></font>
                 </td>
 END
             if ($sortposts) {
@@ -604,7 +593,7 @@
                 my %status_types = ();
                 &sort_filter_names(\%sort_types,\%role_types,\%status_types,$crstype);
 
-                $discussion .= '<td><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
+                $discussion .= '<td class="LC_disc_action_right"><font size="-1"><b>'.&mt('Sorted by').'</b>: '.$sort_types{$sortposts}.'<br />';
                 if (defined($env{'form.totposters'})) {
                     $discussion .= &mt('Posts by').':';
                     if ($totposters > 0) {
@@ -660,9 +649,7 @@
             $discussion .= &action_links_bar($colspan,$ressymb,$visible,
                                              $newpostsflag,$group,
                                              $prevread,$markondisp);
-            $discussion .= "
-           </table>
-           <br /><br /></form>\n";
+            $discussion .= "</table></form>\n";
         } 
         if ($outputtarget eq 'export') {
             if ($manifestok) {
@@ -805,8 +792,8 @@
 
 sub action_links_bar {
     my ($colspan,$ressymb,$visible,$newpostsflag,$group,$prevread,$markondisp) = @_;
-    my $discussion = '<tr><td class="LC_disc_action_links_bar" colspan="'.$colspan.'">'.
-                     '<table width="100%" class="LC_disc_action_table"><tr>'.
+    my $discussion = '<tr><td colspan="'.$colspan.'">'.
+                     '<table width="100%"><tr>'.
                      '<td class="LC_disc_action_left">';
     my $escsymb=&escape($ressymb);
     if ($visible) {
@@ -836,7 +823,7 @@
         $discussion .= '&previous='.$prevread;
     }
     $discussion .= &group_args($group);
-    $discussion .= '">'.&mt('Export').'?</a>  </td>';
+    $discussion .= '">'.&mt('Export').'</a></td>';
     if ($newpostsflag) {
         if (!$markondisp) {
             $discussion .='<td class="LC_disc_action_right"><a href="/adm/preferences?action=changediscussions';