version 1.570, 2007/08/26 21:09:43
|
version 1.572, 2007/08/28 18:32:36
|
Line 721 sub help_open_topic {
|
Line 721 sub help_open_topic {
|
|
|
my $template = ""; |
my $template = ""; |
my $link; |
my $link; |
|
|
$topic=~s/\W/\_/g; |
$topic=~s/\W/\_/g; |
|
|
if (!$stayOnPage) |
if (!$stayOnPage) { |
{ |
|
$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
$link = "javascript:void(open('/adm/help/${filename}.hlp', 'Help_for_$topic', 'menubar=0,toolbar=1,scrollbars=1,width=$width,height=$height,resizable=yes'))"; |
} |
} else { |
else |
|
{ |
|
$link = "/adm/help/${filename}.hlp"; |
$link = "/adm/help/${filename}.hlp"; |
} |
} |
|
|
# Add the text |
# Add the text |
if ($text ne "") |
if ($text ne "") { |
{ |
|
$template .= |
$template .= |
"<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>". |
"<table bgcolor='#3333AA' cellspacing='1' cellpadding='1' border='0'><tr>". |
"<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>"; |
"<td bgcolor='#5555FF'><a target=\"_top\" href=\"$link\"><font color='#FFFFFF' size='2'>$text</font></a>"; |
} |
} |
|
|
# Add the graphic |
# Add the graphic |
Line 805 sub help_open_menu {
|
Line 801 sub help_open_menu {
|
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) |
my ($topic,$component_help,$faq,$bug,$stayOnPage,$width,$height,$text) |
= @_; |
= @_; |
$stayOnPage = 0 if (not defined $stayOnPage); |
$stayOnPage = 0 if (not defined $stayOnPage); |
# formerly only used pop-up help (stayOnPage = 0) |
# only use pop-up help (stayOnPage == 0) |
# if environment.remote is on (using remote control UI) |
# if environment.remote is on (using remote control UI) |
# if ($env{'browser.interface'} eq 'textual' || |
if ($env{'browser.interface'} eq 'textual' || |
# $env{'environment.remote'} eq 'off' ) { |
$env{'environment.remote'} eq 'off' ) { |
# $stayOnPage=1; |
|
#} |
|
# Now making pop-up help the default even with remote control |
|
if ($env{'browser.interface'} eq 'textual') { |
|
$stayOnPage=1; |
$stayOnPage=1; |
} |
} |
my $output; |
my $output; |
Line 834 sub help_open_menu {
|
Line 826 sub help_open_menu {
|
|
|
sub top_nav_help { |
sub top_nav_help { |
my ($text) = @_; |
my ($text) = @_; |
|
|
$text = &mt($text); |
$text = &mt($text); |
|
my $stay_on_page = |
my $stayOnPage = |
|
($env{'browser.interface'} eq 'textual' || |
($env{'browser.interface'} eq 'textual' || |
$env{'environment.remote'} eq 'off' ); |
$env{'environment.remote'} eq 'off' ); |
my $link= ($stayOnPage) ? "javascript:helpMenu('display')" |
my $link = ($stay_on_page) ? "javascript:helpMenu('display')" |
: "javascript:helpMenu('open')"; |
: "javascript:helpMenu('open')"; |
my $banner_link = &update_help_link(undef,undef,undef,undef,$stayOnPage); |
my $banner_link = &update_help_link(undef,undef,undef,undef,$stay_on_page); |
|
|
my $title = &mt('Get help'); |
my $title = &mt('Get help'); |
|
|
Line 5643 sub user_picker {
|
Line 5633 sub user_picker {
|
'exact' => 'is', |
'exact' => 'is', |
'contains' => 'contains', |
'contains' => 'contains', |
'begins' => 'begins with', |
'begins' => 'begins with', |
|
'youm' => "You must include some text to search for.", |
|
'thte' => "The text you are searching for must contain at least two characters when using a 'begins' type search.", |
|
'thet' => "The text you are searching for must contain at least three characters when using a 'contains' type search.", |
|
'yomc' => "You must choose a domain when using an institutional directory search.", |
|
'ymcd' => "You must choose a domain when using a domain search.", |
|
'whus' => "When using searching by last,first you must include a comma as separator between last name and first name.", |
|
'whse' => "When searching by last,first you must include at least one character in the first name.", |
|
'thfo' => "The following need to be corrected before the search can be run:", |
); |
); |
my $domform = &select_dom_form($currdom,'srchdomain',1,1); |
my $domform = &select_dom_form($currdom,'srchdomain',1,1); |
my $srchinsel = ' <select name="srchin">'; |
my $srchinsel = ' <select name="srchin">'; |
Line 5744 function validateEntry(callingForm) {
|
Line 5742 function validateEntry(callingForm) {
|
|
|
if (srchterm == "") { |
if (srchterm == "") { |
checkok = 0; |
checkok = 0; |
msg += "You must include some text to search for.\\n"; |
msg += "$lt{'youm'}\\n"; |
} |
} |
|
|
if (srchtype== 'begins') { |
if (srchtype== 'begins') { |
if (srchterm.length < 2) { |
if (srchterm.length < 2) { |
checkok = 0; |
checkok = 0; |
msg += "The text you are searching for must contain at least two characters when using a 'begins' type search.\\n"; |
msg += "$lt{'thte'}\\n"; |
} |
} |
} |
} |
|
|
if (srchtype== 'contains') { |
if (srchtype== 'contains') { |
if (srchterm.length < 3) { |
if (srchterm.length < 3) { |
checkok = 0; |
checkok = 0; |
msg += "The text you are searching for must contain at least three characters when using a 'contains' type search.\\n"; |
msg += "$lt{'thet'}\\n"; |
} |
} |
} |
} |
if (srchin == 'instd') { |
if (srchin == 'instd') { |
if (srchdomain == '') { |
if (srchdomain == '') { |
checkok = 0; |
checkok = 0; |
msg += "You must choose a domain when using an institutional directory search.\\n"; |
msg += "$lt{'yomc'}\\n"; |
} |
} |
} |
} |
if (srchin == 'dom') { |
if (srchin == 'dom') { |
if (srchdomain == '') { |
if (srchdomain == '') { |
checkok = 0; |
checkok = 0; |
msg += "You must choose a domain when using a domain search.\\n"; |
msg += "$lt{'ymcd'}\\n"; |
} |
} |
} |
} |
if (srchby == 'lastfirst') { |
if (srchby == 'lastfirst') { |
if (srchterm.indexOf(",") == -1) { |
if (srchterm.indexOf(",") == -1) { |
checkok = 0; |
checkok = 0; |
msg += "When using searching by last,first you must include a comma as separator between last name and first name.\\n"; |
msg += "$lt{'whus'}\\n"; |
} |
} |
if (srchterm.indexOf(",") == srchterm.length -1) { |
if (srchterm.indexOf(",") == srchterm.length -1) { |
checkok = 0; |
checkok = 0; |
msg += "When searching by last,first you must include at least one character in the first name.\\n"; |
msg += "$lt{'whse'}\\n"; |
} |
} |
} |
} |
if (checkok == 0) { |
if (checkok == 0) { |
alert("The following need to be corrected before the search can be run:\\n"+msg); |
alert("$lt{'thfo'}\\n"+msg); |
return; |
return; |
} |
} |
if (checkok == 1) { |
if (checkok == 1) { |