more RT integration / reskin / 2.1, RT#6640

diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index a4fcde6..998ed2f 100644 (file)
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -19,6 +19,21 @@
 
 <SCRIPT TYPE="text/javascript">
 
+% my $fs_popup = include( '/elements/popup_link_onclick.html',
+%                           'action'      => $fsurl.'docs/about.html',
+%                           'label'       => 'Freeside',
+%                           'style'       => 'color:#999999',
+%                           'actionlabel' => 'About',
+%                           'width'       => 300,
+%                           'height'      => 360,
+%                           'color'       => '#7e0079',
+%                           'scrolling'   => 'no',
+%                       );
+% $fs_popup =~ s/return false;//;
+  function about_freeside() {
+    <% $fs_popup |n %>
+  }
+
   webfxMenuImagePath      = "<%$fsurl%>images/";
   webfxMenuUseHover       = 1;
   webfxMenuShowTime       = 300;
@@ -504,7 +519,7 @@ tie my %help_menu, 'Tie::IxHash', 'Billing documentation' => [ $doc_link, 'Frees
 $help_menu{'Ticketing documentation'} = [ 'http://wiki.bestpractical.com/', 'Request Tracker Wiki' ]
   if $conf->config('ticket_system') eq 'RT_Internal';
 $help_menu{'separator'} = '';
-$help_menu{"About Freeside v$FS::VERSION"} = [ 'XXXfinishme', 'doh!' ];
+$help_menu{"About Freeside v$FS::VERSION"} = [ "javascript:about_freeside()", '' ];
 $help_menu{"About RT v$RT::VERSION"} = [ 'http://www.bestpractical.com/rt', 'Request Tracker Homepage' ]
   if $conf->config('ticket_system') eq 'RT_Internal';
 

diff --git a/httemplate/elements/popup_link_onclick.html b/httemplate/elements/popup_link_onclick.html
index f539f4b..4c61a6c 100644 (file)
--- a/httemplate/elements/popup_link_onclick.html
+++ b/httemplate/elements/popup_link_onclick.html
@@ -28,7 +28,7 @@ Example:
 
 </%doc>
 % if ($action) { 
-<% $onclick %>\
+<% $onclick |n %>\
 % }
 <%init>
 

diff --git a/httemplate/images/cvv2.png b/httemplate/images/cvv2.png
index 48c58d5..502f27f 100644 (file)
Binary files a/httemplate/images/cvv2.png and b/httemplate/images/cvv2.png differ

diff --git a/httemplate/images/cvv2_amex.png b/httemplate/images/cvv2_amex.png
index 82d1f47..5cf86c8 100644 (file)
Binary files a/httemplate/images/cvv2_amex.png and b/httemplate/images/cvv2_amex.png differ