--- loncom/interface/loncommon.pm	2016/04/02 04:30:20	1.1237
+++ loncom/interface/loncommon.pm	2016/05/04 05:14:45	1.1243
@@ -1,7 +1,7 @@
 # The LearningOnline Network with CAPA
 # a pile of common routines
 #
-# $Id: loncommon.pm,v 1.1237 2016/04/02 04:30:20 raeburn Exp $
+# $Id: loncommon.pm,v 1.1243 2016/05/04 05:14:45 raeburn Exp $
 #
 # Copyright Michigan State University Board of Trustees
 #
@@ -72,7 +72,7 @@ use Apache::lonuserstate();
 use Apache::courseclassifier();
 use LONCAPA qw(:DEFAULT :match);
 use DateTime::TimeZone;
-use DateTime::Locale::Catalog;
+use DateTime::Locale;
 use Encode();
 use Text::Aspell;
 use Authen::Captcha;
@@ -590,7 +590,10 @@ sub coursebrowser_javascript {
         if (formname == 'ccrs') {
             var ownername = document.forms[formid].ccuname.value;
             var ownerdom =  document.forms[formid].ccdomain.options[document.forms[formid].ccdomain.selectedIndex].value;
-            url += '&cloner='+ownername+':'+ownerdom+'&crscode='+document.forms[formid].crscode.value;
+            url += '&cloner='+ownername+':'+ownerdom;
+            if (type == 'Course') {
+                url += '&crscode='+document.forms[formid].crscode.value;
+            }
         }
         if (formname == 'requestcrs') {
             url += '&crsdom=$domainfilter&crscode=$instcode';
@@ -878,6 +881,8 @@ sub selectcourse_link {
    my $linktext = &mt('Select Course');
    if ($selecttype eq 'Community') {
        $linktext = &mt('Select Community');
+   } elsif ($selecttype eq 'Placement') {
+       $linktext = &mt('Select Placement Test'); 
    } elsif ($selecttype eq 'Course/Community') {
        $linktext = &mt('Select Course/Community');
        $type = '';
@@ -969,15 +974,16 @@ sub select_datelocale {
         }
         $output .= '> </option>';
     }
+    my @languages = &Apache::lonlocal::preferred_languages();
     my (@possibles,%locale_names);
-    my @locales = DateTime::Locale::Catalog::Locales;
-    foreach my $locale (@locales) {
-        if (ref($locale) eq 'HASH') {
-            my $id = $locale->{'id'};
-            if ($id ne '') {
-                my $en_terr = $locale->{'en_territory'};
-                my $native_terr = $locale->{'native_territory'};
-                my @languages = &Apache::lonlocal::preferred_languages();
+    my @locales = DateTime::Locale->ids();
+    foreach my $id (@locales) {
+        if ($id ne '') {
+            my ($en_terr,$native_terr);
+            my $loc = DateTime::Locale->load($id);
+            if (ref($loc)) {
+                $en_terr = $loc->name();
+                $native_terr = $loc->native_name();
                 if (grep(/^en$/,@languages) || !@languages) {
                     if ($en_terr ne '') {
                         $locale_names{$id} = '('.$en_terr.')';
@@ -992,8 +998,8 @@ sub select_datelocale {
                     }
                 }
                 $locale_names{$id} = Encode::encode('UTF-8',$locale_names{$id});
-                push (@possibles,$id);
-            }
+                push(@possibles,$id);
+            } 
         }
     }
     foreach my $item (sort(@possibles)) {
@@ -5582,7 +5588,7 @@ sub bodytag {
     if (($crstype eq 'Placement') && (!$env{'request.role.adv'})) {
         undef($role);
     } else {
-        $role = '<span class="LC_nobreak">('.$role.')</span>' if $role;
+        $role = '<span class="LC_nobreak">('.$role.')</span>' if ($role && !$env{'browser.mobile'});
     }
 
         if ($env{'request.state'} eq 'construct') { $forcereg=1; }
@@ -5886,6 +5892,17 @@ div.LC_confirm_box .LC_success img {
   vertical-align: middle;
 }
 
+.LC_maxwidth {
+  max-width: 100%;
+  height: auto;
+}
+
+.LC_textsize_mobile {
+  \@media only screen and (max-device-width: 480px) {
+      -webkit-text-size-adjust:100%; -moz-text-size-adjust:100%; -ms-text-size-adjust:100%;
+  }
+}
+
 .LC_icon {
   border: none;
   vertical-align: middle;
@@ -5991,6 +6008,12 @@ ul.LC_breadcrumb_tools_outerlist li {
     float: right;
 }
 
+.LC_placement_prog {
+    padding-right: 20px;
+    font-weight: bold;
+    font-size: 90%;
+}
+
 table#LC_title_bar td {
   background: $tabbg;
 }
@@ -6007,6 +6030,10 @@ table#LC_menubuttons img {
   vertical-align: middle;
 }
 
+.LC_breadcrumbs_hoverable {
+  background: $sidebg;
+}
+
 td.LC_table_cell_checkbox {
   text-align: center;
 }
@@ -7950,7 +7977,13 @@ OFFLOAD
     $result .= '>' 
         .$inhibitprint
 	.$head_extra;
-    if ($env{'browser.mobile'}) {
+    my $clientmobile;
+    if (($env{'user.name'} eq '') && ($env{'user.domain'} eq '')) {
+        (undef,undef,undef,undef,undef,undef,$clientmobile) = &decode_user_agent();
+    } else {
+        $clientmobile = $env{'browser.mobile'};
+    }
+    if ($clientmobile) {
         $result .= '
 <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0, minimum-scale=1.0, maximum-scale=1.0">
 <meta name="apple-mobile-web-app-capable" content="yes" />';
@@ -14268,6 +14301,8 @@ sub extract_categories {
                     $trailstr = &mt('Official courses (with institutional codes)');
                 } elsif ($name eq 'communities') {
                     $trailstr = &mt('Communities');
+                } elsif ($name eq 'placement') {
+                    $trailstr = &mt('Placement Tests');
                 } else {
                     $trailstr = $name;
                 }
@@ -14406,8 +14441,10 @@ sub assign_categories_table {
                     next if ($parent eq 'instcode');
                     if ($type eq 'Community') {
                         next unless ($parent eq 'communities');
+                    } elsif ($type eq 'Placement') {
+                        next unless ($parent eq 'placement');
                     } else {
-                        next if ($parent eq 'communities');
+                        next if (($parent eq 'communities') || ($parent eq 'placement'));
                     }
                     my $css_class = $itemcount%2?' class="LC_odd_row"':'';
                     my $item = &escape($parent).'::0';
@@ -14420,6 +14457,8 @@ sub assign_categories_table {
                     my $parent_title = $parent;
                     if ($parent eq 'communities') {
                         $parent_title = &mt('Communities');
+                    } elsif ($parent eq 'placement') {
+                        $parent_title = &mt('Placement Tests');
                     }
                     $table .= '<tr '.$css_class.'><td><span class="LC_nobreak">'.
                               '<input type="checkbox" name="usecategory" value="'.
@@ -14855,7 +14894,12 @@ sub construct_course {
 #
 # Open course
 #
-    my $crstype = lc($args->{'crstype'});
+    my $showncrstype;
+    if ($args->{'crstype'} eq 'Placement') {
+        $showncrstype = 'placement test'; 
+    } else {  
+        $showncrstype = lc($args->{'crstype'});
+    }
     my %cenv=();
     $$courseid=&Apache::lonnet::createcourse($args->{'course_domain'},
                                              $args->{'cdescr'},
@@ -14872,7 +14916,7 @@ sub construct_course {
     # Utils::Course. This needs to at least be output as a comment
     # if anyone ever decides to not show this, and Utils::Course::new
     # will need to be suitably modified.
-    $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$crstype,$$courseid).$linefeed;
+    $outcome .= &mt('New LON-CAPA [_1] ID: [_2]',$showncrstype,$$courseid).$linefeed;
     if ($$courseid =~ /^error:/) {
         return (0,$outcome);
     }
@@ -14892,7 +14936,7 @@ sub construct_course {
 # Do the cloning
 #   
     if ($can_clone && $cloneid) {
-	$clonemsg = &mt('Cloning [_1] from [_2]',$crstype,$clonehome);
+	$clonemsg = &mt('Cloning [_1] from [_2]',$showncrstype,$clonehome);
 	if ($context ne 'auto') {
 	    $clonemsg = '<span class="LC_success">'.$clonemsg.'</span>';
 	}
@@ -15200,10 +15244,23 @@ sub construct_course {
 # 
 # Set params for Placement Tests
 #
-    if ($crstype eq 'Placement') {
-       my $storeunder=$$crsudom.'_'.$$crsunum.'.0.buttonshide';
-       my %storecontent = ($storeunder         => 'yes',
-                           $storeunder.'.type' => 'string_yesno');
+    if ($args->{'crstype'} eq 'Placement') {
+       my %storecontent; 
+       my $prefix=$$crsudom.'_'.$$crsunum.'.0.';
+       my %defaults = (
+                        buttonshide   => { value => 'yes',
+                                           type => 'string_yesno',},
+                        type          => { value => 'randomizetry',
+                                           type  => 'string_questiontype',},
+                        maxtries      => { value => 1,
+                                           type => 'int_pos',},
+                        problemstatus => { value => 'no',
+                                           type  => 'string_problemstatus',},
+                      );
+       foreach my $key (keys(%defaults)) {
+           $storecontent{$prefix.$key} = $defaults{$key}{'value'};
+           $storecontent{$prefix.$key.'.type'} = $defaults{$key}{'type'};
+       }
        &Apache::lonnet::cput
                  ('resourcedata',\%storecontent,$$crsudom,$$crsunum); 
     }
@@ -15761,15 +15818,19 @@ sub build_filters {
         $createdfilterform = &timebased_select_form('createdfilter',$filter);
     }
 
+    my $prefix = $crstype;
+    if ($crstype eq 'Placement') {
+        $prefix = 'Placement Test'
+    }
     my %lt = &Apache::lonlocal::texthash(
-                'cac' => "$crstype Activity",
-                'ccr' => "$crstype Created",
-                'cde' => "$crstype Title",
-                'cdo' => "$crstype Domain",
+                'cac' => "$prefix Activity",
+                'ccr' => "$prefix Created",
+                'cde' => "$prefix Title",
+                'cdo' => "$prefix Domain",
                 'ins' => 'Institutional Code',
                 'inc' => 'Institutional Categorization',
-                'cow' => "$crstype Owner/Co-owner",
-                'cop' => "$crstype Personnel Includes",
+                'cow' => "$prefix Owner/Co-owner",
+                'cop' => "$prefix Personnel Includes",
                 'cog' => 'Type',
              );
 
@@ -15777,6 +15838,8 @@ sub build_filters {
         my $typeval = 'Course';
         if ($crstype eq 'Community') {
             $typeval = 'Community';
+        } elsif ($crstype eq 'Placement') {
+            $typeval = 'Placement';
         }
         $typeselectform = '<input type="hidden" name="type" value="'.$typeval.'" />';
     } else {
@@ -15786,8 +15849,14 @@ sub build_filters {
         }
         $typeselectform .= '>'."\n";
         foreach my $posstype ('Course','Community','Placement') {
+            my $shown;
+            if ($posstype eq 'Placement') {
+                $shown = &mt('Placement Test');
+            } else {
+                $shown = &mt($posstype);
+            }
             $typeselectform.='<option value="'.$posstype.'"'.
-                ($posstype eq $crstype ? ' selected="selected" ' : ''). ">".&mt($posstype)."</option>\n";
+                ($posstype eq $crstype ? ' selected="selected" ' : ''). ">".$shown."</option>\n";
         }
         $typeselectform.="</select>";
     }