Update of /cvsroot/sandweb/sandweb/bin
In directory sc8-pr-cvs1:/tmp/cvs-serv2635/bin
Modified Files:
sandweb.cgi
Log Message:
figured out why IE wasn't working with "update" in sandbox_menu ( it
seems to choke on the submit attribute in form tags, very strange ),
and I also was having trouble with the pop-up happening in other areas
of the site since the switchover to HREFs instead of <input>s.
I am removing popup_header and popup_footer, and instead doing it the
same way Nick did the update HREF in sandbox_menu, when I looked at
the two I realized the openwindow.js is _much_ clearer.
Index: sandweb.cgi
===================================================================
RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v
retrieving revision 1.339
retrieving revision 1.340
diff -U2 -r1.339 -r1.340
--- sandweb.cgi 6 Jan 2003 09:26:58 -0000 1.339
+++ sandweb.cgi 13 Jan 2003 08:07:25 -0000 1.340
@@ -866,7 +866,10 @@
#
- my $popup_header = $ui->get_menu(
- MENU => 'popup_header',
- );
+ #my $popup_header = $ui->get_menu(
+ # MENU => 'popup_header',
+ #);
+ #
+ # javascript for pop-ups
+ my $js = $ui->get_javascript( SCRIPT => "openwindow" );
#
@@ -944,9 +947,9 @@
);
- my $popup_footer = $ui->get_menu(
- MENU => 'popup_footer',
- );
+ #my $popup_footer = $ui->get_menu(
+# MENU => 'popup_footer',
+# );
- my $content = "$popup_header $toolbar_menu $current_location_menu $browser_menu $popup_footer";
+ my $content = "$toolbar_menu $current_location_menu $browser_menu";
print $cgi->header( -cookie => $ck_auth );
@@ -958,4 +961,5 @@
CONTENT => $content,
MESSAGE => $message,
+ JAVASCRIPT => $js,
);
exit 0;
@@ -1321,8 +1325,4 @@
my $repo_type = $repository->get_repo_type();
- my $popup_header = $ui->get_menu(
- MENU => 'popup_header',
- );
-
my %toolbar = $browse->get_tool_bar(
'location' => $location,
@@ -1339,4 +1339,7 @@
my $image_dir = $config->{'webserver'}->{'image_dir'};
+ # javascript for pop-ups
+ my $js = $ui->get_javascript( SCRIPT => "openwindow" );
+
my $toolbar_menu = $ui->get_menu(
MENU => 'tool_bar',
@@ -1394,9 +1397,5 @@
- my $popup_footer = $ui->get_menu(
- MENU => 'popup_footer',
- );
-
- my $content = "$popup_header $toolbar_menu $current_location_menu $menu $popup_footer";
+ my $content = "$toolbar_menu $current_location_menu $menu";
print $cgi->header( -cookie => $ck_auth );
@@ -1408,4 +1407,5 @@
CONTENT => $content,
MESSAGE => $message,
+ JAVASCRIPT => $js,
);
}
|
