#2 merge

Merged
myrcy merged 5 commits from EPuters/development into EPuters/master 2 years ago
4 changed files with 30 additions and 15 deletions
  1. 1 15
      _includes/footer.html
  2. 2 0
      _includes/head.html
  3. 4 0
      _posts/2015-04-20-welcome-to-jekyll.markdown
  4. 23 0
      about/javascript.html

+ 1 - 15
_includes/footer.html

@@ -1,5 +1,5 @@
 <footer class="site-footer">
-
+<a href="/about/javascript" data-jslicense="1">JavaScript license information</a>
   <div class="wrapper">
 
     <h3 class="footer-heading">{{ site.title }}</h3>
@@ -89,17 +89,3 @@ $(document).ready(function() {
   {% endfor %}
 {% endif %}
 
-{% if site.ga_tracking_id %}
-<!-- Google Analytics -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-  ga('create', '{{ site.ga_tracking_id }}', 'auto');
-  ga('send', 'pageview', {
-    'page': '{{ page.url }}',
-    'title': '{% if page.title %}{{ page.title }}{% else %}{{ site.title }}{% endif %}'
-  });
-</script>
-{% endif %}

+ 2 - 0
_includes/head.html

@@ -73,6 +73,8 @@
 	
 	<!-- Tooltips -->
 	<script type="text/javascript">
+	  // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
 		window.tooltips = []
+		// @license-end
 	</script>
 </head>

+ 4 - 0
_posts/2015-04-20-welcome-to-jekyll.markdown

@@ -28,7 +28,11 @@ Students must be taughts about how software functions
 **Note**: I shall try and update this post over time as our goals may change.
 
 <script>
+<<<<<<< HEAD
+// @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&dn=expat.txt Expat
+=======
 // @license magnet:?xt=urn:btih:1f739d935676111cfff4b4693e3816e664797050&dn=gpl-3.0.txt GPL-v3-or-Later
+>>>>>>> master
 window.tooltips = window.tooltips || []
 window.tooltips.push(['#someId', { content: "This is the text of the tooltip!" }])
 window.tooltips.push(['#someOtherId', { content: "{% include tooltips/example.html %}", placement: "right" }])

+ 23 - 0
about/javascript.html

@@ -0,0 +1,23 @@
+<table id="jslicense-labels1">
+    <tr>
+        <td><a href="//code.jquery.com/jquery-3.4.1.min.js">jquery-2.1.1.min.js</a></td>
+        <td><a href="https://jquery.org/license/">Expat</a></td>
+    </tr>
+    <tr>
+        <td><a href="//cdnjs.cloudflare.com/ajax/libs/highlight.js/9.15.10/highlight.min.js">highlight.min.js</a></td>
+        <td><a href="http://git.io/hljslicense">BSD-3-clause</a></td>
+    </tr>
+    <tr>
+        <td><a href="//cdnjs.cloudflare.com/ajax/libs/lightbox2/2.11.1/js/lightbox.min.js">lightbox.min.js</a></td>
+        <td><a href="https://github.com/lokesh/lightbox2/blob/master/LICENSE">Expat</a></td>
+    </tr>
+    <tr>
+        <td><a href="//unpkg.com/popper.js@1">popper.js@1</a></td>
+        <td><a href="http://opensource.org/licenses/MIT">Expat</a></td>
+    </tr>
+    </tr>
+    <tr>
+        <td><a href="//unpkg.com/tippy.js@5">popper.js@5</a></td>
+        <td><a href="https://unpkg.com/browse/tippy.js@5.2.1/LICENSE">Expat</a></td>
+    </tr>
+</table>