From raeburn at source.lon-capa.org  Mon Jul 30 09:04:37 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 30 Jul 2012 13:04:37 -0000
Subject: [LON-CAPA-cvs] cvs: doc /build ubuntu12LTS_install.frag
Message-ID: <cvsraeburn1343653477@cvsserver>

raeburn		Mon Jul 30 13:04:37 2012 EDT

  Added files:                 
    /doc/build	ubuntu12LTS_install.frag 
  Log:
  - Installation instructions for Ubuntu 12 LTS.
  
  
-------------- next part --------------

Index: doc/build/ubuntu12LTS_install.frag
+++ doc/build/ubuntu12LTS_install.frag
<h1>Installing LON-CAPA on a basic Ubuntu 12.04 LTS Server</h1>
<p>
This document guides you through the process of setting up a new LON-CAPA
server running Ubuntu 12.04 LTS Server with only the base set of packages installed.  
The computer will be configured solely as a LON-CAPA server and will be 
expected to have no other services running.  Your server is expected to have
a reasonably fast connection to the internet.
</p><p>
More information is available at 
<a href="http://install.lon-capa.org/">http://install.lon-capa.org/</a>.
</p>

<h2>Before you begin</h2>
<p>
Installing Linux is getting easier and easier.
You will be required to log in to the machine and execute
some routine Unix commands.  Familiarity with the Apache web server, mod_perl, 
perl, and MySQL are not required to install and run LON-CAPA.
</p>

<h2>Installation Overview</h2>
<p>
The installation process takes the following steps:
</p>
<ol>
  <li><a href="#obt">Obtain Ubuntu 12.04 LTS .iso</a></li>
  <li><a href="#net">Determine Network Settings</a></li>
  <li><a href="#lin">Install Ubuntu 12.04 LTS</a></li>
  <li><a href="#upd">Update your system</a></li>
  <li><a href="#ilc">Install LON-CAPA</a></li>
  <li><a href="#cdc">Create a Domain Coordinator</a></li>
  <li><a href="#sts">Start/Restart services</a></li>
  <li><a href="#log">Log in to LON-CAPA</a></li>
</ol>

<hr />
<h2>1. <a name="obt">Obtain Ubuntu 12.04 LTS .iso file</a></h2>
<p>
Ubuntu 12.04 LTS (server install) isos can be obtained from the <a href="http://www.ubuntu.com/download/server/download">Ubuntu Server download</a> page<br />
An .iso file (either 32 bit or 64 bit) can be burned to a CD. 
</p>

<h2>2. <a name="net">Determine Network Settings</a></h2>
<p>
You will need to know the following network settings for your installation.
<b>Note:</b>You must have a static IP address to use LON-CAPA.
DHCP is <em>not</em> supported.

<ul>
  <li>ip address </li>
  <li>netmask </li>
  <li>hostname </li>
  <li>gateway </li>
  <li>domain name server(s) </li>
</ul>

<h2>3. <a name="lin">Ubuntu 12.04 LTS installation</a></h2>
<p>
Installing Ubuntu Linux is easy.
Documentation is available from
<a href="https://help.ubuntu.com/community/Installation">https://help.ubuntu.com/community/Installation/</a>
Most of the installation screens are self explanatory.
There are a few steps that require comment and are dealt with below.
</p>
<dl style="list-style:square outside none">
   <dt>Installation Language</dt>
   <dd>Use English as your installation language.</dd>
   <dt>Installation Type</dt>
   <dd>If this is a fresh install choose "Install Ubuntu Server".</dd>
   <dt>Partitioning your Drive</dt>
   <dd>For a fresh install you may want to use the automatic partitioning feature of the installer.
       If you decide to customize partitioning, the following may be useful to know.
       LON-CAPA resource files are stored in the /home directory, so the
       majority of the disk space should be allocated here.  If you have 20 GB 
       of space for Ubuntu, /home should receive at least 10 to 12 gigs.  
       Since MySQL uses the /var filesystem to store its databases you should
       have at least 4 gigs of space available on /var.  Be sure to 
       include adequate swap space.  A minimum is 512 Megs, but you should
       typically have 1 or 2x as much swap space as you do physical RAM.</dd>

   <dt>Network Configuration</dt>
   <dd>LON-CAPA will <b>not</b> work with a machine set up to use a dynamic 
       IP address.  When configuring your network card, be sure to unselect
       the DHCP option and enter in your network information.</dd>
   <dt>Software Selection</dt>
   <dd>The base system will be installed. Once that is complete you will have the option to select additional software collections. Leave all unselected.</dd>
</dl>
<p>

Finish installing your server, reboot it, and log in with the username you created during installation.
  <dt>Firewall Configuration</dt>
   <dd>Use ufw to allow incoming traffic for the following services: 
       ssh, www, https
   </dd>
<pre>
sudo ufw default deny
sudo ufw enable
sudo ufw allow ssh
sudo ufw allow www
sudo ufw allow https
</pre>
   <dt>E-mail: Postfix Installation</dt>
   <dd>Configure to "Internet Site" to allow LON-CAPA to send e-mail to users.</dd>
<pre>
sudo apt-get install postfix
</pre>
   <dt>E-mail: Postfix Configuration</dt>
   <dd>If you need to change the postfix configuration in the future use:<dd>
<pre>
sudo dpkg-reconfigure postfix
</pre>
</p>

<h2>4. <a name="upd">Update your system</a></h2>
<p>
Update your system to the latest versions of the system software using apt-get
</p>
<pre>
sudo apt-get update
sudo apt-get upgrade
</pre>
<p>
If kernel packages were updated, reboot your system before continuing with the installation.
</p>
<p>
Add LON-CAPA ubuntu repository to your /etc/apt/sources.list file. 
</p>
<pre>
sudo apt-get install python-software-properties
sudo apt-add-repository 'deb http://install.loncapa.org/ubuntu precise main'
</pre>
<h2>5. <a name="ilc">Installing LON-CAPA</a></h2>
<h3>Import the LON-CAPA encryption key</h3>
<pre>
wget http://install.loncapa.org/versions/ubuntu/APT-GPG-KEY-loncapa.asc
sudo apt-key add APT-GPG-KEY-loncapa.asc
sudo apt-get update
</pre>
<h3>Install prerequisites</h3>
<p> Execute: </p>
<pre>
sudo apt-get install loncapa-prerequisites
</pre><p>
This may take some minutes due to LON-CAPA's large number of dependencies.
</p>
<h3>Retrieve and execute LON-CAPA setup program</h3>
<p>
Retrieve the LON-CAPA setup script and dependencies with the following command:
</p>
<pre>
wget http://install.loncapa.org/linux/install.tar
</pre>
<p>
Extract the archive with the following command:
</p>
<pre>
tar xf install.tar
</pre>
<p>
This creates a directory named <tt>installation</tt>.  Change to it and
execute the setup script with the following commands:
</p>
<pre>
cd installation
sudo ./install.pl

</pre>
<p>
The script is used to prepare a Linux system to run LON-CAPA, and can also be
used to check the configuration of a system on which LON-CAPA has already been installed.  Typically, though, you will run this script only once, when you first install LON-CAPA.
</p>
<p>
The script will analyze your system to determine which actions are recommended.  The script will then prompt you to choose the actions you would like taken.
Once a choice has been entered for all nine possible actions, required changes will be made.
</p>
<p>The possible actions are:
<ul>
<li>Create the www user/group</li>
<li>Install the package LON-CAPA uses to authenticate users.</li>
<li>Set-up the MySQL database</li>
<li>Set-up MySQL permissions</li>
<li>Configure Apache web server</li>
<li>Configure start-up of services</li>
<li>Check firewall settings</li>
<li>Stop services not used by LON-CAPA,<br />
    e.g., services for a print server: cups daemon</li>
<li>Download LON-CAPA source code in readiness for installation</li>
</ul>
</p>

<h3>Determine LON-CAPA Settings</h3>
<p>
LON-CAPA requires a number of identifying parameters to be set in order
for it to function at all.  Below is a list with descriptions.
</p>
<dl>
  <dt>Host Type (library or access)</dt>
  <dd>The server must be designated a 'library' or an 'access' server.  In
      general you should have a library server for your instructors to create
      their course content on and run their courses.  Students should connect
      to access servers.  If you are doing the first install of LON-CAPA at 
      your site, or if you are playing with it for your own edification you
      should make your machine a 'library' server.</dd>
  <dt>LON-CAPA domain</dt>
  <dd>Each site or school which installs LON-CAPA needs its own domain.
      Here at MSU we use 'msu'.  You should choose something short but
      meaningful.  <i>Restriction: One word, no hyphens, underscores, or 
      special characters.</i><br />Domain names which include a departmental 
      abbreviation are not recommended as although LON-CAPA may start in
      a single department, other departments frequently join subsequently.
      For a domain name: 'msu' is a superior choice to 'msuphys' for example.
  </dd>
  <dt>LON-CAPA host id</dt>
  <dd>Each LON-CAPA server requires a unique internal name.  We use names
      such as "msul1" for the first library server. <i>Restriction: One word, 
      no hyphens, underscores, or special characters.</i>
  </dd>
  <dt>Domain's Primary Library Server ID</dt>
   <dd>If you are setting up a domain with a single library server, then the domain's primary library server ID will be the LON-CAPA host id of that server (e.g., msul1). Once your domain grows and you need to add more servers, one of the library servers in the domain should be assigned as the domain's primary library server.  This will be where domain-wide settings will be stored.<dd>
  <dt>Host administrator email</dt>
  <dd>The amount of email sent to this address is relatively minimal.  Messages
      are sent every time the system starts up, or if the system is in 
      serious trouble. On a laptop, make this <tt>root at localhost</tt>.
  </dd>
  <dt>Support email address</dt>
  <dd>If you enter an e-mail address here, then users of the system  
      will be able to click an "Ask Helpdesk" link in the system to 
      display a web form which they will complete to request support from
      your institution's helpdesk. On form submission the contents 
      will be sent to the e-mail address you specify. 
  </dd>
</dl>

<h3>Configuring LON-CAPA</h3>
<p>
To configure and install LON-CAPA, become root and execute the following commands:
</p>
<pre>
sudo -i
cd /root/loncapa-X.Y.Z     (X.Y.Z should correspond to a version number like '2.11.0')
/UPDATE
</pre>
<p>
You will need to enter the LON-CAPA configuration information you determined 
in the previous section.
</p>

<h2>6. <a name="cdc">Creating a Domain Coordinator</a></h2>
<p>
You will need at least one user at your site who has the role of
'domain coordinator'.  This user creates accounts for other users and
grants them additional privileges.  The make_domain_coordinator.pl script
invoked below requires that you enter the user's password.
Replace USERNAME and DOMAIN with an appropriate username and your domain.
</p>
<pre>
cd /root/loncapa-X.Y.Z/loncom/build
perl make_domain_coordinator.pl USERNAME DOMAIN
</pre>

<h2>7. <a name="sts">Start/Restart Services</a></h2>
<p>
The LON-CAPA network services take a moment to start.  Most misconfigurations
will be apparent at this step. Lastly, exit from root status to resume use of your regular account.
</p>
<pre>
/etc/init.d/loncontrol start
/etc/init.d/apache2 restart
exit
</pre>
<p>
If you receive warnings about missing perl modules when starting Apache,
please make sure you followed the instructions in 
<b>Installing prerequisites</b>.  If you still have errors, please
contact the MSU LON-CAPA group.
</p>

<h2>8. <a name="log">Log in to your LON-CAPA Machine</a></h2>
<p>
Point a web browser at your new machine and log in as the domain
coordinator.  Congratulations!
</p>

<hr />
<h2>If things aren't working right</h2>
<p>
If you've followed the steps above and the server doesn't start or you think 
there's something wrong, please send a <a href="http://help.loncapa.org/help">help request</a> to the MSU LON-CAPA group.  If there were errors in installation of the dependency .deb packages or errors during the
automatic setup, please send us as much information as possible.
If some part of this document is unclear please let us know.
</p>

From bisitz at source.lon-capa.org  Mon Jul 30 09:10:57 2012
From: bisitz at source.lon-capa.org (bisitz)
Date: Mon, 30 Jul 2012 13:10:57 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface portfolio.pm
Message-ID: <cvsbisitz1343653857@cvsserver>

bisitz		Mon Jul 30 13:10:57 2012 EDT

  Modified files:              
    /loncom/interface	portfolio.pm 
  Log:
  Localize start and end date output in confirm message after access control change.
  
  
Index: loncom/interface/portfolio.pm
diff -u loncom/interface/portfolio.pm:1.235 loncom/interface/portfolio.pm:1.236
--- loncom/interface/portfolio.pm:1.235	Fri Jun  8 12:25:59 2012
+++ loncom/interface/portfolio.pm	Mon Jul 30 13:10:57 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # portfolio browser
 #
-# $Id: portfolio.pm,v 1.235 2012/06/08 12:25:59 raeburn Exp $
+# $Id: portfolio.pm,v 1.236 2012/07/30 13:10:57 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -981,11 +981,11 @@
                 $showstart = &mt('Deleted');
                 $showend = $showstart;
             } else {
-                $showstart = localtime($start);
+                $showstart = &Apache::lonlocal::locallocaltime($start);
                 if ($end == 0) {
                     $showend = &mt('No end date');
                 } else {
-                    $showend = localtime($end);
+                    $showend = &Apache::lonlocal::locallocaltime($end);
                 }
             }
             $r->print('<td>'.&mt($scope_desc{$scope}));



From raeburn at source.lon-capa.org  Tue Jul 31 19:38:13 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Tue, 31 Jul 2012 23:38:13 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface londocs.pm
Message-ID: <cvsraeburn1343777893@cvsserver>

raeburn		Tue Jul 31 23:38:13 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	londocs.pm 
  Log:
  - For 2.11
    - Backport 1.488, 1.489, 1.490, 1.491, 1.492.
  
  
-------------- next part --------------
Index: loncom/interface/londocs.pm
diff -u loncom/interface/londocs.pm:1.484.2.6 loncom/interface/londocs.pm:1.484.2.7
--- loncom/interface/londocs.pm:1.484.2.6	Tue May 29 20:56:34 2012
+++ loncom/interface/londocs.pm	Tue Jul 31 23:38:13 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # Documents
 #
-# $Id: londocs.pm,v 1.484.2.6 2012/05/29 20:56:34 raeburn Exp $
+# $Id: londocs.pm,v 1.484.2.7 2012/07/31 23:38:13 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -40,7 +40,9 @@
 use Apache::lonclonecourse;
 use Apache::lonnavmaps;
 use Apache::lonnavdisplay();
+use Apache::lonuserstate();
 use HTML::Entities;
+use HTML::TokeParser;
 use GDBM_File;
 use Apache::lonlocal;
 use Cwd;
@@ -67,10 +69,14 @@
 }
 
 sub storemap {
-    my ($coursenum,$coursedom,$map)=@_;
+    my ($coursenum,$coursedom,$map,$contentchg)=@_;
+    my $report;
+    if (($contentchg) && ($map =~ /^default/)) {
+       $report = 1;
+    }
     my ($outtext,$errtext)=
       &LONCAPA::map::storemap('/uploaded/'.$coursedom.'/'.$coursenum.'/'.
-			      $map,1);
+			      $map,1,$report);
     if ($errtext) { return ($errtext,2); }
 
     $hadchanges=1;
@@ -303,7 +309,7 @@
 		join(':', ($name, $url, $ext, 'normal', 'res'));
 	}
     }
-    return &storemap($coursenum, $coursedom, $folder.'.'.$container);
+    return &storemap($coursenum, $coursedom, $folder.'.'.$container,1);
 }
 
 sub breadcrumbs {
@@ -436,7 +442,7 @@
              '</script>'."\n";
     $r->print(&Apache::loncommon::start_page('Content Change Log',$js));
     $r->print(&Apache::lonhtmlcommon::breadcrumbs('Content Change Log'));
-    $r->print(&startContentScreen('docs'));
+    $r->print(&startContentScreen(($supplementalflag?'suppdocs':'docs')));
     my %orderhash;
     my $container='sequence';
     my $pathitem;
@@ -455,6 +461,9 @@
     my $jumpto = $readfile;
     $jumpto =~ s{^/}{};
     my $tid = 1;
+    if ($supplementalflag) {
+        $tid = 2;
+    }
     my ($breadcrumbtrail) = &breadcrumbs($allowed,$crstype);
     $r->print($breadcrumbtrail.
               &generate_edit_table($tid,\%orderhash,undef,$iconpath,$jumpto,
@@ -529,18 +538,30 @@
                                   ':'.$docslog{$id}{'exe_udom'}.'</tt>'.
                   $send_msg_link.'</td><td>'.
                   $docslog{$id}{'logentry'}{'folder'}.'</td><td>');
+        my $is_supp = 0;
+        if ($docslog{$id}{'logentry'}{'currentfolder'} =~ /^supplemental/) {
+            $is_supp = 1;
+        }
 # Before
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtescape($oldname));
+                my $shown = &LONCAPA::map::qtescape($oldname);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print($shown);
 	    }
 	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'before_order_res_'.$idx}) {
-		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]).'</li>');
+                my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'before_order_res_'.$idx}))[0]);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -551,13 +572,21 @@
 	    my $oldname=(split(/\:/,$docslog{$id}{'logentry'}{'before_resources_'.$idx}))[0];
 	    my $newname=(split(/\:/,$docslog{$id}{'logentry'}{'after_resources_'.$idx}))[0];
 	    if ($oldname ne '' && $oldname ne $newname) {
-		$r->print(&LONCAPA::map::qtescape($newname));
+                my $shown = &LONCAPA::map::qtescape($newname);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($newname));
+                }
+                $r->print($shown);
 	    }
 	}
 	$r->print('<ul>');
 	for (my $idx=0;$idx<=$docslog{$id}{'logentry'}{'maxidx'};$idx++) {
             if ($docslog{$id}{'logentry'}{'after_order_res_'.$idx}) {
-		$r->print('<li>'.&LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]).'</li>');
+                my $shown = &LONCAPA::map::qtescape((split(/\:/,$docslog{$id}{'logentry'}{'after_order_res_'.$idx}))[0]);
+                if ($is_supp) {
+                    $shown = &Apache::loncommon::parse_supplemental_title($shown);
+                }
+                $r->print('<li>'.$shown.'</li>');
 	    }
 	}
 	$r->print('</ul>');
@@ -587,7 +616,7 @@
 }
 
 sub update_paste_buffer {
-    my ($coursenum,$coursedom) = @_;
+    my ($coursenum,$coursedom,$folder) = @_;
 
     return if (!defined($env{'form.markcopy'}));
     return if (!defined($env{'form.copyfolder'}));
@@ -602,35 +631,128 @@
     my ($title,$url)=split(':',$LONCAPA::map::resources[$LONCAPA::map::order[$env{'form.markcopy'}]]);
     if (&is_supplemental_title($title)) {
         &Apache::lonnet::appenv({'docs.markedcopy_supplemental' => $title});
-	($title) = &parse_supplemental_title($title);
+	($title) = &Apache::loncommon::parse_supplemental_title($title);
     } elsif ($env{'docs.markedcopy_supplemental'}) {
         &Apache::lonnet::delenv('docs.markedcopy_supplemental');
     }
     $url=~s{http(&colon;|:)//https(&colon;|:)//}{https$2//};
 
-    &Apache::lonnet::appenv({'docs.markedcopy_title' => $title,
-			    'docs.markedcopy_url'   => $url});
+    (my $cmd,undef)=split('_',$env{'form.cmd'});
+
+    my %addtoenv = (
+                    'docs.markedcopy_title' => $title,
+                    'docs.markedcopy_url'   => $url,
+                    'docs.markedcopy_cmd'   => $cmd,
+                   );
+    &Apache::lonnet::delenv('docs.markedcopy_nested');
+    &Apache::lonnet::delenv('docs.markedcopy_nestednames');
+    if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(default|supplemental)_?(\d*)\.(page|sequence)$}) {
+        my $prefix = $1;
+        my $subdir =$2;
+        if ($subdir eq '') {
+            $subdir = $prefix;
+        }
+        my (%addedmaps,%removefrommap,%removeparam,%hierarchy,%titles,%allmaps);
+        &contained_map_check($url,$folder,\%removefrommap,\%removeparam,\%addedmaps,
+                             \%hierarchy,\%titles,\%allmaps);
+        if (ref($hierarchy{$url}) eq 'HASH') {
+            my ($nested,$nestednames);
+            &recurse_uploaded_maps($url,$subdir,\%hierarchy,\%titles,\$nested,\$nestednames);
+            $nested =~ s/\&$//;
+            $nestednames =~ s/\Q___&&&___\E$//;
+            if ($nested ne '') {
+                $addtoenv{'docs.markedcopy_nested'} = $nested;
+            }
+            if ($nestednames ne '') {
+                $addtoenv{'docs.markedcopy_nestednames'} = $nestednames;
+            }
+        }
+    }
+    &Apache::lonnet::appenv(\%addtoenv);
     delete($env{'form.markcopy'});
 }
 
+sub recurse_uploaded_maps {
+    my ($url,$dir,$hierarchy,$titlesref,$nestref,$namesref) = @_;
+    if (ref($hierarchy->{$url}) eq 'HASH') {
+        my @maps = map { $hierarchy->{$url}{$_}; } sort { $a <=> $b } (keys(%{$hierarchy->{$url}}));
+        my @titles = map { $titlesref->{$url}{$_}; } sort { $a <=> $b } (keys(%{$titlesref->{$url}}));
+        my (@uploaded, at names,%shorter);
+        for (my $i=0; $i<@maps; $i++) {
+            my ($inner) = ($maps[$i] =~ m{^/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_(\d+)\.(?:page|sequence)$});
+            if ($inner ne '') {
+                push(@uploaded,$inner);
+                push(@names,&escape($titles[$i]));
+                $shorter{$maps[$i]} = $inner;
+            }
+        }
+        $$nestref .= "$dir:".join(',', at uploaded).'&';
+        $$namesref .= "$dir:".(join(',', at names)).'___&&&___';
+        foreach my $map (@maps) {
+            if ($shorter{$map} ne '') {
+                &recurse_uploaded_maps($map,$shorter{$map},$hierarchy,$titlesref,$nestref,$namesref);
+            }
+        }
+    }
+    return;
+}
+
 sub print_paste_buffer {
-    my ($r,$container) = @_;
+    my ($r,$container,$folder,$coursedom,$coursenum) = @_;
     return if (!defined($env{'docs.markedcopy_url'}));
 
-    $r->print('<fieldset>'
-             .'<legend>'.&mt('Clipboard').'</legend>'
-             .'<form name="pasteform" action="/adm/coursedocs" method="post">'
-             .'<input type="submit" name="pastemarked" value="'.&mt('Paste').'" /> '
-    );
-
-    my $type;
+    my ($is_external,$othercourse,$fromsupp,$is_uploaded_map,$parent);
+    my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
     if ($env{'docs.markedcopy_url'} =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//} ) {
+        $is_external = 1;
+    }
+
+    my ($canpaste,$nopaste,$othercrs,$areachange,$is_uploaded_map);
+    if ($folder =~ /^supplemental/) {
+        $canpaste = &supp_pasteable($env{'docs.markedcopy_url'});
+        unless ($canpaste) {
+            $nopaste = &mt('Paste into Supplemental Content unavailable for this type of content.');
+        }
+    } else {
+        $canpaste = 1;
+    }
+
+    if ($canpaste) {
+        if ($env{'docs.markedcopy_url'} =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+            my $srcdom = $1;
+            my $srcnum = $2;
+            my $rem = $3;
+            if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+                $othercourse = 1;
+                if ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                    if ($canpaste) {
+                        $othercrs = '<br />'.&mt('(from another course).');
+                    }
+                } else {
+                    $canpaste = 0;
+                    $nopaste = &mt('Paste from another course unavailable.')
+                }
+            }
+            if ($rem =~ m{^(default|supplemental)_?(\d*)\.(?:page|sequence)$}) {
+                my $prefix = $1;
+                $parent = $2;
+                if ($folder !~ /^\Q$prefix\E/) {
+                    $areachange = 1;
+                }
+                $is_uploaded_map = 1;
+            }
+        }
+    }
+
+    $r->print('<fieldset>'
+             .'<legend>'.&mt('Clipboard').'</legend>');
+    my ($type,$buffer);
+    if ($is_external) {
 	$type = &mt('External Resource');
-	$r->print($type.': '.
+	$buffer = $type.': '.
 		  &LONCAPA::map::qtescape($env{'docs.markedcopy_title'}).' ('.
-		  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')');
+                  &LONCAPA::map::qtescape($env{'docs.markedcopy_url'}).')';
     }  else {
-	my $extension = (split(/\./,$env{'docs.markedcopy_url'}))[-1];
 	my $icon = &Apache::loncommon::icon($extension);
 	if ($extension eq 'sequence' &&
 	    $env{'docs.markedcopy_url'} =~ m{/default_\d+\.sequence$ }x) {
@@ -638,116 +760,449 @@
 	    $icon .= '/navmap.folder.closed.gif';
 	}
 	$icon = '<img src="'.$icon.'" alt="" class="LC_icon" />';
-	$r->print($icon.$type.': '.  &parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'})));
+        $buffer = $icon.$type.': '.  &Apache::loncommon::parse_supplemental_title(&LONCAPA::map::qtescape($env{'docs.markedcopy_title'}));
     }
-    if ($container eq 'page') {
-	$r->print('
+    if ($canpaste) {
+        $r->print('<form name="pasteform" action="/adm/coursedocs" method="post">'.$buffer);
+        if (($is_uploaded_map) && (!$areachange)) {
+            if ((!$othercourse) && ($env{'docs.markedcopy_cmd'} eq 'cut')) {
+                $r->print(('&nbsp;'x 4).'<span id="pasteoptionstext">'.
+                          '<a href="javascript:showPasteOptions();" class="LC_menubuttons_link">'.
+                          &mt('Show Paste Options').'</a></span><br />'.
+                          '<div id="pasteoptions" class="LC_dccid">'.('&nbsp;'x 4).
+                          '<label>'.
+                          '<input type="radio" name="docs.markedcopy_options" value="new" checked="checked" />'.
+                          &mt('Copy to new folder').'</label>'.('&nbsp;' x2).
+                          '<label>'.
+                          '<input type="radio" name="docs.markedcopy_options" value="move" />'.
+                          &mt('Move old folder').'</label><br />');
+                if ($env{'docs.markedcopy_nested'}) {
+                    $r->print('<br />'.&mt('Folder to paste contains sub-folders').
+                              '<br /><table border="0">');
+                    my @pastemaps = split(/\&/,$env{'docs.markedcopy_nested'});
+                    my @titles = split(/\Q___&&&___\E/,$env{'docs.markedcopy_nestednames'});
+                    my $lastdir = $parent;
+                    my %depths = (
+                                   $lastdir => 0,
+                                 );
+                    my (%display,%deps);
+                    for (my $i=0; $i<@pastemaps; $i++) {
+                        ($lastdir,my $subfolderstr) = split(/\:/,$pastemaps[$i]);
+                        my ($namedir,$esctitlestr) = split(/\:/,$titles[$i]);
+                        my @subfolders = split(/,/,$subfolderstr);
+                        $deps{$lastdir} = \@subfolders;
+                        my @subfoldertitles = map { &unescape($_); } split(/,/,$esctitlestr);
+                        my $depth = $depths{$lastdir} + 1;
+                        my $offset = int($depth * 4);
+                        my $indent = ('&nbsp;' x $offset);
+                        for (my $j=0; $j<@subfolders; $j++) {
+                            $depths{$subfolders[$j]} = $depth;
+                            $display{$subfolders[$j]} =
+                                  '<tr><td>'.$indent.$subfoldertitles[$j].'&nbsp;</td>'.
+                                  '<td><label>'.
+                                  '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="new" checked="checked" />'.&mt('Copy to new').'</label>'.('&nbsp;' x2).
+                                  '<label>'.
+                                  '<input type="radio" name="docs.markedcopy_'.$subfolders[$j].'" value="move" />'.
+                                  &mt('Move old').'</label>'.
+                                  '</td></tr>';
+                        }
+                    }
+                    &recurse_print($r,$parent,\%deps,\%display);
+                    $r->print('</table>');
+                }
+                $r->print('</div>');
+            }
+        }
+        $r->print('<br /><input type="submit" name="pastemarked" value="'.&mt('Paste').'" />'.$othercrs);
+        if ($container eq 'page') {
+	    $r->print('
 	<input type="hidden" name="pagepath" value="'.&HTML::Entities::encode($env{'form.pagepath'},'<>&"').'" />
 	<input type="hidden" name="pagesymb" value="'.&HTML::Entities::encode($env{'form.pagesymb'},'<>&"').'" />
 ');
-    } else {
-	$r->print('
+        } else {
+	    $r->print('
         <input type="hidden" name="folderpath" value="'.&HTML::Entities::encode($env{'form.folderpath'},'<>&"').'" />
 ');
+        }
+        $r->print('</form>');
+    } else {
+        $r->print(&mt('Paste buffer contains:').' '.$buffer.
+                  '<br /><p class="LC_info">'.$nopaste.'</p>');
     }
-    $r->print('</form></fieldset>');
+    $r->print('</fieldset>');
 }
 
+sub recurse_print {
+    my ($r,$dir,$deps,$display) = @_;
+    $r->print($display->{$dir}."\n");
+    if (ref($deps->{$dir}) eq 'ARRAY') {
+        foreach my $subdir (@{$deps->{$dir}}) {
+            &recurse_print($r,$subdir,$deps,$display);
+        }
+    }
+}
+
+sub supp_pasteable {
+    my ($url) = @_;
+    if (($url =~ m{^(?:/adm/wrapper/ext|(?:http|https)(?:&colon;|:))//}) ||
+        (($url =~ /\.sequence$/) && ($url =~ m{^/uploaded/})) ||
+        ($url =~ m{^/uploaded/$match_domain/$match_courseid/(docs|supplemental)/(default|\d+)/\d+/}) ||
+        ($url =~ m{^/adm/$match_domain/$match_username/aboutme}) ||
+        ($url =~ m{^/public/$match_domain/$match_courseid/syllabus})) {
+        return 1;
+    }
+    return;
+}
+
+sub paste_popup_js {
+    my %lt = &Apache::lonlocal::texthash(
+                                          show => 'Show Paste Options',
+                                          hide => 'Hide Paste Options',
+                                        );
+    return <<"END";
+
+function showPasteOptions() {
+    document.getElementById('pasteoptions').style.display='block';
+    document.getElementById('pasteoptions').style.textAlign='left';
+    document.getElementById('pasteoptions').style.textFace='normal';
+    document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:hidePasteOptions();" class="LC_menubuttons_link">$lt{'hide'}</a><br />';
+    return;
+}
+
+function hidePasteOptions() {
+    document.getElementById('pasteoptions').style.display='none';
+    document.getElementById('pasteoptionstext').innerHTML ='<a href="javascript:showPasteOptions()" class="LC_menubuttons_link">$lt{'show'}</a>';
+    return;
+}
+
+END
+
+}
+
+
 sub do_paste_from_buffer {
-    my ($coursenum,$coursedom,$folder) = @_;
+    my ($coursenum,$coursedom,$folder,$container,$errors) = @_;
 
+# Early out if paste buffer is empty
     if (!$env{'form.pastemarked'}) {
-        return;
+        return ();
+    }
+
+# Supplemental content may only include certain types of content
+# Early out if pasted content is not supported in Supplemental area
+    if ($folder =~ /^supplemental/) {
+        unless (&supp_pasteable($env{'docs.markedcopy_url'})) {
+            return (&mt('Paste failed: content type is not supported within Supplemental Content'));
+        }
     }
 
-# paste resource to end of list
+# Prepare to paste resource at end of list
     my $url=&LONCAPA::map::qtescape($env{'docs.markedcopy_url'});
     my $title=&LONCAPA::map::qtescape($env{'docs.markedcopy_title'});
-# Maps need to be copied first
-    if (($url=~/\.(page|sequence)$/) && ($url=~/^\/uploaded\//)) {
-	$title=&mt('Copy of').' '.$title;
-	my $newid=$$.int(rand(100)).time;
-	my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
-        if ($oldid =~ m{^(/uploaded/\Q$coursedom\E/\Q$coursenum\E/)(\D+)(\d+)$}) {
-            my $path = $1;
-            my $prefix = $2;
-            my $ancestor = $3;
-            if (length($ancestor) > 10) {
-                $ancestor = substr($ancestor,-10,10);
+
+    my ($is_map,$srcdom,$srcnum,$prefixchg,%before,%after,%mapchanges,%tomove);
+    if ($url=~/\.(page|sequence)$/) {
+        $is_map = 1;
+    }
+    if ($url =~ m{^/uploaded/($match_domain)/($match_courseid)/([^/]+)}) {
+        $srcdom = $1;
+        $srcnum = $2;
+        my $oldprefix = $3;
+# When paste buffer was populated using an active role in a different course
+# check for mdc privilege in the course from which the resource was pasted
+        if (($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+            unless ($env{"user.priv.cm./$srcdom/$srcnum"} =~ /\Q:mdc&F\E/) {
+                return (&mt('Paste failed: Item is from a different course which you do not have rights to edit.'));
             }
-            $oldid = $path.$prefix.$ancestor;
         }
-        my $counter = 0;
-        my $newurl=$oldid.$newid.'.'.$ext;
-        my $is_unique = &uniqueness_check($newurl);
-        while (!$is_unique && $counter < 100) {
-            $counter ++;
-            $newid ++;
-            $newurl = $oldid.$newid;
-            $is_unique = &uniqueness_check($newurl);
+# When pasting content from Main Content to Supplemental Content and vice versa
+# URLs will contain different paths (which depend on whether pasted item is
+# a folder/page or a document.
+        if (($folder =~ /^supplemental/) && (($oldprefix =~ /^default/) || ($oldprefix eq 'docs'))) {
+            $prefixchg = 1;
+            %before = ( map => 'default',
+                        doc => 'docs');
+            %after =  ( map => 'supplemental',
+                        doc => 'supplemental' );
+        } elsif (($folder =~ /^default/) && ($oldprefix =~ /^supplemental/)) {
+            $prefixchg = 1;
+            %before = ( map => 'supplemental',
+                        doc => 'supplemental');
+            %after  = ( map => 'default',
+                        doc => 'docs');
+        }
+
+# If pasting an uploaded map, get list of contained uploaded maps.
+        my @nested;
+        if ($env{'docs.markedcopy_nested'}) {
+            my ($type) = ($oldprefix =~ /^(default|supplemental)/);
+            my @items = split(/\&/,$env{'docs.markedcopy_nested'});
+            my @deps = map { /\d+:([\d,]+$)/ } @items;
+            foreach my $dep (@deps) {
+                if ($dep =~ /,/) {
+                    push(@nested,split(/,/,$dep));
+                } else {
+                    push(@nested,$dep);
+                }
+            }
+            foreach my $item (@nested) {
+                if ($env{'form.docs.markedcopy_'.$item} eq 'move') {
+                    $tomove{$type.'_'.$item} = 1;
+                }
+            }
         }
-        if (!$is_unique) {
-            if ($url=~/\.page$/) {
-                return &mt('Paste failed: an error occurred creating a unique URL for the composite page');
-            } else {
-                return &mt('Paste failed: an error occurred creating a unique URL for the folder');
+    }
+
+# Maps need to be copied first
+    my ($oldurl,%removefrommap,%removeparam,%addedmaps,%rewrites,%retitles,%copies,
+        %dbcopies,%zombies,%params,%docmoves,%mapmoves,%newsubdir,%newurls);
+    $oldurl = $url;
+    if ($is_map) {
+        if ($folder =~ /^default/) {
+            my $lastchange = &Apache::lonnet::get_coursechange($coursedom,$coursenum);
+            if ($lastchange > $env{'request.course.tied'}) {
+                &reinit_role($coursedom,$coursenum,$env{"course.$env{'request.course.id'}.home"});
             }
         }
-	my $storefn=$newurl;
-	$storefn=~s{^/\w+/$match_domain/$match_username/}{};
-	my $paste_map_result =
-            &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
-					       &Apache::lonnet::getfile($url));
-        if ($paste_map_result eq '/adm/notfound.html') {
-            if ($url=~/\.page$/) {
-                return &mt('Paste failed: an error occurred saving the composite page');
-            } else {
-                return &mt('Paste failed: an error occurred saving the folder');
+# If pasting a map, check if map contains other maps
+        my (%allmaps,%hierarchy,%titles);
+        if ($folder =~ /^default/) {
+            my $navmap = Apache::lonnavmaps::navmap->new();
+            if (defined($navmap)) {
+                foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_map() },1,0,1)) {
+                    $allmaps{$res->src()} = 1;
+                }
             }
         }
-	$url = $newurl;
-    }
+        &contained_map_check($url,$folder,\%removefrommap,\%removeparam,
+                             \%addedmaps,\%hierarchy,\%titles,\%allmaps);
+        if ($url=~ m{^/uploaded/}) {
+            my $newurl;
+            unless ($env{'form.docs.markedcopy_options'} eq 'move') {
+                ($newurl,my $error) =
+                    &get_newmap_url($url,$folder,$prefixchg,$coursedom,$coursenum,
+                                    $srcdom,$srcnum,\$title,\%allmaps,\%newurls);
+                if ($error) {
+                    return ($error);
+                }
+                if ($newurl ne '') {
+                    if ($newurl ne $url) {
+                        if ($newurl =~ /(?:default|supplemental)_(\d+).(?:sequence|page)$/) {
+                            $newsubdir{$url} = $1;
+                        }
+                        $mapchanges{$url} = 1;
+                    }
+                }
+            }
+            if (($srcdom ne $coursedom) || ($srcnum ne $coursenum) || ($prefixchg) ||
+                (($newurl ne '') && ($newurl ne $url))) {
+                unless (&url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,
+                                          \%allmaps,\%rewrites,\%retitles,\%copies,\%dbcopies,
+                                          \%zombies,\%params,\%mapmoves,\%mapchanges,\%tomove,
+                                          \%newsubdir,\%newurls)) {
+                    $mapmoves{$url} = 1;
+                }
+                $url = $newurl;
+            } elsif ($env{'docs.markedcopy_nested'}) {
+                &url_paste_fixups($url,$folder,$prefixchg,$coursedom,$coursenum,\%allmaps,\%rewrites,
+                                  \%retitles,\%copies,\%dbcopies,\%zombies,\%params,\%mapmoves,
+                                  \%mapchanges,\%tomove,\%newsubdir,\%newurls);
+            }
+        } elsif ($url=~m {^/res/}) {
 # published maps can only exists once, so remove it from paste buffer when done
-    if (($url=~/\.(page|sequence)$/) && ($url=~m {^/res/})) {
-	&Apache::lonnet::delenv('docs.markedcopy');
+            &Apache::lonnet::delenv('docs.markedcopy');
+# if pasting published map (main content are only) check map is not already in course
+            if ($folder =~ /^default/) {
+                if ($allmaps{$url}) {
+                    return (&mt('Paste failed: only one instance of a particular published sequence or page is allowed within each course.'));
+                }
+            }
+        }
     }
     if ($url=~ m{/smppg$}) {
-	my $db_name = &Apache::lonsimplepage::get_db_name($url);
-	if ($db_name =~ /^smppage_/) {
-	    #simple pages, need to copy the db contents to a new one.
-	    my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
-	    my $now = time();
-	    $db_name =~ s{_\d*$ }{_$now}x;
-	    my $result=&Apache::lonnet::put($db_name,\%contents,
-					    $coursedom,$coursenum);
-	    $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
-	    $title=&mt('Copy of').' '.$title;
-	}
+        my $db_name = &Apache::lonsimplepage::get_db_name($url);
+        if ($db_name =~ /^smppage_/) {
+            #simple pages, need to copy the db contents to a new one.
+            my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+            my $now = time();
+            $db_name =~ s{_\d*$ }{_$now}x;
+            my $dbresult=&Apache::lonnet::put($db_name,\%contents,
+                                            $coursedom,$coursenum);
+            if ($dbresult eq 'ok') {
+                $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+                $title=&mt('Copy of').' '.$title;
+            } else {
+                return (&mt('Paste failed: An error occurred when copying the simple page.'));
+            }
+        }
     }
     $title = &LONCAPA::map::qtunescape($title);
     my $ext='false';
     if ($url=~m{^http(|s)://}) { $ext='true'; }
     $url       = &LONCAPA::map::qtunescape($url);
+
+# For uploaded files (excluding pages/sequences) path in copied file is changed
+# if paste is from Main to Supplemental (or vice versa), or if pasting between
+# courses.
+
+    my $newidx;
+    unless ($is_map) {
 # Now insert the URL at the bottom
-    my $newidx = &LONCAPA::map::getresidx($url);
-    if ($env{'docs.markedcopy_supplemental'}) {
-        if ($folder =~ /^supplemental/) {
-            $title = $env{'docs.markedcopy_supplemental'};
+        $newidx = &LONCAPA::map::getresidx($url);
+        if ($url =~ m{^/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(.+)$}) {
+            my $relpath = $1;
+            if ($relpath ne '') {
+                my ($prefix,$subdir,$rem) = ($relpath =~ m{^(default|\d+)/(\d+)/(.+)$});
+                my ($newloc,$newdocsdir) = ($folder =~ /^(default|supplemental)_?(\d*)/);
+                my $newprefix = $newloc;
+                if ($newloc eq 'default') {
+                    $newprefix = 'docs';
+                }
+                if ($newdocsdir eq '') {
+                    $newdocsdir = 'default';
+                }
+                if (($prefixchg) || ($srcdom ne $coursedom) || ($srcnum ne $coursenum)) {
+                    my $newpath = "$newprefix/$newdocsdir/$newidx/$rem";
+                    $url =
+                        &Apache::lonclonecourse::writefile($env{'request.course.id'},$newpath,
+                                                           &Apache::lonnet::getfile($oldurl));
+                    if ($url eq '/adm/notfound.html') {
+                        return (&mt('Paste failed: an error occurred saving the file.'));
+                    } else {
+                        my ($newsubpath) = ($newpath =~ m{^(.*/)[^/]*$});
+                        $newsubpath =~ s{/+$}{/};
+                        $docmoves{$oldurl} = $newsubpath;
+                    }
+                }
+            }
+        }
+    }
+# Apply any changes to maps, or copy dependencies for uploaded HTML pages
+    my ($result,$save_err);
+    $result =
+        &apply_fixups($folder,$is_map,$prefixchg,$coursedom,$coursenum,$oldurl,
+                      $url,\%removefrommap,\%removeparam,\%rewrites,\%retitles,
+                      \%copies,\%dbcopies,\%zombies,\%params,\%docmoves,
+                      \%mapmoves,\%newsubdir,$errors,\%before,\%after);
+    if ($result eq 'ok') {
+        if ($is_map) {
+            my ($errtext,$fatal) = &mapread($coursenum,$coursedom,
+                                            $folder.'.'.$container);
+            return $errtext if ($fatal);
+
+            if ($#LONCAPA::map::order<1) {
+                my $idx=&LONCAPA::map::getresidx();
+                if ($idx<=0) { $idx=1; }
+                $LONCAPA::map::order[0]=$idx;
+                $LONCAPA::map::resources[$idx]='';
+            }
+            $newidx = &LONCAPA::map::getresidx($url);
+        }
+        if ($env{'docs.markedcopy_supplemental'}) {
+            if ($folder !~ /^supplemental/) {
+                (undef,undef,$title) =
+                    &Apache::loncommon::parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+            }
         } else {
-            (undef,undef,$title) =
-                &parse_supplemental_title($env{'docs.markedcopy_supplemental'});
+            if ($folder=~/^supplemental/) {
+                $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
+                       $env{'user.domain'}.'___&&&___'.$title;
+            }
         }
-    } else {
-        if ($folder=~/^supplemental/) {
-           $title=time.'___&&&___'.$env{'user.name'}.'___&&&___'.
-                  $env{'user.domain'}.'___&&&___'.$title;
+        $LONCAPA::map::resources[$newidx]=      $title.':'.$url.':'.$ext.':normal:res';
+        push(@LONCAPA::map::order, $newidx);
+
+# Store the result
+        my ($errtext,$fatal) =
+            &storemap($coursenum,$coursedom,$folder.'.'.$container,1);
+        if ($fatal) {
+            $save_err = $errtext;
         }
     }
 
-    $LONCAPA::map::resources[$newidx]= 	$title.':'.$url.':'.$ext.':normal:res';
-    push(@LONCAPA::map::order, $newidx);
-    return 'ok';
-# Store the result
+    if ($env{'form.docs.markedcopy_options'} eq 'move') {
+        &Apache::lonnet::delenv('docs.markedcopy');
+        &Apache::lonnet::delenv('docs.markedcopy_nested');
+        &Apache::lonnet::delenv('docs.markedcopy_nestednames');
+    }
+    return ($result,$save_err);
+}
+
+sub get_newmap_url {
+    my ($url,$folder,$prefixchg,$coursedom,$coursenum,$srcdom,$srcnum,
+        $titleref,$allmaps,$newurls) = @_;
+    my $newurl;
+    if ($url=~ m{^/uploaded/}) {
+        $$titleref=&mt('Copy of').' '.$$titleref;
+    }
+    my $now = time;
+    my $suffix=$$.int(rand(100)).$now;
+    my ($oldid,$ext) = ($url=~/^(.+)\.(\w+)$/);
+    if ($oldid =~ m{^(/uploaded/$match_domain/$match_courseid/)(\D+)(\d+)$}) {
+        my $path = $1;
+        my $prefix = $2;
+        my $ancestor = $3;
+        if (length($ancestor) > 10) {
+            $ancestor = substr($ancestor,-10,10);
+        }
+        my $newid;
+        if ($prefixchg) {
+            if ($folder =~ /^supplemental/) {
+                $prefix =~ s/^default/supplemental/;
+            } else {
+                $prefix =~ s/^supplemental/default/;
+            }
+        }
+        if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) {
+            $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext;
+        } else {
+            $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$now.'.'.$ext;
+        }
+        my $counter = 0;
+        my $is_unique = &uniqueness_check($newurl);
+        if ($folder =~ /^default/) {
+            if ($allmaps->{$newurl}) {
+                $is_unique = 0;
+            }
+        }
+        while ((!$is_unique || $allmaps->{$newurl} || $newurls->{$newurl}) && ($counter < 100)) {
+            $counter ++;
+            $suffix ++;
+            if (($srcdom eq $coursedom) && ($srcnum eq $coursenum)) {
+                $newurl = $path.$prefix.$ancestor.$suffix.'.'.$ext;
+            } else {
+                $newurl = "/uploaded/$coursedom/$coursenum/$prefix".$ancestor.$suffix.'.'.$ext;
+            }
+            $is_unique = &uniqueness_check($newurl);
+        }
+        if ($is_unique) {
+            $newurls->{$newurl} = 1;
+        } else {
+            if ($url=~/\.page$/) {
+                return (undef,&mt('Paste failed: an error occurred creating a unique URL for the composite page'));
+            } else {
+                return (undef,&mt('Paste failed: an error occurred creating a unique URL for the folder'));
+            }
+        }
+    }
+    return ($newurl);
+}
+
+sub dbcopy {
+    my ($url,$coursedom,$coursenum) = @_;
+    if ($url=~ m{/smppg$}) {
+        my $db_name = &Apache::lonsimplepage::get_db_name($url);
+        if ($db_name =~ /^smppage_/) {
+            #simple pages, need to copy the db contents to a new one.
+            my %contents=&Apache::lonnet::dump($db_name,$coursedom,$coursenum);
+            my $now = time();
+            $db_name =~ s{_\d*$ }{_$now}x;
+            my $result=&Apache::lonnet::put($db_name,\%contents,
+                                            $coursedom,$coursenum);
+            $url =~ s{/(\d*)/smppg$ }{/$now/smppg}x;
+        }
+    }
+    return $url;
 }
 
 sub uniqueness_check {
@@ -764,6 +1219,458 @@
     return $unique;
 }
 
+sub contained_map_check {
+    my ($url,$folder,$removefrommap,$removeparam,$addedmaps,$hierarchy,$titles,
+        $allmaps) = @_;
+    my $content = &Apache::lonnet::getfile($url);
+    unless ($content eq '-1') {
+        my $parser = HTML::TokeParser->new(\$content);
+        $parser->attr_encoded(1);
+        while (my $token = $parser->get_token) {
+            next if ($token->[0] ne 'S');
+            if ($token->[1] eq 'resource') {
+                next if ($token->[2]->{'type'} eq 'zombie');
+                my $ressrc = $token->[2]->{'src'};
+                if ($folder =~ /^supplemental/) {
+                    unless (&supp_pasteable($ressrc)) {
+                        $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        next;
+                    }
+                }
+                if ($ressrc =~ m{^/(res|uploaded)/.+\.(sequence|page)$}) {
+                    if ($1 eq 'uploaded') {
+                        $hierarchy->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        $titles->{$url}{$token->[2]->{'id'}} = $token->[2]->{'title'};
+                    } else {
+                        if ($allmaps->{$ressrc}) {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        } elsif (ref($addedmaps->{$ressrc}) eq 'ARRAY') {
+                            $removefrommap->{$url}{$token->[2]->{'id'}} = $ressrc;
+                        } else {
+                            $addedmaps->{$ressrc} = [$url];
+                        }
+                    }
+                    &contained_map_check($ressrc,$folder,$removefrommap,$removeparam,
+                                         $addedmaps,$hierarchy,$titles,$allmaps);
+                }
+            } elsif ($token->[1] eq 'param') {
+                if ($folder =~ /^supplemental/) {
+                    if (ref($removeparam->{$url}{$token->[2]->{'to'}}) eq 'ARRAY') {
+                        push(@{$removeparam->{$url}{$token->[2]->{'to'}}},$token->[2]->{'name'});
+                    } else {
+                        $removeparam->{$url}{$token->[2]->{'to'}} = [$token->[2]->{'name'}];
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
+sub reinit_role {
+    my ($cdom,$cnum,$chome) = @_;
+    my ($furl,$ferr) = &Apache::lonuserstate::readmap("$cdom/$cnum");
+    unless ($ferr) {
+        &Apache::loncommon::update_content_constraints($cdom,$cnum,$chome,$cdom.'_'.$cnum);
+    }
+    return;
+}
+
+sub url_paste_fixups {
+    my ($oldurl,$folder,$prefixchg,$cdom,$cnum,$allmaps,$rewrites,$retitles,$copies,
+        $dbcopies,$zombies,$params,$mapmoves,$mapchanges,$tomove,$newsubdir,$newurls) = @_;
+    my $checktitle;
+    if (($prefixchg) &&
+        ($oldurl =~ m{^/uploaded/$match_domain/$match_courseid/supplemental})) {
+        $checktitle = 1;
+    }
+    my $skip;
+    if ($oldurl =~ m{^\Q/uploaded/$cdom/$cnum/\E(default|supplemental)(_?\d*)\.(?:page|sequence)$}) {
+        my $mapid = $1.$2;
+        if ($tomove->{$mapid}) {
+            $skip = 1;
+        }
+    }
+    my $file = &Apache::lonnet::getfile($oldurl);
+    return if ($file eq '-1');
+    my $parser = HTML::TokeParser->new(\$file);
+    $parser->attr_encoded(1);
+    my $changed = 0;
+    while (my $token = $parser->get_token) {
+        next if ($token->[0] ne 'S');
+        if ($token->[1] eq 'resource') {
+            my $ressrc = $token->[2]->{'src'};
+            next if ($ressrc eq '');
+            my $id = $token->[2]->{'id'};
+            my $title = $token->[2]->{'title'};
+            if ($checktitle) {
+                if ($title =~ m{\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
+                    $retitles->{$oldurl}{$ressrc} = $id;
+                }
+            }
+            next if ($token->[2]->{'type'} eq 'external');
+            if ($token->[2]->{'type'} eq 'zombie') {
+                next if ($skip);
+                $zombies->{$oldurl}{$ressrc} = $id;
+                $changed = 1;
+            } elsif ($ressrc =~ m{^/uploaded/($match_domain)/($match_courseid)/(.+)$}) {
+                my $srcdom = $1;
+                my $srcnum = $2;
+                my $rem = $3;
+                my $newurl;
+                my $mapname;
+                if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
+                    my $prefix = $1;
+                    $mapname = $prefix.$2;
+                    if ($tomove->{$mapname}) {
+                        &url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
+                                          $rewrites,$retitles,$copies,$dbcopies,$zombies,
+                                          $params,$mapmoves,$mapchanges,$tomove,$newsubdir,
+                                          $newurls);
+                        next;
+                    } else {
+                        ($newurl,my $error) =
+                            &get_newmap_url($ressrc,$folder,$prefixchg,$cdom,$cnum,
+                                            $srcdom,$srcnum,\$title,$allmaps,$newurls);
+                        if ($newurl =~ /(?:default|supplemental)_(\d+)\.(?:sequence|page)$/) {
+                            $newsubdir->{$ressrc} = $1;
+                        }
+                        if ($error) {
+                            next;
+                        }
+                    }
+                }
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum) || ($prefixchg) ||
+                    ($mapchanges->{$oldurl}) || (($newurl ne '') && ($newurl ne $oldurl))) {
+
+                    if ($rem =~ /^(default|supplemental)(_?\d*).(sequence|page)$/) {
+                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $mapchanges->{$ressrc} = 1;
+                        unless (&url_paste_fixups($ressrc,$folder,$prefixchg,$cdom,$cnum,$allmaps,
+                                                  $rewrites,$retitles,$copies,$dbcopies,$zombies,
+                                                  $params,$mapmoves,$mapchanges,$tomove,$newsubdir,
+                                                  $newurls)) {
+                            $mapmoves->{$ressrc} = 1;
+                        }
+                        $changed = 1;
+                    } else {
+                        $rewrites->{$oldurl}{$ressrc} = $id;
+                        $copies->{$oldurl}{$ressrc} = $id;
+                        $changed = 1;
+                    }
+                }
+            } elsif ($ressrc =~ m{^/adm/($match_domain)/($match_courseid)/(.+)$}) {
+                next if ($skip);
+                my $srcdom = $1;
+                my $srcnum = $2;
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
+                    $rewrites->{$oldurl}{$ressrc} = $id;
+                    $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $changed = 1;
+                }
+            } elsif ($ressrc =~ m{^/public/($match_domain)/($match_courseid)/(.+)$}) {
+                next if ($skip);
+                my $srcdom = $1;
+                my $srcnum = $2;
+                if (($srcdom ne $cdom) || ($srcnum ne $cnum)) {
+                    $rewrites->{$oldurl}{$ressrc} = $id;
+                    $dbcopies->{$oldurl}{$ressrc} = $id;
+                    $changed = 1;
+                }
+            }
+        } elsif ($token->[1] eq 'param') {
+            next if ($skip);
+            my $to = $token->[2]->{'to'};
+            if ($to ne '') {
+                if (ref($params->{$oldurl}{$to}) eq 'ARRAY') {
+                    push(@{$params->{$oldurl}{$to}},$token->[2]->{'name'});
+                } else {
+                    @{$params->{$oldurl}{$to}} = ($token->[2]->{'name'});
+                }
+            }
+        }
+    }
+    return $changed;
+}
+
+sub apply_fixups {
+    my ($folder,$is_map,$prefixchg,$cdom,$cnum,$oldurl,$url,$removefrommap,
+        $removeparam,$rewrites,$retitles,$copies,$dbcopies,$zombies,$params,
+        $docmoves,$mapmoves,$newsubdir,$errors,$before,$after) = @_;
+    foreach my $key (keys(%{$copies}),keys(%{$docmoves})) {
+        my @allcopies;
+        if (ref($copies->{$key}) eq 'HASH') {
+            my %added;
+            foreach my $innerkey (keys(%{$copies->{$key}})) {
+                if (($innerkey ne '') && (!$added{$innerkey})) {
+                    push(@allcopies,$innerkey);
+                    $added{$innerkey} = 1;
+                }
+            }
+            undef(%added);
+        }
+        if ($key eq $oldurl) {
+            if ((exists($docmoves->{$key}))) {
+                unless (grep(/^\Q$oldurl\E/, at allcopies)) {
+                    push(@allcopies,$oldurl);
+                }
+            }
+        }
+        if (@allcopies > 0) {
+            foreach my $item (@allcopies) {
+                my ($relpath,$oldsubdir,$fname) =
+                    ($item =~ m{^(/uploaded/$match_domain/$match_courseid/(?:docs|supplemental)/(default|\d+)/.*/)([^/]+)$});
+                if ($fname ne '') {
+                    my $content = &Apache::lonnet::getfile($item);
+                    unless ($content eq '-1') {
+                        my $storefn;
+                        if (($key eq $oldurl) && (ref($docmoves) eq 'HASH') && (exists($docmoves->{$key}))) {
+                            $storefn = $docmoves->{$key};
+                        } else {
+                            $storefn = $relpath;
+                            $storefn =~s{^/uploaded/$match_domain/$match_courseid/}{};
+                            if ($prefixchg) {
+                                $storefn =~ s/^\Q$before->{'doc'}\E/$after->{'doc'}/;
+                            }
+                            if ($newsubdir->{$key}) {
+                                $storefn =~ s#^(docs|supplemental)/\Q$oldsubdir\E/#$1/$newsubdir->{$key}#;
+                            }
+                        }
+                        &copy_dependencies($item,$storefn,$relpath,$errors,\$content);
+                        my $copyurl =
+                            &Apache::lonclonecourse::writefile($env{'request.course.id'},
+                                                               $storefn.$fname,$content);
+                        if ($copyurl eq '/adm/notfound.html') {
+                            if ((ref($docmoves) eq 'HASH') && (exists($docmoves->{$oldurl}))) {
+                                return &mt('Paste failed: an error occurred copying the file.');
+                            } elsif (ref($errors) eq 'HASH') {
+                                $errors->{$item} = 1;
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    foreach my $key (keys(%{$mapmoves})) {
+        my $storefn=$key;
+        $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+        if ($prefixchg) {
+            $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
+        }
+        if ($newsubdir->{$key}) {
+            $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/;
+        }
+        my $mapcontent = &Apache::lonnet::getfile($key);
+        if ($mapcontent eq '-1') {
+            if (ref($errors) eq 'HASH') {
+                $errors->{$key} = 1;
+            }
+        } else {
+            my $newmap =
+                &Apache::lonclonecourse::writefile($env{'request.course.id'},$storefn,
+                                                   $mapcontent);
+            if ($newmap eq '/adm/notfound.html') {
+                if (ref($errors) eq 'HASH') {
+                    $errors->{$key} = 1;
+                }
+            }
+        }
+    }
+    my %updates;
+    if ($is_map) {
+        foreach my $key (keys(%{$rewrites})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$zombies})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$removefrommap})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$removeparam})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$dbcopies})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%{$retitles})) {
+            $updates{$key} = 1;
+        }
+        foreach my $key (keys(%updates)) {
+            my (%torewrite,%toretitle,%toremove,%remparam,%currparam,%zombie,%newdb);
+            if (ref($rewrites->{$key}) eq 'HASH') {
+                %torewrite = %{$rewrites->{$key}};
+            }
+            if (ref($retitles->{$key}) eq 'HASH') {
+                %toretitle = %{$retitles->{$key}};
+            }
+            if (ref($removefrommap->{$key}) eq 'HASH') {
+                %toremove = %{$removefrommap->{$key}};
+            }
+            if (ref($removeparam->{$key}) eq 'HASH') {
+                %remparam = %{$removeparam->{$key}};
+            }
+            if (ref($zombies->{$key}) eq 'HASH') {
+                %zombie = %{$zombies->{$key}};
+            }
+            if (ref($dbcopies->{$key}) eq 'HASH') {
+                foreach my $item (keys(%{$dbcopies->{$key}})) {
+                    $newdb{$item} = &dbcopy($item);
+                }
+            }
+            if (ref($params->{$key}) eq 'HASH') {
+                %currparam = %{$params->{$key}};
+            }
+            my ($errtext,$fatal) = &LONCAPA::map::mapread($key);
+            if ($fatal) {
+                return $errtext;
+            }
+            for (my $i=0; $i<@LONCAPA::map::zombies; $i++) {
+                if (defined($LONCAPA::map::zombies[$i])) {
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::zombies[$i]);
+                    if ($zombie{$src} eq $i) {
+                        undef($LONCAPA::map::zombies[$i]);
+                    }
+                }
+            }
+            for (my $i=0; $i<@LONCAPA::map::resources; $i++) {
+                if (defined($LONCAPA::map::resources[$i])) {
+                    my $changed;
+                    my ($title,$src,$ext,$type)=split(/\:/,$LONCAPA::map::resources[$i]);
+                    if ($toremove{$src} eq $i) {
+                        splice(@LONCAPA::map::order,$i,1);
+                        if (ref($currparam{$i}) eq 'ARRAY') {
+                            foreach my $name (@{$currparam{$i}}) {
+                                &LONCAPA::map::delparameter($i,'parameter_'.$name);
+                            }
+                        }
+                        next;
+                    }
+                    my $origsrc = $src;
+                    if ((exists($toretitle{$src})) && ($toretitle{$src} eq $i)) {
+                        if ($title =~ m{^\d+\Q___&amp;&amp;&amp;___\E$match_username\Q___&amp;&amp;&amp;___\E$match_domain\Q___&amp;&amp;&amp;___\E(.+)$}) {
+                            $changed = 1;
+                        }
+                    }
+                    if ((exists($torewrite{$src})) && ($torewrite{$src} eq $i)) {
+                        $src =~ s{^/(uploaded|adm|public)/$match_domain/$match_courseid/}{/$1/$cdom/$cnum/};
+                        if ($origsrc =~ m{^/uploaded/}) {
+                            if ($prefixchg) {
+                                if ($src =~ /\.(page|sequence)$/) {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'map'}\E#$1$after->{'map'}#;
+                                } else {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/)\Q$before->{'doc'}\E#$1$after->{'doc'}#;
+                                }
+                            }
+                            if ($newsubdir->{$origsrc}) {
+                                if ($src =~ /\.(page|sequence)$/) {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/(?:default|supplemental)_)(\d+)#$1$newsubdir->{$origsrc}#;
+                                } else {
+                                    $src =~ s#^(/uploaded/$match_domain/$match_courseid/\w+/)(\d+)#$1$newsubdir->{$origsrc}#;
+                                }
+                            }
+                        }
+                        $changed = 1;
+                    } elsif ($newdb{$src} ne '') {
+                        $src = $newdb{$src};
+                        $changed = 1;
+                    }
+                    if ($changed) {
+                        $LONCAPA::map::resources[$i] = join(':',($title,$src,$ext,$type));
+                    }
+                }
+            }
+            foreach my $idx (keys(%remparam)) {
+                if (ref($remparam{$idx}) eq 'ARRAY') {
+                    foreach my $name (@{$remparam{$idx}}) {
+                        &LONCAPA::map::delparameter($idx,'parameter_'.$name);
+                    }
+                }
+            }
+            my $storefn;
+            if ($key eq $oldurl) {
+                $storefn = $url;
+                $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+            } else {
+                $storefn = $key;
+                $storefn=~s{^/uploaded/$match_domain/$match_courseid/}{};
+                if ($prefixchg) {
+                    $storefn =~ s/^\Q$before->{'map'}\E/$after->{'map'}/;
+                }
+                if ($newsubdir->{$key}) {
+                    $storefn =~ s/^((?:default|supplemental)_)(\d+)/$1$newsubdir->{$key}/;
+                }
+            }
+            my $report;
+            if ($folder !~ /^supplemental/) {
+                $report = 1;
+            }
+            my ($outtext,$errtext) =
+                &LONCAPA::map::storemap("/uploaded/$cdom/$cnum/$storefn",1,$report);
+            if ($errtext) {
+                return &mt('Paste failed: an error occurred saving the folder or page.');
+            }
+        }
+    }
+    return 'ok';
+}
+
+sub copy_dependencies {
+    my ($item,$storefn,$relpath,$errors,$contentref) = @_;
+    my $content;
+    if (ref($contentref)) {
+        $content = $$contentref;
+    } else {
+        $content = &Apache::lonnet::getfile($item);
+    }
+    unless ($content eq '-1') {
+        my $mm = new File::MMagic;
+        my $mimetype = $mm->checktype_contents($content);
+        if ($mimetype eq 'text/html') {
+            my (%allfiles,%codebase,$state);
+            my $res = &Apache::lonnet::extract_embedded_items(undef,\%allfiles,\%codebase,\$content);
+            if ($res eq 'ok') {
+                my ($numexisting,$numpathchanges,$existing);
+                (undef,$numexisting,$numpathchanges,$existing) =
+                    &Apache::loncommon::ask_for_embedded_content(
+                        '/adm/coursedocs',$state,\%allfiles,\%codebase,
+                        {'error_on_invalid_names'   => 1,
+                         'ignore_remote_references' => 1,
+                         'docs_url'                 => $item,
+                         'context'                  => 'paste'});
+                if ($numexisting > 0) {
+                    if (ref($existing) eq 'HASH') {
+                        foreach my $dep (keys(%{$existing})) {
+                            my $depfile = $dep;
+                            unless ($depfile =~ m{^\Q$relpath\E}) {
+                                $depfile = $relpath.$dep;
+                            }
+                            my $depcontent = &Apache::lonnet::getfile($depfile);
+                            unless ($depcontent eq '-1') {
+                                my $storedep = $dep;
+                                $storedep =~ s{^\Q$relpath\E}{};
+                                my $dep_url =
+                                    &Apache::lonclonecourse::writefile(
+                                        $env{'request.course.id'},
+                                        $storefn.$storedep,$depcontent);
+                                if ($dep_url eq '/adm/notfound.html') {
+                                    if (ref($errors) eq 'HASH') {
+                                        $errors->{$depfile} = 1;
+                                    }
+                                } else {
+                                    &copy_dependencies($depfile,$storefn,$relpath,$errors,\$depcontent);
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    return;
+}
+
 my %parameter_type = ( 'randompick'     => 'int_pos',
 		       'hiddenresource' => 'string_yesno',
 		       'encrypturl'     => 'string_yesno',
@@ -884,20 +1791,35 @@
 	}
 
 	if ($env{'form.pastemarked'}) {
-            my $paste_res =
-                &do_paste_from_buffer($coursenum,$coursedom,$folder);
-            if ($paste_res eq 'ok') {
-                ($errtext,$fatal) = &storemap($coursenum,$coursedom,$folder.'.'.$container);
-                return $errtext if ($fatal);
-            } elsif ($paste_res ne '') {
+            my %paste_errors;
+            my ($paste_res,$save_error) =
+                &do_paste_from_buffer($coursenum,$coursedom,$folder,$container,
+                                      \%paste_errors);
+                if ($save_error ne '') {
+                    return $save_error;
+                }
+            if ($paste_res ne 'ok') {
                 $r->print('<p><span class="LC_error">'.$paste_res.'</span></p>');
             }
+            if (keys(%paste_errors) > 0) {
+                $r->print('<p span class="LC_warning">'."\n".
+                          &mt('The following files are either dependencies of a web page or references within a folder and/or composite page which could not be copied during the paste operation:')."\n".
+                          '<ul>'."\n");
+                foreach my $key (sort(keys(%paste_errors))) {
+                    $r->print('<li>'.$key.'</li>'."\n");
+                }
+                $r->print('</ul></p>'."\n");
+            }
 	}
 
 	$r->print($upload_output);
 
 	if (&handle_edit_cmd()) {
-	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container);
+            my $contentchg;
+            if ($env{'form.cmd'} =~ /^(del|cut)_/) {
+                $contentchg = 1;
+            }
+	    ($errtext,$fatal)=&storemap($coursenum,$coursedom,$folder.'.'.$container,$contentchg);
 	    return $errtext if ($fatal);
 	}
 # Group import/search
@@ -924,7 +1846,7 @@
 		    $LONCAPA::map::order[$#LONCAPA::map::order+1]=$idx;
 		}
 		($errtext,$fatal)=&storemap($coursenum,$coursedom,
-					    $folder.'.'.$container);
+					    $folder.'.'.$container,1);
 		return $errtext if ($fatal);
 	    } else {
 		$r->print('<p><span class="LC_error">'.&mt('No map selected.').'</span></p>');
@@ -1016,7 +1938,7 @@
         my $readfile="/uploaded/$coursedom/$coursenum/$folder.$container";
         $r->print(&generate_edit_table($tid,$orderhash,$to_show,$iconpath,$jumpto,
                                        $readfile));
-        &print_paste_buffer($r,$container);
+        &print_paste_buffer($r,$container,$folder,$coursedom,$coursenum);
     } else {
         if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
             #Function Box for Supplemental Content for users with mdc priv.
@@ -1104,7 +2026,7 @@
 	    $comment.':'.$url.':'.$ext.':normal:res';
         $LONCAPA::map::order[$#LONCAPA::map::order+1]= $newidx;
         ($errtext,$fatal)=&storemap($coursenum,$coursedom,
-				    $folder.'.'.$container);
+				    $folder.'.'.$container,1);
         if ($fatal) {
             $$upload_output = '<div class="LC_error" id="uploadfileresult">'.$errtext.'</div>';
             return;
@@ -1192,36 +2114,13 @@
     return scalar($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/);
 }
 
-sub parse_supplemental_title {
-    my ($title) = @_;
-
-    my ($foldertitle,$renametitle);
-    if ($title =~ /&amp;&amp;&amp;/) {
-	$title = &HTML::Entites::decode($title);
-    }
- if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
-	$renametitle=$4;
-	my ($time,$uname,$udom) = ($1,$2,$3);
-	$foldertitle=&Apache::lontexconvert::msgtexconverted($4);
-	my $name =  &Apache::loncommon::plainname($uname,$udom);
-	$name = &HTML::Entities::encode($name,'"<>&\'');
-        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
-	$title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
-	    $name.': <br />'.$foldertitle;
-    }
-    if (wantarray) {
-	return ($title,$foldertitle,$renametitle);
-    }
-    return $title;
-}
-
 # --------------------------------------------------------------- An entry line
 
 sub entryline {
     my ($index,$title,$url,$folder,$allowed,$residx,$coursenum,$crstype)=@_;
     my ($foldertitle,$pagetitle,$renametitle);
     if (&is_supplemental_title($title)) {
-	($title,$foldertitle,$renametitle) = &parse_supplemental_title($title);
+	($title,$foldertitle,$renametitle) = &Apache::loncommon::parse_supplemental_title($title);
 	$pagetitle = $foldertitle;
     } else {
 	$title=&HTML::Entities::encode($title,'"<>&\'');
@@ -1285,20 +2184,10 @@
 		'cp' => 'Copy');
 	my $nocopy=0;
         my $nocut=0;
-        if ($url=~/\.(page|sequence)$/) {
-	    if ($url =~ m{/res/}) {
-		# no copy for published maps
-		$nocopy = 1;
-	    } else {
-		foreach my $item (&Apache::lonsequence::attemptread(&Apache::lonnet::filelocation('',$url),1)) {
-		    my ($title,$url,$ext,$type)=split(/\:/,$item);
-		    if (($url=~/\.(page|sequence)/) && ($type ne 'zombie')) {
-			$nocopy=1;
-			last;
-		    }
-		}
-	    }
-	}
+        if ($url=~ m{^/res/.+\.(page|sequence)$}) {
+            # no copy for published maps
+            $nocopy=1;
+        }
         if ($url=~/^\/res\/lib\/templates\//) {
            $nocopy=1;
            $nocut=1;
@@ -2447,6 +3336,9 @@
                             onload   => "javascript:resize_scrollbox('contentscroll','1','1');",
                           };
         }
+        if ($env{'docs.markedcopy_url'}) {
+            $script .= &paste_popup_js();
+        }
     }
 # -------------------------------------------------------------------- Body tag
     $script = '<script type="text/javascript">'."\n"
@@ -2634,7 +3526,11 @@
 
 
     if ($allowed) {
-	&update_paste_buffer($coursenum,$coursedom);
+        my $folder = $env{'form.folder'};
+        if ($folder eq '') {
+            $folder='default';
+        }
+	&update_paste_buffer($coursenum,$coursedom,$folder);
 	$r->print(<<HIDDENFORM);
 	<form name="renameform" method="post" action="/adm/coursedocs">
    <input type="hidden" name="title" />
@@ -2877,8 +3773,8 @@
         $communityform = &create_form_ul(&create_list_elements(@communityforma));
 
 my %orderhash = (
-                'aa' => ['Import Documents',$fileuploadform],
-                'bb' => ['Published Resources',$simpleeditdefaultform],
+                'aa' => ['Import Content',$fileuploadform],
+                'bb' => ['Published Content',$simpleeditdefaultform],
                 'cc' => ['Grading Resources',$gradingform],
                 );
 unless ($env{'form.pagepath'}) {
@@ -2997,7 +3893,7 @@
 $supupdocform =  &create_form_ul(&create_list_elements(@supimportdoc)) . '<hr id="ee_hrule" style="width:0px;text-align:left;margin-left:0" />' . $supupdocform;
 my %suporderhash = (
 		'00' => ['Supnewfolder', $supnewfolderform],
-                'ee' => ['Import Documents',$supupdocform],
+                'ee' => ['Import Content',$supupdocform],
                 'ff' => ['Special Documents',&create_form_ul(&create_list_elements(@specialdocs))]
                 );
         if ($supplementalflag) {
@@ -3103,7 +3999,7 @@
     my ($dir,$file,$warning,$error,$output);
     my ($destination,$dir_root,$londocroot,$docudom,$docuname,$container,$hiddenelem)=
         &decompression_info();
-    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/docs/\E(?:default|supplemental|\d+).*/([^/]+)$}) {
+    if ($env{'form.archiveurl'} !~ m{^/uploaded/\Q$docudom/$docuname/\E(?:docs|supplemental)/(?:default|\d+).*/([^/]+)$}) {
         $error = &mt('Archive file "[_1]" not in the expected location.',$env{'form.archiveurl'});
     } else {
         my $file = $1;
@@ -3158,7 +4054,7 @@
             my ($title,$url, at rrest) = 
                 split(/:/,$LONCAPA::map::resources[$LONCAPA::map::order[$position]]);
             if (&handle_edit_cmd($docuname,$docudom)) {
-                ($errtext,$fatal) = &storemap($docuname,$docudom,$map);
+                ($errtext,$fatal) = &storemap($docuname,$docudom,$map,1);
                 if ($fatal) {
                     if ($container eq 'page') {
                         $delwarning = &mt('An error occurred updating the contents of the current page.');
@@ -3286,22 +4182,20 @@
              '<li class="goback">'.
              '<a href="javascript:toContents('."'$jumpto'".');">'.
              '<img src="'.$backicon.'" class="LC_icon" style="border: none; vertical-align: top;"'.
-             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n";
-    if ($tid == 1) {
-        $form .= '<li>'.
-                 '<a href="javascript:groupopen('."'$readfile'".',1);">'.
-                 &mt('Undo Delete').'</a></li>'."\n";
-        if ($env{'form.docslog'}) {
-            $form .= '<li class="active">';
-        } else {
-            $form .= '<li>';
-        }
-        $form .= '<a href="javascript:toggleHistoryDisp(1);">'.
-                  &mt('History').'</a></li>'."\n";
-        if ($env{'form.docslog'}) {
-            $form .= '<li><a href="javascript:toggleHistoryDisp(0);">'.
-                  &mt('Edit').'</a></li>'."\n";
-        }
+             '  alt="'.$backtext.'" />'.$backtext.'</a></li>'."\n".
+             '<li>'.
+             '<a href="javascript:groupopen('."'$readfile'".',1);">'.
+             &mt('Undo Delete').'</a></li>'."\n";
+    if ($env{'form.docslog'}) {
+        $form .= '<li class="active">';
+    } else {
+        $form .= '<li>';
+    }
+    $form .= '<a href="javascript:toggleHistoryDisp(1);">'.
+             &mt('History').'</a></li>'."\n";
+    if ($env{'form.docslog'}) {
+        $form .= '<li><a href="javascript:toggleHistoryDisp(0);">'.
+                 &mt('Edit').'</a></li>'."\n";
     }
     foreach my $name (reverse(sort(keys(%orderhash)))) {
         if($name ne '00'){
@@ -3876,6 +4770,22 @@
 
 =item do_paste_from_buffer()
 
+=item get_newmap_url()
+
+=item dbcopy()
+
+=item uniqueness_check()
+
+=item contained_map_check()
+
+=item reinit_role()
+
+=item url_paste_fixups()
+
+=item apply_fixups()
+
+=item copy_dependencies()
+
 =item update_parameter()
 
 =item handle_edit_cmd()
@@ -3888,8 +4798,6 @@
 
 =item is_supplemental_title()
 
-=item parse_supplemental_title()
-
 =item entryline()
 
 =item tiehash()

From raeburn at source.lon-capa.org  Wed Aug  1 00:34:01 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 04:34:01 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface loncommon.pm
Message-ID: <cvsraeburn1343795641@cvsserver>

raeburn		Wed Aug  1 04:34:01 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm 
  Log:
  - For 2.11.
    - Backport 1.1083, 1.1084, 1.1085, 1.1086, 1.1087.
  
  
-------------- next part --------------
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.10 loncom/interface/loncommon.pm:1.1075.2.11
--- loncom/interface/loncommon.pm:1.1075.2.10	Sat Jun  9 00:42:31 2012
+++ loncom/interface/loncommon.pm	Wed Aug  1 04:34:00 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.10 2012/06/09 00:42:31 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.11 2012/08/01 04:34:00 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9356,7 +9356,7 @@
 sub ask_for_embedded_content {
     my ($actionurl,$state,$allfiles,$codebase,$args)=@_;
     my (%subdependencies,%dependencies,%mapping,%existing,%newfiles,%pathchanges,
-        %currsubfile,%unused);
+        %currsubfile,%unused,$rem);
     my $counter = 0;
     my $numnew = 0;
     my $numremref = 0;
@@ -9369,6 +9369,10 @@
     my $heading = &mt('Upload embedded files');
     my $buttontext = &mt('Upload');
 
+    my $navmap;
+    if ($env{'request.course.id'}) {
+        $navmap = Apache::lonnavmaps::navmap->new();
+    }
     if (($actionurl eq '/adm/portfolio') || ($actionurl eq '/adm/coursegrp_portfolio')) {
         my $current_path='/';
         if ($env{'form.currentpath'}) {
@@ -9398,6 +9402,13 @@
         if (ref($args) eq 'HASH') {
             $url = $args->{'docs_url'};
             $toplevel = $url;
+            if ($args->{'context'} eq 'paste') {
+                ($cdom,$cnum) = ($url =~ m{^\Q/uploaded/\E($match_domain)/($match_courseid)/});
+                ($path) =
+                    ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
+                $fileloc = &Apache::lonnet::filelocation('',$toplevel);
+                $fileloc =~ s{^/}{};
+            }
         }
     } elsif ($actionurl eq '/adm/dependencies') {
         if ($env{'request.course.id'} ne '') {
@@ -9407,6 +9418,7 @@
                 $url = $args->{'docs_url'};
                 $title = $args->{'docs_title'};
                 $toplevel = "/$url";
+                ($rem) = ($toplevel =~ m{^(.+/)[^/]+$});
                 ($path) =  
                     ($toplevel =~ m{^(\Q/uploaded/$cdom/$cnum/\E(?:docs|supplemental)/(?:default|\d+)/\d+)/});
                 $fileloc = &Apache::lonnet::filelocation('',$toplevel);
@@ -9469,7 +9481,9 @@
                 my @subdir_list = grep(!/^\./,readdir($dir));
                 map {$currsubfile{$path}{$_} = 1;} @subdir_list;
             }
-        } elsif ($actionurl eq '/adm/dependencies') {
+        } elsif (($actionurl eq '/adm/dependencies') ||
+                 (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
+                  ($args->{'context'} eq 'paste'))) {
             if ($env{'request.course.id'} ne '') {
                 my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
                 if ($dir ne '') {
@@ -9505,6 +9519,12 @@
                 if (ref($currsubfile{$path}) eq 'HASH') {
                     foreach my $file (keys(%{$currsubfile{$path}})) {
                          unless ($subdependencies{$path}{$file}) {
+                             next if (($rem ne '') &&
+                                      (($env{"httpref.$rem"."$path/$file"} ne '') ||
+                                       (ref($navmap) &&
+                                       (($navmap->getResourceByUrl($rem."$path/$file") ne '') ||
+                                        (($file =~ /^(.*\.s?html?)\.bak$/i) &&
+                                         ($navmap->getResourceByUrl($rem."$path/$1")))))));
                              $unused{$path.'/'.$file} = 1; 
                          }
                     }
@@ -9527,7 +9547,9 @@
             my @dir_list = grep(!/^\./,readdir($dir));
             map {$currfile{$_} = 1;} @dir_list;
         }
-    } elsif ($actionurl eq '/adm/dependencies') {
+    } elsif (($actionurl eq '/adm/dependencies') ||
+             (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
+              ($args->{'context'} eq 'paste'))) {
         if ($env{'request.course.id'} ne '') {
             my ($dir) = ($fileloc =~ m{^(.+/)[^/]+$});
             if ($dir ne '') {
@@ -9561,9 +9583,23 @@
         unless (($file eq $filename) ||
                 ($file eq $filename.'.bak') ||
                 ($dependencies{$file})) {
+            if ($actionurl eq '/adm/dependencies') {
+                next if (($rem ne '') &&
+                         (($env{"httpref.$rem".$file} ne '') ||
+                          (ref($navmap) &&
+                          (($navmap->getResourceByUrl($rem.$file) ne '') ||
+                           (($file =~ /^(.*\.s?html?)\.bak$/i) &&
+                            ($navmap->getResourceByUrl($rem.$1)))))));
+            }
             $unused{$file} = 1;
         }
     }
+    if (($actionurl eq '/adm/coursedocs') && (ref($args) eq 'HASH') &&
+        ($args->{'context'} eq 'paste')) {
+        $counter = scalar(keys(%existing));
+        $numpathchg = scalar(keys(%pathchanges));
+        return ($output,$counter,$numpathchg,\%existing);
+    }
     foreach my $embed_file (sort {lc($a) cmp lc($b)} keys(%newfiles)) {
         if ($actionurl eq '/adm/dependencies') {
             next if ($embed_file =~ m{^\w+://});
@@ -9580,7 +9616,6 @@
             $numremref++;
         } elsif ($args->{'error_on_invalid_names'}
             && $embed_file ne &Apache::lonnet::clean_filename($embed_file,{'keep_path' => 1,})) {
-
             $upload_output.='<span class="LC_warning">'.&mt('Invalid characters').'</span>';
             $numinvalid++;
         } else {
@@ -11068,7 +11103,10 @@
             document.getElementById('arc_depon_'+count).style.display='block'; 
             form.elements[depitem].options.length = 0;
             form.elements[depitem].options[0] = new Option('Select','',true,true);
-            for (var i=1; i<count; i++) {
+            for (var i=1; i<=numitems; i++) {
+                if (i == count) {
+                    continue;
+                }
                 var startelement = $startcount + (i-1) * 7;
                 for (var j=1; j<6; j++) {
                     if ((j != 2) && (j!= 4)) {
@@ -11209,6 +11247,7 @@
     my (%referrer,%orphaned,%todelete,%todeletedir,%newdest,%newseqid);
     if ($numitems) {
         for (my $i=1; $i<=$numitems; $i++) {
+            next if ($env{'form.archive_'.$i} eq 'dependency');
             my $path = $env{'form.archive_content_'.$i};
             if ($path =~ /^\Q$pathtocheck\E/) {
                 if ($env{'form.archive_'.$i} eq 'discard') {
@@ -11259,7 +11298,7 @@
                             my ($outtext,$errtext) =
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
                                                         $docuname.'/'.$folders{$outer}.
-                                                        '.'.$containers{$outer},1);
+                                                        '.'.$containers{$outer},1,1);
                             $newseqid{$i} = $newidx;
                             unless ($errtext) {
                                 $result .=  '<li>'.&mt('Folder: [_1] added to course',$docstitle).'</li>'."\n";
@@ -11292,7 +11331,7 @@
                             my ($outtext,$errtext)=
                                 &LONCAPA::map::storemap('/uploaded/'.$docudom.'/'.
                                                         $docuname.'/'.$folders{$outer}.
-                                                        '.'.$containers{$outer},1);
+                                                        '.'.$containers{$outer},1,1);
                             unless ($errtext) {
                                 if (-e "$prefix$dir/$docstype/$mapinner{$outer}/$newidx/$title") {
                                     $result .= '<li>'.&mt('File: [_1] added to course',$docstitle).'</li>'."\n";
@@ -11300,87 +11339,93 @@
                             }
                         }
                     }
-                } elsif ($env{'form.archive_'.$i} eq 'dependency') {
-                    my ($title) = ($path =~ m{/([^/]+)$});
-                    $referrer{$i} = $env{'form.archive_dependent_on_'.$i};
-                    if ($env{'form.archive_'.$referrer{$i}} eq 'display') {
-                        if (ref($dirorder{$i}) eq 'ARRAY') {
-                            my ($itemidx,$fullpath,$relpath);
+                }
+            } else {
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
+            }
+        }
+        for (my $i=1; $i<=$numitems; $i++) {
+            next unless ($env{'form.archive_'.$i} eq 'dependency');
+            my $path = $env{'form.archive_content_'.$i};
+            if ($path =~ /^\Q$pathtocheck\E/) {
+                my ($title) = ($path =~ m{/([^/]+)$});
+                $referrer{$i} = $env{'form.archive_dependent_on_'.$i};
+                if ($env{'form.archive_'.$referrer{$i}} eq 'display') {
+                    if (ref($dirorder{$i}) eq 'ARRAY') {
+                        my ($itemidx,$fullpath,$relpath);
+                        if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') {
+                            my $container = $dirorder{$referrer{$i}}->[-1];
                             for (my $j=0; $j<@{$dirorder{$i}}; $j++) {
-                                if (ref($dirorder{$referrer{$i}}) eq 'ARRAY') {
-                                    my $container = $dirorder{$referrer{$i}}->[-1];
-                                    for (my $j=0; $j<@{$dirorder{$i}}; $j++) {
-                                        if ($dirorder{$i}->[$j] eq $container) {
-                                            $itemidx = $j;
-                                        }
-                                    }
+                                if ($dirorder{$i}->[$j] eq $container) {
+                                    $itemidx = $j;
                                 }
                             }
-                            if ($itemidx ne '') {
-                                if (grep(/^\Q$referrer{$i}\E$/, at archdirs)) {
-                                    if ($mapinner{$referrer{$i}}) {
-                                        $fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";
-                                        for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
-                                            if (grep(/^\Q$dirorder{$i}->[$j]\E$/, at archdirs)) {
-                                                unless (defined($newseqid{$dirorder{$i}->[$j]})) {
-                                                    $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                                    $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                                    if (!-e $fullpath) {
-                                                        mkdir($fullpath,0755);
-                                                    }
-                                                }
-                                            } else {
-                                                last;
+                        }
+                        if ($itemidx eq '') {
+                            $itemidx =  0;
+                        }
+                        if (grep(/^\Q$referrer{$i}\E$/, at archdirs)) {
+                            if ($mapinner{$referrer{$i}}) {
+                                $fullpath = "$prefix$dir/$docstype/$mapinner{$referrer{$i}}";
+                                for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
+                                    if (grep(/^\Q$dirorder{$i}->[$j]\E$/, at archdirs)) {
+                                        unless (defined($newseqid{$dirorder{$i}->[$j]})) {
+                                            $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                            $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                            if (!-e $fullpath) {
+                                                mkdir($fullpath,0755);
                                             }
                                         }
+                                    } else {
+                                        last;
                                     }
-                                } elsif ($newdest{$referrer{$i}}) {
-                                    $fullpath = $newdest{$referrer{$i}};
-                                    for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
-                                        if ($env{'form.archive_'.$dirorder{$i}->[$j]} eq 'discard') {
-                                            $orphaned{$i} = $env{'form.archive_'.$dirorder{$i}->[$j]};
-                                            last;
-                                        } elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/, at archdirs)) {
-                                            unless (defined($newseqid{$dirorder{$i}->[$j]})) {
-                                                $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                                $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
-                                                if (!-e $fullpath) {
-                                                    mkdir($fullpath,0755);
-                                                }
-                                            }
-                                        } else {
-                                            last;
+                                }
+                            }
+                        } elsif ($newdest{$referrer{$i}}) {
+                            $fullpath = $newdest{$referrer{$i}};
+                            for (my $j=$itemidx; $j<@{$dirorder{$i}}; $j++) {
+                                if ($env{'form.archive_'.$dirorder{$i}->[$j]} eq 'discard') {
+                                    $orphaned{$i} = $env{'form.archive_'.$dirorder{$i}->[$j]};
+                                    last;
+                                } elsif (grep(/^\Q$dirorder{$i}->[$j]\E$/, at archdirs)) {
+                                    unless (defined($newseqid{$dirorder{$i}->[$j]})) {
+                                        $fullpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                        $relpath .= '/'.$titles{$dirorder{$i}->[$j]};
+                                        if (!-e $fullpath) {
+                                            mkdir($fullpath,0755);
                                         }
                                     }
+                                } else {
+                                    last;
                                 }
-                                if ($fullpath ne '') {
-                                    if (-e "$prefix$path") {
-                                        system("mv $prefix$path $fullpath/$title");
-                                    }
-                                    if (-e "$fullpath/$title") {
-                                        my $showpath;
-                                        if ($relpath ne '') {
-                                            $showpath = "$relpath/$title";
-                                        } else {
-                                            $showpath = "/$title";
-                                        } 
-                                        $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
-                                    } 
-                                    unless ($ishome) {
-                                        my $fetch = "$fullpath/$title";
-                                        $fetch =~ s/^\Q$prefix$dir\E//; 
-                                        $prompttofetch{$fetch} = 1;
-                                    }
+                            }
+                        }
+                        if ($fullpath ne '') {
+                            if (-e "$prefix$path") {
+                                system("mv $prefix$path $fullpath/$title");
+                            }
+                            if (-e "$fullpath/$title") {
+                                my $showpath;
+                                if ($relpath ne '') {
+                                    $showpath = "$relpath/$title";
+                                } else {
+                                    $showpath = "/$title";
                                 }
+                                $result .= '<li>'.&mt('[_1] included as a dependency',$showpath).'</li>'."\n";
+                            }
+                            unless ($ishome) {
+                                my $fetch = "$fullpath/$title";
+                                $fetch =~ s/^\Q$prefix$dir\E//;
+                                $prompttofetch{$fetch} = 1;
                             }
                         }
-                    } elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') {
-                        $warning .= &mt('[_1] is a dependency of [_2], which was discarded.',
-                                        $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
                     }
+                } elsif ($env{'form.archive_'.$referrer{$i}} eq 'discard') {
+                    $warning .= &mt('[_1] is a dependency of [_2], which was discarded.',
+                                    $path,$env{'form.archive_content_'.$referrer{$i}}).'<br />';
                 }
             } else {
-                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />'; 
+                $warning .= &mt('Item extracted from archive: [_1] has unexpected path.',$path).'<br />';
             }
         }
         if (keys(%todelete)) {
@@ -13887,6 +13932,66 @@
     return;
 }
 
+sub update_content_constraints {
+    my ($cdom,$cnum,$chome,$cid) = @_;
+    my %curr_reqd_hash = &Apache::lonnet::userenvironment($cdom,$cnum,'internal.releaserequired');
+    my ($reqdmajor,$reqdminor) = split(/\./,$curr_reqd_hash{'internal.releaserequired'});
+    my %checkresponsetypes;
+    foreach my $key (keys(%Apache::lonnet::needsrelease)) {
+        my ($item,$name,$value) = split(/:/,$key);
+        if ($item eq 'resourcetag') {
+            if ($name eq 'responsetype') {
+                $checkresponsetypes{$value} = $Apache::lonnet::needsrelease{$key}
+            }
+        }
+    }
+    my $navmap = Apache::lonnavmaps::navmap->new();
+    if (defined($navmap)) {
+        my %allresponses;
+        foreach my $res ($navmap->retrieveResources(undef,sub { $_[0]->is_problem() },1,0)) {
+            my %responses = $res->responseTypes();
+            foreach my $key (keys(%responses)) {
+                next unless(exists($checkresponsetypes{$key}));
+                $allresponses{$key} += $responses{$key};
+            }
+        }
+        foreach my $key (keys(%allresponses)) {
+            my ($major,$minor) = split(/\./,$checkresponsetypes{$key});
+            if (($major > $reqdmajor) || ($major == $reqdmajor && $minor > $reqdminor)) {
+                ($reqdmajor,$reqdminor) = ($major,$minor);
+            }
+        }
+        undef($navmap);
+    }
+    unless (($reqdmajor eq '') && ($reqdminor eq '')) {
+        &Apache::lonnet::update_released_required($reqdmajor.'.'.$reqdminor,$cdom,$cnum,$chome,$cid);
+    }
+    return;
+}
+
+sub parse_supplemental_title {
+    my ($title) = @_;
+
+    my ($foldertitle,$renametitle);
+    if ($title =~ /&amp;&amp;&amp;/) {
+        $title = &HTML::Entites::decode($title);
+    }
+    if ($title =~ m/^(\d+)___&&&___($match_username)___&&&___($match_domain)___&&&___(.*)$/) {
+        $renametitle=$4;
+        my ($time,$uname,$udom) = ($1,$2,$3);
+        $foldertitle=&Apache::lontexconvert::msgtexconverted($4);
+        my $name =  &plainname($uname,$udom);
+        $name = &HTML::Entities::encode($name,'"<>&\'');
+        $renametitle = &HTML::Entities::encode($renametitle,'"<>&\'');
+        $title='<i>'.&Apache::lonlocal::locallocaltime($time).'</i> '.
+            $name.': <br />'.$foldertitle;
+    }
+    if (wantarray) {
+        return ($title,$foldertitle,$renametitle);
+    }
+    return $title;
+}
+
 =pod
 
 =back

From raeburn at source.lon-capa.org  Wed Aug  1 00:56:54 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 04:56:54 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /lonnet/perl lonnet.pm
Message-ID: <cvsraeburn1343797014@cvsserver>

raeburn		Wed Aug  1 04:56:54 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  - For 2.11.
    - Backport 1.1179, 1.1181.
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1172.2.7 loncom/lonnet/perl/lonnet.pm:1.1172.2.8
--- loncom/lonnet/perl/lonnet.pm:1.1172.2.7	Sun Jun 24 18:03:29 2012
+++ loncom/lonnet/perl/lonnet.pm	Wed Aug  1 04:56:54 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1172.2.7 2012/06/24 18:03:29 raeburn Exp $
+# $Id: lonnet.pm,v 1.1172.2.8 2012/08/01 04:56:54 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -9812,6 +9812,41 @@
     &devalidate_cache_new('allslots',$hashid);
 }
 
+sub get_coursechange {
+    my ($cdom,$cnum) = @_;
+    if ($cdom eq '' || $cnum eq '') {
+        return unless ($env{'request.course.id'});
+        $cnum = $env{'course.'.$env{'request.course.id'}.'.num'};
+        $cdom = $env{'course.'.$env{'request.course.id'}.'.domain'};
+    }
+    my $hashid=$cdom.'_'.$cnum;
+    my ($change,$cached)=&is_cached_new('crschange',$hashid);
+    if ((defined($cached)) && ($change ne '')) {
+        return $change;
+    } else {
+        my %crshash;
+        %crshash = &get('environment',['internal.contentchange'],$cdom,$cnum);
+        if ($crshash{'internal.contentchange'} eq '') {
+            $change = $env{'course.'.$cdom.'_'.$cnum.'.internal.created'};
+            if ($change eq '') {
+                %crshash = &get('environment',['internal.created'],$cdom,$cnum);
+                $change = $crshash{'internal.created'};
+            }
+        } else {
+            $change = $crshash{'internal.contentchange'};
+        }
+        my $cachetime = 600;
+        &do_cache_new('crschange',$hashid,$change,$cachetime);
+    }
+    return $change;
+}
+
+sub devalidate_coursechange_cache {
+    my ($cnum,$cdom)=@_;
+    my $hashid=$cnum.':'.$cdom;
+    &devalidate_cache_new('crschange',$hashid);
+}
+
 # ------------------------------------------------- Update symbolic store links
 
 sub symblist {
@@ -9956,7 +9991,11 @@
 sub symbread {
     my ($thisfn,$donotrecurse)=@_;
     my $cache_str='request.symbread.cached.'.$thisfn;
-    if (defined($env{$cache_str})) { return $env{$cache_str}; }
+    if (defined($env{$cache_str})) {
+        if (($thisfn) || ($env{$cache_str} ne '')) {
+            return $env{$cache_str};
+        }
+    }
 # no filename provided? try from environment
     unless ($thisfn) {
         if ($env{'request.symb'}) {



From raeburn at source.lon-capa.org  Wed Aug  1 01:17:02 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 05:17:02 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /xml lonxml.pm
Message-ID: <cvsraeburn1343798222@cvsserver>

raeburn		Wed Aug  1 05:17:02 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/xml	lonxml.pm 
  Log:
  - For 2.11
    - Backport 1.532.
  
  
Index: loncom/xml/lonxml.pm
diff -u loncom/xml/lonxml.pm:1.531.2.3 loncom/xml/lonxml.pm:1.531.2.4
--- loncom/xml/lonxml.pm:1.531.2.3	Fri May 25 15:01:31 2012
+++ loncom/xml/lonxml.pm	Wed Aug  1 05:17:02 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # XML Parser Module 
 #
-# $Id: lonxml.pm,v 1.531.2.3 2012/05/25 15:01:31 raeburn Exp $
+# $Id: lonxml.pm,v 1.531.2.4 2012/08/01 05:17:02 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1952,7 +1952,7 @@
     my ($url) = @_;
     my ($symb,$itemtitle,$displaypath);
     if ($env{'request.course.id'}) {
-        $symb = &Apache::lonnet::symbread();
+        $symb = &Apache::lonnet::symbread($url);
         my ($map,$id,$res)=&Apache::lonnet::decode_symb($symb);
         my $navmap=Apache::lonnavmaps::navmap->new;
         if (ref($navmap)) {



From www at source.lon-capa.org  Wed Aug  1 07:23:55 2012
From: www at source.lon-capa.org (www)
Date: Wed, 01 Aug 2012 11:23:55 -0000
Subject: [LON-CAPA-cvs] cvs: loncom / production_dns_domain.tab
	production_dns_hosts.tab
Message-ID: <cvswww1343820235@cvsserver>

www		Wed Aug  1 11:23:55 2012 EDT

  Modified files:              
    /loncom	production_dns_domain.tab production_dns_hosts.tab 
  Log:
  Hazen High School
  
  
Index: loncom/production_dns_domain.tab
diff -u loncom/production_dns_domain.tab:1.113 loncom/production_dns_domain.tab:1.114
--- loncom/production_dns_domain.tab:1.113	Tue Jul 17 13:09:44 2012
+++ loncom/production_dns_domain.tab	Wed Aug  1 11:23:55 2012
@@ -132,7 +132,8 @@
 brs:Beaverton Rural Schools:::::::brsl2
 ashleyschools:Ashley Community Schools:::en-US::::ashleyschoolsl1
 
-
+hazen:Hazen High School:::en-US:Renton, WA:-122.2:47.502:hazenl1
+mariettahs:Marietta High School:::en-US:Marietta, OH:-81.5:39.431:mariettahsl1
 lasallehs:La Salle High School:::en-US:Cincinnati, OH:-84.586:39.190:lasallehsl1
 senecavalley:Seneca Valley High School:::en-US:Harmony, PA:-80.2:40.541:senecavalleyl1
 wellston:Wellston School District:::en-US:Wellston, OH:-82.5:39.120:wellstonl1
@@ -150,7 +151,6 @@
 elliott:Elliott County Schools:::en-US:Elliott, KY:-83.098:38.12:elliottl1
 logan:Logan Hocking School District:::en-US:Logan, OH:-82.42:39.53:loganl1
 ohiouk12:Ohio University - K12:::en-US:Athens, OH:-82.1:39.329:ohiouk12l1
-mariettahs:Marietta High School:::en-US:Marietta, OH:-81.5:39.431:mariettahsl1
 
 #Hosted
 wolcott:Wolcott Public Schools:::en::::wolcottl1
Index: loncom/production_dns_hosts.tab
diff -u loncom/production_dns_hosts.tab:1.154 loncom/production_dns_hosts.tab:1.155
--- loncom/production_dns_hosts.tab:1.154	Fri Jul 27 01:28:56 2012
+++ loncom/production_dns_hosts.tab	Wed Aug  1 11:23:55 2012
@@ -148,6 +148,7 @@
 
 #ohio u hosted
 
+hazenl1:hazen:library:capa4.phy.ohiou.edu:http:ohiou.edu
 lasallehsl1:lasallehs:library:capa4.phy.ohiou.edu:http:ohiou.edu
 senecavalleyl1:senecavalley:library:capa4.phy.ohiou.edu:http:ohiou.edu
 wellstonl1:wellston:library:capa4.phy.ohiou.edu:http:ohiou.edu



From raeburn at source.lon-capa.org  Wed Aug  1 08:30:39 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 12:30:39 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
Message-ID: <cvsraeburn1343824239@cvsserver>

raeburn		Wed Aug  1 12:30:39 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11.
    - Backport 1.382.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.13 loncom/interface/lonmenu.pm:1.369.2.14
--- loncom/interface/lonmenu.pm:1.369.2.13	Tue May 29 19:41:27 2012
+++ loncom/interface/lonmenu.pm	Wed Aug  1 12:30:39 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.13 2012/05/29 19:41:27 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.14 2012/08/01 12:30:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -762,13 +762,17 @@
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
-		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/})) {
+		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
                 }
-	        $menuitems.=(<<ENDREALRES);
+                unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
+	            $menuitems.=(<<ENDREALRES);
 s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+ENDREALRES
+                }
+                $menuitems.=(<<ENDREALRES);
 s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
 	    }



From raeburn at source.lon-capa.org  Wed Aug  1 08:52:42 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 12:52:42 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface groupsort.pm
Message-ID: <cvsraeburn1343825562@cvsserver>

raeburn		Wed Aug  1 12:52:42 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	groupsort.pm 
  Log:
  - For 2.11.
    - Backport 1.69.
  
  
Index: loncom/interface/groupsort.pm
diff -u loncom/interface/groupsort.pm:1.68.6.2 loncom/interface/groupsort.pm:1.68.6.3
--- loncom/interface/groupsort.pm:1.68.6.2	Mon Jun  4 02:17:35 2012
+++ loncom/interface/groupsort.pm	Wed Aug  1 12:52:41 2012
@@ -2,7 +2,7 @@
 # The LON-CAPA group sort handler
 # Allows for sorting prior to import into RAT.
 #
-# $Id: groupsort.pm,v 1.68.6.2 2012/06/04 02:17:35 raeburn Exp $
+# $Id: groupsort.pm,v 1.68.6.3 2012/08/01 12:52:41 raeburn Exp $
 # 
 # Copyright Michigan State University Board of Trustees
 #
@@ -37,7 +37,7 @@
 use Apache::loncommon;
 use Apache::lonlocal;
 use Apache::lonnet;
-use LONCAPA;
+use LONCAPA qw(:DEFAULT :match);
 
 my $iconpath; # variable to be accessible to multiple subroutines
 my %hash; # variable to tie to user specific database
@@ -411,7 +411,14 @@
 	    $r->print("<td>");
 	    $r->print("<img src='$iconname' />");
 	    $r->print("</td><td>");
-	    $r->print($resource->{'title'}.$resource->{'notes'}."</td><td>\n");
+            if (($env{'form.recover'}) &&
+                ($resource->{'url'} =~ m{/uploaded/$match_domain/$match_courseid/supplemental/})) {
+                my $title = &Apache::loncommon::parse_supplemental_title($resource->{'title'});
+                $r->print($title);
+            } else {
+                $r->print($resource->{'title'});
+            }
+	    $r->print($resource->{'notes'}."</td><td>\n");
 	    $r->print($resource->{'url'}."</td>"
                      .&Apache::loncommon::end_data_table_row()
                      ."\n");



From bisitz at source.lon-capa.org  Wed Aug  1 12:11:29 2012
From: bisitz at source.lon-capa.org (bisitz)
Date: Wed, 01 Aug 2012 16:11:29 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /localize/localize de.pm
Message-ID: <cvsbisitz1343837489@cvsserver>

bisitz		Wed Aug  1 16:11:29 2012 EDT

  Modified files:              
    /loncom/localize/localize	de.pm 
  Log:
  Added missing phrases and translations - Bug #6318
  - loncom_interface_statistics_loncorrectproblemplot.pm
  - loncom_interface_statistics_longradinganalysis.pm
  - loncom_interface_statistics_lonproblemanalysis.pm
  - loncom_interface_statistics_lonproblemstatistics.pm
  - loncom_interface_statistics_lonstathelpers.pm
  - loncom_interface_statistics_lonstudentassessment.pm
  - loncom_interface_statistics_lonstudentsubmissions.pm
  - loncom_interface_statistics_lonsubmissiontimeanalysis.pm
  
  
-------------- next part --------------
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.459 loncom/localize/localize/de.pm:1.460
--- loncom/localize/localize/de.pm:1.459	Thu Jun 21 14:16:59 2012
+++ loncom/localize/localize/de.pm	Wed Aug  1 16:11:28 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # German Localization Lexicon
 #
-# $Id: de.pm,v 1.459 2012/06/21 14:16:59 goltermann Exp $
+# $Id: de.pm,v 1.460 2012/08/01 16:11:28 bisitz Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -2156,6 +2156,12 @@
    'Preparing Excel Spreadsheet'
 => 'Erstelle Excel-Tabelle',
 
+   'Preparing Excel spreadsheet of student responses'
+=> 'Erstelle Excel-Tabelle mit studentischen Antworten',
+
+   'Preparing Excel spreadsheet of student responses to [_1] problems'
+=> 'Erstelle Excel-Tabelle mit studentischen Antworten von [_1] Aufgaben',
+
    'Problem Status Chart'
 => 'Aufgabenstatus-Diagramm',
 
@@ -7355,6 +7361,9 @@
    'There are no students in the sections/groups selected.'
 => 'In den gew??hlten Sektionen/Gruppen sind keine Studierenden.',
 
+   'There are no students in the sections/groups selected'
+=> 'In den gew??hlten Sektionen/Gruppen sind keine Studierenden.',
+
    'There is no submission data for this problem at all.'
 => 'F??r diese Aufgabe existieren keinerlei studentische Einreichungsdaten.',
 
@@ -7367,6 +7376,9 @@
    'There is no data to plot.'
 => 'Es existieren keine Daten, die geplottet werden k??nnten.',
 
+   'There is no data to plot'
+=> 'Es existieren keine Daten, die geplottet werden k??nnten.',
+
    'Analysis of [_1] is not supported.'
 => 'Die Analyse von Aufgaben des Typs "[_1]" wird nicht unterst??tzt.',
 
@@ -14016,7 +14028,7 @@
 => 'Die Bedingungen k??nnen eine Zugeh??rigkeit mit einem bestimmten Kurs oder Benutzeraccount in einer bestimmten Dom??ne beinhalten.',
 
    'Alternatively access can be granted to people with specific LON-CAPA usernames and domains.'
-=> 'Alternativ kann Zugriff f??r Leute gew??hrt werden, die bestimmte LON-CAPA-Benutezrnamen oder -Dom??nen haben.',
+=> 'Alternativ kann Zugriff f??r Personen gew??hrt werden, die bestimmte LON-CAPA-Benutzernamen oder -Dom??nen haben.',
 
    'Current access controls defined for this file:'
 => 'Derzeit eingestellte Zugriffskontrolle f??r diese Datei:',
@@ -20890,6 +20902,9 @@
    'Anonymous Survey'
 => 'Anonyme Umfrage',
 
+   '(Anonymous Survey)'
+=> '(Anonyme Umfrage)',
+
    'As the current submission is for an anonymous survey, no other details are available.'
 => 'Da die momentane Einreichung f??r eine anonyme Umfrage ist, sind keine weiteren Details verf??gbar.',
 
@@ -23954,6 +23969,175 @@
    'Unavailable at this time'
 => 'Derzeit nicht verf??gbar',
 
+   'Problem weights do not reflect individual student settings.'
+=> 'Die Aufgaben-Gewichtungen beziehen sich nicht auf individuelle studentische Einstellungen.',
+
+   'Statistics on submissions from [_1] to [_2]'
+=> 'Statistik ??ber Einreichungen von [_1] bis [_2]',
+
+   '<b>Output as</b> [_1]'
+=> '<b>Ausgabe als</b> [_1]',
+
+   'Attempt [_1], [_2] submissions, [_3] correct, [_4] incorrect'
+=> 'Versuch [_1], [_2] Einreichungen, [_3] korrekt, [_4] inkorrekt',
+
+   'Bar'
+=> 'Balken',
+
+   'Concept'
+=> 'Konzept',
+
+   'Concept Number'
+=> 'Konzept-Nummer',
+
+   'Correct Value'
+=> 'Korrekter Wert',
+
+   'Data from [_1] to [_2]'
+=> 'Daten von [_1] bis [_2]',
+
+   'Difference between submission and correct'
+=> 'Unterschiede zwischen Einreichung und korrekt',
+
+   'Distribution of correct answers'
+=> 'Verteilung der korrekten Antworten',
+
+   'Start time: [_1]'
+=> 'Startzeit: [_1]',
+
+   'End time: [_1]'
+=> 'Endezeit: [_1]',
+
+   '&nbsp;End Time: [_1]'
+=> '&nbsp;Endezeit: [_1]',
+
+   'Foil Number'
+=> 'Nummer der Auswahlm??glichkeit',
+
+   'Maximum number of coinciding values: [_1]'
+=> 'Maximale Anzahl an ??bereinstimmenden Werten: [_1]',
+
+   'Not enough data for concept analysis.  '
+=> 'Nicht genug Daten f??r Konzeptanalyse vorhanden',
+
+   'Percent Difference'
+=> 'Prozent Unterschied',
+
+   'Range'
+=> 'Bereich',
+
+   '[_1] students, [_2] distinct correct answers'
+=> '[_1] Studierende, [_2] echt unterschiedlich korrekte Antworten',
+
+   '[_1] submissions from [_2] students, [_3] correct, [_4] incorrect'
+=> '[_1] Einreichungen von [_2] Studierenden, [_3] korrekt, [_4] inkorrekt',
+
+   'correct foil chosen'
+=> 'korrekte Auswahlm??glichkeit ausgew??hlt',
+
+   'correct option chosen'
+=> 'korrekte Option ausgew??hlt',
+
+   'Compiling statistics for [_1] problems'
+=> 'Erstelle Statistik f??r [_1] Aufgaben',
+
+   'It may take some time to update the student data '
+=> 'Es kann einige Zeit dauern, bis die studentischen Daten aktualisiert sind.',
+
+   'Sequence Statistics'
+=> 'Statistik zu den Sequenzen',
+
+   'This will take some time.'
+=> 'Dies wird einen Moment dauern.',
+
+   'Unable to plot the requested statistic.'
+=> 'Die angeforderte Statistik konnte nicht geplottet werden.',
+
+   'plot'
+=> 'Plot',
+
+   'Both anonymous and named submissions -- display: [_1]Anonymous [_2]Named[_3]'
+=> 'Anonyme sowie personenbezogene Einreichungen -- Anzeige: [_1]anonym [_2]personenbezogen[_3]',
+
+   'Error: cannot process course structure'
+=> 'Fehler: Die Kursstruktur kann nicht verarbeitet werden.',
+
+   'If a selection contains both anonymous and named parts, [_1]use the Anoymous/Named buttons to ensure selections will be either all anonymous [_1]or all named.'
+=> 'Falls eine Auswahl anonyme sowie personenbezogene Teile enth??lt, [_1]verwenden Sie die Anonym-/Personenbezogen-Buttons, um sicherzustellen, dass Auswahlen entweder alle anonym [_1]oder alle personenbezogen sind.',
+
+   'View data as [_1] [_2]go[_3]'
+=> 'Daten ansehen als [_1] [_2]Go[_3]',
+
+   'You must select either only anonymous or only named problems.'
+=> 'Sie m??ssen entweder nur anonyme oder nur personenbezogene Aufgaben ausw??hlen.',
+
+   'Your selection includes both problems with and without anonymous submissions.'
+=> 'Ihre Auswahl enth??lt sowohl Aufgaben mit als auch ohne anonymer Einreichungen.',
+
+   'response'
+=> 'Antwort',
+
+   'LON-CAPA can produce <b>CSV</b> files of this data or Excel files of the <b>Scores Summary</b> data.'
+=> 'LON-CAPA kann <b>CSV</b>-Dateien aus diesen Daten erzeugen oder Excel-Dateien aus den <b>Punkte-Zusammenfassungs</b>-Daten.',
+
+   'LON-CAPA is unable to produce your Excel spreadsheet because your selections will result in more than 255 columns.  Excel allows only 255 columns in a spreadsheet.'
+=> 'LON-CAPA kann die gew??nschte Excel-Tabelle nicht erstellen, da Ihre Auswahl mehr als 255 Spalten erzeugen w??rde. Excel l??sst maximal 255 Spalten in einer Tabelle zu.',
+
+   'The last problem that will fit in the current spreadsheet is [_1].'
+=> 'Die letzte Aufgabe, die in die aktuelle Tabelle passt ist [_1].',
+
+   'Consider selecting fewer problems to generate reports on, or reducing the number of items per problem.  Or use HTML or CSV output.'
+=> 'Sie k??nnten weniger Aufgaben zur Erstellung des Berichts ausw??hlen oder die Anzahl Elemente je Aufgabe verringern. Alternativ steht Ihnen die HTML- und CSV-Ausgabe zur Verf??gung.',
+
+   'You may consider reducing the number of <b>Sequences or Folders</b> you have selected.'
+=> 'Sie k??nnten die Anzahl an ausgew??hlten <b>Sequenzen oder Verzeichnissen</b> verringern.',
+
+   'Unable to Complete Request'
+=> 'Der Vorgang konnte nicht abgeschlossen werden.',
+
+   'Unable to complete request'
+=> 'Der Vorgang konnte nicht abgeschlossen werden.',
+
+   'Anonymized'
+=> 'Anonymisiert',
+
+   'Contact a Domain Coordinator if you need the threshold to be changed for this course.'
+=> 'Kontaktieren Sie einen Dom??nne-Koordinator, falls Sie den Schwellenwert f??r diesen Kurs ??ndern m??chten.',
+
+   'Generating CSV report of student responses'
+=> 'Erstelle CSV-Bericht der studentischen Antworten',
+
+   'Internal error'
+=> 'Interner Fehler',
+
+   'The number of students matching the selection criteria is too few for display of submission data for anonymous surveys.'
+=> 'Die Anzahl an Studierenden, auf die die gew??hlte Auswahl zutrifft, ist zu gering, um Einreichungsdaten f??r anonyme Umfragen anzuzeigen.',
+
+   'There must be at least [quant,_1,student].'
+=> 'Es sind mindestens [quant,_1,Student/in,Studierende] notwendig.',
+
+   'resource is undefined'
+=> 'Die Ressource ist nicht definiert.',
+
+   'Resource is undefined.'
+=> 'Die Ressource ist nicht definiert.',
+
+   'Correct Submissions (not plotted)'
+=> 'Korrekte Einreichungen (nicht geplottet)',
+
+   'Cumulative Correct of those attempting the problem (not plotted)'
+=> 'Kumulativ korrekt, die die Aufgabe versucht haben (nicht geplottet)',
+
+   'Cumulative Percent Correct of selected students (plotted)'
+=> 'Kumulativ prozentual korrekt der ausgew??hlten Studierenden (geplottet)',
+
+   'Cumulative Percent Correct of those attempting the problem (not plotted)'
+=> 'Kumulativ prozentual korrekt, die die Aufgabe versucht haben (nicht geplottet)',
+
+   'Submissions (plotted)'
+=> 'Einreichungen (geplottet)',
+
+
 #SYNCMARKER
 );
 1;

From raeburn at source.lon-capa.org  Wed Aug  1 13:31:37 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 17:31:37 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface courseprefs.pm
Message-ID: <cvsraeburn1343842297@cvsserver>

raeburn		Wed Aug  1 17:31:37 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	courseprefs.pm 
  Log:
  - For 2.11.
    - Backport 1.50.
  
  
-------------- next part --------------
Index: loncom/interface/courseprefs.pm
diff -u loncom/interface/courseprefs.pm:1.49.2.2 loncom/interface/courseprefs.pm:1.49.2.3
--- loncom/interface/courseprefs.pm:1.49.2.2	Sun Jun  3 13:40:50 2012
+++ loncom/interface/courseprefs.pm	Wed Aug  1 17:31:37 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler to set configuration settings for a course
 #
-# $Id: courseprefs.pm,v 1.49.2.2 2012/06/03 13:40:50 raeburn Exp $
+# $Id: courseprefs.pm,v 1.49.2.3 2012/08/01 17:31:37 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -399,7 +399,8 @@
                       ordered => ['pch.roles.denied','pch.users.denied',
                                   'plc.roles.denied','plc.users.denied',
                                   'allow_limited_html_in_feedback',
-                                  'allow_discussion_post_editing'],
+                                  'allow_discussion_post_editing',
+                                  'discussion_post_fonts'],
                       itemtext => {
                          'pch.roles.denied'             => 'No Resource Discussion',
                          'pch.users.denied'             => 'No Resource Discussion',
@@ -407,6 +408,7 @@
                          'plc.users.denied'             => 'No Chat room use',
                          allow_limited_html_in_feedback => 'Allow limited HTML in discussion',
                          allow_discussion_post_editing  => 'Users can edit/delete own discussion posts',
+                         discussion_post_fonts       => 'Discussion post fonts based on likes/unlikes',
                                   },
                     },
         'classlists' =>
@@ -987,6 +989,35 @@
                                 }
                             }
                             $newvalues{$entry} =~ s/,$//;
+                        } elsif ($entry eq 'discussion_post_fonts') {
+                            my ($classorder,$classtitles) = &discussion_vote_classes();
+                            my $fontchange = 0;
+                            foreach my $class (@{$classorder}) {
+                                my $ext_entry = $entry.'_'.$class;
+                                my $size = $env{'form.'.$ext_entry.'_size'};
+                                my $unit = $env{'form.'.$ext_entry.'_unit'};
+                                my $weight = $env{'form.'.$ext_entry.'_weight'};
+                                my $style = $env{'form.'.$ext_entry.'_style'};
+                                my $other = $env{'form.'.$ext_entry.'_other'};
+                                $size =~ s/,//g;
+                                $unit =~ s/,//g;
+                                $weight =~ s/,//g;
+                                $style =~ s/,//g;
+                                $other =~ s/[^\w;:\s\-\%.]//g;
+                                $other =~ s/(^\s+|\s+$)//g;
+                                $newvalues{$ext_entry} = join(',',($size.$unit,$weight,$style,$other));
+                                my $current = $values->{$ext_entry};
+                                if ($values->{$ext_entry} eq '') {
+                                    $current = ',,,';
+                                }
+                                if ($newvalues{$ext_entry} ne $current) {
+                                    $changes->{$ext_entry} = $newvalues{$ext_entry};
+                                    $fontchange ++;
+                                }
+                            }
+                            if ($fontchange) {
+                                $changes->{$entry} = 1;
+                            }
                         } elsif ($entry eq 'nothideprivileged') {
                             my @curr_nothide;
                             my @new_nothide;
@@ -1090,7 +1121,7 @@
                         } else {
                             $newvalues{$entry} = $env{'form.'.$entry};
                         }
-                        unless ($entry eq 'co-owners') {
+                        unless (($entry eq 'co-owners') || ($entry eq 'discussion_post_fonts')) {
                             if ($newvalues{$entry} ne $values->{$entry}) {
                                 $changes->{$entry} = $newvalues{$entry};
                             }
@@ -1217,7 +1248,7 @@
                                     my ($displayname,$text);
                                     $text = $prefs->{$item}->{'itemtext'}{$key};
                                     my $displayval;
-                                    unless ($key eq 'co-owners') {
+                                    unless (($key eq 'co-owners') || ($key eq 'discussion_post_fonts')) {
                                         $displayval = $changes->{$item}{$key};
                                     }
                                     if ($item eq 'feedback') {
@@ -1253,6 +1284,36 @@
                                                     }
                                                     $displayval = join(', ', at longroles);
                                                 }
+                                            } elsif ($key eq 'discussion_post_fonts') {
+                                                my ($classorder,$classtitles)=&discussion_vote_classes();
+                                                my ($styleorder,$styleitems)=&discussion_vote_styles();
+                                                my $count = 1;
+                                                my $total = scalar(keys(%{$changes->{$item}}));
+                                                foreach my $class (@{$classorder}) {
+                                                    $count ++;
+                                                    next unless ($changes->{$item}{$key.'_'.$class});
+                                                    my @vals = split(/,/,$changes->{$item}{$key.'_'.$class});
+                                                    my $showval = '';
+                                                    for (my $i=0; $i<@{$styleorder}; $i++) {
+                                                        if ($vals[$i] ne '') {
+                                                            $showval .= 'font-'.$styleorder->[$i].': '.$vals[$i].'; ';
+                                                        }
+                                                    }
+                                                    if ($vals[3] ne '') {
+                                                        $showval .= $vals[3];
+                                                    }
+                                                    if ($showval ne '') {
+                                                        $displayval .= $classtitles->{$class}.':{ '.
+                                                                       $showval.'}';
+                                                        $storehash{$key.'_'.$class} = $changes->{$item}{$key.'_'.$class};
+                                                    } else {
+                                                        $displayval .= $classtitles->{$class}.': '.&mt('None');
+                                                        push(@delkeys,$key.'_'.$class);
+                                                    }
+                                                    unless ($count == $total) {
+                                                        $displayval .= ('&nbsp;'x2);
+                                                    }
+                                                }
                                             }
                                             $displayname = &mt($text);
                                         }
@@ -1352,7 +1413,9 @@
                                             }
                                         }
                                     } else {
-                                        $storehash{$key} = $changes->{$item}{$key};
+                                        unless ($key eq 'discussion_post_fonts') {
+                                            $storehash{$key} = $changes->{$item}{$key};
+                                        }
                                     }
                                 }
                                 if ($key eq 'cloners') {
@@ -2970,6 +3033,11 @@
                    text => '<b>'.&mt($itemtext->{'allow_discussion_post_editing'}).'</b>',
                    input => 'checkbox',
                  },
+        'discussion_post_fonts' => {
+                   text => '<b>'.&mt($itemtext->{'discussion_post_fonts'}).'</b>',
+                   input => 'textbox',
+                   size  => '20',
+                 },
     );
     my $datatable;
     my $count;
@@ -3009,6 +3077,17 @@
                           &Apache::loncommon::end_data_table_row().
                           &role_checkboxes($cdom,$cnum,$item,$settings,1).
                           &Apache::loncommon::end_data_table();
+        } elsif ($item eq 'discussion_post_fonts') {
+            $datatable .= &Apache::loncommon::start_data_table().
+                          &Apache::loncommon::start_data_table_row().
+                          '<th align="center">'.&mt('Sum of likes/dislikes').'</th>'.
+                          '<th align="center">'.&mt('font-size').'</th>'.
+                          '<th align="center">'.&mt('font-weight').'</th>'.
+                          '<th align="center">'.&mt('font-style').'</th>'.
+                          '<th align="center">'.&mt('Other css').'</th>'.
+                          &Apache::loncommon::end_data_table_row().
+                          &set_discussion_fonts($cdom,$cnum,$item,$settings).
+                          &Apache::loncommon::end_data_table();
         }
         $datatable .= &item_table_row_end();
     }
@@ -3130,6 +3209,75 @@
     return $output;
 }
 
+sub set_discussion_fonts {
+    my ($cdom,$cnum,$item,$settings) = @_;
+    my ($classorder,$classtitles) = &discussion_vote_classes();
+    my ($styleorder,$styleitems) = &discussion_vote_styles();
+    my $output;
+    if (ref($classorder) eq 'ARRAY') {
+        foreach my $cat (@{$classorder}) {
+            my %curr = ();
+            ($curr{'size'},$curr{'weight'},$curr{'style'},$curr{'other'}) =
+                split(/,/,$settings->{'discussion_post_fonts_'.$cat});
+            $output .= &Apache::loncommon::start_data_table_row().
+                       '<td>'.$classtitles->{$cat}.'</td>';
+            if (ref($styleorder) eq 'ARRAY') {
+                foreach my $item (@{$styleorder}) {
+                    $output .= '<td><span class="LC_nobreak">';
+                    my $selitem = $item;
+                    if ($item eq 'size') {
+                        my ($currsize,$currunit);
+                        if ($curr{'size'} =~ /^(\d+)(px|%)$/) {
+                            ($currsize,$currunit) = ($1,$2);
+                            $curr{'size'} = $currunit;
+                        }
+                        $output .= '<input type="textbox" name="discussion_post_fonts_'.$cat.'_'.$item.'" value="'.$currsize.'" size="5">'.
+                                   '&nbsp;';
+                        $selitem = 'unit';
+                    }
+                    if ((ref($styleitems) eq 'HASH') && (ref($styleitems->{$item}) eq 'ARRAY')) {
+                        $output .= '<select name="discussion_post_fonts_'.$cat.'_'.$selitem.'">';
+                        foreach my $val (@{$styleitems->{$item}}) {
+                            my $sel;
+                            if ($val eq $curr{$item}) {
+                                $sel = ' selected="selected"';
+                            }
+                            $output .= '<option value="'.$val.'"'.$sel.'>'.$val.'</option>';
+                        }
+                    }
+                }
+            }
+            $output .= '</span></td><td><input type="textbox" size="10" name="discussion_post_fonts_'.$cat.'_other" value="'.$curr{'other'}.'" /></td>';
+       }
+       $output .= &Apache::loncommon::end_data_table_row();
+    }
+    return $output;
+}
+
+sub discussion_vote_classes {
+    my $classorder = ['twoplus','oneplus','zero','oneminus','twominus'];
+    my %classtitles = &Apache::lonlocal::texthash(
+                        'twoplus'  => 'Two sigma above mean',
+                        'oneplus'  => 'One sigma above mean',
+                        'zero'     => 'Within one sigma of mean',
+                        'oneminus' => 'One sigma below mean',
+                        'twominus' => 'Two sigma below mean',
+                      );
+    return ($classorder,\%classtitles);
+}
+
+sub discussion_vote_styles {
+    my $styleorder = ['size','weight','style'];
+    my $styleitems = {
+                         size => ['','px','%','xx-small','x-small','small','medium','large',
+                                  'x-large','xx-large','smaller','larger'],
+                         weight => ['','normal','bold','bolder','lighter','100','200','300','400',
+                                    '500','600','700','800','900'],
+                         style => ['','normal','italic','oblique'],
+                     };
+    return ($styleorder,$styleitems);
+}
+
 sub print_classlists {
     my ($position,$cdom,$settings,$itemtext,$rowtotal,$crstype) = @_;
     my @ordered;
@@ -3471,7 +3619,8 @@
             unless (($parameter =~ m/^internal\./)||($parameter =~ m/^metadata\./) ||
                     ($parameter =~ m/^selfenroll_/) || ($parameter =~ /_selfenroll$/)
                     || ($parameter eq 'type') ||
-                    ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)) {
+                    ($parameter =~ m/^(cc|co|in|ta|ep|ad|st)\.plaintext$/)
+                    || ($parameter =~ m/^discussion_post_fonts/)) {
                 push(@ordered,$parameter);
             }
         }

From raeburn at source.lon-capa.org  Wed Aug  1 14:26:25 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 18:26:25 -0000
Subject: [LON-CAPA-cvs] cvs: doc(version_2_11_X) /loncapafiles
	loncapafiles.lpml
Message-ID: <cvsraeburn1343845585@cvsserver>

raeburn		Wed Aug  1 18:26:25 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - For 2.11.
    - Backport 1.805, 1.806.
  
  
-------------- next part --------------
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.797.2.12 doc/loncapafiles/loncapafiles.lpml:1.797.2.13
--- doc/loncapafiles/loncapafiles.lpml:1.797.2.12	Thu Jun  7 12:13:10 2012
+++ doc/loncapafiles/loncapafiles.lpml	Wed Aug  1 18:26:25 2012
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.797.2.12 2012/06/07 12:13:10 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.797.2.13 2012/08/01 18:26:25 raeburn Exp $ -->
 
 <!--
 
@@ -259,7 +259,7 @@
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/httpd/conf</targetdir>
   <targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/apache2</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/apache2</targetdir>
   <categoryname>standard</categoryname>
   <description>web configuration files</description>
 </directory>
@@ -267,7 +267,7 @@
   <protectionlevel>modest_delete</protectionlevel>
   <targetdir dist='default'>etc/httpd/conf/rewrites</targetdir>
   <targetdir dist='suse9.2 suse9.3 sles9'>etc/httpd/rewrites</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/apache2/rewrites</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/apache2/rewrites</targetdir>
   <categoryname>standard</categoryname>
   <description>
   default configuration files to enable/disable http:// -> https:// rewrites
@@ -283,56 +283,56 @@
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/init.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/init.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/init.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run during system startup</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc0.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc0.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc0.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 0</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc1.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc1.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc1.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 1</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc2.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc2.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc2.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 2</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc3.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc3.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc3.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 3</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc4.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc4.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc4.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 4</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc5.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc5.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc5.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 5</description>
 </directory>
 <directory dist='default'>
   <protectionlevel>never_delete</protectionlevel>
   <targetdir dist='default'>etc/rc.d/rc6.d</targetdir>
-  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc6.d</targetdir>
+  <targetdir dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12 suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1'>etc/rc6.d</targetdir>
   <categoryname>standard</categoryname>
   <description>scripts that run for run-level 6</description>
 </directory>
@@ -1007,7 +1007,7 @@
 <file>
 <source>loncom/loncapa.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/loncapa.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa.conf</target>
 <categoryname>conf</categoryname>
 <description>
 <p>
@@ -1050,7 +1050,7 @@
 <file type="postaboutversion">
 <source>loncom/loncapa_apache.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa_apache.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/loncapa_apache.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa_apache.conf</target>
 <categoryname>static conf</categoryname>
 <description>
 The goal of this file is to implement all LON-CAPA specific
@@ -1070,7 +1070,7 @@
 <file>
 <source>loncom/startup.pl</source>
 <target dist='default'>etc/httpd/conf/startup.pl</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/startup.pl</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/startup.pl</target>
 <categoryname>static conf</categoryname>
 <description>
 This file provides initializations for perl handlers.  It adjusts what
@@ -1081,7 +1081,7 @@
 </file>
 <link>
 <linkto>etc/apache2</linkto>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
 etc/apache2/conf
 </target>
 <categoryname>symbolic link</categoryname>
@@ -1092,7 +1092,7 @@
 <file>
 <source>loncom/rewrites/loncapa_rewrite_off.conf</source>
 <target dist='default'>etc/httpd/conf/loncapa_rewrite.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/loncapa_rewrite.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/loncapa_rewrite.conf</target>
 <categoryname>conf</categoryname>
 <description>
 Default rewrite file. 
@@ -1104,7 +1104,7 @@
 <source>loncom/rewrites/loncapa_rewrite_on.conf</source>
 <target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_on.conf</target>
 <target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_on.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/rewrites/loncapa_rewrite_on.conf</target>
 <categoryname>static conf</categoryname>
 <description>
 File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to  /etc/httpd/conf/loncapa_rewrite.conf to enable rewriting of
@@ -1115,7 +1115,7 @@
 <source>loncom/rewrites/loncapa_rewrite_off.conf</source>
 <target dist='default'>etc/httpd/conf/rewrites/loncapa_rewrite_off.conf</target>
 <target dist='sles9'>etc/apache/rewrites/loncapa_rewrite_off.conf</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/rewrites/loncapa_rewrite_off.conf</target>
 <categoryname>static conf</categoryname>
 <description>
 File to copy to /etc/apache2/loncapa_rewrite.conf (SuSE/SLES/Debian/Ubuntu LTS) or to  /etc/httpd/conf/loncapa_rewrite.conf to disable rewriting of
@@ -6016,6 +6016,14 @@
   <status>works/unverified</status>
 </file>
 <file>
+  <source>loncom/auth/lonnoshib.pm</source>
+  <target dist='default'>home/httpd/lib/perl/Apache/lonnoshib.pm</target>
+  <categoryname>handler</categoryname>
+  <description>Content handler for /adm/sso when Shibboleth auth is inactive.
+  </description>
+  <status>works/unverified</status>
+</file>
+<file>
   <source>loncom/html/adm/sso</source>
   <target dist='default'>home/httpd/html/adm/sso</target>
   <categoryname>interface file</categoryname>
@@ -6214,7 +6222,7 @@
 <file>
 <source>loncom/mime.types</source>
 <target dist='default'>etc/httpd/conf/mime.types</target>
-<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/apache2/mime.types</target>
+<target dist='sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/apache2/mime.types</target>
 <categoryname>www static conf</categoryname>
 <description>Expanded mime.types</description>
 </file>
@@ -7864,7 +7872,7 @@
 <file>
 <source>loncom/init.d/loncontrol</source>
 <target dist='default'>etc/rc.d/init.d/loncontrol</target>
-<target dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/init.d/loncontrol</target>
+<target dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/init.d/loncontrol</target>
 <categoryname>root script</categoryname>
 <description>
 Controls the launching/halting of lonc, lond, and lonsql processes.
@@ -7872,7 +7880,7 @@
 </file>
 <link>
 <linkto dist='default'>etc/rc.d/init.d/loncontrol</linkto>
-<linkto dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>etc/init.d/loncontrol</linkto>
+<linkto dist='suse9.2 suse9.3 sles9 sles10 sles11 suse10.1 suse10.2 suse10.3 suse11.1 suse11.2 suse11.3 suse11.4 suse12.1 debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>etc/init.d/loncontrol</linkto>
 <target dist='default'>
 etc/rc.d/rc0.d/K05loncontrol;
 etc/rc.d/rc1.d/K05loncontrol;
@@ -7890,7 +7898,7 @@
 etc/rc.d/rc5.d/S95loncontrol;
 etc/rc.d/rc6.d/K05loncontrol
 </target>
-<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10'>
+<target dist='debian5 debian6 ubuntu6 ubuntu8 ubuntu10 ubuntu12'>
 etc/rc0.d/K05loncontrol;
 etc/rc1.d/K05loncontrol;
 etc/rc2.d/S95loncontrol;

From raeburn at source.lon-capa.org  Wed Aug  1 15:07:52 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 19:07:52 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonwishlist.pm
Message-ID: <cvsraeburn1343848072@cvsserver>

raeburn		Wed Aug  1 19:07:52 2012 EDT

  Modified files:              
    /loncom/interface	lonwishlist.pm 
  Log:
  - Wording change: Wishlist -> Stored Links.
  
  
Index: loncom/interface/lonwishlist.pm
diff -u loncom/interface/lonwishlist.pm:1.15 loncom/interface/lonwishlist.pm:1.16
--- loncom/interface/lonwishlist.pm:1.15	Thu Jun  7 02:28:04 2012
+++ loncom/interface/lonwishlist.pm	Wed Aug  1 19:07:51 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Utility-routines for wishlist
 #
-# $Id: lonwishlist.pm,v 1.15 2012/06/07 02:28:04 raeburn Exp $
+# $Id: lonwishlist.pm,v 1.16 2012/08/01 19:07:51 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1894,7 +1894,7 @@
     # breadcrumbs and start_page 
     &Apache::lonhtmlcommon::add_breadcrumb(
               { href => '/adm/wishlist',
-                text => 'Wishlist'});
+                text => 'Stored Links'});
     my $startPage = &Apache::loncommon::start_page('Stored Links');
     
     my $breadcrumbs = &Apache::lonhtmlcommon::breadcrumbs(&mt('Stored Links').&Apache::loncommon::help_open_topic('Wishlist'));



From raeburn at source.lon-capa.org  Wed Aug  1 16:26:44 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 20:26:44 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface slotrequest.pm
Message-ID: <cvsraeburn1343852804@cvsserver>

raeburn		Wed Aug  1 20:26:44 2012 EDT

  Modified files:              
    /loncom/interface	slotrequest.pm 
  Log:
  - Use <div> for message, to separate it from inline menu.
  
  
Index: loncom/interface/slotrequest.pm
diff -u loncom/interface/slotrequest.pm:1.113 loncom/interface/slotrequest.pm:1.114
--- loncom/interface/slotrequest.pm:1.113	Sat Jun  9 15:41:26 2012
+++ loncom/interface/slotrequest.pm	Wed Aug  1 20:26:43 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Handler for requesting to have slots added to a students record
 #
-# $Id: slotrequest.pm,v 1.113 2012/06/09 15:41:26 raeburn Exp $
+# $Id: slotrequest.pm,v 1.114 2012/08/01 20:26:43 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -877,12 +877,13 @@
         push(@available,$slot);
     }
     if (!@available) {
-        $output = &mt('No available times.');
+        $output = '<div class="LC_info">'.&mt('No available times.');
         if ($env{'form.command'} ne 'manageresv') {
             $output .= ' <a href="/adm/flip?postdata=return:">'.
                        &mt('Return to last resource').'</a>';
         }
-        $r->print('<p class="LC_info">'.$output.'</p>');
+        $output .= '</div>';
+        $r->print($output);
         return;
     }
     if ($env{'form.command'} eq 'manageresv') {



From raeburn at source.lon-capa.org  Wed Aug  1 16:36:05 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Wed, 01 Aug 2012 20:36:05 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
Message-ID: <cvsraeburn1343853365@cvsserver>

raeburn		Wed Aug  1 20:36:05 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11.
    - missing && in backport of 1.382 (in 1.369.2.14).
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.14 loncom/interface/lonmenu.pm:1.369.2.15
--- loncom/interface/lonmenu.pm:1.369.2.14	Wed Aug  1 12:30:39 2012
+++ loncom/interface/lonmenu.pm	Wed Aug  1 20:36:05 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.14 2012/08/01 12:30:39 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.15 2012/08/01 20:36:05 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -762,7 +762,7 @@
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
-		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
+		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
 		    $menuitems.=(<<ENDREALRES);
 s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
 ENDREALRES



From raeburn at source.lon-capa.org  Thu Aug  2 11:08:13 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Thu, 02 Aug 2012 15:08:13 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /html/res/adm/pages mail.png /interface
	mydesk.tab
Message-ID: <cvsraeburn1343920093@cvsserver>

raeburn		Thu Aug  2 15:08:13 2012 EDT

  Modified files:              
    /loncom/interface	mydesk.tab 
    /loncom/html/res/adm/pages	mail.png 
  Log:
  - Rename icon used in Main Menu for DC Broadcast E-mail.
  - mail.png is same as mail-reply-all.png used in sub-menu. 
  
  
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.152 loncom/interface/mydesk.tab:1.153
--- loncom/interface/mydesk.tab:1.152	Fri May 18 16:20:18 2012
+++ loncom/interface/mydesk.tab	Thu Aug  2 15:08:07 2012
@@ -229,7 +229,7 @@
 10:1:community:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Community announcements and my calendar:com
 10:2:any:any:com.png:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and display messages:com
 10:3:clear
-10:3:ppsa:$requested_domain:mail-reply-all.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
+10:3:ppsa:$requested_domain:mail.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
 10:3:course_plc:any:bchat.png:course[_10]:chatroom[_1]:chat_win();:Enter the chat room for the course:com
 10:3:community_plc:any:bchat.png:communi-[_7]:ty chat[_1]:chat_win();:Enter the chat room for the community:com
 11:1:clear
Index: loncom/html/res/adm/pages/mail.png



From raeburn at source.lon-capa.org  Thu Aug  2 11:11:26 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Thu, 02 Aug 2012 15:11:26 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface mydesk.tab
Message-ID: <cvsraeburn1343920286@cvsserver>

raeburn		Thu Aug  2 15:11:26 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	mydesk.tab 
  Log:
  - For 2.11.
    - Backport 1.153.
  
  
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.149.2.6 loncom/interface/mydesk.tab:1.149.2.7
--- loncom/interface/mydesk.tab:1.149.2.6	Sun Jun  3 13:26:54 2012
+++ loncom/interface/mydesk.tab	Thu Aug  2 15:11:25 2012
@@ -249,7 +249,7 @@
 10:1:community:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Community announcements and my calendar:com
 10:2:any:any:com.png:commu-[_1]:nication[_1]:go('/adm/communicate');:Send and display messages:com
 10:3:clear
-10:3:ppsa:$requested_domain:mail-reply-all.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
+10:3:ppsa:$requested_domain:mail.png:bulk[_1]:e-mail[_1]:go('/adm/notify');:Send and display broadcast e-mail:com
 10:3:course_plc:any:bchat.png:course[_10]:chatroom[_1]:chat_win();:Enter the chat room for the course:com
 10:3:community_plc:any:bchat.png:communi-[_7]:ty chat[_1]:chat_win();:Enter the chat room for the community:com
 11:1:clear



From raeburn at source.lon-capa.org  Thu Aug  2 14:19:35 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Thu, 02 Aug 2012 18:19:35 -0000
Subject: [LON-CAPA-cvs] cvs: doc(version_2_11_X) /loncapafiles
	loncapafiles.lpml
Message-ID: <cvsraeburn1343931575@cvsserver>

raeburn		Thu Aug  2 18:19:35 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - For 2.11.
    - Reverse a change in 1.797.2.3. "Stored Links" functionality now in 2.11.
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.797.2.13 doc/loncapafiles/loncapafiles.lpml:1.797.2.14
--- doc/loncapafiles/loncapafiles.lpml:1.797.2.13	Wed Aug  1 18:26:25 2012
+++ doc/loncapafiles/loncapafiles.lpml	Thu Aug  2 18:19:34 2012
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.797.2.13 2012/08/01 18:26:25 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.797.2.14 2012/08/02 18:19:34 raeburn Exp $ -->
 
 <!--
 
@@ -7574,6 +7574,7 @@
 mail-reply-all.png;
 mail-reply-sender.png;
 messalog.png;
+move-22x22.png;
 myaboutme.png;
 navigation.png;
 network-workgroup.png;



From raeburn at source.lon-capa.org  Thu Aug  2 21:23:38 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 01:23:38 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm mydesk.tab
Message-ID: <cvsraeburn1343957018@cvsserver>

raeburn		Fri Aug  3 01:23:38 2012 EDT

  Modified files:              
    /loncom/interface	mydesk.tab lonmenu.pm 
  Log:
  - Use of Stored Links requires user to have $env{'user.adv'}
    (allows links to be stored, when instructor is made a student in a
     colleague's course).
  - Eliminate duplicate entries in $menuitems for Printout and Stored Links.
  
  
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.153 loncom/interface/mydesk.tab:1.154
--- loncom/interface/mydesk.tab:1.153	Thu Aug  2 15:08:07 2012
+++ loncom/interface/mydesk.tab	Fri Aug  3 01:23:38 2012
@@ -222,7 +222,7 @@
 8:1:clear
 8:1:tools:reqcrsshc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rcr
 8:1:tools:reqcrsnsc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rol
-9:3:pbre:$requested_domain:wishlist.png:view[_1]:wishlist[_1]:go('/adm/wishlist'):Stored Links:set
+9:3:adv:any:wishlist.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
 10:1:clear
 10:1:any:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
 10:1:course:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Course anouncements and my calendar:com
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.382 loncom/interface/lonmenu.pm:1.383
--- loncom/interface/lonmenu.pm:1.382	Thu Jul  5 19:22:47 2012
+++ loncom/interface/lonmenu.pm	Fri Aug  3 01:23:38 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.382 2012/07/05 19:22:47 raeburn Exp $
+# $Id: lonmenu.pm,v 1.383 2012/08/03 01:23:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -247,9 +247,7 @@
             my @primsub;
             if (ref($primary_submenu{$title}) eq 'ARRAY') {
                 foreach my $item (@{$primary_submenu{$title}}) {
-                    next if (($item->[2] eq 'wishlist') &&
-                             ((!&Apache::lonnet::allowed('bre',"/res/$env{'user.domain'}/")) &&
-                              (!&Apache::lonnet::allowed('bro',"/res/$env{'user.domain'}/"))));
+                    next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'}));
                     next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));
                     next if ((($item->[2] eq 'portfolio') ||
                              ($item->[2] eq 'blog')) &&
@@ -663,7 +661,7 @@
         ###
         ###
 # Prepare the rest of the buttons
-        my $menuitems;
+        my ($menuitems,$got_prt,$got_wishlist);
         if ($const_space) {
 #
 # We are in construction space
@@ -699,7 +697,7 @@
         } elsif ( defined($env{'request.course.id'}) && 
 		 $env{'request.symb'} ne '' ) {
 #
-# We are in a course and looking at a registred URL
+# We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
 	    $menuitems=(<<ENDMENUITEMS);
@@ -711,12 +709,15 @@
 c&8&2
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-            if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F' && $env{'request.uri'} =~ /^\/res/) {
+            $got_prt = 1;
+            if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
+                && (!$env{'request.enc'})) {
                 # wishlist is only available for users with access to resource-pool
                 # and links can only be set for resources within the resource-pool
                 $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
+                $got_wishlist = 1;
             }
 
 my $currentURL = &Apache::loncommon::get_symb();
@@ -748,16 +749,22 @@
 	    }
         }
 	if ($env{'request.uri'} =~ /^\/res/) {
-	    $menuitems .= (<<ENDMENUITEMS);
+            unless ($got_prt) {
+	        $menuitems .= (<<ENDMENUITEMS);
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-            if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F') {
-                # wishlist is only available for users with access to resource-pool
-                $menuitems .= (<<ENDMENUITEMS);
+                $gotprt = 1;
+            }
+            unless ($got_wishlist) {
+                if (($env{'user.adv'}) && (!$env{'request.enc'})) {
+                    # wishlist is only available for users with access to resource-pool
+                    $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
-            }
-	}
+                    $got_wishlist = 1;
+                }
+	    }
+        }
         my $buttons='';
         foreach (split(/\n/,$menuitems)) {
 	    my ($command, at rest)=split(/\&/,$_);



From raeburn at source.lon-capa.org  Thu Aug  2 21:26:33 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 01:26:33 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonwishlistdisplay.pm
Message-ID: <cvsraeburn1343957193@cvsserver>

raeburn		Fri Aug  3 01:26:33 2012 EDT

  Modified files:              
    /loncom/interface	lonwishlistdisplay.pm 
  Log:
  - Use of Stored Links requires user to have $env{'user.adv'} defined.
  
  
Index: loncom/interface/lonwishlistdisplay.pm
diff -u loncom/interface/lonwishlistdisplay.pm:1.3 loncom/interface/lonwishlistdisplay.pm:1.4
--- loncom/interface/lonwishlistdisplay.pm:1.3	Tue May 15 14:13:14 2012
+++ loncom/interface/lonwishlistdisplay.pm	Fri Aug  3 01:26:33 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to display the wishlist (handler)
 #
-# $Id: lonwishlistdisplay.pm,v 1.3 2012/05/15 14:13:14 raeburn Exp $
+# $Id: lonwishlistdisplay.pm,v 1.4 2012/08/03 01:26:33 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -55,8 +55,7 @@
         return OK;
     }
 
-    if ((&Apache::lonnet::allowed('bre',"/res/$env{'user.domain'}/")) ||
-        (&Apache::lonnet::allowed('bro',"/res/$env{'user.domain'}/"))) {
+    if ($env{'user.adv'}) {
         &Apache::loncommon::content_type($r,'text/html');
         $r->send_http_header;
     } else {



From raeburn at source.lon-capa.org  Thu Aug  2 21:36:55 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 01:36:55 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /interface lonmenu.pm
Message-ID: <cvsraeburn1343957815@cvsserver>

raeburn		Fri Aug  3 01:36:55 2012 EDT

  Modified files:              
    /loncom/interface	lonmenu.pm 
  Log:
  - Fix typo in rev 1.383.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.383 loncom/interface/lonmenu.pm:1.384
--- loncom/interface/lonmenu.pm:1.383	Fri Aug  3 01:23:38 2012
+++ loncom/interface/lonmenu.pm	Fri Aug  3 01:36:55 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.383 2012/08/03 01:23:38 raeburn Exp $
+# $Id: lonmenu.pm,v 1.384 2012/08/03 01:36:55 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -753,7 +753,7 @@
 	        $menuitems .= (<<ENDMENUITEMS);
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-                $gotprt = 1;
+                $got_prt = 1;
             }
             unless ($got_wishlist) {
                 if (($env{'user.adv'}) && (!$env{'request.enc'})) {



From raeburn at source.lon-capa.org  Thu Aug  2 21:37:23 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 01:37:23 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
Message-ID: <cvsraeburn1343957843@cvsserver>

raeburn		Fri Aug  3 01:37:23 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11.
    - Backport 1.383, 1.384.
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.15 loncom/interface/lonmenu.pm:1.369.2.16
--- loncom/interface/lonmenu.pm:1.369.2.15	Wed Aug  1 20:36:05 2012
+++ loncom/interface/lonmenu.pm	Fri Aug  3 01:37:23 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.15 2012/08/01 20:36:05 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.16 2012/08/03 01:37:23 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -247,9 +247,7 @@
             my @primsub;
             if (ref($primary_submenu{$title}) eq 'ARRAY') {
                 foreach my $item (@{$primary_submenu{$title}}) {
-                    next if (($item->[2] eq 'wishlist') && 
-                             ((!&Apache::lonnet::allowed('bre',"/res/$env{'user.domain'}/")) &&
-                              (!&Apache::lonnet::allowed('bro',"/res/$env{'user.domain'}/"))));
+                    next if (($item->[2] eq 'wishlist') && (!$env{'user.adv'})); 
                     next if (($item->[2] eq 'reqcrs') && (!&check_for_rcrs()));
                     next if ((($item->[2] eq 'portfolio') || 
                              ($item->[2] eq 'blog')) && 
@@ -693,7 +691,7 @@
         ###
         ###
 # Prepare the rest of the buttons
-        my $menuitems;
+        my ($menuitems,$got_prt,$got_wishlist);
         if ($const_space) {
 #
 # We are in construction space
@@ -729,7 +727,7 @@
         } elsif ( defined($env{'request.course.id'}) && 
 		 $env{'request.symb'} ne '' ) {
 #
-# We are in a course and looking at a registred URL
+# We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
 	    $menuitems=(<<ENDMENUITEMS);
@@ -741,12 +739,15 @@
 c&8&2
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-            if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F' && $env{'request.uri'} =~ /^\/res/) {
+            $got_prt = 1;
+            if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
+                && (!$env{'request.enc'})) {
                 # wishlist is only available for users with access to resource-pool
                 # and links can only be set for resources within the resource-pool
                 $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
+                $got_wishlist = 1;
             }
 
 my $currentURL = &Apache::loncommon::get_symb();
@@ -778,14 +779,20 @@
 	    }
         }
 	if ($env{'request.uri'} =~ /^\/res/) {
-	    $menuitems .= (<<ENDMENUITEMS);
+            unless ($got_prt) {
+	        $menuitems .= (<<ENDMENUITEMS);
 s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
-            if (&Apache::lonnet::allowed('bre', $env{'request.course.id'}) eq 'F') {
-                # wishlist is only available for users with access to resource-pool
-                $menuitems .= (<<ENDMENUITEMS);
+                $got_prt = 1;
+            }
+            unless ($got_wishlist) {
+                if (($env{'user.adv'}) && (!$env{'request.enc'})) {
+                    # wishlist is only available for users with access to resource-pool
+                    $menuitems .= (<<ENDMENUITEMS);
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
+                    $got_wishlist = 1;
+                } 
             }
 	}
         my $buttons='';



From raeburn at source.lon-capa.org  Thu Aug  2 21:42:11 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 01:42:11 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface mydesk.tab
Message-ID: <cvsraeburn1343958131@cvsserver>

raeburn		Fri Aug  3 01:42:11 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	mydesk.tab 
  Log:
  - For 2.11.
    - Backport 1.154.
  
  
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.149.2.7 loncom/interface/mydesk.tab:1.149.2.8
--- loncom/interface/mydesk.tab:1.149.2.7	Thu Aug  2 15:11:25 2012
+++ loncom/interface/mydesk.tab	Fri Aug  3 01:42:11 2012
@@ -242,7 +242,7 @@
 8:1:clear
 8:1:tools:reqcrsshc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rcr
 8:1:tools:reqcrsnsc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rol
-9:3:pbre:$requested_domain:wishlist.png:view[_1]:wishlist[_1]:go('/adm/wishlist'):Stored Links:set
+9:3:adv:any:wishlist.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
 10:1:clear
 10:1:any:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
 10:1:course:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Course anouncements and my calendar:com



From foxr at source.lon-capa.org  Fri Aug  3 06:55:53 2012
From: foxr at source.lon-capa.org (foxr)
Date: Fri, 03 Aug 2012 10:55:53 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /lonnet/perl lonnet.pm
Message-ID: <cvsfoxr1343991353@cvsserver>

foxr		Fri Aug  3 10:55:53 2012 EDT

  Modified files:              
    /loncom/lonnet/perl	lonnet.pm 
  Log:
  Ensure, if necessary, resources are internally represented as UTF-8
  
  
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.1181 loncom/lonnet/perl/lonnet.pm:1.1182
--- loncom/lonnet/perl/lonnet.pm:1.1181	Sat Jul 21 21:20:12 2012
+++ loncom/lonnet/perl/lonnet.pm	Fri Aug  3 10:55:53 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network
 # TCP networking package
 #
-# $Id: lonnet.pm,v 1.1181 2012/07/21 21:20:12 raeburn Exp $
+# $Id: lonnet.pm,v 1.1182 2012/08/03 10:55:53 foxr Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -75,6 +75,7 @@
 use HTTP::Date;
 use Image::Magick;
 
+
 use Encode;
 
 use vars qw(%perlvar %spareid %pr %prp $memcache %packagetab $tmpdir
@@ -2585,7 +2586,9 @@
 
     $request->header(Cookie => $ENV{'HTTP_COOKIE'});
     my $response= $ua->request($request);
-    my $content = Encode::decode_utf8($response->content);
+    my $content = $response->content;
+
+
     if (wantarray) {
 	return ($content, $response);
     } else {



From foxr at source.lon-capa.org  Fri Aug  3 06:56:52 2012
From: foxr at source.lon-capa.org (foxr)
Date: Fri, 03 Aug 2012 10:56:52 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /html/adm/help/tex
	Authoring_Dynamic_Plot.tex Authoring_Dynamic_Plot_Tics.tex
Message-ID: <cvsfoxr1343991412@cvsserver>

foxr		Fri Aug  3 10:56:52 2012 EDT

  Modified files:              
    /loncom/html/adm/help/tex	Authoring_Dynamic_Plot.tex 
                             	Authoring_Dynamic_Plot_Tics.tex 
  Log:
  BZ5635 - Document the new <tic> tag.
  
  
  
Index: loncom/html/adm/help/tex/Authoring_Dynamic_Plot.tex
diff -u loncom/html/adm/help/tex/Authoring_Dynamic_Plot.tex:1.2 loncom/html/adm/help/tex/Authoring_Dynamic_Plot.tex:1.3
--- loncom/html/adm/help/tex/Authoring_Dynamic_Plot.tex:1.2	Tue Sep 14 22:04:42 2004
+++ loncom/html/adm/help/tex/Authoring_Dynamic_Plot.tex	Fri Aug  3 10:56:52 2012
@@ -130,3 +130,40 @@
 \end{verbatim}
 
 \includegraphics{dynamic_plot2}
+
+It is also possible to override the attributes of the <xtics > and <ytics > by
+nesting <tic > tags inside those tags.   For each <tic > tag, the ``location''
+attribute allows you to specify the location of the tic mark and the contents
+of the tag allow you to specify the tic mark label.  The following
+fragment of XML demonstrates an X axis that is labeled with the monthos of
+the year.  Note that the ``rotate'' attribute of the <xtics > tag will rotate
+the text of the tic marks if the output device supports rotated text:
+
+\begin{verbatim}
+...
+<gnuplot ...
+
+<xtics rotate='on'>
+   <tic location='1'>January</tic>
+   <tic location='2'>February</tic>
+   <tic location='3'>March</tic>
+   <tic location='4'>April</tic>
+   <tic location='5'>May</tic>
+   <tic location='6'>June</tic>
+   <tic location='7'>July</tic>
+   <tic location='8'>August</tic>
+   <tic location='9'>September</tic>
+   <tic location='10'>October</tic>
+   <tic location='11'>November</tic>
+   <tic location='12'>December</tic>
+</xtics>
+<ytics end="6.0" location="border" start="-6.0" 
+       increment="1.0" mirror="on" />
+
+...
+</gnuplot>
+
+\end{verbatim}
+
+The values of location can be arbitrary and need not even be at regular
+intervals.
Index: loncom/html/adm/help/tex/Authoring_Dynamic_Plot_Tics.tex
diff -u loncom/html/adm/help/tex/Authoring_Dynamic_Plot_Tics.tex:1.3 loncom/html/adm/help/tex/Authoring_Dynamic_Plot_Tics.tex:1.4
--- loncom/html/adm/help/tex/Authoring_Dynamic_Plot_Tics.tex:1.3	Tue Oct 21 19:06:37 2003
+++ loncom/html/adm/help/tex/Authoring_Dynamic_Plot_Tics.tex	Fri Aug  3 10:56:52 2012
@@ -7,7 +7,7 @@
 The \textbf{xtics} and \textbf{ytics} tags have identical structure and the
 description presented here applies to both.
 
-The tics tags allow specification of the following parameters:
+The tics tags allow specification of the following attributes:
 
 \begin{itemize}
 
@@ -49,4 +49,47 @@
 
 \includegraphics[  width=0.40\paperwidth]{Authoring_Dynamic_Plot_Axis_Tics_minor}
 
+
+\item \texttt{rotate}
+
+For output devices that support it, the \texttt{rotate=`1'} attribute rotates
+the tic label.  This is most useful with large lables defined by the
+\textbf{tic} tag described below.
+
 \end{itemize}
+
+In addition to specifying regular tic intervals via the attributes of the
+\textbf{xtics} and \textbf{ytics} you can specify arbitrary tic locations
+by enclosing \textbf{tic} tags within the body of these tags.  Each
+\textbf{tic} tag requires the \textbf{location} attribute which specifies the
+location of a tic on the axis.  The body of the tag contains the label of
+that tic.
+
+The \textbf{xtic} or \textbf{ytic}  \texttt{rotate} attribute can rotate
+the label text if the output device supports text rotation.
+If \textbf{tic} tags are embedded within the \textbf{xtic} or \textbf{ytic}
+tags attributes of those tags that specify tic boundaries and interval are
+ignored.  Here's an example of an X axis tic specification in months of the year:
+
+\begin{verbatim}
+...
+<xtics rotate='on'>
+   <tic location='1'>January</tic>
+   <tic location='2'>February</tic>
+   <tic location='3'>March</tic>
+   <tic location='4'>April</tic>
+   <tic location='5'>May</tic>
+   <tic location='6'>June</tic>
+   <tic location='7'>July</tic>
+   <tic location='8'>August</tic>
+   <tic location='9'>September</tic>
+   <tic location='10'>October</tic>
+   <tic location='11'>November</tic>
+   <tic location='12'>December</tic>
+</xtics>
+<ytics end="6.0" location="border" start="-6.0" 
+       increment="1.0" mirror="on" />
+\end{verbatim}
+
+Note that tic locations are completely under your control and do not even have
+to be at regular interevals on the axis if that better suits your needs.



From raeburn at source.lon-capa.org  Fri Aug  3 11:15:56 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 15:15:56 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /homework inputtags.pm
Message-ID: <cvsraeburn1344006956@cvsserver>

raeburn		Fri Aug  3 15:15:56 2012 EDT

  Modified files:              
    /loncom/homework	inputtags.pm 
  Log:
  - Modify changes in rev 1.282. 
    - If status is "SHOW_ANSWER" show message: 
      'Computer's answer now shown above.' unless this is a handgrade item.
  
  
Index: loncom/homework/inputtags.pm
diff -u loncom/homework/inputtags.pm:1.304 loncom/homework/inputtags.pm:1.305
--- loncom/homework/inputtags.pm:1.304	Tue Jun 12 22:02:24 2012
+++ loncom/homework/inputtags.pm	Fri Aug  3 15:15:56 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # input  definitons
 #
-# $Id: inputtags.pm,v 1.304 2012/06/12 22:02:24 raeburn Exp $
+# $Id: inputtags.pm,v 1.305 2012/08/03 15:15:56 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -1522,10 +1522,14 @@
          && $status ne 'RESERVABLE_LATER'
          && $status ne 'NOTRESERVABLE') {
 
+	if ($status eq 'SHOW_ANSWER') {
+            $showbutton = 0;
+        }
+
 	($previousmsg,$latemessage,$message,$trystr) =
 	    &get_grade_messages($id,"resource.$id",$target,$status,
 				$showbutton);
-	if ( $status eq 'SHOW_ANSWER' || $status eq 'CANNOT_ANSWER') {
+	if ($status eq 'CANNOT_ANSWER') {
 	    $showbutton = 0;
 	}
 	if ( $status eq 'SHOW_ANSWER') {



From raeburn at source.lon-capa.org  Fri Aug  3 11:37:38 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 15:37:38 -0000
Subject: [LON-CAPA-cvs] cvs: modules /msu localenroll.pm
Message-ID: <cvsraeburn1344008258@cvsserver>

raeburn		Fri Aug  3 15:37:38 2012 EDT

  Modified files:              
    /modules/msu	localenroll.pm 
  Log:
  - MSU now uses four characters for some department identifiers
    (e.g., rcah).
  
  
Index: modules/msu/localenroll.pm
diff -u modules/msu/localenroll.pm:1.58 modules/msu/localenroll.pm:1.59
--- modules/msu/localenroll.pm:1.58	Sat Mar 10 15:37:55 2012
+++ modules/msu/localenroll.pm	Fri Aug  3 15:37:38 2012
@@ -1,6 +1,6 @@
 # functions to glue school database system into Lon-CAPA for
 # automated enrollment
-# $Id: localenroll.pm,v 1.58 2012/03/10 15:37:55 raeburn Exp $
+# $Id: localenroll.pm,v 1.59 2012/08/03 15:37:38 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,7 +129,7 @@
 <!DOCTYPE text>
 <students>
 |;
-          if ($class =~ m/^([suf]s\d{2})(\w{2,3})(\d{3,4}\w?)(\d{3})$/) {
+          if ($class =~ m/^([suf]s\d{2})(\w{2,})(\d{3,4}\w?)(\d{3})$/) {
               my $sem = $1;
               my $subj = $2;
               my $crse = $3;
@@ -191,7 +191,7 @@
 sub get_sections {
     my ($coursecode,$dom) = @_;
     my @secs = ();
-    if ($coursecode =~ m/^([suf]s\d{2})(\w{2,3})(\d{3,4}\w?)/) {
+    if ($coursecode =~ m/^([suf]s\d{2})(\w{2,4})(\d{3,4}\w?)/) {
         my $term = $1;
         my $subj = $2;
         my $crse = $3;
@@ -237,7 +237,7 @@
             $outcome = "Inclusion of enrollment could not be established for the course section $course_id because the username of the owner contains invalid characters.";
             return $outcome;
         }
-        if ($course_id =~ m/^([suf]s)(\d{2})(\w{2,3})(\d{3,4}\w?)(\d{3})$/) {
+        if ($course_id =~ m/^([suf]s)(\d{2})(\w{2,4})(\d{3,4}\w?)(\d{3})$/) {
             my $sem = $1;
             my $yr = $2;
             my $subj = $3;
@@ -397,7 +397,7 @@
 sub validate_courseID {
     my ($course_id,$dom) = @_;
     my $outcome = '';
-    if ($course_id =~ m/^([suf]s\d{2})(\w{2,3})(\d{3,4}\w?)(\d{3})$/) {
+    if ($course_id =~ m/^([suf]s\d{2})(\w{2,4})(\d{3,4}\w?)(\d{3})$/) {
         my $term = $1;
         my $subj = $2;
         my $crse = $3;
@@ -440,7 +440,7 @@
                     ss => 'Spring',
                     us => 'Summer',
                   );
-    if ($instcode =~ m/^([suf]s)(\d{2})(\w{2,3})(\d{3,4}\w?)$/) {
+    if ($instcode =~ m/^([suf]s)(\d{2})(\w{2,4})(\d{3,4}\w?)$/) {
         my $sem = $1;
         my $year = $2;
         my $term = $sem.$year;
@@ -594,7 +594,7 @@
                     );
     @{$$cat_order{'Semester'}} = ('ss','us','fs');
     foreach my $cid (keys %{$instcodes}) {
-        if ($$instcodes{$cid} =~ m/^([suf]s)(\d{2})(\w{2,3})(\d{3,4}\w?)$/) {
+        if ($$instcodes{$cid} =~ m/^([suf]s)(\d{2})(\w{2,4})(\d{3,4}\w?)$/) {
             $$codes{$cid}{'Semester'} = $1;
             $$codes{$cid}{'Department'} = $3;
             $$codes{$cid}{'Number'} = $4;
@@ -749,7 +749,7 @@
     my ($dbh,$class,$stuinfo) = @_;
     my $pidcount = 0;
     my $blankcount = 0;
-    if ($class =~ m/^([suf]s\d{2})(\w{2,3})(\d{3,4}\w?)(\d{3})$/) {
+    if ($class =~ m/^([suf]s\d{2})(\w{2,4})(\d{3,4}\w?)(\d{3})$/) {
         eval {
             my $sth = $dbh->prepare("SELECT Pid,Pilot_Id FROM LONCAPA_ClassList WHERE Term_Code = '$1' AND Subj_Code = '$2' AND Crse_Code = '$3' AND Sctn_Code = '$4'  ORDER BY Pid");
             $sth->execute();
@@ -809,7 +809,7 @@
             $person .= ':'.$dom;
         }
         if (defined($person) && $person ne '') {
-            if ($class =~ m/^([suf]s\d{2})(\w{2,3})(\d{3,4}\w?)(\d{3})$/) {
+            if ($class =~ m/^([suf]s\d{2})(\w{2,4})(\d{3,4}\w?)(\d{3})$/) {
 # Check if section exists in LONCAPA table.
                 if (!defined($dbh)) {
                     ($dbh,$dbflag) = &connect_DB('RO');
@@ -845,7 +845,7 @@
     %{$defaults} = (
         'Year' => '\d{2}',
         'Semester' => '^[sfu]s',
-        'Department' => '\w{2,3}',
+        'Department' => '\w{2,4}',
         'Number' => '\d{3,4}\w?',
     );
     @{$code_order} = ('Semester','Year','Department','Number');



From raeburn at source.lon-capa.org  Fri Aug  3 12:47:18 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 16:47:18 -0000
Subject: [LON-CAPA-cvs] cvs: modules /msu localenroll.pm
Message-ID: <cvsraeburn1344012438@cvsserver>

raeburn		Fri Aug  3 16:47:18 2012 EDT

  Modified files:              
    /modules/msu	localenroll.pm 
  Log:
  - Modify one regexp in rev. 1.59.
  
  
Index: modules/msu/localenroll.pm
diff -u modules/msu/localenroll.pm:1.59 modules/msu/localenroll.pm:1.60
--- modules/msu/localenroll.pm:1.59	Fri Aug  3 15:37:38 2012
+++ modules/msu/localenroll.pm	Fri Aug  3 16:47:17 2012
@@ -1,6 +1,6 @@
 # functions to glue school database system into Lon-CAPA for
 # automated enrollment
-# $Id: localenroll.pm,v 1.59 2012/08/03 15:37:38 raeburn Exp $
+# $Id: localenroll.pm,v 1.60 2012/08/03 16:47:17 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -129,7 +129,7 @@
 <!DOCTYPE text>
 <students>
 |;
-          if ($class =~ m/^([suf]s\d{2})(\w{2,})(\d{3,4}\w?)(\d{3})$/) {
+          if ($class =~ m/^([suf]s\d{2})(\w{2,4})(\d{3,4}\w?)(\d{3})$/) {
               my $sem = $1;
               my $subj = $2;
               my $crse = $3;



From raeburn at source.lon-capa.org  Fri Aug  3 13:35:39 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 17:35:39 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /auth lonroles.pm
	/interface loncommon.pm lonmenu.pm
Message-ID: <cvsraeburn1344015339@cvsserver>

raeburn		Fri Aug  3 17:35:39 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	loncommon.pm lonmenu.pm 
    /loncom/auth	lonroles.pm 
  Log:
  - For 2.11.
    - Remote Control retained in 2.11.
    - Reverse part of changes in loncommon.pm rev 1.949, 1.953, 1.962, 1.964.
    - Reverse part of changes in lonmenu.pm rev 1.316, 1.318, 1.321.
    - Reverse part of changes in lonroles.pm rev 1.245.
  
  
-------------- next part --------------
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.1075.2.11 loncom/interface/loncommon.pm:1.1075.2.12
--- loncom/interface/loncommon.pm:1.1075.2.11	Wed Aug  1 04:34:00 2012
+++ loncom/interface/loncommon.pm	Fri Aug  3 17:35:32 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1075.2.11 2012/08/01 04:34:00 raeburn Exp $
+# $Id: loncommon.pm,v 1.1075.2.12 2012/08/03 17:35:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -4954,6 +4954,9 @@
 
 =item * $bgcolor, used to override the bgcolor on a webpage to a specific value
 
+=item * $no_inline_link, if true and in remote mode, don't show the
+         'Switch To Inline Menu' link
+
 =item * $args, optional argument valid values are
             no_auto_mt_title -> prevents &mt()ing the title arg
             inherit_jsmath -> when creating popup window in a page,
@@ -4971,7 +4974,7 @@
 
 sub bodytag {
     my ($title,$function,$addentries,$bodyonly,$domain,$forcereg,
-        $no_nav_bar,$bgcolor,$args)=@_;
+        $no_nav_bar,$bgcolor,$no_inline_link,$args)=@_;
 
     my $public;
     if ((($env{'user.name'} eq 'public') && ($env{'user.domain'} eq 'public'))
@@ -5013,6 +5016,8 @@
     }
 
     if (!$realm) { $realm='&nbsp;'; }
+# Set messages
+    my $messages=&domainlogo($domain);
 
     my $extra_body_attr = &make_attr_string($forcereg,\%design);
 
@@ -5047,6 +5052,7 @@
     $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
     &get_unprocessed_cgi($ENV{'QUERY_STRING'}, ['inhibitmenu']);
 
+    unless ($env{'environment.remote'} eq 'on') {
         if ($no_nav_bar || $env{'form.inhibitmenu'} eq 'yes') { 
             return $bodytag; 
         } 
@@ -5103,6 +5109,42 @@
         }
 
         return $bodytag;
+    }
+
+#
+# Top frame rendering, Remote is up
+#
+
+    my $imgsrc = $img;
+    if ($img =~ /^\/adm/) {
+        $imgsrc = &lonhttpdurl($img);
+    }
+    my $upperleft='<img src="'.$imgsrc.'" alt="'.$function.'" />';
+
+    # Explicit link to get inline menu
+    my $menu= ($no_inline_link?''
+               :'<a href="/adm/remote?action=collapse" target="_top">'.&mt('Switch to Inline Menu Mode').'</a>');
+
+    if ($dc_info) {
+        $dc_info = qq|<span class="LC_cusr_subheading">($dc_info)</span>|;
+    }
+
+    unless ($env{'form.inhibitmenu'}) {
+        $bodytag .= qq|<div id="LC_nav_bar">$name $role</div>
+                       <ol class="LC_primary_menu LC_right">
+                       <li>$menu</li>
+                       </ol><div id="LC_realm"> $realm $dc_info</div>|;
+    }
+    return(<<ENDBODY);
+$bodytag
+<table id="LC_title_bar" class="LC_with_remote">
+<tr><td>$upperleft</td>
+    <td>$messages&nbsp;</td>
+</tr>
+<tr><td>$titleinfo $dc_info $menu</td>
+</tr>
+</table>
+ENDBODY
 }
 
 sub dc_courseid_toggle {
@@ -5134,8 +5176,15 @@
 		delete($attr_ref->{$key});
 	    }
 	}
-	$attr_ref->{'onload'}  = $on_load;
-	$attr_ref->{'onunload'}= $on_unload;
+        if ($env{'environment.remote'} eq 'on') {
+            $attr_ref->{'onload'}  =
+                &Apache::lonmenu::loadevents().  $on_load;
+            $attr_ref->{'onunload'}=
+                &Apache::lonmenu::unloadevents().$on_unload;
+        } else {  
+	    $attr_ref->{'onload'}  = $on_load;
+	    $attr_ref->{'onunload'}= $on_unload;
+        }
     }
 
     my $attr_string;
@@ -7100,8 +7149,8 @@
     if (!$args->{'frameset'}) {
 	$result .= &Apache::lonhtmlcommon::htmlareaheaders();
     }
-    if ($args->{'force_register'} && $env{'request.noversionuri'} !~ m{^/res/adm/pages/}) {
-        $result .= Apache::lonxml::display_title();
+    if ($args->{'force_register'}) {
+        $result .= &Apache::lonmenu::registerurl(1);
     }
     if (!$args->{'no_nav_bar'} 
 	&& !$args->{'only_body'}
@@ -7310,6 +7359,8 @@
              skip_phases    -> hash ref of 
                                     head -> skip the <html><head> generation
                                     body -> skip all <body> generation
+             no_inline_link -> if true and in remote mode, don't show the
+                                    'Switch To Inline Menu' link
              no_auto_mt_title -> prevent &mt()ing the title arg
              inherit_jsmath -> when creating popup window in a page,
                                     should it have jsmath forced on by the
@@ -7345,7 +7396,8 @@
                          $args->{'function'},       $args->{'add_entries'},
                          $args->{'only_body'},      $args->{'domain'},
                          $args->{'force_register'}, $args->{'no_nav_bar'},
-                         $args->{'bgcolor'},        $args);
+                         $args->{'bgcolor'},        $args->{'no_inline_link'},
+                         $args);
         }
     }
 
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.16 loncom/interface/lonmenu.pm:1.369.2.17
--- loncom/interface/lonmenu.pm:1.369.2.16	Fri Aug  3 01:37:23 2012
+++ loncom/interface/lonmenu.pm	Fri Aug  3 17:35:32 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.16 2012/08/03 01:37:23 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.17 2012/08/03 17:35:32 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -131,6 +131,26 @@
 
 This gets called in order to register a URL in the body of the document
 
+=item loadevents()
+
+=item unloadevents()
+
+=item startupremote()
+
+=item setflags()
+
+=item maincall()
+
+=item load_remote_msg()
+
+=item get_menu_name()
+
+=item reopenmenu()
+
+=item open()
+
+Open the menu
+
 =item clear()
 
 =item switch()
@@ -458,6 +478,34 @@
     return $menu;
 }
 
+sub registerurl {
+    my ($forcereg) = @_;
+    my $result = '';
+    if ($env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+    my $force_title='';
+    if ($env{'request.state'} eq 'construct') {
+        $force_title=&Apache::lonxml::display_title();
+    }
+    if (($env{'environment.remote'} eq 'off') ||
+        ((($env{'request.publicaccess'}) ||
+         (!&Apache::lonnet::is_on_map(
+           &unescape($env{'request.noversionuri'})))) &&
+        (!$forcereg))) {
+        return
+        $result
+       .'<script type="text/javascript">'."\n"
+       .'// <![CDATA['."\n"
+       .'function LONCAPAreg(){;} function LONCAPAstale(){}'."\n"
+       .'// ]]>'."\n"
+       .'</script>'
+       .$force_title;
+    }
+# Graphical display after login only
+    if ($env{'request.registered'} && !$forcereg) { return ''; }
+    $result.=&innerregister($forcereg);
+    return $result.$force_title;
+}
+
 sub innerregister {
     my ($forcereg,$bread_crumbs) = @_;
     my $const_space = ($env{'request.state'} eq 'construct');
@@ -467,8 +515,19 @@
 
     $env{'request.registered'} = 1;
 
+    my $noremote = ($env{'environment.remote'} eq 'off');
+
     undef(@inlineremote);
 
+    my $reopen=&Apache::lonmenu::reopenmenu();
+
+    my $newmail='';
+
+    if (&Apache::lonmsg::newmail() && !$noremote) {
+        # We have new mail and remote is up
+        $newmail= 'swmenu.setstatus("you have","messages");';
+    }
+
     my $resurl; 
     if ( $env{'request.symb'} && $env{'request.course.id'} ) {
 
@@ -507,10 +566,48 @@
         &Apache::lonhtmlcommon::clear_breadcrumbs();
         &Apache::lonhtmlcommon::add_breadcrumb({text => 'View Resource'});
     }
+    my $timesync   = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' );
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    return '' unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/}) 
-                       || $forcereg );
+    unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
+                       || ($forcereg)) {
+        unless ($noremote) {
+# Not registered, graphical
+           return (<<ENDDONOTREGTHIS);
+
+<script type="text/javascript">
+// <![CDATA[
+// BEGIN LON-CAPA Internal
+var swmenu=null;
+
+    function LONCAPAreg() {
+          swmenu=$reopen
+          $timesync
+          swmenu.currentStale=1;
+          swmenu.clearbut(2,1);
+          swmenu.clearbut(2,3);
+          swmenu.clearbut(8,1);
+          swmenu.clearbut(8,2);
+          swmenu.clearbut(8,3);
+          if (swmenu.currentURL) {
+             swmenu.switchbutton
+              (3,1,'reload.gif','return','location','go(currentURL)');
+          } else {
+              swmenu.clearbut(3,1);
+          }
+    }
+
+    function LONCAPAstale() {
+    }
+
+// END LON-CAPA Internal
+// ]]>
+</script>
+ENDDONOTREGTHIS
+
+        }
+        return '';
+    }
 
 # -- This applies to homework problems for users with grading privileges
 	my $crs='/'.$env{'request.course.id'};
@@ -792,7 +889,7 @@
 s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
                     $got_wishlist = 1;
-                } 
+                }
             }
 	}
         my $buttons='';
@@ -813,44 +910,94 @@
                 }
             }
         }
-
+        if ($noremote) {
 	    my $addremote=0;
 	    foreach (@inlineremote) { if ($_ ne '') { $addremote=1; last;} }
-    if ($addremote) {
+            if ($addremote) {
 
-        &Apache::lonhtmlcommon::clear_breadcrumb_tools();
+                &Apache::lonhtmlcommon::clear_breadcrumb_tools();
 
-            &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                'navigation', @inlineremote[21,23]);
+                &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                    'navigation', @inlineremote[21,23]);
+
+                my $countdown = &countdown_timer();
+                if (&hidden_button_check() eq 'yes') {
+                    if ($countdown) {
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
+                    }
+                } else {
+                    my @tools = @inlineremote[93,91,81,82,83];
+                    if ($countdown) {
+                        unshift(@tools,$countdown);
+                    }
+                    &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                        'tools', at tools);
 
-        my $countdown = &countdown_timer();
-        if (&hidden_button_check() eq 'yes') {
-            if ($countdown) {
-                &Apache::lonhtmlcommon::add_breadcrumb_tool('tools',$countdown);
+                    #publish button in construction space
+                    if ($env{'request.state'} eq 'construct'){
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                            'advtools', $inlineremote[63]);
+                    } else {
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                            'tools', $inlineremote[63]);
+                    }
+                    unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
+                        &Apache::lonhtmlcommon::add_breadcrumb_tool(
+                            'advtools', @inlineremote[61,71,72,73,74,92]);
+                    }
+                }
             }
         } else {
-            my @tools = @inlineremote[93,91,81,82,83];
-            if ($countdown) {
-                unshift(@tools,$countdown);
-            }
-            &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                'tools', at tools);
+            my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
+            $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
+            my $cursymb=&Apache::lonenc::check_encrypt($env{'request.symb'});
+            my $navstatus=&get_nav_status();
+            my $clearcstr;
 
-            #publish button in construction space
-            if ($env{'request.state'} eq 'construct'){
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                     'advtools', $inlineremote[63]);
-            } else {
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                     'tools', $inlineremote[63]);
-            }
-            
-            unless ($env{'request.noversionuri'}=~ m{^/adm/(navmaps|viewclasslist)(\?|$)}) {
-                &Apache::lonhtmlcommon::add_breadcrumb_tool(
-                    'advtools', @inlineremote[61,71,72,73,74,92]);
-            }
+            if ($env{'user.adv'}) { $clearcstr='clearbut(6,1)'; }
+            return <<ENDREGTHIS;
+
+<script type="text/javascript">
+// <![CDATA[
+// BEGIN LON-CAPA Internal
+var swmenu=null;
+
+    function LONCAPAreg() {
+          swmenu=$reopen;
+          swmenu.clearTimeout(swmenu.menucltim);
+          $timesync
+          $newmail
+          $buttons
+          swmenu.currentURL="$requri";
+          swmenu.reloadURL=swmenu.currentURL+window.location.search;
+          swmenu.currentSymb="$cursymb";
+          swmenu.reloadSymb="$cursymb";
+          swmenu.currentStale=0;
+          $navstatus
+          $hwkadd
+          $editbutton
+    }
+
+    function LONCAPAstale() {
+          swmenu=$reopen
+          swmenu.currentStale=1;
+          if (swmenu.reloadURL!='' && swmenu.reloadURL!= null) {
+             swmenu.switchbutton
+             (3,1,'reload.gif','return','location','go(reloadURL)','Return to the last known location in the course sequence');
+          }
+          swmenu.clearbut(7,2);
+          swmenu.clearbut(7,3);
+          swmenu.menucltim=swmenu.setTimeout(
+ 'clearbut(2,1);clearbut(2,3);clearbut(8,1);clearbut(8,2);clearbut(8,3);'+
+ 'clearbut(9,1);clearbut(9,3);clearbut(6,3);$clearcstr',
+                          2000);
+      }
+
+// END LON-CAPA Internal
+// ]]>
+</script>
+ENDREGTHIS
         }
-    }
 
     return   &Apache::lonhtmlcommon::scripttag('', 'start')
            . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
@@ -893,10 +1040,22 @@
     return $cfile;
 }
 
+sub loadevents() {
+    if ($env{'request.state'} eq 'construct' ||
+        $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+    return 'LONCAPAreg();';
+}
+
+sub unloadevents() {
+    if ($env{'request.state'} eq 'construct' ||
+        $env{'request.noversionuri'} =~ m{^/res/adm/pages/}) { return ''; }
+    return 'LONCAPAstale();';
+}
+
 sub startupremote {
     my ($lowerurl)=@_;
-    if ($env{'environment.remote'} eq 'off') {
-     return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
+    unless ($env{'environment.remote'} eq 'on') {
+        return ('<meta HTTP-EQUIV="Refresh" CONTENT="0.5; url='.$lowerurl.'" />');
     }
 #
 # The Remote actually gets launched!
@@ -974,7 +1133,7 @@
 }
 
 sub maincall() {
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
     return(<<ENDMAINCALL);
 <script type="text/javascript">
 // <![CDATA[
@@ -987,7 +1146,7 @@
 sub load_remote_msg {
     my ($lowerurl)=@_;
 
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
 
     my $esclowerurl=&escape($lowerurl);
     my $link=&mt('[_1]Continue[_2] on in Inline Menu mode'
@@ -1011,7 +1170,7 @@
 
 
 sub reopenmenu {
-   if ($env{'environment.remote'} eq 'off') { return ''; }
+   unless ($env{'environment.remote'} eq 'on') { return ''; }
    my $menuname = &get_menu_name();
    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
    return('window.open('.$nothing.',"'.$menuname.'","",false);');
@@ -1020,7 +1179,7 @@
 
 sub open {
     my $returnval='';
-    if ($env{'environment.remote'} eq 'off') {
+    unless ($env{'environment.remote'} eq 'on') {
         return
         '<script type="text/javascript">'."\n"
        .'// <![CDATA['."\n"
@@ -1055,8 +1214,13 @@
 
 sub clear {
     my ($row,$col)=@_;
-    $inlineremote[10*$row+$col]='';
-    return ''; 
+    if ($env{'environment.remote'} eq 'on') {
+       if (($row<1) || ($row>13)) { return ''; }
+       return "\n".qq(window.status+='.';swmenu.clearbut($row,$col););
+    } else {
+        $inlineremote[10*$row+$col]='';
+        return '';
+    }
 }
 
 # ============================================ Switch a button or create a link
@@ -1073,6 +1237,14 @@
     my $idx=10*$row+$col;
     $category_members{$cat}.=':'.$idx;
 
+    if ($env{'environment.remote'} eq 'on') {
+        if (($row<1) || ($row>13)) { return ''; }
+# Remote
+        $img=~s/\.png$/\.gif/;
+        return "\n".
+ qq(window.status+='.';swmenu.switchbutton($row,$col,"$img","$top","$bot","$act","$desc"););
+    }
+
 # Inline Menu
     if ($nobreak==2) { return ''; }
     my $text=$top.' '.$bot;
@@ -1134,6 +1306,13 @@
     return $output;
 }
 
+sub openmenu {
+    my $menuname = &get_menu_name();
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
+    my $nothing = &Apache::lonhtmlcommon::javascript_nothing();
+    return "window.open(".$nothing.",'".$menuname."');";
+}
+
 sub inlinemenu {
     undef(@inlineremote);
     undef(%category_members);
@@ -1176,7 +1355,13 @@
 #
     my $textualoverride=shift;
     my $output='';
-    return '' unless $textualoverride;
+    if ($env{'environment.remote'} eq 'on') {
+       $output.=
+ "window.status='Opening Remote Control';var swmenu=".&openmenu().
+"\nwindow.status='Configuring Remote Control ';";
+    } else {
+        unless ($textualoverride) { return ''; }
+    }
     my $uname=$env{'user.name'};
     my $udom=$env{'user.domain'};
     my $adv=$env{'user.adv'};
@@ -1351,6 +1536,12 @@
           $uname,$udom,$rol,$crs,$pub,$con,$row,$col,$prt,$img,$top,$bot,$act,$desc,$cat);
         }
     }
+    if ($env{'environment.remote'} eq 'on') {
+        $output.="\nwindow.status='Synchronizing Time';swmenu.syncclock(1000*".time.");\nwindow.status='Remote Control Configured.';";
+        if (&Apache::lonmsg::newmail()) {
+            $output.='swmenu.setstatus("you have","messages");';
+        }
+    }
     return $output;
 }
 
@@ -1379,7 +1570,7 @@
 # ======================================================================= Close
 
 sub close {
-    if ($env{'environment.remote'} eq 'off') { return ''; }
+    unless ($env{'environment.remote'} eq 'on') { return ''; }
     my $menuname = &get_menu_name();
     return(<<ENDCLOSE);
 <script type="text/javascript">
@@ -1664,6 +1855,16 @@
 ENDCONSTSPACEFORM
 }
 
+sub get_nav_status {
+    my $navstatus="swmenu.w_loncapanav_flag=";
+    if ($env{'environment.remotenavmap'} eq 'on') {
+        $navstatus.="1";
+    } else {
+        $navstatus.="-1";
+    }
+    return $navstatus;
+}
+
 sub hidden_button_check {
     if ( $env{'request.course.id'} eq ''
          || $env{'request.role.adv'} ) {
Index: loncom/auth/lonroles.pm
diff -u loncom/auth/lonroles.pm:1.269 loncom/auth/lonroles.pm:1.269.2.1
--- loncom/auth/lonroles.pm:1.269	Sat Jul 21 21:09:03 2012
+++ loncom/auth/lonroles.pm	Fri Aug  3 17:35:39 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # User Roles Screen
 #
-# $Id: lonroles.pm,v 1.269 2012/07/21 21:09:03 raeburn Exp $
+# $Id: lonroles.pm,v 1.269.2.1 2012/08/03 17:35:39 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -149,6 +149,7 @@
     &Apache::loncommon::content_type($r,'text/html');
     &Apache::loncommon::no_cache($r);
     $r->send_http_header;
+    my $swinfo=&Apache::lonmenu::rawconfig();
 
     # Breadcrumbs
     my $brcrum = [{'href' => $url,
@@ -163,6 +164,11 @@
     $url=~s/ /\%20/g;
     $r->print(<<ENDREDIR);
 $start_page
+<script type="text/javascript">
+// <![CDATA[
+$swinfo
+// ]]>
+</script>
 <p>$msg</p>
 $end_page
 ENDREDIR

From raeburn at source.lon-capa.org  Fri Aug  3 18:38:35 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Fri, 03 Aug 2012 22:38:35 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
Message-ID: <cvsraeburn1344033515@cvsserver>

raeburn		Fri Aug  3 22:38:35 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm 
  Log:
  - For 2.11.
    - Modify changes in 1.1075.2.12 so CSTR button is available for editing
      a resource in course context, where uses has au/ca role for resource's
      authorship.
    - Prevent javascript error for Folder/Page Content item when remote control
      is active. 
  
  
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.17 loncom/interface/lonmenu.pm:1.369.2.18
--- loncom/interface/lonmenu.pm:1.369.2.17	Fri Aug  3 17:35:32 2012
+++ loncom/interface/lonmenu.pm	Fri Aug  3 22:38:35 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.17 2012/08/03 17:35:32 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.18 2012/08/03 22:38:35 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -569,46 +569,8 @@
     my $timesync   = ( $noremote ? '' : 'swmenu.syncclock(1000*'.time.');' );
 # =============================================================================
 # ============================ This is for URLs that actually can be registered
-    unless ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
+    if ( ($env{'request.noversionuri'}!~m{^/(res/)*adm/})
                        || ($forcereg)) {
-        unless ($noremote) {
-# Not registered, graphical
-           return (<<ENDDONOTREGTHIS);
-
-<script type="text/javascript">
-// <![CDATA[
-// BEGIN LON-CAPA Internal
-var swmenu=null;
-
-    function LONCAPAreg() {
-          swmenu=$reopen
-          $timesync
-          swmenu.currentStale=1;
-          swmenu.clearbut(2,1);
-          swmenu.clearbut(2,3);
-          swmenu.clearbut(8,1);
-          swmenu.clearbut(8,2);
-          swmenu.clearbut(8,3);
-          if (swmenu.currentURL) {
-             swmenu.switchbutton
-              (3,1,'reload.gif','return','location','go(currentURL)');
-          } else {
-              swmenu.clearbut(3,1);
-          }
-    }
-
-    function LONCAPAstale() {
-    }
-
-// END LON-CAPA Internal
-// ]]>
-</script>
-ENDDONOTREGTHIS
-
-        }
-        return '';
-    }
-
 # -- This applies to homework problems for users with grading privileges
 	my $crs='/'.$env{'request.course.id'};
 	if ($env{'request.course.sec'}) {
@@ -635,11 +597,13 @@
 			     "gocmd('/adm/parmset','set')",
 			     'Content Settings');
 	}
-        if ($env{'request.symb'}=~/^uploaded/ &&
-            &Apache::lonnet::allowed('mdc',$crs)) {
-            $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]',
-                             "gocmd('/adm/coursedocs','direct')",
-                             'Folder/Page Content');
+        if ($noremote) {  
+            if ($env{'request.symb'}=~/^uploaded/ &&
+                &Apache::lonnet::allowed('mdc',$crs)) {
+                $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]',
+                                 "gocmd('/adm/coursedocs','direct')",
+                                 'Folder/Page Content');
+            }
         }
 # -- End Homework
         ###
@@ -947,6 +911,10 @@
                     }
                 }
             }
+            return   &Apache::lonhtmlcommon::scripttag('', 'start')
+                   . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
+                   . &Apache::lonhtmlcommon::scripttag('', 'end');
+
         } else {
             my $requri=&Apache::lonnet::clutter(&Apache::lonnet::fixversion((split(/\?/,$env{'request.noversionuri'}))[0]));
             $requri=&Apache::lonenc::check_encrypt(&unescape($requri));
@@ -998,10 +966,44 @@
 </script>
 ENDREGTHIS
         }
+    } else {
+       unless ($noremote) {
+# Not registered, graphical
+           return (<<ENDDONOTREGTHIS);
+
+<script type="text/javascript">
+// <![CDATA[
+// BEGIN LON-CAPA Internal
+var swmenu=null;
 
-    return   &Apache::lonhtmlcommon::scripttag('', 'start')
-           . &Apache::lonhtmlcommon::breadcrumbs(undef,undef,0)
-           . &Apache::lonhtmlcommon::scripttag('', 'end');
+    function LONCAPAreg() {
+          swmenu=$reopen
+          $timesync
+          swmenu.currentStale=1;
+          swmenu.clearbut(2,1);
+          swmenu.clearbut(2,3);
+          swmenu.clearbut(8,1);
+          swmenu.clearbut(8,2);
+          swmenu.clearbut(8,3);
+          if (swmenu.currentURL) {
+             swmenu.switchbutton
+              (3,1,'reload.gif','return','location','go(currentURL)');
+          } else {
+              swmenu.clearbut(3,1);
+          }
+    }
+
+    function LONCAPAstale() {
+    }
+
+// END LON-CAPA Internal
+// ]]>
+</script>
+ENDDONOTREGTHIS
+
+        }
+        return '';
+    }
 }
 
 sub is_course_upload {



From raeburn at source.lon-capa.org  Sat Aug  4 12:37:49 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Sat, 04 Aug 2012 16:37:49 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /html/res/adm/pages menu.html
Message-ID: <cvsraeburn1344098269@cvsserver>

raeburn		Sat Aug  4 16:37:49 2012 EDT

  Modified files:              
    /loncom/html/res/adm/pages	menu.html 
  Log:
  - For 2.11
    - Remote Control retained in 2.11. Retrieve menu.html from attic.
    - Stored links replace bookmarks
        - remove set_bookmark() and add set_wishlistlink().
    - switchbutton() includes checking that 'b'+idx item is an object.
  
  
-------------- next part --------------
Index: loncom/html/res/adm/pages/menu.html
diff -u /dev/null loncom/html/res/adm/pages/menu.html:1.130
--- /dev/null	Sat Aug  4 16:37:49 2012
+++ loncom/html/res/adm/pages/menu.html	Sat Aug  4 16:37:49 2012
@@ -0,0 +1,656 @@
+<html>
+<!--
+The LearningOnline Network with CAPA
+Remote Control
+
+//
+// $Id: menu.html,v 1.130 2012/08/04 16:37:49 raeburn Exp $
+//
+// Copyright Michigan State University Board of Trustees
+//
+// This file is part of the LearningOnline Network with CAPA (LON-CAPA).
+//
+// LON-CAPA is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// LON-CAPA is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with LON-CAPA; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// /home/httpd/html/adm/gpl.txt
+//
+// http://www.lon-capa.org/
+//
+
+-->
+<head>
+<title>LON-CAPA Remote</title>
+</head>
+
+<body bgcolor="#BBBBBB" 
+      background="remotebg.gif"
+      onUnload="collapse();"
+      onLoad="activate();"
+      style="{background-repeat: no-repeat;}"
+      id="LC_remote">
+<script type="text/javascript">
+//<!--
+var statustop = '';
+var statusbot = '';
+var active = 0;
+var dislocked = 1;
+var statuslocked = 0;
+
+var imgpath='/res/adm/pages/';
+var fontpath='/adm/lonLCDfont/';
+var currentURL='';
+var reloadURL='';
+var currentSymb='';
+var reloadSymb='';
+var currentStale=1;
+var menucltim;
+var clockdelta=0;
+
+var w_extdisp_flag=-1;
+var extdisp=null;
+
+var autologout=1;
+
+// not used (yet)
+// var w_Annotator;
+// var w_bmquery;
+// var w_BookmarkPal;
+// var w_LONcatInfo;
+
+//////////////////////////////////////
+var w_Annotator_flag=-1;
+var w_bmquery_flag=-1;
+var w_BookmarkPal_flag=-1;
+var w_LONcatInfo_flag=-1;
+var w_LONchat_flag=-1;
+var w_loncapanav_flag=-1;
+ // 1 means currently open
+ // 0 means closed (but has been open)
+ // -1 means never yet opened/defined
+///////////////////////////////////////
+
+var hr = new Array;
+var db = new Array;
+var dt = new Array;
+var ds = new Array;
+
+for (var i=1;i<=3;i++) {
+   for (var j=1;j<=10;j++) {
+      var index = 10*j+i;
+      hr[index]='';
+      db[index]='';
+      dt[index]='';
+      ds[index]='';
+   }
+}
+
+var clientwindow=opener;
+var navwindow;
+
+function syncclock(servertime) {
+    var clientclock=new Date;
+    clockdelta=servertime-clientclock.getTime();
+}
+
+function advanceclock() {
+    var clock=new Date();
+    clock.setTime(clock.getTime()+clockdelta);
+    if (!statuslocked) {
+       var days=""+clock.getDate();
+       if (days.length<2) { days="0"+days; }
+       var mons=""+(clock.getMonth()+1);
+       if (mons.length<2) { mons="0"+mons; }
+       var years=""+clock.getYear();
+
+       if (years>1000) {
+          years=years.substring(2,4);
+       } else {
+          years=years.substring(1,3);
+       }
+       statustop=mons+'/'+days+'/'+years;
+
+       var secs=""+clock.getSeconds();
+       if (secs.length<2) { secs="0"+secs; }
+       var mins=""+clock.getMinutes();
+       if (mins.length<2) { mins="0"+mins; }
+       var hours=""+clock.getHours();
+       if (hours.length<2) { hours=" "+hours; }
+       statusbot=hours+':'+mins+':'+secs;
+
+       if (!dislocked) { showdisplay(); }
+    }
+    setTimeout('advanceclock();',1000);
+}
+
+function windowcheck() {
+   if (clientwindow==null || clientwindow.closed) {
+      clientwindow=window.open("/",'',
+      "height=400,width=440,"+
+      "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,menubar=1,"+
+      "left=190,top=15,screenX=190,screenY=15"); 
+      clientwindow.name='loncapaclient';
+   }
+   extenddispclose();
+}
+
+function navwindowcheck() {
+   if (navwindow==null || navwindow.closed) {
+      navwindow=window.open("/adm/navmaps#curloc",
+                  "loncapanav","height=600,width=400,scrollbars=1"); 
+   }
+}
+
+function collapse() {
+   if (autologout) {
+       windowcheck();
+       clientwindow.location='/adm/remote?action=collapse';
+   }
+}
+ 
+function logout () {
+   windowcheck();
+
+      if (w_Annotator_flag!=-1 && annotator && !annotator.closed) {
+          annotator.close();
+      }
+      if (w_bmquery_flag!=-1 && bmquery && !bmquery.closed) {
+          bmquery.close();
+      }
+      if (w_BookmarkPal_flag!=-1 && bookmarkpal && !bookmarkpal.closed) {
+          bookmarkpal.close();
+      }
+      if (w_LONcatInfo_flag!=-1 && loncatinfo && !loncatinfo.closed) {
+          loncatinfo.close();
+      }
+      if (w_LONchat_flag!=-1 && lonchat && !lonchat.closed) {
+          lonchat.close();
+      }
+      if (autologout) {
+         go("/adm/logout");
+      }
+}
+
+function activate () {
+   setTimeout('opener.menuloaded=1;',1000);
+   setTimeout('active=1;',500);
+   advanceclock();
+}
+
+function deactivate () {
+   active=0;
+}
+
+function display(utext,ltext) {
+    this.window.focus();
+    showdisplay(utext,ltext);
+}
+
+function defdis() {
+   this.window.focus();
+   display();
+}
+
+function switchbutton(row,col,imgsrc,texttop,textbot,action,desc) {
+    var idx=10*row+col;
+    if (typeof(this.document['b'+idx]) == 'object') {
+        this.document['b'+idx].src=imgpath+imgsrc;
+        hr[idx]=action;
+        dt[idx]=texttop;
+        db[idx]=textbot;
+        ds[idx]=desc;
+        for (var k=0;k<document.links.length;k++) {
+            if (document.links[k].name=='link'+idx) {
+                document.links[k].title=desc;
+            }
+        }
+    }
+}
+
+function clearbut(row,col) {
+   var idx=10*row+col;
+   this.document['b'+idx].src=imgpath+'empty.gif';
+   hr[idx]='javascript:defdis();';
+   dt[idx]='';
+   db[idx]='';
+   ds[idx]='';
+   for (var k=0;k<document.links.length;k++) {
+       if (document.links[k].name=='link'+idx) {
+          document.links[k].title='';
+       }
+   }
+}
+
+function setstatus(tp,bt) {
+   this.document['led'].src=imgpath+"ledblink.gif";
+   statustop=tp;
+   statusbot=bt;
+   statuslocked=1;
+   defdis();
+}
+
+function go(url) {
+   windowcheck();
+   statuslocked=0;
+   this.document['led'].src=imgpath+"ledsend.gif";
+   if (url!='' && url!= null) {
+      currentURL = null;
+      currentSymb= null;
+      this.document.server.target='loncapaclient';
+      this.document.server.action=url;
+      this.document.server.postdata.value='';
+      this.document.server.command.value='';
+      this.document.server.url.value='';
+      this.document.server.postsymb.value='';
+      this.document.server.submit();
+   }
+}
+
+function gonav(url) {
+   if (w_loncapanav_flag == 1) {
+      navwindowcheck();
+      statuslocked=0;
+      this.document.server.target="loncapanav";
+   } else {
+      this.document.server.target="loncapaclient";
+   } 
+   this.document['led'].src=imgpath+"ledsend.gif";
+   if (url!='' && url!= null) {
+       this.document.server.action=url;
+       this.document.server.postdata.value=currentURL;
+       this.document.server.command.value='';
+       this.document.server.url.value='';
+       this.document.server.postsymb.value=currentSymb;
+       this.document.server.submit();
+   }
+}
+
+function gopost(url,postdata,makenewwin) {
+   windowcheck();
+   statuslocked=0;
+   this.document['led'].src=imgpath+"ledsend.gif";
+   if (url!='') {
+      if (makenewwin) {
+         var LONcomWin=window.open("/adm/rat/empty.html",
+                       'LONcom',
+                       "height=600,width=600,"+
+      "scrollbars=1,toolbar=0,status=0,resizable=1,location=0,menubar=0"); 
+         this.document.server.target='LONcom';
+      } else {
+         this.document.server.target='loncapaclient';
+      }
+      this.document.server.action=url;
+      this.document.server.postdata.value=postdata;
+      this.document.server.command.value='';
+      this.document.server.url.value='';
+      this.document.server.postsymb.value='';
+      this.document.server.submit();
+   }
+}
+
+function gocmd(url,cmd) {
+   windowcheck();
+   statuslocked=0;
+   this.document['led'].src=imgpath+"ledsend.gif";
+   if (url!='') {
+      this.document.server.target='loncapaclient';
+      this.document.server.action=url;
+      this.document.server.postdata.value='';
+      this.document.server.command.value=cmd;
+      this.document.server.url.value=currentURL;
+      this.document.server.postsymb.value=currentSymb;
+      this.document.server.submit();
+   }
+}
+
+function annotate() {
+   w_Annotator_flag=1;
+   annotator=window.open('','Annotator','width=365,height=265,scrollbars=0');
+   annotator.document.write(
+   "<html><body onload='Javascript:document.goannotate.submit();'>"
+  +"<form name='goannotate' target='Annotator' method='post' "
+  +"action='/adm/annotations'>"
+  +"<input type='hidden' name='symbnew' value='"+currentSymb+"' />"
+  +"<\/form><\/body><\/html>");
+   annotator.document.close();
+}
+
+function set_wishlistlink() {
+    go('');
+    var title;
+    var path;
+    if (currentStale) {
+        title="Enter Title";
+        path=currentURL;
+    } else {
+        title=clientwindow.document.title;
+        path=clientwindow.location.pathname;
+    }
+    Win = window.open('/adm/wishlist?mode=newLink&setTitle='+title+'&setPath='+path,
+                      'wishlistNewLink','width=560,height=350,scrollbars=0');
+}
+
+function extenddispclose() {
+   if (w_extdisp_flag>0) {
+      if (extdisp!=null && !extdisp.closed) {
+         extdisp.close();
+      }
+      w_extdisp_flag=-1;
+   }
+}
+
+function extenddisp() {
+   go('');
+   w_extdisp_flag=1;
+   extdisp=window.open("/adm/rat/loading.html",
+               "ExtDisp", "scrollbars=1,width=400,height=450");
+}
+
+function drawwindow() {
+   extdisp.document.clear();
+   extdisp.document.writeln(
+  '<html><body bgcolor="#666666" text="#DDDDDD" link="#EEEEEE" '+
+         'onUnload="opener.w_extdisp_flag=-1;">'+
+  '<h2>LON-CAPA Extended Display Remote Control<\/h2>'+
+  '<script type="text/javascript">var currentURL="'+currentURL+'";self.focus();<\/s'+'cript>'+
+  '<table border="2"><tr><th>Select Functionality from Below<\/th>'+
+  '<th>Description<\/th><\/tr>');
+   for (var i=0; i<=ds.length; i++) {
+       if (typeof(ds[i])!='undefined') {
+          if (ds[i]!='') {
+             extdisp.document.writeln(
+                '<tr><td align="center"><a href="javascript:opener.'+
+               hr[i]+';">&gt;&gt;&gt;<img align="absmiddle" border="0" src="'+
+            this.document['b'+i].src+'" />&lt;&lt;&lt;<\/a><br />&nbsp;<br />');
+             bigdisplay(dt,db,i);
+             extdisp.document.writeln('<\/td><td>'+ds[i]+'<\/td><\/tr>');
+          }
+       }
+   }
+   extdisp.document.writeln('<\/table><\/body><\/html>');
+   extdisp.document.close();
+}
+
+function edit_bookmarks() {
+   go('');
+   w_BookmarkPal_flag=1;
+   bookmarkpal=window.open("/adm/bookmarks",
+               "BookmarkPal", "width=400,height=505,scrollbars=0");
+}
+
+function catalog_info() {
+   go('');
+   w_LONcatInfo_flag=1;
+   loncatinfo=window.open(clientwindow.window.location.pathname+'.meta',"cat",'height=420,width=480,resizable=yes,scrollbars=yes,location=no,menubar=no,toolbar=no');
+}
+
+function chat_win() {
+   go('');
+   w_LONchat_flag=1;
+   lonchat=window.open('/res/adm/pages/chatroom.html',"LONchat",'height=420,width=480,resizable=yes,location=no,menubar=no,toolbar=no');
+}
+//-->
+</script>
+<block condition="&EXT('request.browser.textremote')!=1">
+<script type="text/javascript">
+//<!--
+function bigdisplay(dt,db,i) {
+             extdisp.document.writeln(
+'<table hspace="0" border="0" cellspacing="1" cellpadding="0"><tr>');
+             for (var j=0;j<=7;j++) {
+                if (j<dt[i].length) {
+                   ch=dt[i].charAt(j);
+                   if (ch==' ') { ch='space'; }
+                   if (ch=='-') { ch='hyphen'; }
+                   if (ch==':') { ch='colon'; }
+                   if (ch=='/') { ch='slash'; }
+                } else { ch='space'; }
+                extdisp.document.writeln('<td><img border="0" src="'
+                                         +fontpath+ch+'.gif" /><\/td>');
+             }
+             extdisp.document.writeln('<\/tr><tr>');
+             for (var j=0;j<=7;j++) {
+                if (j<db[i].length) {
+                   ch=db[i].charAt(j);
+                   if (ch==' ') { ch='space'; }
+                   if (ch=='-') { ch='hyphen'; }
+                   if (ch==':') { ch='colon'; }
+                   if (ch=='/') { ch='slash'; }
+                } else { ch='space'; }
+                extdisp.document.writeln('<td><img border="0" src="'
+                                         +fontpath+ch+'.gif" /><\/td>');
+            }
+            extdisp.document.writeln('<\/tr><\/table>');
+}
+
+function showdisplay(utext,ltext) {
+  var i; var ch;
+  dislocked=1;
+  if (utext == null) { utext = '';}
+  if (ltext == null) { ltext = '';}
+  if (typeof(utext)!="string") { utext=''; }
+  if (typeof(ltext)!="string") { ltext=''; }
+  if ((utext=='') && (ltext=='')) {
+     utext=statustop;
+     ltext=statusbot;
+     dislocked=0;
+  }
+  if (active) {
+   for (i=0;i<=7;i++) {
+      if (i<utext.length) {
+         ch=utext.charAt(i);
+         if (ch==' ') { ch='space'; }
+         if (ch=='-') { ch='hyphen'; }
+         if (ch==':') { ch='colon'; }
+         if (ch=='/') { ch='slash'; }
+      } else { ch='space'; }
+      this.document['i'+i].src=fontpath+ch+'.gif';
+   }
+   for (i=0;i<=7;i++) {
+      if (i<ltext.length) {
+         ch=ltext.charAt(i);
+         if (ch==' ') { ch='space'; }
+         if (ch=='-') { ch='hyphen'; }
+         if (ch==':') { ch='colon'; }
+         if (ch=='/') { ch='slash'; }
+      } else { ch='space'; }
+      this.document['j'+i].src=fontpath+ch+'.gif';
+   }
+  }
+}
+//-->
+</script>
+<display>
+return '<script type="text/javascript">w_loncapanav_flag=\''.('on' eq &EXT('user.environment.remotenavmap')).'\';</script>';
+</display>
+</block>
+<block condition="&EXT('request.browser.textremote')">
+<script type="text/javascript">
+//<!--
+function bigdisplay(dt,db,i) {
+  extdisp.document.writeln(dt[i]+'<br />'+db[i]);
+}
+
+function showdisplay(utext,ltext) {
+  var i; var ch;
+  dislocked=1;
+  if (utext == null) { utext = '';}
+  if (ltext == null) { ltext = '';}
+  if (typeof(utext)!="string") { utext=''; }
+  if (typeof(ltext)!="string") { ltext=''; }
+  if ((utext=='') && (ltext=='')) {
+     utext=statustop;
+     ltext=statusbot;
+     dislocked=0;
+  }
+  if (active) {
+   self.document.forms.disp.topdisplay.value=utext;
+   self.document.forms.disp.botdisplay.value=ltext;
+  }
+}
+//-->
+</script>
+</block>
+<center>
+<table hspace="0" border="0" cellspacing="0" cellpadding="0">
+<tr><td>
+<a href="javascript:defdis();"
+   onmouseover="defdis();"
+><img border="0" width="80" height="50" src="title.gif" /></a>
+</td><td>
+<img border="0" width="50" height="50" name="led" src="ledoff.gif" />
+</td></tr>
+</table>
+</center>
+
+<center>
+<a href="javascript:extenddisp();"
+   onmouseover="defdis();"
+><img width="104" height="10" border="0" src="spacer.gif" /></a>
+</center>
+
+<center>
+<block condition="&EXT('request.browser.textremote')!=1">
+<table hspace="1" border="0" cellspacing="0" cellpadding="1">
+<tr><td bgcolor="#666666">
+<table hspace="0" border="0" cellspacing="1" cellpadding="0"> 
+<tr>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i0" width="15" height="19" src="/adm/lonLCDfont/l.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i1" width="15" height="19" src="/adm/lonLCDfont/o.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i2" width="15" height="19" src="/adm/lonLCDfont/n.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i3" width="15" height="19" src="/adm/lonLCDfont/hyphen.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i4" width="15" height="19" src="/adm/lonLCDfont/c.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i5" width="15" height="19" src="/adm/lonLCDfont/a.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i6" width="15" height="19" src="/adm/lonLCDfont/p.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0"  name="i7" width="15" height="19" src="/adm/lonLCDfont/a.gif" /></a></td>
+</tr>
+<tr>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j0" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j1" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j2" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j3" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j4" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j5" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j6" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+<td><a href="javascript:defdis();" onmouseover="defdis();"><img border="0" name="j7" width="15" height="19" src="/adm/lonLCDfont/space.gif" /></a></td>
+</tr>
+</table>
+</td></tr>
+</table>
+</block>
+<block condition="&EXT('request.browser.textremote')">
+<font size="1">
+<form name="disp">
+<input type="text" name="topdisplay" size="14" value="LON-CAPA" /><br />
+<input type="text" name="botdisplay" size="14" value="" />
+</form>
+</font>
+</block>
+
+</center>
+
+<center>
+<table hspace="0" border="0" cellspacing="0" cellpadding="0">
+
+<tr>
+<td colspan="2"><a name="link11" href="javascript:eval(hr[11]);" onmouseover="display(dt[11],db[11]);"><img width="86" height="20" border="0" name="b11" src="dempty.gif" /></a></td>
+<td><a name="link12" href="javascript:eval(hr[12]);" onmouseover="display(dt[12],db[12]);"><img width="43" height="20" border="0" name="b12" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td rowspan="2"><a name="link21" href="javascript:eval(hr[21]);" onmouseover="display(dt[21],db[21]);"><img width="43" height="40" border="0" name="b21" src="qempty.gif" /></a></td>
+<td><a name="link22" href="javascript:eval(hr[22]);" onmouseover="display(dt[22],db[22]);"><img width="43" height="20" border="0" name="b22" src="empty.gif" /></a></td>
+<td rowspan="2"><a name="link23" href="javascript:eval(hr[23]);" onmouseover="display(dt[23],db[23]);"><img width="43" height="40" border="0" name="b23" src="qempty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link31" href="javascript:eval(hr[31]);" onmouseover="display(dt[31],db[31]);"><img width="43" height="20" border="0" name="b31" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link41" href="javascript:eval(hr[41]);" onmouseover="display(dt[41],db[41]);"><img width="43" height="20" border="0" name="b41" src="empty.gif" /></a></td>
+<td><a name="link42" href="javascript:eval(hr[42]);" onmouseover="display(dt[42],db[42]);"><img width="43" height="20" border="0" name="b42" src="empty.gif" /></a></td>
+<td><a name="link43" href="javascript:eval(hr[43]);" onmouseover="display(dt[43],db[43]);"><img width="43" height="20" border="0" name="b43" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link51" href="javascript:eval(hr[51]);" onmouseover="display(dt[51],db[51]);"><img width="43" height="20" border="0" name="b51" src="empty.gif" /></a></td>
+<td><a name="link52" href="javascript:eval(hr[52]);" onmouseover="display(dt[52],db[52]);"><img width="43" height="20" border="0" name="b52" src="empty.gif" /></a></td>
+<td><a name="link53" href="javascript:eval(hr[53]);" onmouseover="display(dt[53],db[53]);"><img width="43" height="20" border="0" name="b53" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link61" href="javascript:eval(hr[61]);" onmouseover="display(dt[61],db[61]);"><img width="43" height="20" border="0" name="b61" src="empty.gif" /></a></td>
+<td><a name="link62" href="javascript:eval(hr[62]);" onmouseover="display(dt[62],db[62]);"><img width="43" height="20" border="0" name="b62" src="empty.gif" /></a></td>
+<td><a name="link63" href="javascript:eval(hr[63]);" onmouseover="display(dt[63],db[63]);"><img width="43" height="20" border="0" name="b63" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link71" href="javascript:eval(hr[71]);" onmouseover="display(dt[71],db[71]);"><img width="43" height="20" border="0" name="b71" src="empty.gif" /></a></td>
+<td><a name="link72" href="javascript:eval(hr[72]);" onmouseover="display(dt[72],db[72]);"><img width="43" height="20" border="0" name="b72" src="empty.gif" /></a></td>
+<td><a name="link73" href="javascript:eval(hr[73]);" onmouseover="display(dt[73],db[73]);"><img width="43" height="20" border="0" name="b73" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link81" href="javascript:eval(hr[81]);" onmouseover="display(dt[81],db[81]);"><img width="43" height="20" border="0" name="b81" src="empty.gif" /></a></td>
+<td><a name="link82" href="javascript:eval(hr[82]);" onmouseover="display(dt[82],db[82]);"><img width="43" height="20" border="0" name="b82" src="empty.gif" /></a></td>
+<td><a name="link83" href="javascript:eval(hr[83]);" onmouseover="display(dt[83],db[83]);"><img width="43" height="20" border="0" name="b83" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link91" href="javascript:eval(hr[91]);" onmouseover="display(dt[91],db[91]);"><img width="43" height="20" border="0" name="b91" src="empty.gif" /></a></td>
+<td><a name="link92" href="javascript:eval(hr[92]);" onmouseover="display(dt[92],db[92]);"><img width="43" height="20" border="0" name="b92" src="empty.gif" /></a></td>
+<td><a name="link93" href="javascript:eval(hr[93]);" onmouseover="display(dt[93],db[93]);"><img width="43" height="20" border="0" name="b93" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link101" href="javascript:eval(hr[101]);" onmouseover="display(dt[101],db[101]);"><img width="43" height="20" border="0" name="b101" src="empty.gif" /></a></td>
+<td><a name="link102" href="javascript:eval(hr[102]);" onmouseover="display(dt[102],db[102]);"><img width="43" height="20" border="0" name="b102" src="empty.gif" /></a></td>
+<td><a name="link103" href="javascript:eval(hr[103]);" onmouseover="display(dt[103],db[103]);"><img width="43" height="20" border="0" name="b103" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link111" href="javascript:eval(hr[111]);" onmouseover="display(dt[111],db[111]);"><img width="43" height="20" border="0" name="b111" src="empty.gif" /></a></td>
+<td><a name="link112" href="javascript:eval(hr[112]);" onmouseover="display(dt[112],db[112]);"><img width="43" height="20" border="0" name="b112" src="empty.gif" /></a></td>
+<td><a name="link113" href="javascript:eval(hr[113]);" onmouseover="display(dt[113],db[113]);"><img width="43" height="20" border="0" name="b113" src="empty.gif" /></a></td>
+</tr>
+
+<tr>
+<td><a name="link121" href="javascript:eval(hr[121]);" onmouseover="display(dt[121],db[121]);"><img width="43" height="20" border="0" name="b121" src="empty.gif" /></a></td>
+<td><a name="link122" href="javascript:eval(hr[122]);" onmouseover="display(dt[122],db[122]);"><img width="43" height="20" border="0" name="b122" src="empty.gif" /></a></td>
+<td><a name="link123" href="javascript:eval(hr[123]);" onmouseover="display(dt[123],db[123]);"><img width="43" height="20" border="0" name="b123" src="empty.gif" /></a></td></tr>
+
+<tr>
+<td><a name="link131" href="javascript:eval(hr[131]);" onmouseover="display(dt[131],db[131]);"><img width="43" height="20" border="0" name="b131" src="empty.gif" /></a></td>
+<td><a name="link132" href="javascript:eval(hr[132]);" onmouseover="display(dt[132],db[132]);"><img width="43" height="20" border="0" name="b132" src="empty.gif" /></a></td>
+<td><a name="link133" href="javascript:eval(hr[133]);" onmouseover="display(dt[133],db[133]);"><img width="43" height="20" border="0" name="b133" src="empty.gif" /></a></td></tr>
+
+</table>
+</center>
+
+<form name="server" action="/adm/logout" method="post" target="loncapaclient">
+<input type="hidden" name="postdata" value="none" />
+<input type="hidden" name="command" value="none" />
+<input type="hidden" name="url" value="none" />
+<input type="hidden" name="postsymb" value="none" />
+</form>
+</body>
+</html>
+
+
+
+
+
+
+

From raeburn at source.lon-capa.org  Sun Aug  5 21:56:02 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 06 Aug 2012 01:56:02 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /html/res/adm/pages alnk.png slnk.png
Message-ID: <cvsraeburn1344218162@cvsserver>

raeburn		Mon Aug  6 01:56:02 2012 EDT

  Added files:                 
    /loncom/html/res/adm/pages	alnk.png slnk.png 
  Log:
  - For 2.11.
    - Icons for adding Stored Link, or viewing Stored Links.
    - File names use four-character names for consistency with .gif files 
      for Remote Control.
  
  



From raeburn at source.lon-capa.org  Sun Aug  5 22:03:58 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 06 Aug 2012 02:03:58 -0000
Subject: [LON-CAPA-cvs] cvs: loncom /html/res/adm/pages alnk.gif slnk.gif
Message-ID: <cvsraeburn1344218638@cvsserver>

raeburn		Mon Aug  6 02:03:58 2012 EDT

  Added files:                 
    /loncom/html/res/adm/pages	alnk.gif slnk.gif 
  Log:
  - For 2.11.
    Icons for adding "Store Link", or viewing "Stored Links" for Remote Control.
  
  



From raeburn at source.lon-capa.org  Sun Aug  5 23:34:21 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 06 Aug 2012 03:34:21 -0000
Subject: [LON-CAPA-cvs] cvs: doc(version_2_11_X) /loncapafiles
	loncapafiles.lpml
Message-ID: <cvsraeburn1344224061@cvsserver>

raeburn		Mon Aug  6 03:34:21 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /doc/loncapafiles	loncapafiles.lpml 
  Log:
  - For 2.11.
    - Bookmarks replaces with Stored Links.
    - Remote Control retained. 
  
  
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.797.2.14 doc/loncapafiles/loncapafiles.lpml:1.797.2.15
--- doc/loncapafiles/loncapafiles.lpml:1.797.2.14	Thu Aug  2 18:19:34 2012
+++ doc/loncapafiles/loncapafiles.lpml	Mon Aug  6 03:34:21 2012
@@ -2,7 +2,7 @@
  "http://lpml.sourceforge.net/DTD/lpml.dtd">
 <!-- loncapafiles.lpml -->
 
-<!-- $Id: loncapafiles.lpml,v 1.797.2.14 2012/08/02 18:19:34 raeburn Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.797.2.15 2012/08/06 03:34:21 raeburn Exp $ -->
 
 <!--
 
@@ -2827,7 +2827,6 @@
 turning.gif;
 uploadscores.gif;
 uplusr.gif;
-vbkm.gif;
 verify.gif;
 wishlist.gif;
 wishlist-link.gif;
@@ -7338,7 +7337,6 @@
 prt_pt.gif;
 res_pt.gif;
 roles_pt.gif;
-sbkm_pt.gif;
 spacer_pt.gif;
 sprs_pt.gif;
 src_pt.gif;
@@ -7353,6 +7351,7 @@
 <categoryname>graphic file</categoryname>
 <description>icons used for the entire LON-CAPA user interface</description>
 <filenames>
+alnk.gif;
 anno.gif;
 anot.gif;
 anot2.gif;
@@ -7426,10 +7425,10 @@
 roles.gif;
 rsrv.gif;
 rtrv.gif;
-sbkm.gif;
 sctr.gif;
 show-all.gif;
 show-incomplete-problems.gif;
+slnk.gif;
 spacer.gif;
 sprs.gif;
 src.gif;
@@ -7438,7 +7437,6 @@
 stat.gif;
 subm.gif;
 title.gif;
-vbkm.gif;
 </filenames>
 </fileglob>
 <fileglob>
@@ -7467,7 +7465,6 @@
 pref.png;
 roles.png;
 sprs.png;
-vbkm.png;
 anot.png;
 anot2.png;
 blog.png;
@@ -7484,7 +7481,7 @@
 prt.png;
 rcrs.png;
 rsrv.png;
-sbkm.png;
+slnk.png;
 src.png;
 srvr.png;
 subm.png;
@@ -7531,6 +7528,7 @@
 <categoryname>graphic file</categoryname>
 <description>graphical icons used in submenus</description>
 <filenames>
+alnk.png;
 aboutme.png;
 addClickerInfoFile.png;
 anonsurveythreshold.png;



From raeburn at source.lon-capa.org  Sun Aug  5 23:38:08 2012
From: raeburn at source.lon-capa.org (raeburn)
Date: Mon, 06 Aug 2012 03:38:08 -0000
Subject: [LON-CAPA-cvs] cvs: loncom(version_2_11_X) /interface lonmenu.pm
	mydesk.tab
Message-ID: <cvsraeburn1344224288@cvsserver>

raeburn		Mon Aug  6 03:38:08 2012 EDT

  Modified files:              (Branch: version_2_11_X)
    /loncom/interface	lonmenu.pm mydesk.tab 
  Log:
  - For 2.11.
    - Remote Control retained.
    - Text used in $menuitems string for each button/icon determined based on
      context -- use &get_inline_text() for inline menu; &get_rc_text() for
      Remote Control so LCD display in Remote functions correctly.
  
  
-------------- next part --------------
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.369.2.18 loncom/interface/lonmenu.pm:1.369.2.19
--- loncom/interface/lonmenu.pm:1.369.2.18	Fri Aug  3 22:38:35 2012
+++ loncom/interface/lonmenu.pm	Mon Aug  6 03:38:08 2012
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # Routines to control the menu
 #
-# $Id: lonmenu.pm,v 1.369.2.18 2012/08/03 22:38:35 raeburn Exp $
+# $Id: lonmenu.pm,v 1.369.2.19 2012/08/06 03:38:08 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -578,29 +578,35 @@
 	}
 	$crs=~s/\_/\//g;
 
+        my %swtext;
+        if ($noremote) {
+            %swtext = &get_inline_text();
+        } else {
+            %swtext = &get_rc_text();
+        } 
         my $hwkadd='';
         if ($env{'request.symb'} ne '' &&
 	    $env{'request.filename'}=~/$LONCAPA::assess_re/) {
 	    if (&Apache::lonnet::allowed('mgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'pgrd.png','Content Grades','grades[_4]',
+		$hwkadd.=&switch('','',7,2,'pgrd.png',$swtext{'pgrd'},'grades[_4]',
                        "gocmd('/adm/grades','gradingmenu')",
                        'Content Grades');
             } elsif (&Apache::lonnet::allowed('vgr',$crs)) {
-		$hwkadd.=&switch('','',7,2,'subm.png','Content Submissions','missions[_1]',
+		$hwkadd.=&switch('','',7,2,'subm.png',$swtext{'subm'},'missions[_1]',
                        "gocmd('/adm/grades','submission')",
 		       'Content Submissions');
             }
 	}
 	if ($env{'request.symb'} ne '' &&
 	    &Apache::lonnet::allowed('opa',$crs)) {
-	    $hwkadd.=&switch('','',7,3,'pparm.png','Content Settings','parms[_2]',
+	    $hwkadd.=&switch('','',7,3,'pparm.png',$swtext{'pparm'},'parms[_2]',
 			     "gocmd('/adm/parmset','set')",
 			     'Content Settings');
 	}
         if ($noremote) {  
             if ($env{'request.symb'}=~/^uploaded/ &&
                 &Apache::lonnet::allowed('mdc',$crs)) {
-                $hwkadd.=&switch('','',7,4,'docs.png','Folder/Page Content','parms[_2]',
+                $hwkadd.=&switch('','',7,4,'docs.png',$swtext{'docs'},'parms[_2]',
                                  "gocmd('/adm/coursedocs','direct')",
                                  'Folder/Page Content');
             }
@@ -646,7 +652,7 @@
 		my @ids=&Apache::lonnet::current_machine_ids();
 		foreach my $id (@ids) { if ($id eq $home) { $allowed=1; } }
 		if (!$allowed) {
-		    $editbutton=&switch('','',6,1,$top,,$bottom,$action,$desc);
+		    $editbutton=&switch('','',6,1,,$top,$bottom,$action,$desc);
                     $noeditbutton = 0;
                 }
             }
@@ -713,7 +719,7 @@
                         }
                     }
                     $editbutton=&switch
-                       ('','',6,1,'pcstr.png','Edit','resource[_2]',
+                       ('','',6,1,'pcstr.png',$swtext{'pcstr'},'resource[_2]',
                         $bot,"Edit this resource");
                     $noeditbutton = 0;
                 }
@@ -729,7 +735,7 @@
                         my $cfile = &edit_course_upload($file,$cnum,$cdom);
                         if ($cfile) {
                             $editbutton=&switch
-                                        ('','',6,1,'pcstr.png','Edit',
+                                        ('','',6,1,'pcstr.png',$swtext{'pcstr'},
                                          'resource[_2]',"go('".$cfile."');",
                                          'Edit this resource');
                         }
@@ -741,7 +747,7 @@
             if ($resurl eq "public/$cdom/$cnum/syllabus") {
                 if ($env{'course.'.$env{'request.course.id'}.'.externalsyllabus'} =~ /\w/) {
                     if (&Apache::lonnet::allowed('mdc',$env{'request.course.id'})) {
-                        $editbutton=&switch('','',6,1,'pcstr.png','Edit',
+                        $editbutton=&switch('','',6,1,'pcstr.png',$swtext{'pcstr'},
                                             'resource[_2]',
                                             "go('/adm/courseprefs?phase=display&actions=courseinfo')",
                                             'Edit this resource');
@@ -772,11 +778,11 @@
 # Probably should be in mydesk.tab
 #
                 $menuitems=(<<ENDMENUITEMS);
-s&6&1&list.png&Directory&dir[_1]&golist('$esc_currdir')&List current directory
-s&6&2&rtrv.png&Retrieve&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version
-s&6&3&pub.png&Publish&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
-s&7&1&del.png&Delete&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
-s&7&2&prt.png&Print&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
+s&6&1&list.png&$swtext{'list'}&dir[_1]&golist('$esc_currdir')&List current directory
+s&6&2&rtrv.png&$swtext{'rtrv'}&version[_1]&gocstr('/adm/retrieve','/priv/$udom/$uname/$cleandisfn')&Retrieve old version
+s&6&3&pub.png&$swtext{'pub'}&resource[_3]&gocstr('/adm/publish','/priv/$udom/$uname/$cleandisfn')&Publish this resource
+s&7&1&del.png&$swtext{'del'}&resource[_2]&gocstr('/adm/cfile?action=delete','/priv/$udom/$uname/$cleandisfn')&Delete this resource
+s&7&2&prt.png&$swtext{'prt'}&printout[_1]&gocstr('/adm/printout','/priv/$udom/$uname/$cleandisfn')&Prepare a printable document
 ENDMENUITEMS
             }
                 if (ref($bread_crumbs) eq 'ARRAY') {
@@ -791,14 +797,15 @@
 # We are in a course and looking at a registered URL
 # Should probably be in mydesk.tab
 #
+
 	    $menuitems=(<<ENDMENUITEMS);
 c&3&1
-s&2&1&back.png&&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
-s&2&3&forw.png&&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
+s&2&1&back.png&$swtext{'back'}&&gopost('/adm/flip','back:'+currentURL)&Previous content resource&&1
+s&2&3&forw.png&$swtext{'forw'}&&gopost('/adm/flip','forward:'+currentURL)&Next content resource&&3
 c&6&3
 c&8&1
 c&8&2
-s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
             $got_prt = 1;
             if (($env{'user.adv'}) && ($env{'request.uri'} =~ /^\/res/)
@@ -806,7 +813,7 @@
                 # wishlist is only available for users with access to resource-pool
                 # and links can only be set for resources within the resource-pool
                 $menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
                 $got_wishlist = 1;
             }
@@ -820,29 +827,29 @@
 }else{
 	$menuitems.="anot.png";
 }
-$menuitems.="&Notes&&annotate()&";
+$menuitems.="&$swtext{'anot'}&tations[_1]&annotate()&";
 $menuitems.="Make notes and annotations about this resource&&1\n";
 
             unless ($env{'request.noversionuri'}=~/\/(bulletinboard|smppg|navmaps|syllabus|aboutme|viewclasslist|portfolio)(\?|$)/) {
 		if ((!$env{'request.enc'}) && ($env{'request.noversionuri'} !~ m{^/adm/wrapper/ext/}) && ($env{'request.noversionuri'} !~ m{^/uploaded/$match_domain/$match_courseid/docs/})) {
 		    $menuitems.=(<<ENDREALRES);
-s&6&3&catalog.png&Info&info[_1]&catalog_info()&Show Metadata
+s&6&3&catalog.png&$swtext{'catalog'}&info[_1]&catalog_info()&Show Metadata
 ENDREALRES
                 }
                 unless ($env{'request.noversionuri'} =~ m{^/uploaded/$match_domain/$match_courseid/docs/}) {
 	            $menuitems.=(<<ENDREALRES);
-s&8&1&eval.png&Evaluate&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
+s&8&1&eval.png&$swtext{'eval'}&this[_1]&gopost('/adm/evaluate',currentURL,1)&Provide my evaluation of this resource
 ENDREALRES
                 }
                 $menuitems.=(<<ENDREALRES);
-s&8&2&fdbk.png&Communicate&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
+s&8&2&fdbk.png&$swtext{'fdbk'}&discuss[_1]&gopost('/adm/feedback',currentURL,1)&Provide feedback messages or contribute to the course discussion about this resource
 ENDREALRES
 	    }
         }
 	if ($env{'request.uri'} =~ /^\/res/) {
             unless ($got_prt) {
 	        $menuitems .= (<<ENDMENUITEMS);
-s&8&3&prt.png&Print&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
+s&8&3&prt.png&$swtext{'prt'}&printout[_1]&gopost('/adm/printout',currentURL)&Prepare a printable document
 ENDMENUITEMS
                 $got_prt = 1;
             }
@@ -850,7 +857,7 @@
                 if (($env{'user.adv'}) && (!$env{'request.enc'})) {
                     # wishlist is only available for users with access to resource-pool
                     $menuitems .= (<<ENDMENUITEMS);
-s&9&1&wishlist-link.png&Stored Links&wishlistlink[_2]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
+s&9&1&alnk.png&$swtext{'alnk'}&linkstor[_1]&set_wishlistlink()&Save a link for this resource in your personal Stored Links repository&&1
 ENDMENUITEMS
                     $got_wishlist = 1;
                 }
@@ -1006,6 +1013,49 @@
     }
 }
 
+sub get_inline_text {
+    my %text = (
+                 pgrd     => 'Content Grades',
+                 subm     => 'Content Submissions',
+                 pparm    => 'Content Settings',
+                 docs     => 'Folder/Page Content',
+                 pcstr    => 'Edit',
+                 list     => 'Directory',
+                 rtrv     => 'Retrieve',
+                 pub      => 'Publish',
+                 del      => 'Delete',
+                 prt      => 'Print',
+                 alnk     => 'Stored Links',
+                 anot     => 'Notes',
+                 catalog  => 'Info',
+                 eval     => 'Evaluate',
+                 fdbk     => 'Feedback',
+    );
+    return %text;
+}
+
+sub get_rc_text {
+    my %text = (
+                   pgrd    => 'problem[_1]',
+                   subm    => 'view sub-[_1]',
+                   pparm   => 'problem[_2]',
+                   pcstr   => 'edit[_1]',
+                   list    => 'list[_1]',
+                   rtrv    => 'retrieve[_1]',
+                   pub     => 'publish[_1]',
+                   del     => 'delete[_1]',
+                   prt     => 'prepare[_1]',
+                   back    => 'backward[_1]',
+                   forw    => 'forward[_1]',
+                   alnk    => 'add to[_1]',
+                   anot    => 'anno-[_1]',
+                   catalog => 'catalog[_2]',
+                   eval    => 'evaluate[_1]',
+                   fdbk    => 'feedback[_1]',
+    );
+    return %text;
+}
+
 sub is_course_upload {
     my ($file,$cnum,$cdom) = @_;
     my $uploadpath = &LONCAPA::propath($cdom,$cnum);
Index: loncom/interface/mydesk.tab
diff -u loncom/interface/mydesk.tab:1.149.2.8 loncom/interface/mydesk.tab:1.149.2.9
--- loncom/interface/mydesk.tab:1.149.2.8	Fri Aug  3 01:42:11 2012
+++ loncom/interface/mydesk.tab	Mon Aug  6 03:38:08 2012
@@ -242,7 +242,7 @@
 8:1:clear
 8:1:tools:reqcrsshc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rcr
 8:1:tools:reqcrsnsc:rcrs.png:request[_1]:course[_16]:go('/adm/requestcourse');:Course/Community requests:rol
-9:3:adv:any:wishlist.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
+9:2:adv:any:slnk.png:view[_1]:linkstor[_1]:go('/adm/wishlist'):Stored Links:set
 10:1:clear
 10:1:any:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Announcements and my calendar:com
 10:1:course:any:anno.png:calendar[_1]:announce[_1]:go('/adm/announcements');:Course anouncements and my calendar:com