Merge branch 'master' into msqur.com

nearwood · Nov 7, 2019 · 83bc28b · 83bc28b
2 parents 31903a0 + d53081e
commit 83bc28b
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 1,562 deletions.
diff --git a/src/view/header.php b/src/view/header.php
@@ -22,23 +22,17 @@
 	<meta name="twitter:creator" content="@nearwood">
 	<!-- Twitter Summary card images must be at least 120x120px -->
 	<meta name="twitter:image" content="https://msqur.com/view/img/tutorial5.png">
-<?php
-if (DEBUG) { ?>
-	<script src="view/lib/jquery.min.js"></script>
-	<link rel="stylesheet" href="view/lib/jquery-ui.css" />
-	<script src="view/lib/jquery-ui.min.js"></script>
-	<script src="view/lib/angular.min.js"></script>
-	<script src="view/lib/tablesorter/jquery.tablesorter.min.js"></script>
-	<script src="view/lib/Chart.js/Chart.min.js"></script>
-<?php } else { ?>
+	<!-- External scripts -->
 	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js" integrity="sha384-UM1JrZIpBwVf5jj9dTKVvGiiZPZTLVoq4sfdvIe9SBumsvCuv6AHDNtEiIb5h1kU" crossorigin="anonymous"></script>
 	<link rel="stylesheet" href="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/themes/smoothness/jquery-ui.css" integrity="sha384-5L1Zwk1YapN1l4l4rYc+1fr3Z0g23LbCBztpq0LQcbDCelzqgFb96BMCFtDwjq/b" crossorigin="anonymous">
 	<script src="//ajax.googleapis.com/ajax/libs/jqueryui/1.11.1/jquery-ui.min.js" integrity="sha384-ovZOciNc/R4uUo2fCVS1oDT0vIBuaou1d39yqL4a9xFdZAYDswCgrJ6tF8ShkqzF" crossorigin="anonymous"></script>
 	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.2/angular.min.js" integrity="sha384-neqWoCEBO5KsP6TEzfMryfZUeh7+qMQEODngh2KGzau+pMU9csLE2azsvQFa8Oel" crossorigin="anonymous"></script>
 	<script src="//ajax.googleapis.com/ajax/libs/angularjs/1.5.2/angular-resource.min.js" integrity="sha384-fQqYlHIz3plgWo88gnyC2Z5EKOTk53w3z102UGn+OnE17oQeCa4h+u0PPijIpklj" crossorigin="anonymous"></script>
+	<!-- Hosted scripts -->
+	<script src="view/lib/tablesorter/jquery.tablesorter.min.js"></script>
+	<script src="view/lib/Chart.js/Chart.min.js"></script>
+	<script src="view/msqur.js"></script>
 <?php
-}
-
 if (isset($_GET['msq'])) {
 ?>
 	<meta name="robots" content="noindex">