diff --git a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/MozillaClick.pm b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/MozillaClick.pm
index a3ab8631b3c..aa263fe45eb 100644
--- a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/MozillaClick.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/MozillaClick.pm
@@ -6,8 +6,8 @@
# portable to all browsers.
-# $Revision: 1.2 $
-# $Date: 2003-02-03 13:43:31 $
+# $Revision: 1.3 $
+# $Date: 2003-04-20 20:25:36 $
# $Author: kestes%walrus.com $
# $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/MozillaClick.pm,v $
# $Name: not supported by cvs2svn $
@@ -361,7 +361,7 @@ sub Link {
"");
}
- $out .= "$linktxt";
+ $out .= "$linktxt";
return $out;
}
diff --git a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/None.pm b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/None.pm
index 0c2a45e836c..cda95acadec 100644
--- a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/None.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/None.pm
@@ -3,8 +3,8 @@
# HTMLPopUp::None.pm - the implementation of the header and link
# command which will be used if no popup menus are desired.
-# $Revision: 1.8 $
-# $Date: 2003-01-19 17:20:08 $
+# $Revision: 1.9 $
+# $Date: 2003-04-20 20:25:37 $
# $Author: kestes%walrus.com $
# $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/None.pm,v $
# $Name: not supported by cvs2svn $
@@ -110,13 +110,15 @@ EOF
# call the function like this
#
# Link(
-# "statuslinetxt"=>"",
-# "windowtxt"=>"",
-# "linktxt"=>"",
-# "name"=>"",
-# "href"=>"",
+# "linktxt"=>"text to usually show ",
+# "alt_linktxt" => Alternative text to display if there
+# is no popup library installed and the text
+# should be different from the normal linktxt
+# "name"=>"so that other links can point here",
+# "href"=>"where this link will go to",
+# "windowtxt"=>"the contents of the popup window",
#
-# (arguments with defaults)
+# (These are deprecated: arguments with defaults)
#
# "windowtitle"=>"",
# "windowheight"=>"",
@@ -135,8 +137,9 @@ sub Link {
$name = "name=\"$args{'name'}\"";
}
- $out .= "";
- $out .= "$args{'linktxt'}\n";
+ $out .= "";
+ $out .= ($args{'alt_linktxt'}) || ($args{'linktxt'});
+ $out .= "\n";
return $out;
}
diff --git a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/OverLib.pm b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/OverLib.pm
index 83f703121d1..4e7eb3e1705 100644
--- a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/OverLib.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/OverLib.pm
@@ -7,8 +7,8 @@
# Contributed by dominik.stadler@gmx.at
-# $Revision: 1.3 $
-# $Date: 2003-04-13 20:44:35 $
+# $Revision: 1.4 $
+# $Date: 2003-04-20 20:25:37 $
# $Author: kestes%walrus.com $
# $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/OverLib.pm,v $
# $Name: not supported by cvs2svn $
@@ -1520,7 +1520,7 @@ sub Link {
$href .= "HREF=\"javascript:void(0);\"";
}
- $out .= "$linktxt";
+ $out .= "$linktxt";
return $out;
}
diff --git a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/PortableLayers.pm b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/PortableLayers.pm
index 879442f0851..ef1304e3500 100644
--- a/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/PortableLayers.pm
+++ b/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/PortableLayers.pm
@@ -4,8 +4,8 @@
# windows using javascript layers written by Elena Dykhno.
-# $Revision: 1.4 $
-# $Date: 2002-05-02 23:15:48 $
+# $Revision: 1.5 $
+# $Date: 2003-04-20 20:25:37 $
# $Author: kestes%walrus.com $
# $Source: /home/befator/cvs/jail/cvsroot/mozilla/webtools/tinderbox2/src/lib/HTMLPopUp/PortableLayers.pm,v $
# $Name: not supported by cvs2svn $
@@ -284,7 +284,7 @@ sub Link {
}
- $out .= ">$args{'linktxt'}";
+ $out .= ">$args{'linktxt'}";
return $out;
}