Merge branch 'master' of ssh://git.freeside.biz/home/git/freeside

2 files changed, 21 insertions, 9 deletions

diff --git a/httemplate/docs/part_svc-table.html b/httemplate/docs/part_svc-table.html
index 56a4d0e8c..b1cd0b1cc 100644
--- a/httemplate/docs/part_svc-table.html
+++ b/httemplate/docs/part_svc-table.html
@@ -5,6 +5,7 @@
     <TH ALIGN="left">Generic</TH>
     <TH ALIGN="left">Access</TH>
     <TH ALIGN="left">Telephony</TH>
+    <TH ALIGN="left">Video</TH>
 <!--    <TH>Hosting</TH>
     <TH>Colocation</TH>
 -->
@@ -15,23 +16,31 @@
         <LI><B>svc_acct</B>: Accounts - anything with a username (mailbox, shell, RADIUS, etc.)
         <LI><B>svc_hardware</B>: Equipment supplied to customers
         <LI><B>svc_external</B>: Externally-tracked service
+        <LI><B>svc_group</B>: Generic group service
       </UL>
     </TD>
     <TD VALIGN="top">
       <UL STYLE="margin:0">
         <LI><B>svc_dsl</B>: DSL
-        <LI><B>svc_broadband</B>: Wireless broadband
+        <LI><B>svc_broadband</B>: Fixed wireless broadband
         <LI><B>svc_cable</B>: Cable
-        <LI><B>svc_dish</B>: DISH Network
+        <LI><B>svc_fiber</B>: Fiber-to-the-premise service
       </UL>
     </TD>
     <TD VALIGN="top">
       <UL STYLE="margin:0">
         <LI><B>svc_phone</B>: Customer phone number
         <LI><B>svc_pbx</B>: Customer PBX
+        <LI><B>svc_conferencing</B>: Conferencing service
         <LI><B>svc_circuit</B>: Phone circuits other than DSL
       </UL>
     </TD>
+    <TD VALIGN="top">
+      <UL STYLE="margin:0">
+        <LI><B>svc_video</B>: IPTV or video-on-demand service
+        <LI><B>svc_dish</B>: DISH Network
+      </UL>
+    </TD>
   </TR>
 </TABLE>
 <BR>
@@ -39,6 +48,7 @@
   <TR>
     <TH ALIGN="left">Hosting</TH>
     <TH ALIGN="left">Colocation</TH>
+    <TH ALIGN="left">Alarm</TH>
     <TH ALIGN="left">Real Estate</TH>
   </TR>
     <TD VALIGN="top">
@@ -57,14 +67,16 @@
     </TD>
     <TD VALIGN="top">
       <UL STYLE="margin:0">
+        <LI><B>svc_alarm</B>: Alarm service
+      </UL>
+    </TD>
+    <TD VALIGN="top">
+      <UL STYLE="margin:0">
         <LI><B>svc_realestate</B>: Real estate properties
       </UL>
     </TD>
   </TR>
 <TABLE>
-<!--   <LI>svc_charge - One-time charges (Partially unimplemented)
-       <LI>svc_wo - Work orders (Partially unimplemented)
--->
 
 </BODY>
 </HTML>
diff --git a/httemplate/edit/part_svc.cgi b/httemplate/edit/part_svc.cgi
index 49c1c03d8..b80118f89 100755
--- a/httemplate/edit/part_svc.cgi
+++ b/httemplate/edit/part_svc.cgi
@@ -251,11 +251,11 @@ my $help = '';
 unless ( $hashref->{svcpart} ) {
   $help = '&nbsp;'.
           include('/elements/popup_link.html',
-                    'action' => $p.'docs/part_svc-table.html',
-                    'label'  => 'help',
+                    'action'      => $p.'docs/part_svc-table.html',
+                    'label'       => 'help',
                     'actionlabel' => 'Service table help',
-                    'width'       => 763,
-                    #'height'      => 400,
+                    'width'       => 960,
+                    'height'      => 400,
                   );
 }