[freeside-commits] branch FREESIDE_4_BRANCH updated. b2f778f0d9406c4edeb6a0c13aa6d6791e93b065

Thu Sep 29 10:02:27 PDT 2016

The branch, FREESIDE_4_BRANCH has been updated
       via  b2f778f0d9406c4edeb6a0c13aa6d6791e93b065 (commit)
      from  4f9036b228a12204d8282344a5abbdd621959a85 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit b2f778f0d9406c4edeb6a0c13aa6d6791e93b065
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Thu Sep 29 10:02:26 2016 -0700

    remove popup border cruft

diff --git a/httemplate/docs/cvv2.html b/httemplate/docs/cvv2.html
index 6025a67..653e1ff 100644
--- a/httemplate/docs/cvv2.html
+++ b/httemplate/docs/cvv2.html
@@ -1,10 +1,5 @@
-<HTML>
-  <HEAD>
-    <TITLE>
-      <% mt('CVV2 information') |h %>
-    </TITLE>
-  </HEAD>
-  <BODY BGCOLOR="#f8f8f8">
+<& /elements/header-popup.html, '' &>
+
   <% mt('The CVV2 number (also called CVC2 or CID) is a three- or four-digit security code used to reduce credit card fraud') |h %>
   <BR><BR>
   <TABLE BORDER=0 CELLSPACING=4>
@@ -20,5 +15,5 @@
         <IMG BORDER=0 ALT="<% mt('American Express') |h %>" SRC="../images/cvv2_amex.png">
       </TD>
   </TABLE>
-  </BODY>
-</HTML>
+
+<& /elements/footer-popup.html &>
diff --git a/httemplate/elements/cust_payby.html b/httemplate/elements/cust_payby.html
index 1d789a4..6404bcb 100644
--- a/httemplate/elements/cust_payby.html
+++ b/httemplate/elements/cust_payby.html
@@ -71,7 +71,15 @@
                VALUE     = "<% scalar($cgi->param($name.'_paycvv')) || ('*' x length($cust_payby->paycvv)) %>"
                onChange  = "<% $onchange %>"
         >
-        <BR><FONT SIZE="-1"><% mt('CVV2') |h %> (<A HREF="javascript:void(0);" onClick="overlib( OLiframeContent('<%$p%>docs/cvv2.html', 480, 275, 'cvv2_popup' ), CAPTION, 'CVV2 Help', STICKY, AUTOSTATUSCAP, CLOSECLICK, DRAGGABLE ); return false;"><% mt('help') |h %></A>)</FONT>
+        <BR><FONT SIZE="-1"><% mt('CVV2') |h %> <& /elements/popup_link.html,
+           'action'      => $p.'docs/cvv2.html',
+           'label'       => mt('(help)'),
+           'actionlabel' => 'CVV2 Help',
+           'width'       => 480,
+           'height'      => 275,
+           'nocenter'    => 1,
+           #popup_name    => 'cvv2_popup',
+        &></FONT>
       </TD>
 
       <TD ID="<%$id%>_td_payname" <%$card_display%>>
diff --git a/httemplate/elements/popup_link.html b/httemplate/elements/popup_link.html
index e9728ac..86d3ed6 100644
--- a/httemplate/elements/popup_link.html
+++ b/httemplate/elements/popup_link.html
@@ -51,6 +51,7 @@ if (ref($_[0]) eq 'HASH') {
 
 my $label = $params->{'label'};
 $label =~ s/ / /g;
+$label = encode_entities($label);
 $label = $params->{'html_label'} || $label;
 my $onclick = include('/elements/popup_link_onclick.html', $params);
 
diff --git a/httemplate/elements/popup_link_onclick.html b/httemplate/elements/popup_link_onclick.html
index 8faa27f..b59720a 100644
--- a/httemplate/elements/popup_link_onclick.html
+++ b/httemplate/elements/popup_link_onclick.html
@@ -21,6 +21,7 @@ Example:
     'height'         => 336,
     'color'          => '#ff0000',
     'closetext'      => 'Go Away',      # the value '' removes the link
+    'nocenter'       => 0, #bool, elminates centering the popup
 
     #uncommon opt
     'frame'          => 0, #bool
@@ -68,8 +69,9 @@ my $popup_name = 'popup-'.random_id();
 
 my $onclick =
   "overlib( OLiframeContent($action, $width, $height, '$popup_name', 0, '$scrolling' ), ".
-    "CAPTION, $actionlabel, STICKY, AUTOSTATUSCAP, MIDX, 0, MIDY, 0, ".
-    "DRAGGABLE, CLOSECLICK, ".
+    "CAPTION, $actionlabel, STICKY, AUTOSTATUSCAP, ".
+    ( $params->{'nocenter'} ? "" : "MIDX, 0, MIDY, 0, " ).
+    "DRAGGABLE, CLOSECLICK, TEXTPADDING, 0, BASE, 0, ".
     "BGCOLOR, '$color', CGCOLOR, '$color', FGCOLOR, '#f8f8f8', ".
     "CLOSETEXT, '$closetext'".
     ( $frame ? ", FRAME, $frame" : '' ).

-----------------------------------------------------------------------

Summary of changes:
 httemplate/docs/cvv2.html                   |   13 ++++---------
 httemplate/elements/cust_payby.html         |   10 +++++++++-
 httemplate/elements/popup_link.html         |    1 +
 httemplate/elements/popup_link_onclick.html |    6 ++++--
 4 files changed, 18 insertions(+), 12 deletions(-)


