--- loncom/interface/loncommon.pm 2012/12/22 16:03:25 1.1075.2.22
+++ loncom/interface/loncommon.pm 2012/05/18 14:27:11 1.1076
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.1075.2.22 2012/12/22 16:03:25 raeburn Exp $
+# $Id: loncommon.pm,v 1.1076 2012/05/18 14:27:11 raeburn Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -70,8 +70,6 @@ use Apache::lonclonecourse();
use LONCAPA qw(:DEFAULT :match);
use DateTime::TimeZone;
use DateTime::Locale::Catalog;
-use Authen::Captcha;
-use Captcha::reCAPTCHA;
# ---------------------------------------------- Designs
use vars qw(%defaultdesign);
@@ -887,14 +885,10 @@ sub check_uncheck_jscript {
function checkAll(field) {
if (field.length > 0) {
for (i = 0; i < field.length; i++) {
- if (!field[i].disabled) {
- field[i].checked = true;
- }
+ field[i].checked = true ;
}
} else {
- if (!field.disabled) {
- field.checked = true;
- }
+ field.checked = true
}
}
@@ -2481,7 +2475,7 @@ END
return $result;
}
-sub authform_authorwarning {
+sub authform_authorwarning{
my $result='';
$result=''.
&mt('As a general rule, only authors or co-authors should be '.
@@ -2490,16 +2484,16 @@ sub authform_authorwarning {
return $result;
}
-sub authform_nochange {
+sub authform_nochange{
my %in = (
formname => 'document.cu',
kerb_def_dom => 'MSU.EDU',
@_,
);
- my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
+ my ($authnum,%can_assign) = &get_assignable_auth($in{'domain'});
my $result;
- if (!$authnum) {
- $result = &mt('Under your current role you are not permitted to change login settings for this user');
+ if (keys(%can_assign) == 0) {
+ $result = &mt('Under you current role you are not permitted to change login settings for this user');
} else {
$result = '
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
current page
bread_crumbs -> Array containing breadcrumbs
bread_crumbs_component -> if exists show it as headline else show only the breadcrumbs
- group -> includes the current group, if page is for a
- specific group
=back
@@ -7434,7 +7279,7 @@ sub start_page {
#&Apache::lonnet::logthis("start_page ".join(':',caller(0)));
$env{'internal.start_page'}++;
- my ($result,@advtools);
+ my $result;
if (! exists($args->{'skip_phases'}{'head'}) ) {
$result .= &xml_begin() . &headtag($title, $head_extra, $args);
@@ -7451,8 +7296,7 @@ sub start_page {
$args->{'function'}, $args->{'add_entries'},
$args->{'only_body'}, $args->{'domain'},
$args->{'force_register'}, $args->{'no_nav_bar'},
- $args->{'bgcolor'}, $args->{'no_inline_link'},
- $args, \@advtools);
+ $args->{'bgcolor'}, $args);
}
}
@@ -7481,10 +7325,6 @@ sub start_page {
&Apache::lonhtmlcommon::add_breadcrumb($crumb);
}
}
- # if @advtools array contains items add then to the breadcrumbs
- if (@advtools > 0) {
- &Apache::lonmenu::advtools_crumbs(@advtools);
- }
#if bread_crumbs_component exists show it as headline else show only the breadcrumbs
if(exists($args->{'bread_crumbs_component'})){
@@ -7492,8 +7332,6 @@ sub start_page {
}else{
$result .= &Apache::lonhtmlcommon::breadcrumbs();
}
- } elsif ($env{'request.noversionuri'} =~ m{^/res/}) {
- $result .= '