From 95d34dc9bd5d87d8f6ad08e1ebcb6555edfc6418 Mon Sep 17 00:00:00 2001 From: Haacked Date: Mon, 28 Oct 2013 16:10:43 -0700 Subject: [PATCH] Group licenses together --- css/application.css | 2 +- licenses.html | 6 +++--- licenses/agpl.txt | 2 ++ licenses/apache.txt | 1 + licenses/artistic.txt | 1 + licenses/bsd-3-clause.txt | 2 ++ licenses/bsd.txt | 2 ++ licenses/eclipse.txt | 1 + licenses/gpl-v2.txt | 4 ++++ licenses/gpl-v3.txt | 4 ++-- licenses/lgpl-v2.1.txt | 3 ++- licenses/lgpl-v3.txt | 2 ++ licenses/mit.txt | 1 + licenses/mozilla.txt | 1 + 14 files changed, 25 insertions(+), 7 deletions(-) diff --git a/css/application.css b/css/application.css index ad074f5..cbd2d2d 100644 --- a/css/application.css +++ b/css/application.css @@ -243,7 +243,7 @@ strong { .license-rules .name { border-right: solid 1px #d9d7d2; padding-left: 0; - width: 280px; + width: 140px; } .license-rules .name a { font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif; diff --git a/licenses.html b/licenses.html index 32f7035..3a40999 100644 --- a/licenses.html +++ b/licenses.html @@ -12,7 +12,7 @@ class: license-types
- {{ page.title }} + {% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %} {{ page.description }} View full license » @@ -44,11 +44,11 @@ class: license-types {% for page in site.pages %} {% if page.layout == "license" %} - {% if page.featured != true %} + {% if page.featured != true and page.hide-from-license-list != true %}
- {{ page.title }} + {% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %} {{ page.description }} View full license » diff --git a/licenses/agpl.txt b/licenses/agpl.txt index 49d258d..4cca975 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -1,5 +1,7 @@ --- title: Affero GPL +family-title: GPL +hide-from-license-list: true layout: license permalink: /licenses/agpl/ source: http://www.gnu.org/licenses/agpl-3.0.txt diff --git a/licenses/apache.txt b/licenses/apache.txt index 212737e..c3468d0 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -1,5 +1,6 @@ --- title: Apache v2 License +family-title: Apache layout: license permalink: /licenses/apache/ diff --git a/licenses/artistic.txt b/licenses/artistic.txt index 3f37ffe..e97657e 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -1,6 +1,7 @@ --- layout: license title: Artistic License 2.0 +family-title: Artistic permalink: /licenses/artistic/ source: http://www.perlfoundation.org/attachment/legal/artistic-2_0.txt diff --git a/licenses/bsd-3-clause.txt b/licenses/bsd-3-clause.txt index 2b8d334..57e9fe7 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -1,6 +1,8 @@ --- layout: license title: BSD (3-Clause) License +family-title: BSD +hide-from-license-list: true permalink: /licenses/bsd-3-clause/ how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. Replace [year] with the current year and [fullname] with the name (or names) of the copyright holders. Replace {organization} with the organization, if any, that sponsors this work. diff --git a/licenses/bsd.txt b/licenses/bsd.txt index e40886b..600a205 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -1,6 +1,8 @@ --- layout: license title: BSD 2-Clause license +family-title: BSD +hide-from-license-list: false permalink: /licenses/bsd/ description: A permissive license that comes in two variants, the BSD 2-Clause and BSD 3-Clause. Both have very minute differences to the MIT license. diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index 212a843..88f18ff 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -1,6 +1,7 @@ --- layout: license title: Eclipse Public License v1.0 +family-title: Eclipse permalink: /licenses/eclipse/ description: This commercially-friendly copyleft license provides the ability to commercially license binaries; a modern royalty-free patent license grant; and the ability for linked works to use other licenses, including commercial ones. diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index 019e09e..c4903a5 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -1,9 +1,13 @@ --- title: GPL v2 +family-title: GPL +hide-from-license-list: false layout: license permalink: /licenses/gpl-v2/ source: http://www.gnu.org/licenses/gpl-2.0.txt +description: GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. There are multiple variants of the GPL each with different requirements, GPL v2, GPL v3, and Affero GPL. + featured: true how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index 487377f..f9717ce 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -1,11 +1,11 @@ --- title: GPL v3 +family-title: GPL +hide-from-license-list: true layout: license permalink: /licenses/gpl-v3/ source: http://www.gnu.org/licenses/gpl-3.0.txt -description: GPL is the most widely used free software license and has a strong copyleft requirement. When distributing derived works, the source code of the work must be made available under the same license. - how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. note: The Free Software Foundation recommends taking the additional step of adding a boilerplate notice to the top of each file. The boilerplate can be found at the end of the license. diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index b0976cb..7d68343 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -1,10 +1,11 @@ --- layout: license title: LGPL v2.1 +family-title: LGPL permalink: /licenses/lgpl-v2.1/ source: http://www.gnu.org/licenses/lgpl-2.1.txt -description: Primarily used for software libraries, LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. +description: Primarily used for software libraries, LGPL requires that derived works be licensed under the same license, but works that only link to it do not fall under this restriction. There are two commonly used versions of the LGPL: LGPL v2.1 and LGPL v3. how: Create a text file (typically named LICENSE or LICENSE.txt) in the root of your source code and copy the text of the license into the file. diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index f486e4b..82b4c5e 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -1,6 +1,8 @@ --- layout: license title: LGPL v3 +family-title: LGPL +hide-from-license-list: true permalink: /licenses/lgpl-v3/ source: http://www.gnu.org/licenses/lgpl-3.0.txt diff --git a/licenses/mit.txt b/licenses/mit.txt index e9ae8d6..217f8cd 100644 --- a/licenses/mit.txt +++ b/licenses/mit.txt @@ -1,6 +1,7 @@ --- layout: license title: MIT License +family-title: Apache permalink: /licenses/mit/ source: http://opensource.org/licenses/MIT diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 37ec20d..1efcfd4 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -1,6 +1,7 @@ --- layout: license title: Mozilla Public License Version 2.0 +family-title: Mozilla permalink: /licenses/mozilla/ source: http://www.mozilla.org/MPL/2.0/