From 7823ec906183ad6b5eed779f2d82b08f36b60458 Mon Sep 17 00:00:00 2001 From: Haacked Date: Wed, 19 Dec 2012 14:47:01 -0800 Subject: [PATCH] Consolidated annotations into a single file. The annotations are now described in app.js. This'll make it much easier for us to change these up without having to fix tem up in the entire site. --- javascripts/app.js | 33 ++++++++++++++ licenses/foundation/index.html | 78 +++++++++++++++++----------------- licenses/permissive/index.html | 41 +++++++++--------- licenses/reciprocal/index.html | 75 ++++++++++++++++++-------------- 4 files changed, 137 insertions(+), 90 deletions(-) diff --git a/javascripts/app.js b/javascripts/app.js index c598a89..e5a7025 100644 --- a/javascripts/app.js +++ b/javascripts/app.js @@ -1,9 +1,42 @@ +var annotations = { + permitted: { + 'commercial-use' : 'This software and derivatives may be used for commercial purposes.', + 'modifications' : 'This software may be modified.', + 'distribution' : 'You may distribute this software.', + 'sublicense' : 'You may grant a sublicense to modify and distribute this software to third parties not included in the license.', + 'warranty' : 'You may place a warranty on the software.' + }, + + forbidden: { + 'no-warranty' : 'Software is released without warranty and the software/license owner cannot be charged for damages.', + 'trademark-use' : 'You may NOT use the names, logos, or trademarks of contributors.', + 'no-liability' : 'Software is provided without warranty and the software author/license owner cannot be held liable for damages.', + 'no-sublicense' : 'You may not grant a sublicense to modify and distribute this software to third parties not included in the license.', + }, + + required: { + 'include-copyright' : 'Include the original copyright with the code.', + 'include-license' : 'Include the full text of the license with the code.', + 'document-changes' : 'Indicate significant changes made to the code.', + 'disclose-source' : 'Source code must be made available when distributing the software.', + 'nonstatic-linkage' : 'The library must be linked in a way that allows it to be replaced with a similar library.' + } +} + + var qtip_position = { my: 'top center', at: 'bottom center' }; $(document).ready(function() { + for (var category in annotations) { + var categoryAnnotations = annotations[category]; + for (var annotation in categoryAnnotations) { + $('table.license ul.' + category + ' li.' + annotation).attr('title', categoryAnnotations[annotation]); + } + } + $('table.license ul.required li').qtip({ content: { text: false, diff --git a/licenses/foundation/index.html b/licenses/foundation/index.html index 5ef2787..c1a261e 100644 --- a/licenses/foundation/index.html +++ b/licenses/foundation/index.html @@ -38,9 +38,9 @@ Required @@ -48,11 +48,11 @@ Permitted @@ -60,8 +60,8 @@ Forbidden @@ -80,8 +80,8 @@ Required @@ -89,11 +89,11 @@ Permitted @@ -101,8 +101,8 @@ Forbidden @@ -121,9 +121,9 @@ Required @@ -131,11 +131,11 @@ Permitted @@ -143,21 +143,23 @@ Forbidden - + diff --git a/licenses/permissive/index.html b/licenses/permissive/index.html index 5790eeb..e8dd7f8 100644 --- a/licenses/permissive/index.html +++ b/licenses/permissive/index.html @@ -37,7 +37,7 @@ Required @@ -45,10 +45,10 @@ Permitted @@ -56,7 +56,7 @@ Forbidden @@ -75,7 +75,7 @@ Required @@ -83,11 +83,11 @@ Permitted @@ -95,7 +95,7 @@ Forbidden @@ -114,7 +114,7 @@ Required @@ -122,9 +122,9 @@ Permitted @@ -132,9 +132,9 @@ Forbidden @@ -148,6 +148,7 @@

Please consult a legal expert before adopting a software license for your project.
This site is licensed under the Creative Commons Attribution 3.0 Unported License. +

diff --git a/licenses/reciprocal/index.html b/licenses/reciprocal/index.html index 1644095..511e259 100644 --- a/licenses/reciprocal/index.html +++ b/licenses/reciprocal/index.html @@ -39,10 +39,9 @@ Required @@ -50,9 +49,10 @@ Permitted @@ -60,8 +60,8 @@ Forbidden @@ -81,10 +81,9 @@ Required @@ -92,9 +91,10 @@ Permitted @@ -102,8 +102,8 @@ Forbidden @@ -123,8 +123,8 @@ Required @@ -132,10 +132,10 @@ Permitted @@ -143,7 +143,7 @@ Forbidden @@ -164,8 +164,8 @@ Required @@ -173,10 +173,10 @@ Permitted @@ -184,11 +184,22 @@ Forbidden +