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

[raeburn]

raeburn		Sun Dec 25 18:19:38 2011 EDT

  Modified files:              
    /loncom/interface	londocs.pm 
  Log:
  - Make preview in modal window in DOCS work for supplemental content.
  
  
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.469 loncom/interface/londocs.pm:1.470
--- loncom/interface/londocs.pm:1.469	Wed Dec 21 23:23:08 2011
+++ loncom/interface/londocs.pm	Sun Dec 25 18:19:38 2011
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.469 2011/12/21 23:23:08 www Exp $
+# $Id: londocs.pm,v 1.470 2011/12/25 18:19:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2204,7 +2204,8 @@
     if ($url=~m{/adm/coursedocs}) {
        $line.='<a href="'.$url.'"><img src="'.$icon.'" alt="" class="LC_icon" /></a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.'&inhibitmenu=yes','<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+                                             '<img src="'.$icon.'" alt="" class="LC_icon" />',600,500);
     } else {
        $line.='<img src="'.$icon.'" alt="" class="LC_icon" />';
     }
@@ -2212,7 +2213,8 @@
     if ($url=~m{/adm/coursedocs}) {
        $line.='<a href="'.$url.'">'.$title.'</a>';
     } elsif ($url) {
-       $line.=&Apache::loncommon::modal_link($url.'&inhibitmenu=yes',$title,600,500);
+       $line.=&Apache::loncommon::modal_link($url.(($url=~/\?/)?'&':'?').'inhibitmenu=yes',
+                                             $title,600,500);
     } else {
        $line.=$title.' <span class="LC_docs_reinit_warn">'.$reinit.'</span>';
     }