[freeside-commits] branch FREESIDE_4_BRANCH updated. e5c6705041884828bc4989ba1530e4e69c84abed

Ivan ivan at 420.am
Tue Jun 16 16:49:30 PDT 2015


The branch, FREESIDE_4_BRANCH has been updated
       via  e5c6705041884828bc4989ba1530e4e69c84abed (commit)
      from  2ebbe972c9c8b14938c34b044fdf2635c4496963 (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 e5c6705041884828bc4989ba1530e4e69c84abed
Author: Ivan Kohler <ivan at freeside.biz>
Date:   Tue Jun 16 16:49:29 2015 -0700

    UI spring cleaning: include jquery in all pages, animate customer edit service address hide/unhide

diff --git a/httemplate/edit/cust_main.cgi b/httemplate/edit/cust_main.cgi
index f0de6e1..effe84b 100755
--- a/httemplate/edit/cust_main.cgi
+++ b/httemplate/edit/cust_main.cgi
@@ -68,8 +68,8 @@
            VALUE="Y"
            <% $has_ship_address ? '' : 'CHECKED' %>
     ><% mt('same as billing address') |h %>
-    <DIV CLASS="fsinnerbox">
-      <TABLE ID="table_ship_location" WIDTH="100%">
+    <DIV ID="div_ship_location">
+      <TABLE WIDTH="100%" CLASS="fsinnerbox">
       <& cust_main/before_ship_location.html, $cust_main &>
       <& /elements/location.html,
           object => $cust_main->ship_location,
@@ -95,16 +95,20 @@
   </TD>
 </TR></TABLE>
 
-<SCRIPT>
+<SCRIPT TYPE="text/javascript">
+
 function samechanged(what) {
-  var t1 = document.getElementById('table_ship_location');
   if ( what.checked ) {
-    t1.style.display = 'none';
+    $('#div_ship_location').slideUp();
   } else {
-    t1.style.display = ''
+    $('#div_ship_location').slideDown();
   }
 }
-samechanged(document.getElementById('same'));
+
+% if ( ! $has_ship_address ) {
+  $('#div_ship_location').hide();
+% }
+
 </SCRIPT>
 
 <& cust_main/contacts_new.html, 'cust_main'=>$cust_main, &>
diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html
index 01a7ba8..dc60ae6 100644
--- a/httemplate/elements/header-popup.html
+++ b/httemplate/elements/header-popup.html
@@ -28,6 +28,7 @@ Example:
     <META HTTP-Equiv="Cache-Control" Content="no-cache">
     <META HTTP-Equiv="Pragma" Content="no-cache">
     <META HTTP-Equiv="Expires" Content="0"> 
+    <SCRIPT SRC="<% $p %>elements/jquery.js"></SCRIPT>
     <% $head %>
   </HEAD>
   <BODY <% $etc %>>
diff --git a/httemplate/elements/header.html b/httemplate/elements/header.html
index fd8a03d..55b4fca 100644
--- a/httemplate/elements/header.html
+++ b/httemplate/elements/header.html
@@ -42,6 +42,7 @@ Example:
               ) |n
     %>
 
+    <SCRIPT SRC="<% $p %>elements/jquery.js"></SCRIPT>
     <% include('init_overlib.html') |n %>
     <% include('rs_init_object.html') |n %>
 

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

Summary of changes:
 httemplate/edit/cust_main.cgi         |   18 +++++++++++-------
 httemplate/elements/header-popup.html |    1 +
 httemplate/elements/header.html       |    1 +
 3 files changed, 13 insertions(+), 7 deletions(-)




More information about the freeside-commits mailing list