[interchange-cvs] interchange - heins modified 3 files
interchange-core@icdevgroup.org
interchange-core@icdevgroup.org
Wed Aug 14 13:57:01 2002
User: heins
Date: 2002-08-14 17:56:41 GMT
Modified: dist/lib/UI/pages/admin customer_mailing.html error.html
Modified: dist/lib/UI/vars UI_STD_HEAD
Log:
* Standardize check for old browser in UI_STD_INIT. Separate [calc] to
prevent catastrophic error on a syntax fault in MV_DHTML_BROWSER.
* Use this facility in a page that didn't work well with Opera or
Netscape.
* Remove login hint from error page now that a simple login problem
won't give you this page.
Revision Changes Path
1.3 +3 -1 interchange/dist/lib/UI/pages/admin/customer_mailing.h=
tml
rev 1.3, prev_rev 1.2
Index: customer_mailing.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/customer_mailing.htm=
l,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- customer_mailing.html 14 Aug 2002 15:52:48 -0000 1.2
+++ customer_mailing.html 14 Aug 2002 17:56:41 -0000 1.3
@@ -229,10 +229,12 @@
=20
[if cgi show_members]
<div style=3D"
- Height: 100px;
Margin-left: 5%;
Width: 600px;
+ [if !scratch ui_old_browser]
+ Height: 100px;
Overflow: auto;
+ [/if]
">[tmpn tmp_seen][/tmpn]
[loop search=3D"
fi=3Duserdb
2.3 +0 -2 interchange/dist/lib/UI/pages/admin/error.html
rev 2.3, prev_rev 2.2
Index: error.html
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/pages/admin/error.html,v
retrieving revision 2.2
retrieving revision 2.3
diff -u -r2.2 -r2.3
--- error.html 29 Jul 2001 15:12:50 -0000 2.2
+++ error.html 14 Aug 2002 17:56:41 -0000 2.3
@@ -48,8 +48,6 @@
</BLOCKQUOTE>
<p>
[L]Please correct and try again.[/L]
-<p>
-<i>[scratch loginhint]</i>
</td>
</tr>
2.23 +8 -13 interchange/dist/lib/UI/vars/UI_STD_HEAD
rev 2.23, prev_rev 2.22
Index: UI_STD_HEAD
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
RCS file: /var/cvs/interchange/dist/lib/UI/vars/UI_STD_HEAD,v
retrieving revision 2.22
retrieving revision 2.23
diff -u -r2.22 -r2.23
--- UI_STD_HEAD 14 Aug 2002 15:52:49 -0000 2.22
+++ UI_STD_HEAD 14 Aug 2002 17:56:41 -0000 2.23
@@ -1,5 +1,9 @@
Variable UI_STD_INIT <<EOV
-[perl]
+[calc]
+ my $regex =3D $Tag->var('MV_DHTML_BROWSER', 2) || 'MSIE.*Windows|Mozilla.=
*Gecko';
+ $Scratch->{ui_old_browser} =3D $Session->{browser} !~ /$regex/;
+ return '';
+[/calc][perl]
# call only once per page
return if $Config->{ImageDirOriginal};
=20
@@ -87,18 +91,9 @@
[/if-mm]
[/if]
[if scratch dhtml_required]
- [calc]
- $regex =3D qr/MSIE [5-9].*Windows|Mozilla.*Gecko/;
- if ($Session->{browser} =3D~ $regex) {
- delete $Scratch->{old_browser};
- }
- else {
- $Scratch->{old_browser} =3D 1;
- $Scratch->{ui_error} =3D "Modern browser like Mozilla or MSIE 5 required=
for page accessed.";
- }
- return;
- [/calc]
- [bounce page=3D"__UI_BASE__/error" if=3D"[scratch old_browser]"]
+[and scratch ui_old_browser]
+ [seti ui_error][loc]Modern browser like Mozilla or MSIE 5 required for pa=
ge accessed[/loc][/seti]
+ [bounce page=3D"__UI_BASE__/error"]
[/if]
<html[scratch ui_language_direction]>
<head>