Merge branch 'feature/jen-camp-access' of github.com:SalesforceFounda…

…tion/Volunteers-for-Salesforce into feature/jen-camp-access
SalesforceFoundation · Jan 24, 2020 · 9fbd6bc · 9fbd6bc
2 parents 1833890 + b183bf6
commit 9fbd6bc
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 17 deletions.
diff --git a/src/pages/JobCalendar.page b/src/pages/JobCalendar.page
@@ -37,8 +37,8 @@
     cache="false"
     title="{!$Label.labelCalendarPageTitle}">
 
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}"/>
     <apex:includeScript value="{!URLFOR($Resource.FullCalendar, 'fullcalendar/fullcalendar.js')}"/>
     <apex:includeScript value="{!URLFOR($Resource.wtooltip, 'wtooltip.min.js')}"/>
     <apex:stylesheet value="{!URLFOR($Resource.FullCalendar, 'fullcalendar/fullcalendar.css')}"/>

diff --git a/src/pages/PersonalSiteContactLookup.page b/src/pages/PersonalSiteContactLookup.page
@@ -32,15 +32,15 @@
     language="{!strLanguage}" cache="false">
 
     <!-- Load jQuery  -->
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}" />
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}" />
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}" />
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}" />
 
     <!--Load Bootstrap -->
     <apex:stylesheet value="{!URLFOR($Resource.Bootstrap4Force)}" />
     <apex:stylesheet value="{!URLFOR($Resource.Bootstrap, 'bootstrap/css/bootstrap.min.css')}" />
     <apex:includescript value="{!URLFOR($Resource.Bootstrap, 'bootstrap/js/bootstrap.min.js')}" />
 
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.validate-1.17.0.min.js')}" />
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.validate.min.js')}" />
 
     <apex:stylesheet value="{!strURLtoCSSFile}" />
 

diff --git a/src/pages/PersonalSiteTemplate.page b/src/pages/PersonalSiteTemplate.page
@@ -31,8 +31,8 @@
 <apex:page showHeader="false" id="SiteTemplate" standardStylesheets="false" controller="VOL_CTRL_PersonalSiteTemplate" cache="false">
 
 <!-- Load jQuery  -->
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}"/>
 
 <!--Load Bootstrap -->     
     <apex:stylesheet value="{!URLFOR($Resource.Bootstrap4Force)}"/>    

diff --git a/src/pages/PersonalSiteTemplateEspanol.page b/src/pages/PersonalSiteTemplateEspanol.page
@@ -31,8 +31,8 @@
 <apex:page showHeader="false" id="SiteTemplate" standardStylesheets="false" controller="VOL_CTRL_PersonalSiteTemplate" cache="false">
 
 <!-- Load jQuery  -->
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}"/>
 
 <!--Load Bootstrap -->     
     <apex:stylesheet value="{!URLFOR($Resource.Bootstrap4Force)}"/>    

diff --git a/src/pages/VolunteersFind.page b/src/pages/VolunteersFind.page
@@ -31,8 +31,8 @@
 <apex:page controller="VOL_CTRL_VolunteersFind" tabStyle="Find_Volunteers__tab" standardStylesheets="true" title="{!$Label.labelFindVolunteers}" docType="html-5.0">
     <apex:stylesheet value="{!URLFOR($Resource.sfdo213, '/assets/styles/salesforce-lightning-design-system-vf.min.css')}" />
     <apex:stylesheet value="{!URLFOR($Resource.v4sStaticResources, '/v4s_slds/v4s-common.css')}" />
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}"/>
-    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}"/>
+    <apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}"/>
 
     <style> 
         .header {

diff --git a/src/pages/VolunteersJobListing.page b/src/pages/VolunteersJobListing.page
@@ -30,9 +30,9 @@
 
 <apex:page controller="VOL_CTRL_VolunteersJobListing" showheader="false" sidebar="false" standardStylesheets="false" cache="false">
 
-<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}"/>
-<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}"/>
-<apex:stylesheet value="{!URLFOR($Resource.jQueryFiles, 'css/ui-lightness/jquery-ui-1.12.1.custom.min.css')}"/>
+<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}"/>
+<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}"/>
+<apex:stylesheet value="{!URLFOR($Resource.jQueryFiles, 'css/ui-lightness/jquery-ui.custom.min.css')}"/>
 <apex:stylesheet value="{!strURLtoCSSFile}" /> 
 
 <script type="text/javascript">

diff --git a/src/pages/VolunteersJobListingFS.page b/src/pages/VolunteersJobListingFS.page
@@ -31,9 +31,9 @@
 
 <apex:page controller="VOL_CTRL_VolunteersJobListingFS" language="{!strLanguage}" showheader="false" sidebar="false" standardStylesheets="false" cache="false">
 
-<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-3.2.1.min.js')}"/>
-<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui-1.12.1.custom.min.js')}"/>
-<apex:stylesheet value="{!URLFOR($Resource.jQueryFiles, 'css/ui-lightness/jquery-ui-1.12.1.custom.min.css')}"/>
+<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery.min.js')}"/>
+<apex:includeScript value="{!URLFOR($Resource.jQueryFiles, 'js/jquery-ui.custom.min.js')}"/>
+<apex:stylesheet value="{!URLFOR($Resource.jQueryFiles, 'css/ui-lightness/jquery-ui.custom.min.css')}"/>
 <apex:stylesheet value="{!strURLtoCSSFile}" /> 
 
 <script type="text/javascript">

diff --git a/src/staticresources/jQueryFiles.resource b/src/staticresources/jQueryFiles.resource