[freeside-commits] branch master updated. ca5b439d4e874bec01a346f53f2bd9e50d612151
Mitch Jackson
mitch at freeside.biz
Mon Jan 7 18:00:53 PST 2019
The branch, master has been updated
via ca5b439d4e874bec01a346f53f2bd9e50d612151 (commit)
via d5e7f2e510d6ab008fa423e7a42e1beb1a5cade9 (commit)
via d80e78b7233271355ad601849369991a07d84e86 (commit)
from a2885e497c74fc2f85055df86d6978db2a8aac77 (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 ca5b439d4e874bec01a346f53f2bd9e50d612151
Author: Mitch Jackson <mitch at freeside.biz>
Date: Mon Jan 7 20:52:13 2019 -0500
RT# 81706 Browser reloads CSS after Freeside upgrade
diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 79e7633fe..5586a0a85 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -56,7 +56,7 @@ Example:
% if ( $include_selectize ) {
<script src="<% $fsurl %>elements/selectize/selectize-0.12.6.min.js"></script>
<link href="<% $fsurl %>elements/selectize/selectize-0.12.6.css" type="text/css" rel="stylesheet">
- <link href="<% $fsurl %>elements/selectize/selectize-freeside.css" type="text/css" rel="stylesheet">
+ <link href="<% $fsurl %>elements/selectize/selectize-freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
% }
<% include('init_overlib.html') |n %>
<% include('rs_init_object.html') |n %>
@@ -100,7 +100,7 @@ Example:
<TABLE WIDTH="100%" CELLSPACING=0 CELLPADDING=0>
-<link href="<%$fsurl%>elements/freeside-menu.css" type="text/css" rel="stylesheet">
+<link href="<%$fsurl%>elements/freeside-menu.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
% if ( $menu_position eq 'top' ) {
diff --git a/httemplate/elements/header-logo.html b/httemplate/elements/header-logo.html
index 465fb84b1..0d4289247 100644
--- a/httemplate/elements/header-logo.html
+++ b/httemplate/elements/header-logo.html
@@ -34,8 +34,8 @@ Example:
% }
% unless ( $nocss ) {
- <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
- <link href="<%$fsurl%>elements/freeside-print.css" type="text/css" rel="stylesheet" media="print">
+ <link href="<%$fsurl%>elements/freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
+ <link href="<%$fsurl%>elements/freeside-print.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet" media="print">
% }
% unless ( $no_jquery ) {
diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html
index 660e71d55..22a390e36 100644
--- a/httemplate/elements/header-popup.html
+++ b/httemplate/elements/header-popup.html
@@ -44,7 +44,7 @@ Example:
<& /elements/freeside.css &>
</style>
% } else {
- <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
+ <link href="<%$fsurl%>elements/freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
% }
% if ( $title || $title_noescape ) {
<FONT SIZE=6>
diff --git a/httemplate/elements/menu.html b/httemplate/elements/menu.html
index 717d9704d..009f38084 100644
--- a/httemplate/elements/menu.html
+++ b/httemplate/elements/menu.html
@@ -13,10 +13,10 @@
% }
% unless ( $opt{'nocss'} ) {
- <link href="<%$fsurl%>elements/freeside.css" type="text/css" rel="stylesheet">
- <link href="<%$fsurl%>elements/freeside-print.css" type="text/css" rel="stylesheet" media="print">
+ <link href="<%$fsurl%>elements/freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
+ <link href="<%$fsurl%>elements/freeside-print.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet" media="print">
% }
-<link href="<%$fsurl%>elements/freeside-menu.css" type="text/css" rel="stylesheet">
+<link href="<%$fsurl%>elements/freeside-menu.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
<SCRIPT TYPE="text/javascript">
diff --git a/httemplate/loginout/login.html b/httemplate/loginout/login.html
index b787a3eea..72e9525c4 100644
--- a/httemplate/loginout/login.html
+++ b/httemplate/loginout/login.html
@@ -1,5 +1,5 @@
<& /elements/header-minimal.html, 'Login' &>
-<link href="<%$url_string%>elements/freeside.css" type="text/css" rel="stylesheet">
+<link href="<%$url_string%>elements/freeside.css?v=<% $FS::VERSION %>" type="text/css" rel="stylesheet">
<CENTER>
commit d5e7f2e510d6ab008fa423e7a42e1beb1a5cade9
Author: Mitch Jackson <mitch at freeside.biz>
Date: Mon Jan 7 20:28:08 2019 -0500
RT# 81706 Version numbers in js library files jquery, selectize
diff --git a/httemplate/elements/header-full.html b/httemplate/elements/header-full.html
index 08e20c875..79e7633fe 100644
--- a/httemplate/elements/header-full.html
+++ b/httemplate/elements/header-full.html
@@ -44,18 +44,18 @@ Example:
%>
% unless ( $no_jquery ) {
- <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css">
- <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT>
+ <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui-1.12.1.min.css">
+ <SCRIPT SRC="<% $fsurl %>elements/jquery-3.3.1.js"></SCRIPT>
<SCRIPT SRC="<% $fsurl %>elements/jquery-migrate-3.0.1.min.js"></SCRIPT>
- <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT>
- <SCRIPT SRC="<% $fsurl %>elements/jquery.validate.min.js"></SCRIPT>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery-ui-1.12.1.min.js"></SCRIPT>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery.validate-1.17.0.min.js"></SCRIPT>
% if ( $FS::CurrentUser::CurrentUser->option('printtofit') ) {
<SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
% }
% }
% if ( $include_selectize ) {
- <script src="<% $fsurl %>elements/selectize/selectize.min.js"></script>
- <link href="<% $fsurl %>elements/selectize/selectize.css" type="text/css" rel="stylesheet">
+ <script src="<% $fsurl %>elements/selectize/selectize-0.12.6.min.js"></script>
+ <link href="<% $fsurl %>elements/selectize/selectize-0.12.6.css" type="text/css" rel="stylesheet">
<link href="<% $fsurl %>elements/selectize/selectize-freeside.css" type="text/css" rel="stylesheet">
% }
<% include('init_overlib.html') |n %>
diff --git a/httemplate/elements/header-logo.html b/httemplate/elements/header-logo.html
index 9948242ef..465fb84b1 100644
--- a/httemplate/elements/header-logo.html
+++ b/httemplate/elements/header-logo.html
@@ -39,11 +39,11 @@ Example:
% }
% unless ( $no_jquery ) {
- <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui.min.css">
- <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT>
+ <link rel="stylesheet" href="<% $fsurl %>elements/jquery-ui-1.12.1.min.css">
+ <SCRIPT SRC="<% $fsurl %>elements/jquery-3.3.1.js"></SCRIPT>
<SCRIPT SRC="<% $fsurl %>elements/jquery-migrate-3.0.1.min.js"></SCRIPT>
- <SCRIPT SRC="<% $fsurl %>elements/jquery-ui.min.js"></SCRIPT>
- <SCRIPT SRC="<% $fsurl %>elements/jquery.validate.min.js"></SCRIPT>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery-ui-1.12.1.min.js"></SCRIPT>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery.validate-1.17.0.min.js"></SCRIPT>
% if ( $FS::CurrentUser::CurrentUser->option('printtofit') ) {
<SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
% }
diff --git a/httemplate/elements/header-popup.html b/httemplate/elements/header-popup.html
index f7296047b..660e71d55 100644
--- a/httemplate/elements/header-popup.html
+++ b/httemplate/elements/header-popup.html
@@ -29,7 +29,7 @@ Example:
<META HTTP-Equiv="Pragma" Content="no-cache">
<META HTTP-Equiv="Expires" Content="0">
% unless ( $no_jquery ) {
- <SCRIPT SRC="<% $fsurl %>elements/jquery.js"></SCRIPT>
+ <SCRIPT SRC="<% $fsurl %>elements/jquery-3.3.1.js"></SCRIPT>
<SCRIPT SRC="<% $fsurl %>elements/jquery-migrate-3.0.1.min.js"></SCRIPT>
% if ( $FS::CurrentUser::CurrentUser->option('printtofit') ) {
<SCRIPT SRC="<% $fsurl %>elements/printtofit.js"></SCRIPT>
diff --git a/httemplate/elements/jquery.js b/httemplate/elements/jquery-3.3.1.js
similarity index 100%
rename from httemplate/elements/jquery.js
rename to httemplate/elements/jquery-3.3.1.js
diff --git a/httemplate/elements/jquery-ui.min.css b/httemplate/elements/jquery-ui-1.12.1.min.css
similarity index 100%
rename from httemplate/elements/jquery-ui.min.css
rename to httemplate/elements/jquery-ui-1.12.1.min.css
diff --git a/httemplate/elements/jquery-ui.min.js b/httemplate/elements/jquery-ui-1.12.1.min.js
similarity index 100%
rename from httemplate/elements/jquery-ui.min.js
rename to httemplate/elements/jquery-ui-1.12.1.min.js
diff --git a/httemplate/elements/jquery.validate.min.js b/httemplate/elements/jquery.validate-1.17.0.min.js
similarity index 100%
rename from httemplate/elements/jquery.validate.min.js
rename to httemplate/elements/jquery.validate-1.17.0.min.js
diff --git a/httemplate/elements/selectize/selectize.css b/httemplate/elements/selectize/selectize-0.12.6.css
similarity index 100%
rename from httemplate/elements/selectize/selectize.css
rename to httemplate/elements/selectize/selectize-0.12.6.css
diff --git a/httemplate/elements/selectize/selectize.min.js b/httemplate/elements/selectize/selectize-0.12.6.min.js
similarity index 100%
rename from httemplate/elements/selectize/selectize.min.js
rename to httemplate/elements/selectize/selectize-0.12.6.min.js
commit d80e78b7233271355ad601849369991a07d84e86
Author: Mitch Jackson <mitch at freeside.biz>
Date: Mon Jan 7 19:55:06 2019 -0500
RT# 81706 Remove redundant loads of jquery.js
diff --git a/httemplate/browse/part_pkg_taxproduct/suretax.html b/httemplate/browse/part_pkg_taxproduct/suretax.html
index 4605c1f34..91f37376c 100755
--- a/httemplate/browse/part_pkg_taxproduct/suretax.html
+++ b/httemplate/browse/part_pkg_taxproduct/suretax.html
@@ -16,7 +16,6 @@
'nohtmlheader' => 1,
'disable_total' => 1,
&>
-<script src="<% $fsurl %>elements/jquery.js"></script>
<script>
var category_labels = <% encode_json(\%category_labels) %>;
$().ready(function() {
diff --git a/httemplate/graph/report_cust_bill_pkg.html b/httemplate/graph/report_cust_bill_pkg.html
index 93531fb0d..d675aadba 100644
--- a/httemplate/graph/report_cust_bill_pkg.html
+++ b/httemplate/graph/report_cust_bill_pkg.html
@@ -1,8 +1,6 @@
<& /elements/header.html,
{ title => 'Sales Report',
head => '
- <SCRIPT TYPE="text/javascript" SRC="'. $p. 'elements/jquery.js"></SCRIPT>
- <SCRIPT TYPE="text/javascript" SRC="'. $p. 'elements/jquery-migrate-3.0.1.min.js"></SCRIPT>
<SCRIPT TYPE="text/javascript" SRC="'. $p. 'elements/spectrum.js"></SCRIPT>
<LINK REL="stylesheet" HREF="'. $p. 'elements/spectrum.css" />',
}
diff --git a/httemplate/misc/edge_browser_check-iframe.html b/httemplate/misc/edge_browser_check-iframe.html
index 086178442..1a10bcd8b 100644
--- a/httemplate/misc/edge_browser_check-iframe.html
+++ b/httemplate/misc/edge_browser_check-iframe.html
@@ -7,8 +7,6 @@
<input id="canary-submit" type="submit">
</form>
-<script type="text/javascript" src="<% $fsurl %>elements/jquery.js"></script>
-<SCRIPT SRC="<% $fsurl %>elements/jquery-migrate-3.0.1.min.js"></SCRIPT>
<script type="text/javascript">
$( function() {
if ( ! $("#canary-result").val() ) {
-----------------------------------------------------------------------
Summary of changes:
httemplate/browse/part_pkg_taxproduct/suretax.html | 1 -
httemplate/elements/header-full.html | 16 ++++++++--------
httemplate/elements/header-logo.html | 12 ++++++------
httemplate/elements/header-popup.html | 4 ++--
httemplate/elements/{jquery.js => jquery-3.3.1.js} | 0
.../{jquery-ui.min.css => jquery-ui-1.12.1.min.css} | 0
.../{jquery-ui.min.js => jquery-ui-1.12.1.min.js} | 0
...ery.validate.min.js => jquery.validate-1.17.0.min.js} | 0
httemplate/elements/menu.html | 6 +++---
.../selectize/{selectize.css => selectize-0.12.6.css} | 0
.../{selectize.min.js => selectize-0.12.6.min.js} | 0
httemplate/graph/report_cust_bill_pkg.html | 2 --
httemplate/loginout/login.html | 2 +-
httemplate/misc/edge_browser_check-iframe.html | 2 --
14 files changed, 20 insertions(+), 25 deletions(-)
rename httemplate/elements/{jquery.js => jquery-3.3.1.js} (100%)
rename httemplate/elements/{jquery-ui.min.css => jquery-ui-1.12.1.min.css} (100%)
rename httemplate/elements/{jquery-ui.min.js => jquery-ui-1.12.1.min.js} (100%)
rename httemplate/elements/{jquery.validate.min.js => jquery.validate-1.17.0.min.js} (100%)
rename httemplate/elements/selectize/{selectize.css => selectize-0.12.6.css} (100%)
rename httemplate/elements/selectize/{selectize.min.js => selectize-0.12.6.min.js} (100%)
More information about the freeside-commits
mailing list