3 Commits 56503a4be9 ... 606b74c17c

Author SHA1 Message Date
  UltrasonicMadness 606b74c17c Updated legal page to reflect recent additions. 5 years ago
  UltrasonicMadness 54bd853bb3 GSEmbed now works with LibreJS enabled. 5 years ago
  UltrasonicMadness 2d7f4c0bc9 Removed unused parameter in the privacy page. 5 years ago

+ 2 - 1
backend/include/footer.inc

@@ -7,6 +7,7 @@
     </div>
 
     
-    <p>Copyright &copy; 2018 UltrasonicMadness. The code to generate the website is licensed under the <a target="_blank" href="https://www.gnu.org/licenses/agpl.html">GNU Affero General Public License version 3</a>, the information and media on the website is licensed under the <a target="_blank" href="https://creativecommons.org/licenses/by-sa/4.0/legalcode">Creative Commons Attribution-ShareAlike 4.0 International Public License</a>, unless otherwise stated. See the <a href="/legal">legal</a> and <a href="/legal/privacy">privacy</a> page for details.</p>
+    <p>Copyright &copy; 2018 UltrasonicMadness. The code to generate the website is licensed under the <a target="_blank" href="https://www.gnu.org/licenses/agpl.html">GNU Affero General Public License version 3</a>, the information and media on the website is licensed under the <a target="_blank" href="https://creativecommons.org/licenses/by-sa/4.0/legalcode">Creative Commons Attribution-ShareAlike 4.0 International Public License</a>, unless otherwise stated. See the <a href="/legal">legal</a> and <a href="/legal/privacy">privacy</a> pages for details.</p>
+    <p>UltrasonicMadness.org only uses <a rel="jslicense" href="/legal/js">freely available JavaScript</a> and it has been tested with <a target="_blank" href="http://www.gnu.org/software/librejs/">GNU LibreJS</a>.</p>
 	<p>Source code for this website <a href="/software/usm-website/">is available</a>.</p>
 </footer>

File diff suppressed because it is too large
+ 10364 - 0
public_html/common/js/source/jquery-3.3.1.js


+ 27 - 0
public_html/common/style/mobile.css

@@ -183,3 +183,30 @@ footer
     width:45%;
     margin:2mm;
 }
+
+#jslicense-labels1
+{
+	width:96%;
+	border-collapse:collapse;
+	
+	margin:2%;
+}
+
+#jslicense-labels1 td
+{
+	border-width:1px;
+	border-style:solid;
+	border-color:#333333;
+	
+	margin:0;
+	padding:0;
+	
+	line-height:2em;
+}
+
+#jslicense-labels1 a
+{
+	display:block;
+	width:100%;
+	text-decoration:none;
+}

+ 3 - 3
public_html/legal/index.php

@@ -35,15 +35,15 @@
             <main>
                 <h1>Legal</h1>
                 <h3>Licensing</h3>
-                <p>The code for UltrasonicMadness.org, unless otherwise stated, is licensed under the <a target="_blank" href="https://www.gnu.org/licenses/agpl.html">GNU Affero General Public License version 3</a> and the information and media displayed, unless otherwise stated, is licensed under the <a target="_blank" href="https://creativecommons.org/licenses/by-sa/4.0/legalcode">Creative Commons Attribution-ShareAlike 4.0 International Public License</a>.</p>
+                <p>The code for UltrasonicMadness.org "the Website", unless otherwise stated, is licensed under the <a target="_blank" href="https://www.gnu.org/licenses/agpl.html">GNU Affero General Public License version 3</a> and the information and media displayed, unless otherwise stated, is licensed under the <a target="_blank" href="https://creativecommons.org/licenses/by-sa/4.0/legalcode">Creative Commons Attribution-ShareAlike 4.0 International Public License</a>. The Website uses <a href="/legal/js">JavaScript Web Labels</a> to allow it to function with extensions such as <a target="_blank" href="http://www.gnu.org/software/librejs/">GNU LibreJS</a>.</p>
                 
                 <h3>Third-party Material</h3>
-                <p>The logos of <a target="_blank" href="https://gnusocial.no/">GNU Social</a> and <a target="_blank" href="https://notabug.org/">NotABug</a> are property of their respective owners and they are used on this website solely for the purpose of linking to profiles owned and controlled by UltrasonicMadness on those websites.</p>
+                <p>The logos of <a target="_blank" href="https://gnusocial.no/">GNU Social</a>, <a target="_blank" href="https://notabug.org/">NotABug</a> and <a target="_blank" href="http://darcs.net/">Darcs</a> are property of their respective owners and they are used on this website solely for the purpose of linking to profiles owned and controlled by UltrasonicMadness on those websites.</p>
                 
                 <h3>Privacy</h3>
                 <p>UltrasonicMadness.org takes your privacy very seriously. I will only use and collect user details as specified in the <a href="/legal/privacy">privacy policy</a>. I may update this from time to time as I add software to the website but I will never collect more information than I need to operate such software.</p>
                 
-                <p>Last updated: 23 June 2018</p>
+                <p>Last updated: 22 September 2018</p>
             </main>
 
             <?php inc_footer(); ?>

+ 54 - 0
public_html/legal/js/index.php

@@ -0,0 +1,54 @@
+<?php
+    /*
+     * Personal website of UltrasonicMadness
+     * Copyright (C) 2018 UltrasonicMadness
+     *
+     * This program is free software: you can redistribute it and/or modify
+     * it under the terms of the GNU Affero General Public License as
+     * published by the Free Software Foundation, either version 3 of the
+     * License, or (at your option) any later version.
+     *
+     * This program is distributed in the hope that it will be useful,
+     * but WITHOUT ANY WARRANTY; without even the implied warranty of
+     * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     * GNU Affero General Public License for more details.
+     *
+     * You should have received a copy of the GNU Affero General Public License
+     * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
+     */
+    
+    include($_SERVER['DOCUMENT_ROOT'] . '/../backend/php/page-elements.php');
+?>
+
+<!DOCTYPE html>
+<html>
+    <head>
+        <?php
+            gen_html_head('JavaScript Licenses', 'gray');
+        ?>
+    </head>
+    
+    <body>
+        <?php gen_common_pane(); ?>
+        
+        <div id="page-pane">
+            <main>
+                <h1>JavaScript Licenses</h1>
+                <table id="jslicense-labels1">
+					<tr>
+						<td><a href="/common/js/gsembed.js">gsembed.js</a></td>
+						<td><a href="http://www.apache.org/licenses/LICENSE-2.0">Apache-2.0</a></td>
+						<td><a href="/common/js/gsembed.js">gsembed.js</a></td>
+					</tr>
+					<tr>
+						<td><a href="/common/js/jquery-3.3.1.min.js">jquery-3.3.1.min.js</a></td>
+						<td><a href="http://www.jclark.com/xml/copying.txt">Expat</a></td>
+						<td><a href="/common/js/source/jquery-3.3.1.js">jquery-3.3.1.js</a></td>
+					</tr>
+                </table>
+            </main>
+
+            <?php inc_footer(); ?>
+        </div>
+    </body>
+</html>

+ 1 - 1
public_html/legal/privacy/index.php

@@ -24,7 +24,7 @@
 <html>
     <head>
         <?php
-            gen_html_head('Privacy Policy', 'gray', !isset($_GET['disable-js']));
+            gen_html_head('Privacy Policy', 'gray');
         ?>
     </head>