--- loncom/interface/lonfeedback.pm	2011/12/10 01:45:36	1.306
+++ loncom/interface/lonfeedback.pm	2011/12/10 23:16:36	1.308
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Feedback
 #
-# $Id: lonfeedback.pm,v 1.306 2011/12/10 01:45:36 www Exp $
+# $Id: lonfeedback.pm,v 1.308 2011/12/10 23:16:36 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -771,17 +771,25 @@ END
     return $discussion;
 }
 
+
+sub discussion_link {
+   my ($ressymb,$linktext,$cmd,$item,$flag,$prev,$adds)=@_;
+   my $link='/adm/feedback?inhibitmenu=yes&modal=yes&'.$cmd.'='.&escape($ressymb).':::'.$item;
+   if ($flag) { $link .= '&previous='.$prev; }
+   if ($adds) { $link .= $adds; }
+   return &Apache::loncommon::modal_link($link,$linktext,600,400);
+}
+
+
 sub send_feedback_link {
     my ($ressymb) = @_;
-    my $output = '<span class="LC_feedback_link">'.
-                 &Apache::loncommon::modal_link(
-                    '/adm/feedback?inhibitmenu=yes&modal=yes&replydisc='.&escape($ressymb).':::',
+    return '<span class="LC_feedback_link">'.
+                 &discussion_link($ressymb,
                     '<img alt="" class="LC_noBorder" src="'.
                     &Apache::loncommon::lonhttpdurl('/adm/lonMisc/chat.gif').
                     '" border="0" /><span class="LC_menubuttons_inline_text">'.&mt('Post Discussion').'</span>',
-                    600,400).
-                 '</span>';
-    return $output;
+                    'replydisc').
+           '</span>';
 }
 
 sub send_message_link {
@@ -1096,14 +1104,8 @@ sub build_posting_display {
                             if ($outputtarget ne 'tex') {
                                 if (&editing_allowed($escsymb.':::'.$idx,$group)) {
                                     if (($env{'user.domain'} eq $contrib{$idx.':senderdomain'}) && ($env{'user.name'} eq $contrib{$idx.':sendername'})) {
-                                        $sender.=' <a href="/adm/feedback?editdisc='.
-                                             $escsymb.':::'.$idx;
-                                        if ($$newpostsflag) {
-                                            $sender .= '&amp;previous='.$prevread;
-                                        }
-				        $sender .= &group_args($group);
-                                        $sender .= '">'.&mt('Edit').'</a>';
-                                    
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Edit'),'editdisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         unless ($seeid) {
                                             my $grpargs = &group_args($group);
                                             $sender.=" <a href=\"javascript:verifydelete('studentdelete','$escsymb','$idx','$$newpostsflag','$prevread','$grpargs')";
@@ -1114,21 +1116,12 @@ sub build_posting_display {
 			        if ($seeid) {
 			            if ($hiddens{$idx}) {
                                         unless ($studenthidden) {
-			                    $sender.=' <a href="/adm/feedback?unhide='.
-				                     $escsymb.':::'.$idx;
-                                            if ($$newpostsflag) {
-                                                $sender .= '&amp;previous='.$prevread;
-                                            }
-                                            $sender .= '">'.&mt('Make Visible').'</a>';
+ 		                           $sender.=' '.
+                                            &discussion_link($symb,&mt('Make Visible'),'unhide',$idx,$$newpostsflag,$prevread,&group_args($group));
                                         }
 			            } else {
-				        $sender.=' <a href="/adm/feedback?hide='.
-				                 $escsymb.':::'.$idx;
-                                        if ($$newpostsflag) {
-                                            $sender .= '&amp;previous='.$prevread;
-                                        }
-				        $sender .= &group_args($group);
-                                        $sender .= '">'.&mt('Hide').'</a>';
+                                        $sender.=' '.
+                                         &discussion_link($symb,&mt('Hide'),'hide',$idx,$$newpostsflag,$prevread,&group_args($group));
 			            }
                                     my $grpargs = &group_args($group);
 			            $sender.= 
@@ -1166,23 +1159,14 @@ sub build_posting_display {
 		            if (&discussion_open($status)) {
                                 if (($group ne '') && 
                                     (&check_group_priv($group,'pgd') eq 'ok')) {
-                                     $sender.=' <a href="/adm/feedback?replydisc='.
-                                              $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-                                    $sender .= &group_args($group);
-                                    $sender .= '">'.&mt('Reply').'</a>';
+                                     $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 } elsif (&Apache::lonnet::allowed('pch', 
 				     $env{'request.course.id'}.
 				     ($env{'request.course.sec'}?'/'.
                                       $env{'request.course.sec'}:''))) {
-			             $sender.=' <a href="/adm/feedback?replydisc='.
-			                      $escsymb.':::'.$idx;
-                                    if ($$newpostsflag) {
-                                        $sender .= '&amp;previous='.$prevread;
-                                    }
-                                    $sender .= '">'.&mt('Reply').'</a>';
+			             $sender.=' '.
+                                         &discussion_link($symb,&mt('Reply'),'replydisc',$idx,$$newpostsflag,$prevread);
                                 }
                             }
 		            if ($viewgrades) {
@@ -1313,9 +1297,8 @@ sub build_posting_display {
                                 my @postversions = ();
                                 $$discussionitems[$idx] .= &mt('This post has been edited by the author.');
                                 if ($seeid) {
-                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;<a href="/adm/feedback?allversions='.$escsymb.':::'.$idx;
-				    $$discussionitems[$idx] .= &group_args($group);
-                                    $$discussionitems[$idx] .= '">'.&mt('Display all versions').'</a>';
+                                    $$discussionitems[$idx] .= '&nbsp;&nbsp;'.
+                                         &discussion_link($symb,&mt('Display all versions'),'allversions',$idx,$$newpostsflag,$prevread,&group_args($group));
                                 }
                                 $$discussionitems[$idx].='<br/>'.&mt('Earlier version(s) were posted on: ');
                                 if ($contrib{$idx.':history'} =~ m/:/) {