fix visual and other bugs

7 files changed, 86 insertions, 56 deletions

diff --git a/htdocs/browse/agent.cgi b/htdocs/browse/agent.cgi
index 6e5e09fb7..1241ced03 100755
--- a/htdocs/browse/agent.cgi
+++ b/htdocs/browse/agent.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent.cgi,v 1.6 1998-11-23 05:29:46 ivan Exp $
+# $Id: agent.cgi,v 1.7 1998-12-17 05:25:16 ivan Exp $
 #
 # ivan@sisd.com 97-dec-12
 #
@@ -15,7 +15,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent.cgi,v $
-# Revision 1.6  1998-11-23 05:29:46  ivan
+# Revision 1.7  1998-12-17 05:25:16  ivan
+# fix visual and other bugs
+#
+# Revision 1.6  1998/11/23 05:29:46  ivan
 # use CGI::Carp
 #
 # Revision 1.5  1998/11/23 05:27:31  ivan
@@ -44,9 +47,11 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my($p)=popurl(2);
+
 print $cgi->header, header('Agent Listing', menubar(
-  'Main Menu'   => popurl(2),
-  'Agent Types' => 'agent_type.cgi',
+  'Main Menu'   => $p,
+  'Agent Types' => $p. 'browse/agent_type.cgi',
 #  'Add new agent' => '../edit/agent.cgi'
 )), <<END;
 Agents are resellers of your service. Agents may be limited to a subset of your
@@ -64,7 +69,6 @@ END
 #        <TH>Agent</TH>
 
 my($agent);
-my($p)=popurl(2);
 foreach $agent ( sort { 
   $a->getfield('agentnum') <=> $b->getfield('agentnum')
 } qsearch('agent',{}) ) {
@@ -74,11 +78,11 @@ foreach $agent ( sort {
   my($atype)=$agent_type->getfield('atype');
   print <<END;
       <TR>
-        <TD><A HREF="$p/edit/agent.cgi?$hashref->{agentnum}">
+        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agentnum}</A></TD>
-        <TD><A HREF="$p/edit/agent.cgi?$hashref->{agentnum}">
+        <TD><A HREF="${p}edit/agent.cgi?$hashref->{agentnum}">
           $hashref->{agent}</A></TD>
-        <TD><A HREF="$p/edit/agent_type.cgi?$typenum">$atype</A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi?$typenum">$atype</A></TD>
         <TD>$hashref->{freq}</TD>
         <TD>$hashref->{prog}</TD>
       </TR>
@@ -88,8 +92,8 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/agent.cgi"><I>Add new agent</I></A></TD>
-        <TD><A HREF="$p/edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/agent.cgi"><I>Add new agent</I></A></TD>
+        <TD><A HREF="${p}edit/agent_type.cgi"><I>Add new agent type</I></A></TD>
       </TR>
     </TABLE>
 
diff --git a/htdocs/browse/agent_type.cgi b/htdocs/browse/agent_type.cgi
index cb6ee8d16..a1fa3b28e 100755
--- a/htdocs/browse/agent_type.cgi
+++ b/htdocs/browse/agent_type.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: agent_type.cgi,v 1.2 1998-11-21 07:39:52 ivan Exp $
+# $Id: agent_type.cgi,v 1.3 1998-12-17 05:25:17 ivan Exp $
 #
 # ivan@sisd.com 97-dec-10
 #
@@ -11,7 +11,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: agent_type.cgi,v $
-# Revision 1.2  1998-11-21 07:39:52  ivan
+# Revision 1.3  1998-12-17 05:25:17  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/11/21 07:39:52  ivan
 # visual
 #
 
@@ -50,10 +53,10 @@ foreach $agent_type ( sort {
   $rowspan = int($rowspan/2+0.5) ;
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/agent_type.cgi?$hashref->{typenum}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/agent_type.cgi?$hashref->{typenum}">
           $hashref->{typenum}
         </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}/edit/agent_type.cgi?$hashref->{typenum}">$hashref->{atype}</A></TD>
 END
 
   my($type_pkgs);
@@ -63,7 +66,7 @@ END
     my($part_pkg) = qsearchs('part_pkg',{'pkgpart'=> $pkgpart });
     print qq!<TR>! if ($tdcount == 0) ;
     $tdcount = 0 if ($tdcount == -1) ;
-    print qq!<TD><A HREF="$p/edit/part_pkg.cgi?$pkgpart">!,
+    print qq!<TD><A HREF="${p}edit/part_pkg.cgi?$pkgpart">!,
           $part_pkg->getfield('pkg'),"</A></TD>";
     $tdcount ++ ;
     if ($tdcount == 2)
@@ -77,7 +80,7 @@ END
 }
 
 print <<END;
-  <TR><TD COLSPAN=2><I><A HREF="$p/edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
+  <TR><TD COLSPAN=2><I><A HREF="${p}edit/agent_type.cgi">Add new agent type</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/htdocs/browse/cust_main_county.cgi b/htdocs/browse/cust_main_county.cgi
index 4defa574d..fc0935515 100755
--- a/htdocs/browse/cust_main_county.cgi
+++ b/htdocs/browse/cust_main_county.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: cust_main_county.cgi,v 1.2 1998-11-18 09:01:34 ivan Exp $
+# $Id: cust_main_county.cgi,v 1.3 1998-12-17 05:25:18 ivan Exp $
 #
 # ivan@sisd.com 97-dec-13
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: cust_main_county.cgi,v $
-# Revision 1.2  1998-11-18 09:01:34  ivan
+# Revision 1.3  1998-12-17 05:25:18  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/11/18 09:01:34  ivan
 # i18n! i18n!
 #
 
@@ -26,9 +29,11 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my($p) = popurl(2);
+
 print $cgi->header, header("Tax Rate Listing", menubar(
-  'Main Menu' => popurl(2),
-  'Edit tax rates' => popurl(2). "/edit/cust_main_county.cgi",
+  'Main Menu' => $p,
+  'Edit tax rates' => $p. "edit/cust_main_county.cgi",
 )),<<END;
     Click on <u>expand country</u> to specify a country's tax rates by state.
     <BR>Click on <u>expand state</u> to specify a state's tax rates by county.
@@ -53,7 +58,7 @@ END
   print "<TD>", $hashref->{state}
       ? $hashref->{state}
       : qq!(ALL) <FONT SIZE=-1>!.
-        qq!<A HREF="!. popurl(2). qq!/edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+        qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
         qq!">expand country</A></FONT>!
     , "</TD>";
   print "<TD>";
@@ -63,7 +68,7 @@ END
     print "(ALL)";
     if ( $hashref->{state} ) {
       print qq!<FONT SIZE=-1>!.
-          qq!<A HREF="!. popurl(2). qq!/edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
+          qq!<A HREF="${p}edit/cust_main_county-expand.cgi?!. $hashref->{taxnum}.
           qq!">expand state</A></FONT>!;
     }
   }
diff --git a/htdocs/browse/part_pkg.cgi b/htdocs/browse/part_pkg.cgi
index 1a7b2cb48..5d4aaa11f 100755
--- a/htdocs/browse/part_pkg.cgi
+++ b/htdocs/browse/part_pkg.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_pkg.cgi,v 1.3 1998-11-21 07:23:45 ivan Exp $
+# $Id: part_pkg.cgi,v 1.4 1998-12-17 05:25:19 ivan Exp $
 #
 # ivan@sisd.com 97-dec-5,9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_pkg.cgi,v $
-# Revision 1.3  1998-11-21 07:23:45  ivan
+# Revision 1.4  1998-12-17 05:25:19  ivan
+# fix visual and other bugs
+#
+# Revision 1.3  1998/11/21 07:23:45  ivan
 # visual
 #
 # Revision 1.2  1998/11/21 07:00:32  ivan
@@ -31,8 +34,10 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header("Package Part Listing",menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 )), "One or more services are grouped together into a package and given",
   " pricing information. Customers purchase packages, not services.<BR><BR>", 
   table, <<END;
@@ -49,7 +54,6 @@ print $cgi->header, header("Package Part Listing",menubar(
 END
 
 my($part_pkg);
-my($p)=popurl(2);
 foreach $part_pkg ( sort { 
   $a->getfield('pkgpart') <=> $b->getfield('pkgpart')
 } qsearch('part_pkg',{}) ) {
@@ -59,10 +63,10 @@ foreach $part_pkg ( sort {
   my($rowspan)=scalar(@pkg_svc);
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">
           $hashref->{pkgpart}
         </A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_pkg.cgi?$hashref->{pkgpart}">$hashref->{pkg}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{comment}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{setup}</TD>
         <TD ROWSPAN=$rowspan>$hashref->{freq}</TD>
@@ -74,7 +78,7 @@ END
   foreach $pkg_svc ( @pkg_svc ) {
     my($svcpart)=$pkg_svc->getfield('svcpart');
     my($part_svc) = qsearchs('part_svc',{'svcpart'=> $svcpart });
-    print $n,qq!<TD><A HREF="$p/edit/part_svc.cgi?$svcpart">!,
+    print $n,qq!<TD><A HREF="${p}edit/part_svc.cgi?$svcpart">!,
           $part_svc->getfield('svc'),"</A></TD><TD>",
           $pkg_svc->getfield('quantity'),"</TD></TR>\n";
     $n="<TR>";
@@ -84,7 +88,7 @@ END
 }
 
 print <<END;
-   <TR><TD COLSPAN=2><I><A HREF="$p/edit/part_pkg.cgi">Add new package</A></I></TD></TR>
+   <TR><TD COLSPAN=2><I><A HREF="${p}edit/part_pkg.cgi">Add new package</A></I></TD></TR>
     </TABLE>
   </BODY>
 </HTML>
diff --git a/htdocs/browse/part_referral.cgi b/htdocs/browse/part_referral.cgi
index 3357ec841..b08efdbbc 100755
--- a/htdocs/browse/part_referral.cgi
+++ b/htdocs/browse/part_referral.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_referral.cgi,v 1.4 1998-12-17 04:32:55 ivan Exp $
+# $Id: part_referral.cgi,v 1.5 1998-12-17 05:25:20 ivan Exp $
 #
 # ivan@sisd.com 98-feb-23 
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_referral.cgi,v $
-# Revision 1.4  1998-12-17 04:32:55  ivan
+# Revision 1.5  1998-12-17 05:25:20  ivan
+# fix visual and other bugs
+#
+# Revision 1.4  1998/12/17 04:32:55  ivan
 # print $cgi->header
 #
 # Revision 1.3  1998/12/17 04:31:36  ivan
@@ -26,31 +29,33 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch);
 use FS::CGI qw(header menubar popurl table);
+use FS::part_referral;
 
 my $cgi = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header("Referral Listing", menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 #  'Add new referral' => "../edit/part_referral.cgi",
-)), table, <<END;
+)), "Where a customer heard about your service. Tracked for informational purposes.<BR><BR>", table, <<END;
       <TR>
         <TH COLSPAN=2>Referral</TH>
       </TR>
 END
 
 my($part_referral);
-my($p)=popurl(2);
 foreach $part_referral ( sort { 
   $a->getfield('refnum') <=> $b->getfield('refnum')
 } qsearch('part_referral',{}) ) {
   my($hashref)=$part_referral->hashref;
   print <<END;
       <TR>
-        <TD><A HREF="$p/edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
           $hashref->{refnum}</A></TD>
-        <TD><A HREF="$p/edit/part_referral.cgi?$hashref->{refnum}">
+        <TD><A HREF="${p}edit/part_referral.cgi?$hashref->{refnum}">
           $hashref->{referral}</A></TD>
       </TR>
 END
@@ -59,7 +64,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/part_referral.cgi"><I>Add new referral</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_referral.cgi"><I>Add new referral</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>
diff --git a/htdocs/browse/part_svc.cgi b/htdocs/browse/part_svc.cgi
index c9f0d3da1..983849f69 100755
--- a/htdocs/browse/part_svc.cgi
+++ b/htdocs/browse/part_svc.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: part_svc.cgi,v 1.4 1998-11-21 02:26:22 ivan Exp $
+# $Id: part_svc.cgi,v 1.5 1998-12-17 05:25:21 ivan Exp $
 #
 # ivan@sisd.com 97-nov-14, 97-dec-9
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: part_svc.cgi,v $
-# Revision 1.4  1998-11-21 02:26:22  ivan
+# Revision 1.5  1998-12-17 05:25:21  ivan
+# fix visual and other bugs
+#
+# Revision 1.4  1998/11/21 02:26:22  ivan
 # visual
 #
 # Revision 1.3  1998/11/20 23:10:57  ivan
@@ -32,8 +35,10 @@ my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header('Service Part Listing', menubar(
-  'Main Menu' => popurl(2),
+  'Main Menu' => $p,
 )),<<END;
     Services are items you offer to your customers.<BR><BR>
 END
@@ -47,7 +52,6 @@ print table, <<END;
 END
 
 my($part_svc);
-my($p)=popurl(2);
 foreach $part_svc ( sort {
   $a->getfield('svcpart') <=> $b->getfield('svcpart')
 } qsearch('part_svc',{}) ) {
@@ -63,9 +67,9 @@ foreach $part_svc ( sort {
   my($rowspan)=scalar(@rows) || 1;
   print <<END;
       <TR>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">
           $hashref->{svcpart}</A></TD>
-        <TD ROWSPAN=$rowspan><A HREF="$p/edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
+        <TD ROWSPAN=$rowspan><A HREF="${p}edit/part_svc.cgi?$hashref->{svcpart}">          $hashref->{svc}</A></TD>
         <TD ROWSPAN=$rowspan>$hashref->{svcdb}</TD>
 END
 
@@ -85,7 +89,7 @@ print "</TR>";
 
 print <<END;
       <TR>
-        <TD COLSPAN=2><A HREF="$p/edit/part_svc.cgi"><I>Add new service</I></A></TD>
+        <TD COLSPAN=2><A HREF="${p}edit/part_svc.cgi"><I>Add new service</I></A></TD>
       </TR>
     </TABLE>
   </BODY>
diff --git a/htdocs/browse/svc_acct_pop.cgi b/htdocs/browse/svc_acct_pop.cgi
index f7627c1ef..2231aefe2 100755
--- a/htdocs/browse/svc_acct_pop.cgi
+++ b/htdocs/browse/svc_acct_pop.cgi
@@ -1,6 +1,6 @@
 #!/usr/bin/perl -Tw
 #
-# $Id: svc_acct_pop.cgi,v 1.2 1998-12-17 04:36:59 ivan Exp $
+# $Id: svc_acct_pop.cgi,v 1.3 1998-12-17 05:25:22 ivan Exp $
 #
 # ivan@sisd.com 98-mar-8
 #
@@ -10,7 +10,10 @@
 # lose background, FS::CGI ivan@sisd.com 98-sep-2
 #
 # $Log: svc_acct_pop.cgi,v $
-# Revision 1.2  1998-12-17 04:36:59  ivan
+# Revision 1.3  1998-12-17 05:25:22  ivan
+# fix visual and other bugs
+#
+# Revision 1.2  1998/12/17 04:36:59  ivan
 # use CGI;, use CGI::Carp, visual changes, relative URLs
 #
 
@@ -20,14 +23,17 @@ use CGI::Carp qw(fatalsToBrowser);
 use FS::UID qw(cgisuidsetup swapuid);
 use FS::Record qw(qsearch qsearchs);
 use FS::CGI qw(header menubar table popurl);
+use FS::svc_acct_pop;
 
 my($cgi) = new CGI;
 
 &cgisuidsetup($cgi);
 
+my $p = popurl(2);
+
 print $cgi->header, header('POP Listing', menubar(
-  'Main Menu' => popurl(2),
-)), table, <<END;
+  'Main Menu' => $p,
+)), "Points of Presence<BR><BR>", table, <<END;
       <TR>
         <TH></TH>
         <TH>City</TH>
@@ -38,22 +44,21 @@ print $cgi->header, header('POP Listing', menubar(
 END
 
 my($svc_acct_pop);
-my($p)=popurl(2);
 foreach $svc_acct_pop ( sort { 
   $a->getfield('popnum') <=> $b->getfield('popnum')
 } qsearch('svc_acct_pop',{}) ) {
   my($hashref)=$svc_acct_pop->hashref;
   print <<END;
       <TR>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{popnum}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{city}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{state}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{ac}</A></TD>
-        <TD><A HREF="$p/edit/svc_acct_pop.cgi?$hashref->{popnum}">
+        <TD><A HREF="${p}edit/svc_acct_pop.cgi?$hashref->{popnum}">
           $hashref->{exch}</A></TD>
       </TR>
 END
@@ -62,7 +67,7 @@ END
 
 print <<END;
       <TR>
-        <TD COLSPAN=5><A HREF="$p/edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
+        <TD COLSPAN=5><A HREF="${p}edit/svc_acct_pop.cgi"><I>Add new POP</I></A></TD>
       </TR>
     </TABLE>
     </CENTER>