[LON-CAPA-cvs] cvs: loncom /publisher lonpubdir.pm

[raeburn]

raeburn		Wed Nov 23 19:13:01 2011 EDT

  Modified files:              
    /loncom/publisher	lonpubdir.pm 
  Log:
  - Bug 6530.
    - Additional clean up for bug 1320, following retirement of lonconstruct.pm
      (see: loncapa_apache.conf rev 1.205 vs. 1.204).
  
  
Index: loncom/publisher/lonpubdir.pm
diff -u loncom/publisher/lonpubdir.pm:1.137 loncom/publisher/lonpubdir.pm:1.138
--- loncom/publisher/lonpubdir.pm:1.137	Mon Nov 14 00:20:31 2011
+++ loncom/publisher/lonpubdir.pm	Wed Nov 23 19:13:01 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Construction Space Directory Lister
 #
-# $Id: lonpubdir.pm,v 1.137 2011/11/14 00:20:31 raeburn Exp $
+# $Id: lonpubdir.pm,v 1.138 2011/11/23 19:13:01 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -603,11 +603,11 @@
     my $editlink='';
     my $editlink2='';
     if ($filename=~/\.(xml|html|htm|xhtml|xhtm|sty)$/) {
-	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('Edit').'</a>)';
+	$editlink=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/$LONCAPA::assess_re/) {
-	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?forceedit=1" target="_parent">'.&mt('EditXML').'</a>)';
-	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?forceColoredit=1" target="_parent">'.&mt('Edit').'</a>)';
+	$editlink=' (<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=editxml">'.&mt('EditXML').'</a>)';
+	$editlink2=' <br />(<a href="'.$linkdir.'/'.$filename.'?editmode=Edit&problemmode=edit">'.&mt('Edit').'</a>)';
     }
     if ($filename=~/\.(problem|exam|quiz|assess|survey|form|library|xml|html|htm|xhtml|xhtm|sty)$/) {
 	$editlink.=' (<a href="/adm/cleanup?filename='.$linkfilename.'" target="_parent">'.&mt('Clean Up').')</a>';