From 95d34dc9bd5d87d8f6ad08e1ebcb6555edfc6418 Mon Sep 17 00:00:00 2001 From: Haacked Date: Mon, 28 Oct 2013 16:10:43 -0700 Subject: [PATCH 01/11] 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/ From a9f1de32aedd3e9e48b20ee3848cc55453b66a1f Mon Sep 17 00:00:00 2001 From: Jason Long Date: Tue, 5 Nov 2013 14:22:51 -0500 Subject: [PATCH 02/11] pulled family name and description out of table --- css/application.css | 30 +++++++++++++++--------------- licenses.html | 26 +++++++++----------------- 2 files changed, 24 insertions(+), 32 deletions(-) diff --git a/css/application.css b/css/application.css index cbd2d2d..9245c31 100644 --- a/css/application.css +++ b/css/application.css @@ -123,8 +123,9 @@ h1 { h2 { color: #443a33; + opacity: 0.8; font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif; - font-size: 18px; + font-size: 24px; font-weight: 900; line-height: 1.1; margin-top: 24px; @@ -181,6 +182,7 @@ strong { line-height: 70px; margin-bottom: 45px; vertical-align: middle; + opacity: 1; } .home h2 span { color: #e9e6e2; @@ -226,7 +228,19 @@ strong { margin-top: 20px; } +.license-family-name { + font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif; + font-size: 28px; + font-weight: 900; + line-height: 1.1; +} + +.license-family-description { + color: #5c5855; +} + .license-rules { + border-top: solid 1px #e9e6e2; font-size: 13px; line-height: 1.3; margin-bottom: 40px; @@ -240,23 +254,9 @@ strong { .license-rules th.summary { line-height: 1.4; } -.license-rules .name { - border-right: solid 1px #d9d7d2; - padding-left: 0; - width: 140px; -} -.license-rules .name a { - font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif; - font-size: 28px; - font-weight: 900; - line-height: 1.1; -} .license-rules .name small a { font-size: 16px; } -.license-rules .summary { - color: #5c5855; -} .license-rules td { border-bottom: solid 1px #e9e6e2; padding: 4px 10px; diff --git a/licenses.html b/licenses.html index 3a40999..2246a21 100644 --- a/licenses.html +++ b/licenses.html @@ -4,20 +4,18 @@ permalink: licenses/ class: license-types --- -

Featured

+

Licenses

+ +

Featured Licenses

{% for page in site.pages %} {% if page.layout == "license" %} {% if page.featured %} +

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

+ +

{{ page.description }} View full license »

+ - - - - {% assign types = "required|permitted|forbidden" | split: "|" %} {% for type in types %} @@ -45,15 +43,9 @@ class: license-types {% for page in site.pages %} {% if page.layout == "license" %} {% if page.featured != true and page.hide-from-license-list != true %} +

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

+

{{ page.description }} View full license »

- {% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %} - - {{ page.description }} View full license » -
- - - - {% assign types = "required|permitted|forbidden" | split: "|" %} {% for type in types %} From 246cbc8d65c8668631b29746de4cfbee442504a5 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Wed, 6 Nov 2013 10:10:48 -0500 Subject: [PATCH 03/11] pill nav for license variations --- css/application.css | 68 +++++++++++++++++++++++++++++++++------------ licenses.html | 52 +++++++++++++++++++++++----------- 2 files changed, 87 insertions(+), 33 deletions(-) diff --git a/css/application.css b/css/application.css index 9245c31..6cd7abe 100644 --- a/css/application.css +++ b/css/application.css @@ -228,6 +228,26 @@ strong { margin-top: 20px; } +.license-family { + clear: both; + margin-bottom: 50px; +} + +.license-family-heading { + float: left; + width: 35%; +} + +.license-details { + float: right; + width: 55%; +} + +.license-variations { + height: 31px; + padding-top: 23px; +} + .license-family-name { font-family: 'Chivo', 'Helvetica Neue', Helvetica, Arial, serif; font-size: 28px; @@ -240,15 +260,19 @@ strong { } .license-rules { - border-top: solid 1px #e9e6e2; + border-bottom: solid 1px #d9d7d2; font-size: 13px; line-height: 1.3; - margin-bottom: 40px; + margin-bottom: 12px; width: 100%; } +.license-rules th, +.license-rules td { + width: 33%; +} .license-rules th { - border-bottom: solid 1px #d9d7d2; - padding: 5px 10px 12px 10px; + font-size: 15px; + padding: 5px 10px 5px 0; vertical-align: bottom; } .license-rules th.summary { @@ -258,25 +282,18 @@ strong { font-size: 16px; } .license-rules td { - border-bottom: solid 1px #e9e6e2; - padding: 4px 10px; + padding: 4px 0 12px 0; + vertical-align: top; } .license-rules .label { - border-right: solid 1px #d9d7d2; font-weight: bold; } .license-rules li { background-position: 0 1px; background-repeat: no-repeat; background-size: 12px 12px; - float: left; - display: -moz-inline-stack; - display: inline-block; - vertical-align: middle; - *vertical-align: auto; - zoom: 1; - *display: inline; margin-right: 15px; + margin-bottom: 5px; padding-left: 16px; } .license-rules li:hover { @@ -291,9 +308,6 @@ strong { .license-forbidden li { background-image: url(../images/red-dot@2x.png); } -.license-rules tr:nth-child(2n) td { - background-color: rgba(0, 0, 0, 0.02); -} .license-rules-sidebar li { float: none; @@ -395,6 +409,26 @@ strong { margin-left: 2em; } +.nav-pills > li { + float: left; + display: block; + margin-right: 10px; +} + +.nav-pills > li > a { + padding: 5px 10px; + border-radius: 3px; +} + +.nav-pills > li.active > a { + background-color: #149ad4; + color: #f7f4ef; +} + +.small { + font-size: 90%; +} + /* Qtip styles */ .qtip-required { background-color: #d0ebf6 ! important; diff --git a/licenses.html b/licenses.html index 2246a21..553b715 100644 --- a/licenses.html +++ b/licenses.html @@ -11,25 +11,45 @@ class: license-types {% for page in site.pages %} {% if page.layout == "license" %} {% if page.featured %} -

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

+
+
+

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

-

{{ page.description }} View full license »

+

{{ page.description }}

+
-
- {% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %} - - {{ page.description }} View full license » -
- {% assign types = "required|permitted|forbidden" | split: "|" %} - {% for type in types %} - - - - - {% endfor %} -
{{ type | capitalize }} -
    - {% for req in page[type] %} -
  • {{ site.rules[type][req].label }}
    • - {% endfor %} +
    +
    + {% comment %} always show this div, even w/o variations, for proper spacing {% endcomment %} + -
+ + + + {% assign types = "required|permitted|forbidden" | split: "|" %} + {% for type in types %} + + {% endfor %} + + + {% for type in types %} + + {% endfor %} + +
{{ type | capitalize }}
+
    + {% for req in page[type] %} +
  • {{ site.rules[type][req].label }}
    • + {% endfor %} +
+
+

View full GPL v2 license »

+ + + {% endif %} {% endif %} {% endfor %} From f28894d90583e10695cf2262daed91a55aa0bd32 Mon Sep 17 00:00:00 2001 From: Jason Long Date: Wed, 6 Nov 2013 11:24:34 -0500 Subject: [PATCH 04/11] made partial for license overview sections --- _includes/license-overview.html | 49 ++++++++++++++++++++++++++++ css/application.css | 8 +++++ javascripts/app.coffee | 14 ++++++++ javascripts/app.js | 14 ++++++++ licenses.html | 58 ++------------------------------- licenses/gpl-v2.txt | 2 +- 6 files changed, 88 insertions(+), 57 deletions(-) create mode 100644 _includes/license-overview.html diff --git a/_includes/license-overview.html b/_includes/license-overview.html new file mode 100644 index 0000000..e2e19fc --- /dev/null +++ b/_includes/license-overview.html @@ -0,0 +1,49 @@ +
+
+

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

+ +

{{ page.description }}

+
+ +
+
+ + +
+
+ + + {% assign types = "required|permitted|forbidden" | split: "|" %} + {% for type in types %} + + {% endfor %} + + + {% for type in types %} + + {% endfor %} + +
{{ type | capitalize }}
+
    + {% for req in page[type] %} +
  • {{ site.rules[type][req].label }}
    • + {% endfor %} +
+
+

View full GPL v2 license »

+
+
+ GPL v3 table +

View full GPL v3 license »

+
+
+ Affero GPL table +

View full Affero GPL license »

+
+
+
+ diff --git a/css/application.css b/css/application.css index 6cd7abe..f6b191a 100644 --- a/css/application.css +++ b/css/application.css @@ -425,6 +425,14 @@ strong { color: #f7f4ef; } +.variation-tab { + display: none; +} + +.variation-tab.active { + display: block; +} + .small { font-size: 90%; } diff --git a/javascripts/app.coffee b/javascripts/app.coffee index 2bb3806..9e4cd81 100644 --- a/javascripts/app.coffee +++ b/javascripts/app.coffee @@ -36,6 +36,7 @@ class Choosealicense constructor: -> @initTooltips() @initClipboard() + @initLicenseVariationNav() # Init tooltip action initTooltips: -> @@ -92,5 +93,18 @@ class Choosealicense clipboardComplete: (client, args) -> @innerText = "Copied!" + # Initializes pill navigation for license variations + initLicenseVariationNav: -> + $(".js-nav-pills a").click (e) -> + selectedTab = $(this).data('selected-tab') + nav = $(this).closest('.js-nav-pills') + nav.find('li').removeClass('active') + nav.closest('.js-license-variations').siblings('.js-variation-tab').removeClass('active') + + $(this).parent('li').addClass('active') + $('.' + selectedTab).addClass('active') + + e.preventDefault() + $ -> new Choosealicense() diff --git a/javascripts/app.js b/javascripts/app.js index be3bca0..4837e7e 100644 --- a/javascripts/app.js +++ b/javascripts/app.js @@ -40,6 +40,7 @@ function Choosealicense() { this.initTooltips(); this.initClipboard(); + this.initLicenseVariationNav(); } Choosealicense.prototype.initTooltips = function() { @@ -106,6 +107,19 @@ return this.innerText = "Copied!"; }; + Choosealicense.prototype.initLicenseVariationNav = function() { + return $(".js-nav-pills a").click(function(e) { + var nav, selectedTab; + selectedTab = $(this).data('selected-tab'); + nav = $(this).closest('.js-nav-pills'); + nav.find('li').removeClass('active'); + nav.closest('.js-license-variations').siblings('.js-variation-tab').removeClass('active'); + $(this).parent('li').addClass('active'); + $('.' + selectedTab).addClass('active'); + return e.preventDefault(); + }); + }; + return Choosealicense; })(); diff --git a/licenses.html b/licenses.html index 553b715..630e9a6 100644 --- a/licenses.html +++ b/licenses.html @@ -11,45 +11,7 @@ class: license-types {% for page in site.pages %} {% if page.layout == "license" %} {% if page.featured %} -
-
-

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

- -

{{ page.description }}

-
- -
-
- {% comment %} always show this div, even w/o variations, for proper spacing {% endcomment %} - -
- - - {% assign types = "required|permitted|forbidden" | split: "|" %} - {% for type in types %} - - {% endfor %} - - - {% for type in types %} - - {% endfor %} - -
{{ type | capitalize }}
-
    - {% for req in page[type] %} -
  • {{ site.rules[type][req].label }}
    • - {% endfor %} -
-
-

View full GPL v2 license »

-
-
- + {% include license-overview.html %} {% endif %} {% endif %} {% endfor %} @@ -63,23 +25,7 @@ class: license-types {% for page in site.pages %} {% if page.layout == "license" %} {% if page.featured != true and page.hide-from-license-list != true %} -

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

-

{{ page.description }} View full license »

- - {% assign types = "required|permitted|forbidden" | split: "|" %} - {% for type in types %} - - - - - {% endfor %} -
{{ type | capitalize }} -
    - {% for req in page[type] %} -
  • {{ site.rules[type][req].label }}
    • - {% endfor %} -
-
+ {% include license-overview.html %} {% endif %} {% endif %} {% endfor %} diff --git a/licenses/gpl-v2.txt b/licenses/gpl-v2.txt index c4903a5..1a433ae 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -6,7 +6,7 @@ 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. +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. featured: true From 94389c5873cde725f8cd0d5d5eb33cbe44e5c025 Mon Sep 17 00:00:00 2001 From: Haacked Date: Mon, 18 Nov 2013 14:48:32 -0800 Subject: [PATCH 05/11] Implement license family tabs --- _includes/license-overview.html | 28 +++++++++++++--------------- licenses/agpl.txt | 3 ++- licenses/apache.txt | 3 ++- licenses/artistic.txt | 3 ++- licenses/bsd-3-clause.txt | 3 ++- licenses/bsd.txt | 3 ++- licenses/eclipse.txt | 3 ++- licenses/gpl-v2.txt | 3 ++- licenses/gpl-v3.txt | 3 ++- licenses/lgpl-v2.1.txt | 3 ++- licenses/lgpl-v3.txt | 3 ++- licenses/mit.txt | 3 ++- licenses/mozilla.txt | 3 ++- licenses/no-license.html | 2 ++ licenses/public-domain.txt | 2 ++ 15 files changed, 41 insertions(+), 27 deletions(-) diff --git a/_includes/license-overview.html b/_includes/license-overview.html index e2e19fc..1622174 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -1,6 +1,6 @@
-

{% if page.family-title %}{{ page.family-title }}{% else %}{{ page.title }}{% endif %}

+

{% if page.category %}{{ page.category }}{% else %}{{ page.title }}{% endif %}

{{ page.description }}

@@ -9,12 +9,16 @@
-
+ {% for variation in site.pages %} + {% if variation.category and variation.category == page.category %} +
{% assign types = "required|permitted|forbidden" | split: "|" %} @@ -26,7 +30,7 @@ {% for type in types %}
    - {% for req in page[type] %} + {% for req in variation[type] %}
  • {{ site.rules[type][req].label }}
    • {% endfor %}
@@ -34,16 +38,10 @@ {% endfor %}
-

View full GPL v2 license »

-
-
- GPL v3 table -

View full GPL v3 license »

-
-
- Affero GPL table -

View full Affero GPL license »

+

View full {{ variation.title }} license »

+ {% endif %} + {% endfor %}
diff --git a/licenses/agpl.txt b/licenses/agpl.txt index 4cca975..efa18ef 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -1,6 +1,7 @@ --- title: Affero GPL -family-title: GPL +category: GPL +slug: agpl hide-from-license-list: true layout: license permalink: /licenses/agpl/ diff --git a/licenses/apache.txt b/licenses/apache.txt index c3468d0..4fdb809 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -1,6 +1,7 @@ --- title: Apache v2 License -family-title: Apache +category: Apache +slug: apache layout: license permalink: /licenses/apache/ diff --git a/licenses/artistic.txt b/licenses/artistic.txt index e97657e..9fd6d6a 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -1,7 +1,8 @@ --- layout: license title: Artistic License 2.0 -family-title: Artistic +category: Artistic +slug: 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 57e9fe7..79a9250 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -1,7 +1,8 @@ --- layout: license title: BSD (3-Clause) License -family-title: BSD +category: BSD +slug: bsd-3 hide-from-license-list: true permalink: /licenses/bsd-3-clause/ diff --git a/licenses/bsd.txt b/licenses/bsd.txt index 600a205..98f8b9b 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -1,7 +1,8 @@ --- layout: license title: BSD 2-Clause license -family-title: BSD +category: BSD +slug: bsd hide-from-license-list: false permalink: /licenses/bsd/ diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index 88f18ff..30ee0f6 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -1,7 +1,8 @@ --- layout: license title: Eclipse Public License v1.0 -family-title: Eclipse +category: Eclipse +slug: 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 1a433ae..f0ddfda 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -1,6 +1,7 @@ --- title: GPL v2 -family-title: GPL +category: GPL +slug: gpl-v2 hide-from-license-list: false layout: license permalink: /licenses/gpl-v2/ diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index f9717ce..9648203 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -1,6 +1,7 @@ --- title: GPL v3 -family-title: GPL +category: GPL +slug: gpl-v3 hide-from-license-list: true layout: license permalink: /licenses/gpl-v3/ diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index 7d68343..d31a02c 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -1,7 +1,8 @@ --- layout: license title: LGPL v2.1 -family-title: LGPL +category: LGPL +slug: lgpl-v2.1 permalink: /licenses/lgpl-v2.1/ source: http://www.gnu.org/licenses/lgpl-2.1.txt diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index 82b4c5e..860ba96 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -1,7 +1,8 @@ --- layout: license title: LGPL v3 -family-title: LGPL +category: LGPL +slug: lgpl-v3 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 217f8cd..3bc3976 100644 --- a/licenses/mit.txt +++ b/licenses/mit.txt @@ -1,7 +1,8 @@ --- layout: license title: MIT License -family-title: Apache +category: mit +slug: mit permalink: /licenses/mit/ source: http://opensource.org/licenses/MIT diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 1efcfd4..ce91ea0 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -1,7 +1,8 @@ --- layout: license title: Mozilla Public License Version 2.0 -family-title: Mozilla +category: Mozilla +slug: mozilla permalink: /licenses/mozilla/ source: http://www.mozilla.org/MPL/2.0/ diff --git a/licenses/no-license.html b/licenses/no-license.html index 783e374..9ae7baa 100644 --- a/licenses/no-license.html +++ b/licenses/no-license.html @@ -1,6 +1,8 @@ --- layout: license permalink: /licenses/no-license/ +category: No License +slug: no-license class: license-types title: No License diff --git a/licenses/public-domain.txt b/licenses/public-domain.txt index a870459..b002f6c 100644 --- a/licenses/public-domain.txt +++ b/licenses/public-domain.txt @@ -3,6 +3,8 @@ layout: license permalink: /licenses/public-domain/ class: license-types title: Public Domain (Unlicense) +category: Public Domain +slug: unlicense filename: UNLICENSE source: http://unlicense.org/UNLICENSE From 6f36d6bfcb9e688cf1d966ded8bc3e8c99d05bbe Mon Sep 17 00:00:00 2001 From: Haacked Date: Mon, 18 Nov 2013 17:00:15 -0800 Subject: [PATCH 06/11] Hide pill nav for a single license --- _includes/license-overview.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/cc0.txt | 2 +- licenses/eclipse.txt | 1 - licenses/gpl-v2.txt | 2 +- licenses/gpl-v3.txt | 2 +- licenses/lgpl-v2.1.txt | 2 +- licenses/lgpl-v3.txt | 2 +- licenses/mit.txt | 1 - licenses/mozilla.txt | 1 - licenses/no-license.html | 1 - licenses/unlicense.txt | 2 +- 16 files changed, 13 insertions(+), 17 deletions(-) diff --git a/_includes/license-overview.html b/_includes/license-overview.html index 1622174..80b9f51 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -8,17 +8,19 @@
+ {% if page.tab-slug %} + {% endif %}
{% for variation in site.pages %} {% if variation.category and variation.category == page.category %} -
+
{% assign types = "required|permitted|forbidden" | split: "|" %} diff --git a/licenses/agpl.txt b/licenses/agpl.txt index afc9406..328317d 100644 --- a/licenses/agpl.txt +++ b/licenses/agpl.txt @@ -1,7 +1,7 @@ --- title: Affero GPL category: GPL -slug: agpl +tab-slug: agpl hide-from-license-list: true layout: license permalink: /licenses/agpl/ diff --git a/licenses/apache.txt b/licenses/apache.txt index a2c2d71..fd4bd0a 100644 --- a/licenses/apache.txt +++ b/licenses/apache.txt @@ -1,7 +1,6 @@ --- title: Apache v2 License category: Apache -slug: apache layout: license permalink: /licenses/apache/ diff --git a/licenses/artistic.txt b/licenses/artistic.txt index e6fd215..b3dede4 100644 --- a/licenses/artistic.txt +++ b/licenses/artistic.txt @@ -2,7 +2,6 @@ layout: license title: Artistic License 2.0 category: Artistic -slug: 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 5fb4c75..61f4964 100644 --- a/licenses/bsd-3-clause.txt +++ b/licenses/bsd-3-clause.txt @@ -2,7 +2,7 @@ layout: license title: BSD (3-Clause) License category: BSD -slug: bsd-3 +tab-slug: bsd-3 hide-from-license-list: true permalink: /licenses/bsd-3-clause/ diff --git a/licenses/bsd.txt b/licenses/bsd.txt index 8edbb49..c6cfe1c 100644 --- a/licenses/bsd.txt +++ b/licenses/bsd.txt @@ -2,7 +2,7 @@ layout: license title: BSD 2-Clause license category: BSD -slug: bsd +tab-slug: bsd hide-from-license-list: false permalink: /licenses/bsd/ diff --git a/licenses/cc0.txt b/licenses/cc0.txt index 68699ce..b330b37 100644 --- a/licenses/cc0.txt +++ b/licenses/cc0.txt @@ -2,7 +2,7 @@ layout: license title: CC0 1.0 Universal category: Public Domain Dedication -slug: cc0 +tab-slug: cc0 permalink: /licenses/cc0/ class: license-types hide-from-license-list: true diff --git a/licenses/eclipse.txt b/licenses/eclipse.txt index 054b235..01c4c17 100644 --- a/licenses/eclipse.txt +++ b/licenses/eclipse.txt @@ -2,7 +2,6 @@ layout: license title: Eclipse Public License v1.0 category: Eclipse -slug: 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 3a764a8..6bee8b7 100644 --- a/licenses/gpl-v2.txt +++ b/licenses/gpl-v2.txt @@ -1,7 +1,7 @@ --- title: GPL v2 category: GPL -slug: gpl-v2 +tab-slug: gpl-v2 hide-from-license-list: false layout: license permalink: /licenses/gpl-v2/ diff --git a/licenses/gpl-v3.txt b/licenses/gpl-v3.txt index fa7db2b..510e4e9 100644 --- a/licenses/gpl-v3.txt +++ b/licenses/gpl-v3.txt @@ -1,7 +1,7 @@ --- title: GPL v3 category: GPL -slug: gpl-v3 +tab-slug: gpl-v3 hide-from-license-list: true layout: license permalink: /licenses/gpl-v3/ diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index 442c6fc..13c4603 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -2,7 +2,7 @@ layout: license title: LGPL v2.1 category: LGPL -slug: lgpl-v2.1 +tab-slug: lgpl-v2.1 permalink: /licenses/lgpl-v2.1/ source: http://www.gnu.org/licenses/lgpl-2.1.txt diff --git a/licenses/lgpl-v3.txt b/licenses/lgpl-v3.txt index 7982712..728f5f5 100644 --- a/licenses/lgpl-v3.txt +++ b/licenses/lgpl-v3.txt @@ -2,7 +2,7 @@ layout: license title: LGPL v3 category: LGPL -slug: lgpl-v3 +tab-slug: lgpl-v3 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 fff3e51..7b0e212 100644 --- a/licenses/mit.txt +++ b/licenses/mit.txt @@ -2,7 +2,6 @@ layout: license title: MIT License category: mit -slug: mit permalink: /licenses/mit/ source: http://opensource.org/licenses/MIT diff --git a/licenses/mozilla.txt b/licenses/mozilla.txt index 46990cb..5a7ee26 100644 --- a/licenses/mozilla.txt +++ b/licenses/mozilla.txt @@ -2,7 +2,6 @@ layout: license title: Mozilla Public License Version 2.0 category: Mozilla -slug: mozilla permalink: /licenses/mozilla/ source: http://www.mozilla.org/MPL/2.0/ diff --git a/licenses/no-license.html b/licenses/no-license.html index f0b24ae..8455e23 100644 --- a/licenses/no-license.html +++ b/licenses/no-license.html @@ -2,7 +2,6 @@ layout: license permalink: /licenses/no-license/ category: No License -slug: no-license class: license-types title: No License diff --git a/licenses/unlicense.txt b/licenses/unlicense.txt index d25cf8b..4af2e41 100644 --- a/licenses/unlicense.txt +++ b/licenses/unlicense.txt @@ -2,7 +2,7 @@ layout: license title: The Unlicense category: Public Domain Dedication -slug: unlicense +tab-slug: unlicense permalink: /licenses/unlicense/ class: license-types filename: UNLICENSE From 7ab42bd87ce24c77beaa94a951118fe34e9d8c96 Mon Sep 17 00:00:00 2001 From: Haacked Date: Mon, 18 Nov 2013 17:57:08 -0800 Subject: [PATCH 07/11] uppercase dat mit --- licenses/mit.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/mit.txt b/licenses/mit.txt index 7b0e212..a046d14 100644 --- a/licenses/mit.txt +++ b/licenses/mit.txt @@ -1,7 +1,7 @@ --- layout: license title: MIT License -category: mit +category: MIT permalink: /licenses/mit/ source: http://opensource.org/licenses/MIT From e4d2dc8f43c4494f0f7d6abd1571ee5ef5f82b64 Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 19 Nov 2013 09:05:41 -0800 Subject: [PATCH 08/11] reduce spacing between description and details --- css/application.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/css/application.css b/css/application.css index 807fc8b..95b568b 100644 --- a/css/application.css +++ b/css/application.css @@ -19,7 +19,7 @@ time, mark, audio, video { vertical-align: baseline; } -html { +html { line-height: 1; } @@ -240,8 +240,9 @@ strong { } .license-details { - float: right; + float: left; width: 55%; + padding-left: 20px; } .license-variations { From 21347f4538bfd26e4d6d3f33a77d8ac4fbc27a52 Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 19 Nov 2013 09:30:11 -0800 Subject: [PATCH 09/11] Give tabs ids --- _includes/license-overview.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/license-overview.html b/_includes/license-overview.html index 80b9f51..91f5e66 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -20,7 +20,7 @@ {% for variation in site.pages %} {% if variation.category and variation.category == page.category %} -
+
{% assign types = "required|permitted|forbidden" | split: "|" %} From 86854bc0ddd72b5cad96d782359d135c48efe0d1 Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 19 Nov 2013 10:28:26 -0800 Subject: [PATCH 10/11] Remove links from LGPL description --- licenses/lgpl-v2.1.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/licenses/lgpl-v2.1.txt b/licenses/lgpl-v2.1.txt index 13c4603..3d3aa5d 100644 --- a/licenses/lgpl-v2.1.txt +++ b/licenses/lgpl-v2.1.txt @@ -6,7 +6,7 @@ tab-slug: lgpl-v2.1 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. There are two commonly used versions of the LGPL: LGPL v2.1 and LGPL v3. +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. 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. From 48165e5270180c0668be7b86ea0c79788368473b Mon Sep 17 00:00:00 2001 From: Haacked Date: Tue, 19 Nov 2013 10:32:42 -0800 Subject: [PATCH 11/11] Align variation headings with bullets --- css/application.css | 1 + 1 file changed, 1 insertion(+) diff --git a/css/application.css b/css/application.css index 95b568b..6e225a6 100644 --- a/css/application.css +++ b/css/application.css @@ -248,6 +248,7 @@ strong { .license-variations { height: 31px; padding-top: 23px; + margin-left: -10px; } .license-family-name {