Update license stuff.

jlas · Nov 5, 2012 · ad524e0 · ad524e0
1 parent aee5be3
commit ad524e0
Show file tree

Hide file tree

Showing 17 changed files with 144 additions and 30 deletions.
diff --git a/COPYING → COPYING.txt b/COPYING → COPYING.txt
diff --git a/README b/README
diff --git a/README.md b/README.md
@@ -0,0 +1,37 @@
+Quirky
+======
+
+Quirky is a Qwirkle board game clone built with node.js and jQuery. It is not mobile / tablet friendly yet.
+
+## Requires
+
+* [node.js](http://nodejs.org/), tested with 0.4.7
+* cookies (https://github.com/jed/cookies)
+
+### Third party libraries included (not written by me):
+
+* thirdparty/jquery.min.js (http://jquery.com/)
+* thirdparty/jquery-ui.min.js (http://jqueryui.com/)
+* thirdparty/jquery.cookie.js (https://github.com/carhartl/jquery-cookie)
+* thirdparty/normalize.css (http://necolas.github.com/normalize.css/)
+
+## Images:
+
+* media/light_noise_diagonal.png from http://subtlepatterns.com
+* media/dark_wood.png from http://subtlepatterns.com
+
+## Fonts:
+
+* Open Sans and Chango from [Google Web Fonts](http://www.google.com/webfonts)
+
+Copyright
+---------
+
+Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
+
+Licensed under GPL, see COPYING.txt for details.
+
+Quirky includes some third party libraries and media, see thirdparty/ and media/
+for license information on these.
+
+Send any questions or comments [here](http://twitter.com/jlas_).
diff --git a/color.css b/color.css
@@ -1,8 +1,8 @@
 /*
-  This file is part of Quirky.
+  Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
 
-  Quirky is free software under the terms of the GNU General Public License
-  version 3, see <http://www.gnu.org/licenses/>.
+  This file is part of Quirky. Quirky is free software under the terms of the
+  GNU General Public License version 3, see <http://www.gnu.org/licenses/>.
 */
 
 body { background-image: url("light_noise_diagonal.png"); }

diff --git a/game-client.js b/game-client.js
@@ -1,4 +1,6 @@
 /*
+  Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
+
   This file is part of Quirky.
 
   Quirky is free software: you can redistribute it and/or modify

diff --git a/game.js b/game.js
@@ -1,4 +1,6 @@
 /*
+  Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
+
   This file is part of Quirky.
 
   Quirky is free software: you can redistribute it and/or modify
@@ -37,10 +39,10 @@ var static_files = {
     'layout.css': fs.readFileSync('layout.css'),
     'color.css': fs.readFileSync('color.css'),
     'typography.css': fs.readFileSync('typography.css'),
-    'normalize.css': fs.readFileSync('normalize.css'),
-    'jquery.min.js': fs.readFileSync('jquery/jquery.min.js'),
-    'jquery-ui.min.js': fs.readFileSync('jquery/jquery-ui.min.js'),
-    'jquery.cookie.js': fs.readFileSync('jquery/jquery.cookie.js'),
+    'normalize.css': fs.readFileSync('thirdparty/normalize.css'),
+    'jquery.min.js': fs.readFileSync('thirdparty/jquery.min.js'),
+    'jquery-ui.min.js': fs.readFileSync('thirdparty/jquery-ui.min.js'),
+    'jquery.cookie.js': fs.readFileSync('thirdparty/jquery.cookie.js'),
     'light_noise_diagonal.png': fs.readFileSync("media/light_noise_diagonal.png"),
     'wood.png': fs.readFileSync("media/dark_wood.png")
 };

diff --git a/index.html b/index.html
@@ -12,6 +12,8 @@
   </head>
 
   <!--
+      Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
+
       This file is part of Quirky.
 
       Quirky is free software: you can redistribute it and/or modify
@@ -156,5 +158,16 @@ <h2>Turn Steps</h2>
       Fork it on <a href="http://www.github.com/jlas/quirky">GitHub</a>.
     </footer>
 
+    <!-- subtle patterns attribution -->
+
+    <div xmlns:cc="http://creativecommons.org/ns#"
+         xmlns:dct="http://purl.org/dc/terms/"
+         about="http://subtlepatterns.com/about/">
+      <span property="dct:title">Subtle Patterns</span>
+      (<a rel="cc:attributionURL" property="cc:attributionName"
+          href="http://subtlepatterns.com">Subtle Patterns</a>) /
+      <a rel="license" href="http://creativecommons.org/licenses/by-sa/3.0/">
+        CC BY-SA 3.0</a></div>
+
   </body>
 </html>
diff --git a/layout.css b/layout.css
@@ -1,8 +1,8 @@
 /*
-  This file is part of Quirky.
+  Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
 
-  Quirky is free software under the terms of the GNU General Public License
-  version 3, see <http://www.gnu.org/licenses/>.
+  This file is part of Quirky. Quirky is free software under the terms of the
+  GNU General Public License version 3, see <http://www.gnu.org/licenses/>.
 */
 
 @import url(normalize.css);

diff --git a/media/subtlepatterns.LICENSE.txt b/media/subtlepatterns.LICENSE.txt
@@ -0,0 +1,11 @@
+Subtle Patterns by Subtle Patterns is licensed under a Creative Commons
+Attribution-ShareAlike 3.0 Unported License. See
+http://creativecommons.org/licenses/by-sa/3.0/
+
+Based on work at subtlepatterns.com.
+
+Permissions beyond the scope of this license may be available upon contact.
+
+A project by Atle Mo.
+
+Subtle Patterns and www.subtlepatterns.com © 2012 Atle Mo.
diff --git a/thirdparty/jquery-ui.MIT-LICENSE.txt b/thirdparty/jquery-ui.MIT-LICENSE.txt
@@ -0,0 +1,26 @@
+Copyright 2012 jQuery Foundation and other contributors,
+http://jqueryui.com/
+
+This software consists of voluntary contributions made by many
+individuals (AUTHORS.txt, http://jqueryui.com/about) For exact
+contribution history, see the revision history and logs, available
+at http://jquery-ui.googlecode.com/svn/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/jquery/jquery-ui.min.js → thirdparty/jquery-ui.min.js b/jquery/jquery-ui.min.js → thirdparty/jquery-ui.min.js
diff --git a/thirdparty/jquery.MIT-LICENSE.txt b/thirdparty/jquery.MIT-LICENSE.txt
@@ -0,0 +1,21 @@
+Copyright 2012 jQuery Foundation and other contributors
+http://jquery.com/
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/jquery/jquery.cookie.js → thirdparty/jquery.cookie.js b/jquery/jquery.cookie.js → thirdparty/jquery.cookie.js
diff --git a/jquery/jquery.min.js → thirdparty/jquery.min.js b/jquery/jquery.min.js → thirdparty/jquery.min.js
diff --git a/thirdparty/normalize.LICENSE.md b/thirdparty/normalize.LICENSE.md
@@ -0,0 +1,19 @@
+Copyright (c) Nicolas Gallagher and Jonathan Neal
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+of the Software, and to permit persons to whom the Software is furnished to do
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/normalize.css → thirdparty/normalize.css b/normalize.css → thirdparty/normalize.css
diff --git a/typography.css b/typography.css
@@ -1,8 +1,8 @@
 /*
-  This file is part of Quirky.
+  Copyright (C) 2012 Juan Lasheras (http://www.juanl.org).
 
-  Quirky is free software under the terms of the GNU General Public License
-  version 3, see <http://www.gnu.org/licenses/>.
+  This file is part of Quirky. Quirky is free software under the terms of the
+  GNU General Public License version 3, see <http://www.gnu.org/licenses/>.
 */
 
 body { font-family: "Open Sans", sans-serif;}