Merge pull request #147 from Mathics3/GPL-compliance

Link Copyright into Startup screens.
Mathics3 · Dec 18, 2021 · 9c0e424 · 9c0e424
2 parents 1b4bf43 + 894019a
commit 9c0e424
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 21 deletions.
diff --git a/COPYING.txt b/COPYING.txt
@@ -34,7 +34,8 @@ SciPy                              BSD 3-Clause
 
 
 CONTACT INFO:
-     Jan Poeschko; [email protected];
+     https://groups.google.com/g/mathics-users
+     https://github.com/orgs/Mathics3/teams/users/discussions
      https://mathics.org/
 
 =========================================================================
@@ -43,7 +44,7 @@ CONTACT INFO:
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Copyright (C) 2007, 2021 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -869,4 +870,4 @@ AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-================================================================================
+================================================================================
diff --git a/mathics_django/web/templates/about.html b/mathics_django/web/templates/about.html
@@ -19,7 +19,7 @@
 	{% block main %}
 		<div id="about">
 
-			<h1>Software information</h1>
+			<h1>Software Information</h1>
 
 			<h2>Python</h2>
 			<ul>
@@ -127,9 +127,19 @@ <h1>Connection Information</h1>
 		<!-- FIXME: figure out how to reuse welcome.html. We can't run ajax from here. -->
 		<div id="welcomeContainerAbout">
 			<div id="welcome">
-				<p><h1>About Mathics in Django!</h1></p>
-				<p>Mathics is a general-purpose computer algebra system.</p>
-				<p>See the <a href="/doc">online documentation in fullscreen</a> for a full list of supported functions, or <a href="/">go back to the main page</a>.
+			  <p><h1>About Mathics in Django!</h1></p>
+
+			  <p>Mathics is a general-purpose computer algebra system.</p>
+
+			  <p>Copyright (C) 2021 The Mathics Team<p><br>
+			  This program comes with ABSOLUTELY NO WARRANTY;
+			    This is free software, and you are welcome to redistribute it
+			    under <a href="doc/license/gnu-general-public-license/">certain conditions</a>.
+			  </p>
+			  <p>See the <a href="/doc">online documentation in fullscreen</a> for
+			    a full list of supported functions, or <a href="/">go
+			      back to the main page</a>.
+			  </p>
 			</div>
 		</div>
 	{% endblock main %}

diff --git a/mathics_django/web/templates/welcome.html b/mathics_django/web/templates/welcome.html
@@ -1,17 +1,26 @@
 <div id="welcomeContainer">
 	<div id="welcome">
-		<p><h1>Welcome to Mathics (in Django)!</h1></p>
-		<p>Mathics is a general-purpose computer algebra system.</p>
-		<p>
-			Enter queries and evaluate them by pressing <code>Shift</code> + <code>Return</code>.
-			See the <a href="javascript:showGallery()">gallery</a> for some examples or the <a href="javascript:showDoc()">documentation</a> for a full list of supported functions.
-			See <a href="/about">/about</a> for software version, machine, and system information.
-			<!--<p><small>This box will disappear as soon as you submit your first query.</small></p>-->
-		</p>
-		<p>Mathics uses <a href="http://www.mathjax.org/" target="_blank">MathJax</a> and <a href="http://threejs.org/" target="_blank">three.js</a> to display beautiful math and 3D graphics. For further information about the project visit <a href="https://mathics.org" target="_blank">the home page</a>.</p>
+	  <p><h1>Welcome to Mathics (in Django)!</h1></p>
 
-		<div style="position:absolute;right:0;bottom:-2.8em;">
-			<p style="text-align:right;color:#3f3f3f;">
-				<label><input type="checkbox" id="hideStartupMsg" />Do not show on startup.</label>
-			</p>
-		</div>
+	  <p>Copyright (C) 2021 The Mathics Team<p><br>
+	    This program comes with ABSOLUTELY NO WARRANTY;
+	    This is free software, and you are welcome to redistribute it
+	    under <a href="doc/license/gnu-general-public-license/">certain conditions</a>.
+	  </p>
+
+	  <p>Mathics is a general-purpose computer algebra system.</p>
+
+	  <p>
+	    Enter queries and evaluate them by pressing <code>Shift</code> + <code>Return</code>.
+	    See the <a href="javascript:showGallery()">gallery</a> for some examples or the <a href="javascript:showDoc()">documentation</a> for a full list of supported functions.
+	    See <a href="/about">/about</a> for software version, machine, and system information.
+	    <!--<p><small>This box will disappear as soon as you submit your first query.</small></p>-->
+	  </p>
+
+	  <p>Mathics uses <a href="http://www.mathjax.org/" target="_blank">MathJax</a> and <a href="http://threejs.org/" target="_blank">three.js</a> to display beautiful math and 3D graphics. For further information about the project visit <a href="https://mathics.org" target="_blank">the home page</a>.</p>
+
+	  <div style="position:absolute;right:0;bottom:-2.8em;">
+	    <p style="text-align:right;color:#3f3f3f;">
+	      <label><input type="checkbox" id="hideStartupMsg" />Do not show on startup.</label>
+	    </p>
+	  </div>