chiark / gitweb /
~yarrgweb / ypp-sc-tools.db-test.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 5be99f4)
Tidier copyright notices
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 Aug 2009 17:29:44 +0000 (18:29 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Thu, 13 Aug 2009 17:29:44 +0000 (18:29 +0100)
yarrg/web/copyrightdate [new file with mode: 0644] patch | blob
yarrg/web/docs patch | blob | history
yarrg/web/footer patch | blob | history
yarrg/web/lookup patch | blob | history
yarrg/web/webcopyright [new file with mode: 0644] patch | blob

diff --git a/yarrg/web/copyrightdate b/yarrg/web/copyrightdate
new file mode 100644 (file)
index 0000000..26b7264
--- /dev/null
+++ b/yarrg/web/copyrightdate
@@ -0,0 +1 @@
+Copyright 2009 Ian Jackson, Steve Early, Clare Boothby
\ No newline at end of file
diff --git a/yarrg/web/docs b/yarrg/web/docs
index b4eb90b8f3a8e185dd29cd1b76c50c4d57879213..18a1d1ab99166bc9a3efe7abb9dbb9c90431f571 100644 (file)
--- a/yarrg/web/docs
+++ b/yarrg/web/docs
@@ -31,6 +31,7 @@
 %#
 <html><head><title>YARRG (Yet Another Revenue Research Gatherer)</title>
 </head><body>
 %#
 <html><head><title>YARRG (Yet Another Revenue Research Gatherer)</title>
 </head><body>
+<& webcopyright &>
 
 <h1>Introduction to YARRG</h1>
 YARRG (Yet Another Revenue Research Gatherer) is inspired by PCTB.
 
 <h1>Introduction to YARRG</h1>
 YARRG (Yet Another Revenue Research Gatherer) is inspired by PCTB.
@@ -97,4 +98,4 @@ expected by the code you'll be running.  Please just ask us.
 
 </html>
 
 
 </html>
 
-<& footer &>
+<& footer, isdocs => 1 &>
diff --git a/yarrg/web/footer b/yarrg/web/footer
index 081b07e5bea99bfd39cb64841eb568c35e4e2c87..9d5d77f64e93ad2fed091882b16f27a532330260 100644 (file)
--- a/yarrg/web/footer
+++ b/yarrg/web/footer
@@ -29,18 +29,30 @@
 %#
 %# This Mason component is simply the page footer.
 %#
 %#
 %# This Mason component is simply the page footer.
 %#
+<%args>
+$isdocs => 0
+</%args>
 <hr>
 <address>
 YARRG is Yet Another Revenue Research Gatherer, a project of the
 crew Special Circumstances on the Midnight Ocean
 and of the Sinister Greenend Organisation.
 <p>
 <hr>
 <address>
 YARRG is Yet Another Revenue Research Gatherer, a project of the
 crew Special Circumstances on the Midnight Ocean
 and of the Sinister Greenend Organisation.
 <p>
+
+YARRG is Free Software.
+You may share and modify the code and the
+website, according to the terms of the GNU General Public Licence and
+the GNU Affero General Public Licence respectively (v3 or later).
+% if (!$isdocs) {
+Please see the <a href="docs">YARRG documentation webpage</a> for
+details of how to obtain the client and server code and full details
+of the licences.
+% }
+
+<p>
+YARRG is <& copyrightdate &>.
 Yohoho and Puzzle Pirates are trademarks of Three Rings and are used
 without permission.  YARRG is not endorsed or sponsored by Three
 Rings.
 Yohoho and Puzzle Pirates are trademarks of Three Rings and are used
 without permission.  YARRG is not endorsed or sponsored by Three
 Rings.
-<p>
-YARRG is Free Software.  You may share and modify the code, including
-the website.  Please see the
-<a href="docs">YARRG documentation webpage</a> for details of how to
-obtain the client and server code.
+
 </address>
 </address>
diff --git a/yarrg/web/lookup b/yarrg/web/lookup
index f59d6cca4a98328986a7f9930f8e40e20e6e777b..41eda49db3359e0462a330245c3ce1468fe9b86d 100644 (file)
--- a/yarrg/web/lookup
+++ b/yarrg/web/lookup
@@ -81,6 +81,7 @@ foreach my $var (@vars) {
 
 </%perl>
 <html><head><title><% ucfirst $ahtml{Query} %> - YARRG</title></head><body>
 
 </%perl>
 <html><head><title><% ucfirst $ahtml{Query} %> - YARRG</title></head><body>
+<& webcopyright &>
 
 <a href="<% $m->current_comp()->name() |u %>">YARRG</a> -
  Yet Another Revenue Research Gatherer
 
 <a href="<% $m->current_comp()->name() |u %>">YARRG</a> -
  Yet Another Revenue Research Gatherer
diff --git a/yarrg/web/webcopyright b/yarrg/web/webcopyright
new file mode 100644 (file)
index 0000000..b0f724f
--- /dev/null
+++ b/yarrg/web/webcopyright
@@ -0,0 +1,13 @@
+<!--
+    This HTML is generated by the YARRG website, which is
+    <& copyrightdate &>.
+
+    The YARRG website is Free Software and licenced according to the
+    GNU Affero General Public Licence (v3 or later).  See the link at
+    the bottom of this page for full licence and copyright
+    information.
+
+    Many YARRG web pages also display data from the YARRG database,
+    which contains mostly contributions from YARRG users and is not
+    covered by the AGPL.
+-->
yarrg testing database