[LON-CAPA-cvs] cvs: loncom /auth lonlogin.pm /html/adm/lonDomColors default.tab /interface domainprefs.pm /localize/localize de.pm pt.pm doc/loncapafiles loncapafiles.lpml
bisitz
bisitz@source.lon-capa.org
Fri, 21 May 2010 15:54:49 -0000
This is a MIME encoded message
--bisitz1274457289
Content-Type: text/plain
bisitz Fri May 21 15:54:49 2010 EDT
Modified files:
/doc/loncapafiles loncapafiles.lpml
/loncom/auth lonlogin.pm
/loncom/html/adm/lonDomColors default.tab
/loncom/interface domainprefs.pm
/loncom/localize/localize de.pm pt.pm
Log:
Bug 6271, Bug 5577:
Get rid of user authentication image on login page (always use text version)
including all corresponding configuration settings.
Although the user interface is cleaned up and functional, the internal domain configuration cleanup could be improved.
--bisitz1274457289
Content-Type: text/plain
Content-Disposition: attachment; filename="bisitz-20100521155449.txt"
Index: doc/loncapafiles/loncapafiles.lpml
diff -u doc/loncapafiles/loncapafiles.lpml:1.683 doc/loncapafiles/loncapafiles.lpml:1.684
--- doc/loncapafiles/loncapafiles.lpml:1.683 Wed Apr 28 14:55:50 2010
+++ doc/loncapafiles/loncapafiles.lpml Fri May 21 15:54:29 2010
@@ -2,7 +2,7 @@
"http://lpml.sourceforge.net/DTD/lpml.dtd">
<!-- loncapafiles.lpml -->
-<!-- $Id: loncapafiles.lpml,v 1.683 2010/04/28 14:55:50 wenzelju Exp $ -->
+<!-- $Id: loncapafiles.lpml,v 1.684 2010/05/21 15:54:29 bisitz Exp $ -->
<!--
@@ -5964,9 +5964,6 @@
upperright.gif;
user.gif;
user_big.gif;
-userauthentication.gif;
-userauthentication_pt.gif;
-userauthentication_de.gif;
wav.gif;
wav_big.gif;
white_space_20_22.gif;
Index: loncom/auth/lonlogin.pm
diff -u loncom/auth/lonlogin.pm:1.137 loncom/auth/lonlogin.pm:1.138
--- loncom/auth/lonlogin.pm:1.137 Thu May 6 16:15:59 2010
+++ loncom/auth/lonlogin.pm Fri May 21 15:54:34 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network
# Login Screen
#
-# $Id: lonlogin.pm,v 1.137 2010/05/06 16:15:59 bisitz Exp $
+# $Id: lonlogin.pm,v 1.138 2010/05/21 15:54:34 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -270,10 +270,6 @@
my $logo=&Apache::loncommon::designparm('login.logo',$domain);
my $img=&Apache::loncommon::designparm('login.img',$domain);
my $domainlogo='<div>'.&Apache::loncommon::domainlogo($domain).'</div>';
-my $login=&Apache::loncommon::designparm('login.login',$domain);
-if ($login eq '') {
-$login = $iconpath.'/'.&mt('userauthentication.gif');
-}
my $showbanner = 1;
my $showmainlogo = 1;
if (defined(&Apache::loncommon::designparm('login.showlogo_img',$domain))) {
@@ -285,7 +281,6 @@
my $showadminmail=&Apache::loncommon::designparm('login.adminmail',$domain);
my $showcoursecat =
&Apache::loncommon::designparm('login.coursecatalog',$domain);
-my $loginheader =&Apache::loncommon::designparm('login.loginheader',$domain);
my $shownewuserlink =
&Apache::loncommon::designparm('login.newuser',$domain);
my $now=time;
@@ -403,14 +398,9 @@
my $logintitle =
'<h2 class="LC_hcell"'
.' style="background:'.$loginbox_header_bgcol.';'
- .' color:'.$loginbox_header_textcol.'">';
-if ($loginheader eq 'text') {
- $logintitle .= $lt{'log'};
-} else {
- $logintitle .= '<img src="'.$login.'"'.
- ' alt="'.&mt('User Authentication').'" />';
-}
-$logintitle .= '</h2>';
+ .' color:'.$loginbox_header_textcol.'">'
+ .$lt{'log'}
+ .'</h2>';
my $noscript_warning='<noscript><span class="LC_warning"><b>'
.&mt('Use of LON-CAPA requires Javascript to be enabled in your web browser.')
Index: loncom/html/adm/lonDomColors/default.tab
diff -u loncom/html/adm/lonDomColors/default.tab:1.19 loncom/html/adm/lonDomColors/default.tab:1.20
--- loncom/html/adm/lonDomColors/default.tab:1.19 Tue Feb 9 13:17:44 2010
+++ loncom/html/adm/lonDomColors/default.tab Fri May 21 15:54:39 2010
@@ -1,7 +1,6 @@
login.img=/adm/lonIcons/header.gif
login.logo=/adm/lonIcons/loncapalogo.gif
login.login=/adm/lonIcons/userauthentication.gif
-login.loginheader=image
login.pgbg=#006600
login.mainbg=#FFFFFF
login.sidebg=#FFFFFF
Index: loncom/interface/domainprefs.pm
diff -u loncom/interface/domainprefs.pm:1.134 loncom/interface/domainprefs.pm:1.135
--- loncom/interface/domainprefs.pm:1.134 Wed Apr 14 04:27:20 2010
+++ loncom/interface/domainprefs.pm Fri May 21 15:54:44 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Handler to set domain-wide configuration settings
#
-# $Id: domainprefs.pm,v 1.134 2010/04/14 04:27:20 raeburn Exp $
+# $Id: domainprefs.pm,v 1.135 2010/05/21 15:54:44 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -756,7 +756,6 @@
$checkedon{$item} = ' ';
}
}
- my $loginheader = 'image';
my @images = ('img','logo','domlogo','login');
my @logintext = ('textcol','bgcol');
my @bgs = ('pgbg','mainbg','sidebg');
@@ -805,9 +804,6 @@
$is_custom{$item} = 1;
}
}
- if ($settings->{'loginheader'} ne '') {
- $loginheader = $settings->{'loginheader'};
- }
if ($settings->{'font'} ne '') {
$designs{'font'} = $settings->{'font'};
$is_custom{'font'} = 1;
@@ -866,7 +862,7 @@
'</tr>';
$itemcount ++;
}
- $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext,$loginheader);
+ $datatable .= &display_color_options($dom,$confname,$phase,'login',$itemcount,\%choices,\%is_custom,\%defaults,\%designs,\@images,\@bgs,\@links,\%alt_text,$rowtotal,\@logintext);
$datatable .= '</tr></table></td></tr>';
return $datatable;
}
@@ -986,7 +982,7 @@
sub display_color_options {
my ($dom,$confname,$phase,$role,$itemcount,$choices,$is_custom,$defaults,$designs,
- $images,$bgs,$links,$alt_text,$rowtotal,$logintext,$loginheader) = @_;
+ $images,$bgs,$links,$alt_text,$rowtotal,$logintext) = @_;
my $css_class = $itemcount%2?' class="LC_odd_row"':'';
my $datatable = '<tr'.$css_class.'>'.
'<td>'.$choices->{'font'}.'</td>';
@@ -1028,8 +1024,7 @@
if ($role eq 'login') {
if ($img eq 'login') {
$login_hdr_pick =
- &login_header_options($img,$role,$defaults,$is_custom,$choices,
- $loginheader);
+ &login_header_options($img,$role,$defaults,$is_custom,$choices);
$logincolors =
&login_text_colors($img,$role,$logintext,$phase,$choices,
$designs);
@@ -1106,8 +1101,8 @@
}
$datatable .= '<td>';
if ($img eq 'login') {
- $datatable .= $login_hdr_pick;
- }
+ $datatable .= $login_hdr_pick;
+ }
$datatable .= &image_changes($is_custom->{$img},$alt_text->{$img},$img_import,
$showfile,$fullsize,$role,$img,$imgfile,$logincolors);
} else {
@@ -1121,7 +1116,9 @@
if ($switchserver) {
$datatable .= &mt('Upload to library server: [_1]',$switchserver);
} else {
- $datatable .=' <input type="file" name="'.$role.'_'.$img.'" />';
+ if ($img ne 'login') { # suppress file selection for Log-in header
+ $datatable .=' <input type="file" name="'.$role.'_'.$img.'" />';
+ }
}
$datatable .= '</td></tr>';
}
@@ -1210,20 +1207,10 @@
}
sub login_header_options {
- my ($img,$role,$defaults,$is_custom,$choices,$loginheader) = @_;
- my $image_checked = ' checked="checked" ';
- my $text_checked = ' ';
- if ($loginheader eq 'text') {
- $image_checked = ' ';
- $text_checked = ' checked="checked" ';
- }
- my $output = '<span class="LC_nobreak"><label><input type="radio" name="'.
- 'loginheader" value="image" '.$image_checked.'/>'.
- &mt('use image').'</label> '.
- '<label><input type="radio" name="loginheader" value="text"'.
- $text_checked.'/>'.&mt('use text').'</label><br />'."\n";
+ my ($img,$role,$defaults,$is_custom,$choices) = @_;
+ my $output = '';
if ((!$is_custom->{'textcol'}) || (!$is_custom->{'bgcol'})) {
- $output .= &mt('Text default(s)').':<br />';
+ $output .= &mt('Text default(s):').'<br />';
if (!$is_custom->{'textcol'}) {
$output .= $choices->{'textcol'}.': '.$defaults->{'logintext'}{'textcol'}.
' ';
@@ -1259,25 +1246,31 @@
sub image_changes {
my ($is_custom,$alt_text,$img_import,$showfile,$fullsize,$role,$img,$imgfile,$logincolors) = @_;
my $output;
- if (!$is_custom) {
+ if ($img eq 'login') {
+ # suppress image for Log-in header
+ } elsif (!$is_custom) {
if ($img ne 'domlogo') {
$output .= &mt('Default image:').'<br />';
} else {
$output .= &mt('Default in use:').'<br />';
}
}
- if ($img_import) {
- $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
- }
- $output .= '<a href="'.$fullsize.'" target="_blank"><img src="'.
- $showfile.'" alt="'.$alt_text.'" border="0" /></a></td>';
- if ($is_custom) {
- $output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'.
- '<input type="checkbox" name="'.
- $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
- '</label> '.&mt('Replace:').'</span><br />';
+ if ($img eq 'login') { # suppress image for Log-in header
+ $output .= '<td>'.$logincolors;
} else {
- $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
+ if ($img_import) {
+ $output .= '<input type="hidden" name="'.$role.'_import_'.$img.'" value="'.$imgfile.'" />';
+ }
+ $output .= '<a href="'.$fullsize.'" target="_blank"><img src="'.
+ $showfile.'" alt="'.$alt_text.'" border="0" /></a></td>';
+ if ($is_custom) {
+ $output .= '<td>'.$logincolors.'<span class="LC_nobreak"><label>'.
+ '<input type="checkbox" name="'.
+ $role.'_del_'.$img.'" value="1" />'.&mt('Delete?').
+ '</label> '.&mt('Replace:').'</span><br />';
+ } else {
+ $output .= '<td valign="bottom">'.$logincolors.&mt('Upload:').'<br />';
+ }
}
return $output;
}
@@ -3708,22 +3701,12 @@
}
}
}
- if (($domconfig{'login'}{'loginheader'} eq 'text') &&
- ($env{'form.loginheader'} eq 'image')) {
- $changes{'loginheader'} = 1;
- } elsif (($domconfig{'login'}{'loginheader'} eq '' ||
- $domconfig{'login'}{'loginheader'} eq 'image') &&
- ($env{'form.loginheader'} eq 'text')) {
- $changes{'loginheader'} = 1;
- }
}
if (keys(%changes) > 0 || $colchgtext) {
&Apache::loncommon::devalidate_domconfig_cache($dom);
$resulttext = &mt('Changes made:').'<ul>';
foreach my $item (sort(keys(%changes))) {
- if ($item eq 'loginheader') {
- $resulttext .= '<li>'.&mt("$title{$item} set to $env{'form.loginheader'}").'</li>';
- } elsif ($item eq 'loginvia') {
+ if ($item eq 'loginvia') {
if (ref($changes{$item}) eq 'HASH') {
$resulttext .= '<li>'.&mt('Log-in page availability:').'<ul>';
foreach my $lonhost (sort(keys(%{$changes{$item}}))) {
Index: loncom/localize/localize/de.pm
diff -u loncom/localize/localize/de.pm:1.382 loncom/localize/localize/de.pm:1.383
--- loncom/localize/localize/de.pm:1.382 Tue May 18 16:13:47 2010
+++ loncom/localize/localize/de.pm Fri May 21 15:54:48 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# German Localization Lexicon
#
-# $Id: de.pm,v 1.382 2010/05/18 16:13:47 bisitz Exp $
+# $Id: de.pm,v 1.383 2010/05/21 15:54:48 bisitz Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -5664,7 +5664,7 @@
=> 'Zeige',
'show'
-=> 'Zeige',
+=> 'anzeigen',
'TRASH'
=> 'Gelöscht',
@@ -7974,9 +7974,6 @@
'You can search for courses and communities which permit self-enrollment, if you would like to enroll in one.'
=> 'Falls Sie sich in einen Kurs oder in eine Community eintragen möchten, können Sie die Kurs-/Community-Übersicht nach Kursen und Communitys durchsuchen, die eine Selbsteintragung zulassen.',
- 'User Authentication'
-=> 'Benutzer-Authentifizierung',
-
'Log-in Help'
=> 'Login-Hilfe',
@@ -9351,9 +9348,6 @@
'as a result of the nightly enrollment check:'
=> 'aufgrund des nächtlichen Kursbelegungsabgleichs:',
- 'View/Modify Course Settings'
-=> 'Kurs-Einstellungen betrachten/ändern',
-
'Course search'
=> 'Kurs-Suche',
@@ -19443,7 +19437,7 @@
=> 'Community-Einstellungen',
'Course/Community Creation'
-=> 'Kurs/Community-Erstellung',
+=> 'Kurs-/Community-Erstellung',
'Course and community creation'
=> 'Kurs- und Community-Erstellung',
@@ -19670,6 +19664,9 @@
'Log-in Header'
=> 'Login-Kopfbereich',
+ 'Text default(s):'
+=> 'Textvoreinstellung(en):',
+
'Log-in Page Items'
=> 'Elemente auf der Login-Seite',
Index: loncom/localize/localize/pt.pm
diff -u loncom/localize/localize/pt.pm:1.44 loncom/localize/localize/pt.pm:1.45
--- loncom/localize/localize/pt.pm:1.44 Mon May 3 10:53:21 2010
+++ loncom/localize/localize/pt.pm Fri May 21 15:54:48 2010
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Portuguese Localization Lexicon
#
-# $Id: pt.pm,v 1.44 2010/05/03 10:53:21 bisitz Exp $
+# $Id: pt.pm,v 1.45 2010/05/21 15:54:48 bisitz Exp $
#
# Copyright UNICAMP, Sao Paulo
# Supported in part by Partnership in Global Learning
@@ -137,9 +137,6 @@
'accessbutton.gif'
=> 'accessbutton_pt.gif',
- 'userauthentication.gif'
-=> 'userauthentication_pt.gif',
-
'Domain'
=> 'Domínio',
--bisitz1274457289--