[prev in list] [next in list] [prev in thread] [next in thread] 

List:       lon-capa-cvs
Subject:    [LON-CAPA-cvs] cvs: loncom /publisher lonpublisher.pm
From:       www <lon-capa-cvs-allow () mail ! lon-capa ! org>
Date:       2007-09-24 13:59:11
Message-ID: cvswww1190642351 () cvsserver
[Download RAW message or body]

www		Mon Sep 24 09:59:11 2007 EDT

  Modified files:              
    /loncom/publisher	lonpublisher.pm 
  Log:
  Death to "private"
  
  
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.228 loncom/publisher/lonpublisher.pm:1.229
--- loncom/publisher/lonpublisher.pm:1.228	Mon Aug  6 21:52:44 2007
+++ loncom/publisher/lonpublisher.pm	Mon Sep 24 09:59:09 2007
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Publication Handler
 #
-# $Id: lonpublisher.pm,v 1.228 2007/08/07 01:52:44 albertel Exp $
+# $Id: lonpublisher.pm,v 1.229 2007/09/24 13:59:09 www Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1131,6 +1131,11 @@
 	    '</span></h1><p><span class="LC_warning">'.
 	    &mt('If this resource is in active use, student performance data from the \
previous version may become inaccessible.').'</span></p><hr />';  }
+    if ($metadatafields{'copyright'} eq 'priv') {
+        $scrout.='</p><h1><span class="LC_warning">'.&mt('Warning!').
+            '</span></h1><p><span class="LC_warning">'.
+            &mt('Copyright/distribution option "Private" is no longer supported. \
Select another option from below. Consider "Custom Rights" for maximum control over \
the usage of your resource.').'</span></p><hr />'; +    }
 
 # ------------------------------------------------------- Now have all metadata
 
@@ -1290,6 +1295,9 @@
 	$metadatafields{'copyright'}='default';
 	$metadatafields{'sourceavail'}='open';
     }
+    if ($metadatafields{'copyright'} eq 'priv') {
+        $metadatafields{'copyright'}='domain';
+    }
 # ------------------------------------------------ Dial in reasonable defaults
     my $defaultoption=$metadatafields{'copyright'};
     unless ($defaultoption) { $defaultoption='default'; }
@@ -1306,12 +1314,12 @@
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				    (grep !/^public$/,(&Apache::loncommon::copyrightids)));
+				    (grep !/^(public|priv)$/,(&Apache::loncommon::copyrightids)));
 	} else {
 	    $intr_scrout.=&selectbox('Copyright/Distribution','copyright',
 				     $defaultoption,
 				     \&Apache::loncommon::copyrightdescription,
-				     (&Apache::loncommon::copyrightids));
+				     (grep !/^priv$/,(&Apache::loncommon::copyrightids)));
 	}
 	my $copyright_help =
 	    Apache::loncommon::help_open_topic('Publishing_Copyright');


_______________________________________________
LON-CAPA-cvs mailing list
LON-CAPA-cvs@mail.lon-capa.org
http://mail.lon-capa.org/mailman/listinfo/lon-capa-cvs


[prev in list] [next in list] [prev in thread] [next in thread]