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

[freeside.git] / httemplate / pref / pref.html

diff --git a/httemplate/pref/pref.html b/httemplate/pref/pref.html
index 5455e42..4629106 100644 (file)
--- a/httemplate/pref/pref.html
+++ b/httemplate/pref/pref.html
@@ -78,22 +78,6 @@ Interface
     </TD>
   </TR>
 
-  <TR>
-    <TH ALIGN="right">Hide package changes: </TH>
-    <TD COLSPAN=2>
-    <& /elements/select.html,
-      field   => 'hide_package_changes',
-      options => [ '', 'location', 'all' ],
-      labels  => { ''         => 'never',
-                   'location' => 'location changes',
-                   'all'      => 'all package changes',
-                 },
-      curr_value => ($cgi->param('hide_package_changes') 
-                      || $curuser->option('hide_package_changes')),
-    &>
-    </TD>
-  </TR>
-
 % my $history_order = $curuser->option('history_order') || 'oldest';
   <TR>
     <TH ALIGN="right">Customer history sort order: </TH>
@@ -167,6 +151,15 @@ Interface
     </TD>
   </TR>
 
+  <TR>
+    <TH ALIGN="right">How many recent outbound emails to show in customer view</TH>
+    <TD ALIGN="left" COLSPAN=2>
+      <INPUT TYPE="text" NAME="customer_view_emails" VALUE="<% $curuser->option('customer_view_emails') %>"></TD>
+    </TD>
+  </TR>
+
+
+
 </TABLE>
 <BR>
 
@@ -220,6 +213,8 @@ Development
 </TABLE>
 <BR>
 
+% if ( $curuser->access_right('Employee preference telephony integration') ) {
+
 SNOM integration
 <% ntable("#cccccc",2) %>
 
@@ -264,6 +259,7 @@ Vonage integration (see <a href="https://secure.click2callu.com/">Click2Call</a>
 </TABLE>
 <BR>
 
+% }
 
 % foreach my $prop (qw( height width availHeight availWidth colorDepth )) {
   <INPUT TYPE="hidden" NAME="<% $prop %>" VALUE="">
@@ -285,19 +281,20 @@ tie my %customer_views, 'Tie::IxHash',
   'Basics'          => 'basics',
   'Notes'           => 'notes', #notes and files?
   'Tickets'         => 'tickets',
+  'Appointments'    => 'appointments',
+  'Quotations'      => 'quotations',
   'Packages'        => 'packages',
   'Payment History' => 'payment_history',
 ;
 $customer_views{'Change History'} = 'change_history'
   if $curuser->access_right('View customer history');
-$customer_views{'Jumbo'} = 'jumbo';
 
 # XSS via your own preferences?  seems unlikely, but nice try anyway...
 ( $curuser->option('menu_position') || 'top' )
   =~ /^(\w+)$/ or die "illegal menu_position";
 my $menu_position = $1;
 ( $curuser->option('email_address') )
-  =~ /^([,\w\@.]*)$/ or die "illegal email_address";  #too late
+  =~ /^([,\w\@.\-]*)$/ or die "illegal email_address";  #too late
 my $email_address = $1;
 
 </%init>