From 660eb2695baf26cc23db00c6a2ccbf4b56ecf44b Mon Sep 17 00:00:00 2001
From: akshath <akshath.t@vtiger.com>
Date: Fri, 30 Oct 2020 23:33:19 +0530
Subject: [PATCH] Fix for #1526 - Extend versioning support to all client side
resources.
---
layouts/v7/modules/Vtiger/Header.tpl | 26 +++++-----
layouts/v7/modules/Vtiger/JSResources.tpl | 58 +++++++++++------------
2 files changed, 42 insertions(+), 42 deletions(-)
diff --git a/layouts/v7/modules/Vtiger/Header.tpl b/layouts/v7/modules/Vtiger/Header.tpl
index b6bb5e99e..f42113ed7 100644
--- a/layouts/v7/modules/Vtiger/Header.tpl
+++ b/layouts/v7/modules/Vtiger/Header.tpl
@@ -15,19 +15,19 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/todc/css/bootstrap.min.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/todc/css/docs.min.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/todc/css/todc-bootstrap.min.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/font-awesome/css/font-awesome.min.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/jquery/select2/select2.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/select2-bootstrap/select2-bootstrap.css'>
- <link type='text/css' rel='stylesheet' href='libraries/bootstrap/js/eternicode-bootstrap-datepicker/css/datepicker3.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/jquery/jquery-ui-1.11.3.custom/jquery-ui.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/vt-icons/style.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/animate/animate.min.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/jquery/malihu-custom-scrollbar/jquery.mCustomScrollbar.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/jquery/jquery.qtip.custom/jquery.qtip.css'>
- <link type='text/css' rel='stylesheet' href='layouts/v7/lib/jquery/daterangepicker/daterangepicker.css'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/todc/css/bootstrap.min.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/todc/css/docs.min.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/todc/css/todc-bootstrap.min.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/font-awesome/css/font-awesome.min.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/select2/select2.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/select2-bootstrap/select2-bootstrap.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("libraries/bootstrap/js/eternicode-bootstrap-datepicker/css/datepicker3.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/jquery-ui-1.11.3.custom/jquery-ui.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/vt-icons/style.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/animate/animate.min.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/malihu-custom-scrollbar/jquery.mCustomScrollbar.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/jquery.qtip.custom/jquery.qtip.css")}'>
+ <link type='text/css' rel='stylesheet' href='{vresource_url("layouts/v7/lib/jquery/daterangepicker/daterangepicker.css")}'>
<input type="hidden" id="inventoryModules" value={ZEND_JSON::encode($INVENTORY_MODULES)}>
diff --git a/layouts/v7/modules/Vtiger/JSResources.tpl b/layouts/v7/modules/Vtiger/JSResources.tpl
index fc4fa9b21..ff7ac3d1c 100644
--- a/layouts/v7/modules/Vtiger/JSResources.tpl
+++ b/layouts/v7/modules/Vtiger/JSResources.tpl
@@ -10,34 +10,34 @@
********************************************************************************/
-->*}
{strip}
- <script type="text/javascript" src="layouts/v7/lib/jquery/purl.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/select2/select2.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery.class.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery-ui-1.11.3.custom/jquery-ui.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/todc/js/popper.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/todc/js/bootstrap.min.js"></script>
- <script type="text/javascript" src="libraries/jquery/jstorage.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery-validation/jquery.validate.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery.slimscroll.min.js"></script>
- <script type="text/javascript" src="libraries/jquery/jquery.ba-outside-events.min.js"></script>
- <script type="text/javascript" src="libraries/jquery/defunkt-jquery-pjax/jquery.pjax.js"></script>
- <script type="text/javascript" src="libraries/jquery/multiplefileupload/jquery_MultiFile.js"></script>
- <script type="text/javascript" src="resources/jquery.additions.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/bootstrap-notify/bootstrap-notify.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/websockets/reconnecting-websocket.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery-play-sound/jquery.playSound.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/malihu-custom-scrollbar/jquery.mousewheel.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/malihu-custom-scrollbar/jquery.mCustomScrollbar.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/autoComplete/jquery.textcomplete.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery.qtip.custom/jquery.qtip.js"></script>
- <script type="text/javascript" src="libraries/jquery/jquery-visibility.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/momentjs/moment.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/daterangepicker/moment.min.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/daterangepicker/jquery.daterangepicker.js"></script>
- <script type="text/javascript" src="layouts/v7/lib/jquery/jquery.timeago.js"></script>
- <script type="text/javascript" src="libraries/jquery/ckeditor/ckeditor.js"></script>
- <script type="text/javascript" src="libraries/jquery/ckeditor/adapters/jquery.js"></script>
- <script type='text/javascript' src='layouts/v7/lib/anchorme_js/anchorme.min.js'></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/purl.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/select2/select2.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery.class.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery-ui-1.11.3.custom/jquery-ui.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/todc/js/popper.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/todc/js/bootstrap.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/jstorage.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery-validation/jquery.validate.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery.slimscroll.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/jquery.ba-outside-events.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/defunkt-jquery-pjax/jquery.pjax.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/multiplefileupload/jquery_MultiFile.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('resources/jquery.additions.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/bootstrap-notify/bootstrap-notify.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/websockets/reconnecting-websocket.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery-play-sound/jquery.playSound.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/malihu-custom-scrollbar/jquery.mousewheel.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/malihu-custom-scrollbar/jquery.mCustomScrollbar.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/autoComplete/jquery.textcomplete.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery.qtip.custom/jquery.qtip.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/jquery-visibility.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/momentjs/moment.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/daterangepicker/moment.min.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/daterangepicker/jquery.daterangepicker.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('layouts/v7/lib/jquery/jquery.timeago.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/ckeditor/ckeditor.js')}"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/jquery/ckeditor/adapters/jquery.js')}"></script>
+ <script type='text/javascript' src="{vresource_url('layouts/v7/lib/anchorme_js/anchorme.min.js')}"></script>
<script type="text/javascript" src="{vresource_url('layouts/v7/modules/Vtiger/resources/Class.js')}"></script>
<script type='text/javascript' src="{vresource_url('layouts/v7/resources/helper.js')}"></script>
<script type="text/javascript" src="{vresource_url('layouts/v7/resources/application.js')}"></script>
@@ -60,7 +60,7 @@
<script type="text/javascript" src="{vresource_url('layouts/v7/resources/v7_client_compat.js')}"></script>
<!-- Added in the end since it should be after less file loaded -->
- <script type="text/javascript" src="libraries/bootstrap/js/less.min.js"></script>
+ <script type="text/javascript" src="{vresource_url('libraries/bootstrap/js/less.min.js')}"></script>
<!-- Enable tracking pageload time -->
<script type="text/javascript">
--
GitLab