[LON-CAPA-cvs] cvs: loncom /html/adm/help/tex Publishing_Copyright.tex /publisher loncfile.pm lonpublisher.pm lonpubmenu.pm publisher.html
www
lon-capa-cvs@mail.lon-capa.org
Thu, 10 Mar 2005 03:50:49 -0000
www Wed Mar 9 22:50:49 2005 EDT
Modified files:
/loncom/html/adm/help/tex Publishing_Copyright.tex
/loncom/publisher loncfile.pm lonpublisher.pm lonpubmenu.pm
publisher.html
Log:
* Be able to make new library files
* Check for existing filename on new file generation was defunct
* Bug #3443: Copyright/Distribution Help was misplaced on screen and outdated
Index: loncom/html/adm/help/tex/Publishing_Copyright.tex
diff -u loncom/html/adm/help/tex/Publishing_Copyright.tex:1.2 loncom/html/adm/help/tex/Publishing_Copyright.tex:1.3
--- loncom/html/adm/help/tex/Publishing_Copyright.tex:1.2 Thu Jul 18 11:52:27 2002
+++ loncom/html/adm/help/tex/Publishing_Copyright.tex Wed Mar 9 22:50:49 2005
@@ -4,14 +4,14 @@
to use your resource as follows:
\begin{itemize}
-\item \textbf{Limited to courses in the domain published} means that only courses
-running in the same domain as you can use your content. Talk to your LON-CAPA
-administrator if you want more information about your domain.
-\item \textbf{Free} means that anyone can find and use the resource.
+\item \textbf{System Wide} is the default. The content can be used for any course within the network, regardless of the domain. Instructors can find your content and use it in their courses. Once an instructor selected a resource, the students in the course have access.
+\item \textbf{Domain - Limited to courses in the domain published} means that only courses
+running in the same domain as you can use your content.
\item \textbf{Private - visible to author only} means that it can't be used for
any course.
\item \textbf{Public - no authentication required} means anyone can find and use
-the resource.
+the resource - even without being logged in to the system.
+\item \textbf{Customized right of use} means that access to the resource is controlled by a separate Custom Rights file. This file needs to be specified during publication. You can edit a Custom Rights file in your author space, and need to publish it like any other file. Any number of your resource can point at the same Custom Rights file - if you want to change access rights for all of them, you just need to change and re-publish this one file.
\end{itemize}
Not all of these choices may be visible, depending on the nature of
-the resource.
\ No newline at end of file
+the resource.
Index: loncom/publisher/loncfile.pm
diff -u loncom/publisher/loncfile.pm:1.64 loncom/publisher/loncfile.pm:1.65
--- loncom/publisher/loncfile.pm:1.64 Tue Dec 28 16:28:49 2004
+++ loncom/publisher/loncfile.pm Wed Mar 9 22:50:49 2005
@@ -9,7 +9,7 @@
# and displays a page showing the results of the action.
#
#
-# $Id: loncfile.pm,v 1.64 2004/12/28 21:28:49 albertel Exp $
+# $Id: loncfile.pm,v 1.65 2005/03/10 03:50:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -802,8 +802,10 @@
$ENV{'form.action'} eq 'newsequencefile' ||
$ENV{'form.action'} eq 'newrightsfile' ||
$ENV{'form.action'} eq 'newstyfile' ||
+ $ENV{'form.action'} eq 'newlibraryfile' ||
$ENV{'form.action'} eq 'Select Action') {
- if ($newfilename) {
+ my $empty=&mt('Type Name Here');
+ if (($newfilename!~/\/$/) && ($newfilename!~/$empty$/)) {
&NewFile1($r, $uname, $udom, $fn, $newfilename);
} else {
$r->print('<p>'.&mt('No new filename specified.').'</p></form>');
@@ -1286,6 +1288,7 @@
$ENV{'form.action'} eq 'newsequencefile' ||
$ENV{'form.action'} eq 'newrightsfile' ||
$ENV{'form.action'} eq 'newstyfile' ||
+ $ENV{'form.action'} eq 'newlibraryfile' ||
$ENV{'form.action'} eq 'Select Action' ) {
$r->print('<h3>'.&mt('New Resource').'</h3>');
} else {
Index: loncom/publisher/lonpublisher.pm
diff -u loncom/publisher/lonpublisher.pm:1.187 loncom/publisher/lonpublisher.pm:1.188
--- loncom/publisher/lonpublisher.pm:1.187 Wed Mar 9 21:34:58 2005
+++ loncom/publisher/lonpublisher.pm Wed Mar 9 22:50:49 2005
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Publication Handler
#
-# $Id: lonpublisher.pm,v 1.187 2005/03/10 02:34:58 www Exp $
+# $Id: lonpublisher.pm,v 1.188 2005/03/10 03:50:49 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -1288,7 +1288,7 @@
}
my $copyright_help =
Apache::loncommon::help_open_topic('Publishing_Copyright');
- $intr_scrout =~ s/DISTRIBUTION:/'DISTRIBUTION: ' . $copyright_help/ge;
+ $intr_scrout =~ s/Distribution:/'Distribution: ' . $copyright_help/ge;
$intr_scrout.=&text_with_browse_field('Custom Distribution File','customdistributionfile',$metadatafields{'customdistributionfile'},'rights').$copyright_help;
$intr_scrout.=&selectbox('Source Distribution','sourceavail',
$defaultsourceoption,
Index: loncom/publisher/lonpubmenu.pm
diff -u loncom/publisher/lonpubmenu.pm:1.1 loncom/publisher/lonpubmenu.pm:1.2
--- loncom/publisher/lonpubmenu.pm:1.1 Fri Dec 10 09:57:47 2004
+++ loncom/publisher/lonpubmenu.pm Wed Mar 9 22:50:49 2005
@@ -51,6 +51,7 @@
nseq => 'New assembled sequence',
ncrf => 'New custom rights file',
nsty => 'New style file',
+ nlib => 'New library file',
nsub => 'New subdirectory',
renm => 'Rename current file to',
move => 'Move current file to',
@@ -329,6 +330,7 @@
<option value="newsequencefile">$lt{'nseq'}:</option>
<option value="newrightsfile">$lt{'ncrf'}:</option>
<option value="newstyfile">$lt{'nsty'}:</option>
+ <option value="newlibraryfile">$lt{'nlib'}:</option>
<option value="newdir">$lt{'nsub'}:</option>
ENDOPTIONS
if ($disp ne 'dir') {
Index: loncom/publisher/publisher.html
diff -u loncom/publisher/publisher.html:1.39 loncom/publisher/publisher.html:1.40
--- loncom/publisher/publisher.html:1.39 Wed Dec 15 14:02:45 2004
+++ loncom/publisher/publisher.html Wed Mar 9 22:50:49 2005
@@ -174,6 +174,7 @@
<option value="newsequencefile">MT{New assembled sequence}:</option>
<option value="newrightsfile">MT{New custom rights file}:</option>
<option value="newstyfile">MT{New style file}:</option>
+ <option value="newlibraryfile">MT{New library file}:</option>
<option value="newdir">MT{New subdirectory}:</option>
<option value="rename">MT{Rename current file to}:</option>
<option value="move">MT{Move current file to}:</option>