[LON-CAPA-cvs] cvs: loncom /html/res/adm/pages menu.html /localize/localize ja.pm /lonnet/perl lonnet.pm
www
lon-capa-cvs@mail.lon-capa.org
Sun, 12 Oct 2003 22:02:44 -0000
www Sun Oct 12 18:02:44 2003 EDT
Modified files:
/loncom/html/res/adm/pages menu.html
/loncom/localize/localize ja.pm
/loncom/lonnet/perl lonnet.pm
Log:
Bug #2245:
Non-LCD display in Remote if no LCD special chars available for language.
Index: loncom/html/res/adm/pages/menu.html
diff -u loncom/html/res/adm/pages/menu.html:1.108 loncom/html/res/adm/pages/menu.html:1.109
--- loncom/html/res/adm/pages/menu.html:1.108 Sat Oct 11 16:53:03 2003
+++ loncom/html/res/adm/pages/menu.html Sun Oct 12 18:02:44 2003
@@ -4,7 +4,7 @@
Remote Control
//
-// $Id: menu.html,v 1.108 2003/10/11 20:53:03 albertel Exp $
+// $Id: menu.html,v 1.109 2003/10/12 22:02:44 www Exp $
//
// Copyright Michigan State University Board of Trustees
//
@@ -384,7 +384,7 @@
}
// -->
</script>
-<block condition="&EXT('browser.textremote')!=1">
+<block condition="&EXT('request.browser.textremote')!=1">
<script type="text/javascript">
//<!--
function bigdisplay(dt,db,i) {
@@ -454,7 +454,7 @@
//-->
</script>
</block>
-<block condition="&EXT('browser.textremote')">
+<block condition="&EXT('request.browser.textremote')">
<script type="text/javascript">
//<!--
function bigdisplay(dt,db,i) {
@@ -474,8 +474,8 @@
dislocked=0;
}
if (active) {
- this.document.topdisplay.value=utext;
- this.document.botdisplay.value=ltext;
+ self.document.forms.disp.topdisplay.value=utext;
+ self.document.forms.disp.botdisplay.value=ltext;
}
}
//-->
@@ -500,7 +500,7 @@
</center>
<center>
-<block condition="&EXT('browser.textremote')!=1">
+<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">
@@ -528,10 +528,13 @@
</td></tr>
</table>
</block>
-<block condition="&EXT('browser.textremote')">
+<block condition="&EXT('request.browser.textremote')">
<font size="1">
-<input type="text" name="topdisplay" size="10" value="LON-CAPA" /><br />
-<input type="text" name="botdisplay" size="10" value="" />
+<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>
Index: loncom/localize/localize/ja.pm
diff -u loncom/localize/localize/ja.pm:1.10 loncom/localize/localize/ja.pm:1.11
--- loncom/localize/localize/ja.pm:1.10 Wed Oct 8 14:24:15 2003
+++ loncom/localize/localize/ja.pm Sun Oct 12 18:02:44 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network with CAPA
# Japanese Localization Lexicon
#
-# $Id: ja.pm,v 1.10 2003/10/08 18:24:15 www Exp $
+# $Id: ja.pm,v 1.11 2003/10/12 22:02:44 www Exp $
#
# Copyright i-Learning Limited Partnership Company
#
@@ -40,7 +40,7 @@
'date_days' => '日,月,火,水,木,金,土',
'date_am' => 'am',
'date_pm' => 'pm',
-
+'textual_remote_display' => 'on',
'Domain'
Index: loncom/lonnet/perl/lonnet.pm
diff -u loncom/lonnet/perl/lonnet.pm:1.429 loncom/lonnet/perl/lonnet.pm:1.430
--- loncom/lonnet/perl/lonnet.pm:1.429 Tue Oct 7 03:24:51 2003
+++ loncom/lonnet/perl/lonnet.pm Sun Oct 12 18:02:44 2003
@@ -1,7 +1,7 @@
# The LearningOnline Network
# TCP networking package
#
-# $Id: lonnet.pm,v 1.429 2003/10/07 07:24:51 albertel Exp $
+# $Id: lonnet.pm,v 1.430 2003/10/12 22:02:44 www Exp $
#
# Copyright Michigan State University Board of Trustees
#
@@ -3610,7 +3610,15 @@
} elsif ($realm eq 'request') {
# ------------------------------------------------------------- request.browser
if ($space eq 'browser') {
- return $ENV{'browser.'.$qualifier};
+ if ($qualifier eq 'textremote') {
+ if (&mt('textual_remote_display') eq 'on') {
+ return 1;
+ } else {
+ return 0;
+ }
+ } else {
+ return $ENV{'browser.'.$qualifier};
+ }
# ------------------------------------------------------------ request.filename
} else {
return $ENV{'request.'.$spacequalifierrest};