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

[albertel]

albertel		Fri Dec  9 18:49:45 2005 EDT

  Modified files:              
    /loncom/interface	portfolio.pm lonmeta.pm 
  Log:
  - trying to use 'catalog information' rather than 'metadata'
  - I think 'associating' with a course is a better way of presenting this to a user
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.88 loncom/interface/portfolio.pm:1.89
--- loncom/interface/portfolio.pm:1.88	Fri Sep  9 15:12:29 2005
+++ loncom/interface/portfolio.pm	Fri Dec  9 18:49:45 2005
@@ -165,9 +165,11 @@
                     if (exists $locked_files{$current_path.$filename}){
                         $r->print('<td colspan="2"><a href="portfolio?lockinfo='.$current_path.$filename.'">Locked</a></td>');
                     } else {
+			my $cat='<img alt="'.&mt('Catalog Information').
+			    '" src="'.&Apache::loncommon::lonhttpdurl('/res/adm/pages/catalog.gif').'" />';
                         $r->print('<td><input type="checkbox" name="selectfile" value="'.$filename.'" />
                             <a href="/adm/portfolio?rename='.$filename.'&amp;currentpath='.$current_path.'">Rename</a></td>
-                            <td><a href="'.$href_edit_location.$filename.'.meta">Meta</a>
+                            <td><a href="'.$href_edit_location.$filename.'.meta">'.$cat.'</a>
                             </td>');
                     }
                 }
Index: loncom/interface/lonmeta.pm
diff -u loncom/interface/lonmeta.pm:1.135 loncom/interface/lonmeta.pm:1.136
--- loncom/interface/lonmeta.pm:1.135	Wed Dec  7 21:17:56 2005
+++ loncom/interface/lonmeta.pm	Fri Dec  9 18:49:45 2005
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Metadata display handler
 #
-# $Id: lonmeta.pm,v 1.135 2005/12/08 02:17:56 banghart Exp $
+# $Id: lonmeta.pm,v 1.136 2005/12/09 23:49:45 albertel Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -302,9 +302,9 @@
             $courses{$coursekey} = $value;
         }
     }
-    $r->print('<h3>Course Related Meta-Data</h3><br />');
+    $r->print('<h3>Associate resource with a course</h3><br />');
     $r->print('<form action="" method="post">');
-    $r->print('Select course restrictions<br />');
+    $r->print('Select course <br />');
     $r->print('<select name="metacourse" >');
     my $meta_not_found = 1;
     foreach my $key (keys (%courses)) {    
@@ -322,7 +322,7 @@
     }
     unless ($meta_not_found) {
         $r->print('</select><br />');
-        $r->print('<input type="submit" value="Assign Portfolio Metadata" />');
+        $r->print('<input type="submit" value="Associate" />');
         $r->print('</form>');
     }
     return 'ok';
@@ -1196,14 +1196,8 @@
                 }
             }
         }
-        my $button_label;
-        if ($fn =~ /\/portfolio\//) {
-            $button_label = 'Store Metadata';
-        } else {
-            $button_label = 'Store Catalog Information';
-        }
-	    $r->print($output.'<br /><input type="submit" name="store" value="'.
-                  &mt($button_label).'">');
+	$r->print($output.'<br /><input type="submit" name="store" value="'.
+                  &mt('Store Catalog Information').'">');
     }
     $r->print('</form>');
     return;