[LON-CAPA-cvs] cvs: loncom /interface loncommon.pm lonmenu.pm
www
lon-capa-cvs@mail.lon-capa.org
Mon, 10 Nov 2003 15:15:08 -0000
www Mon Nov 10 10:15:08 2003 EDT
Modified files:
/loncom/interface loncommon.pm lonmenu.pm
Log:
Bug #1961: Use same words on inline remote as on normal remote.
Index: loncom/interface/loncommon.pm
diff -u loncom/interface/loncommon.pm:1.147 loncom/interface/loncommon.pm:1.148
--- loncom/interface/loncommon.pm:1.147 Sun Nov 9 20:59:55 2003
+++ loncom/interface/loncommon.pm Mon Nov 10 10:15:08 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# a pile of common routines
#
-# $Id: loncommon.pm,v 1.147 2003/11/10 01:59:55 www Exp $
+# $Id: loncommon.pm,v 1.148 2003/11/10 15:15:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -2189,7 +2189,7 @@
<font size="2" face="Arial, Helvetica, sans-serif">$role</font>
</td></tr>
<tr>
-<td bgcolor="$tabbg" align="right"><font size="2">$realm</font> </td></tr>
+<td bgcolor="$tabbg" align="right"><font size="2" face="Arial, Helvetica, sans-serif">$realm</font> </td></tr>
</table><br>
ENDBODY
}
Index: loncom/interface/lonmenu.pm
diff -u loncom/interface/lonmenu.pm:1.98 loncom/interface/lonmenu.pm:1.99
--- loncom/interface/lonmenu.pm:1.98 Fri Nov 7 18:22:21 2003
+++ loncom/interface/lonmenu.pm Mon Nov 10 10:15:08 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Routines to control the menu
#
-# $Id: lonmenu.pm,v 1.98 2003/11/07 23:22:21 www Exp $
+# $Id: lonmenu.pm,v 1.99 2003/11/10 15:15:08 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -148,7 +148,7 @@
<script>
// BEGIN LON-CAPA Internal
</script>
-<table bgcolor="$pgbg" width="100%" border="0" cellpadding="3" cellspacing="3">
+<font face="Arial,Helvetica,sans-serif"><table bgcolor="$pgbg" width="100%" border="0" cellpadding="1" cellspacing="1">
<tr>
<td bgcolor="$tabbg">
<a href="/adm/menu" target="_top"><font color="$font">$lt{'main'}</font></a>
@@ -163,6 +163,7 @@
<b>LON-CAPA</b></td>
</tr>
</table>
+</font>
<script>
// END LON-CAPA Internal
</script>
@@ -230,7 +231,7 @@
my $newmail='';
if ($noremote) {
- $newmail='<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%"><tr><td bgcolor="'.$tabbg.'">';
+ $newmail='<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%"><tr><td bgcolor="'.$tabbg.'">';
}
if (($textual) && ($ENV{'request.symb'}) && ($ENV{'request.course.id'})) {
my ($mapurl,$rid,$resurl)=&Apache::lonnet::decode_symb($ENV{'request.symb'});
@@ -251,11 +252,11 @@
'swmenu.setstatus("you have","messages");');
}
if ($noremote) {
- $newmail.='</td></tr></table>';
+ $newmail.='</td></tr></table></font>';
}
my $timesync=($textual?'':'swmenu.syncclock(1000*'.time.');');
- my $tablestart=($noremote?'<table bgcolor="'.$pgbg.'" border="0" cellspacing="3" cellpadding="3" width="100%">':'');
- my $tableend=($noremote?'</table>':'');
+ my $tablestart=($noremote?'<font face="Arial,Helvetica,sans-serif"><table bgcolor="'.$pgbg.'" border="0" cellspacing="1" cellpadding="1" width="100%">':'');
+ my $tableend=($noremote?'</table></font>':'');
# =============================================================================
# ============================ This is for URLs that actually can be registered
if (($ENV{'request.noversionuri'}!~/^\/(res\/)*adm\//) || ($forcereg)) {
@@ -652,21 +653,24 @@
if ($nobreak==2) { return ''; }
my $text=$top.' '.$bot;
$text=~s/\s*\-\s*//gs;
+ my $pic=
+ '<img border="0" alt="'.$text.'" src="/res/adm/pages/'.$img.'" />';
if ($nobreak==3) {
$inlineremote[10*$row+$col]="\n".
- '<td width="50%" colspan="2" align="right" bgcolor="'.$tabbg.'">'.
- '<a href="javascript:'.$act.';"><font color="'.$font.'" size="+1">'.$text.
- '</font></a></td></tr>';
+ '<td width="40%" align="right"><font color="'.$font.'" size="+1">'.$text.
+ '</font></td><td width="10%" align="right" bgcolor="'.$tabbg.'">'.
+ '<a href="javascript:'.$act.';">'.$pic.'</a></td></tr>';
} elsif ($nobreak) {
$inlineremote[10*$row+$col]="\n<tr>".
- '<td width="50%" colspan="2" align="left" bgcolor="'.$tabbg.'">'.
- '<a href="javascript:'.$act.';"><font color="'.$font.'" size="+1">'.$text.
- '</font></a></td>';
+ '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+ '<a href="javascript:'.$act.';">'.$pic.
+ '</a></td><td width="40%" align="left"><font color="'.$font.'" size="+1">'.$text.'</font></td>';
} else {
$inlineremote[10*$row+$col]="\n<tr>".
- '<td width="50%" colspan="4" align="left" bgcolor="'.$tabbg.'">'.
- '<a href="javascript:'.$act.';"><font color="'.$font.'">'.$desc.
- '</font></a></td></tr>';
+ '<td width="10%" align="left" bgcolor="'.$tabbg.'">'.
+ '<a href="javascript:'.$act.';">'.$pic.
+ '</a></td><td colspan="3"><font color="'.$font.'">'.$desc.
+ '</font></td></tr>';
}
}
return '';