going back to default jquery version on header and add neccessary boo…

…tstrap jquery version on footer, to avoid conflic on upgrade page and maybe other that overwrite jquery file.
phpList · Mar 29, 2016 · 7e0b0de · 7e0b0de
1 parent 4a98d7e
commit 7e0b0de
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/footer.inc b/footer.inc
@@ -41,7 +41,7 @@
     <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-
+<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/phpList3ToBootstrap.js"></script>
 <script type="text/javascript" src="ui/bootlist/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/jcarousellite_1.0.1.min.js"></script>

diff --git a/footer_minified.inc b/footer_minified.inc
@@ -41,7 +41,7 @@
     <!-- /.modal-dialog -->
 </div>
 <!-- /.modal -->
-
+<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/phpList3ToBootstrap.js"></script>
 <script type="text/javascript" src="ui/bootlist/bootstrap/js/bootstrap.min.js"></script>
 <script type="text/javascript" src="ui/bootlist/js/jcarousellite_1.0.1.min.js"></script>

diff --git a/pagetop.php b/pagetop.php
@@ -29,7 +29,7 @@
 
 
 <!-- initial styles and JS from basic application -->
-<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="js/jquery.tools.scrollable.js"></script>
 <script type="text/javascript" src="js/phplistapp.js"></script>
 <link rel="stylesheet" href="css/app.css" />

diff --git a/pagetop_minified.php b/pagetop_minified.php
@@ -26,7 +26,7 @@
 <link rel="apple-touch-icon-precomposed" href="./images/phplist-touch-icon.png" />
 
 <!-- initial styles and JS from basic application -->
-<script type="text/javascript" src="ui/bootlist/js/jquery-1.12.1.min.js"></script>
+<script type="text/javascript" src="js/jquery-1.7.1.min.js"></script>
 <script type="text/javascript" src="js/jquery.tools.scrollable.js"></script>
 <script type="text/javascript" src="js/phplistapp.js"></script>
 <link rel="stylesheet" href="css/app.css" />