From afd7b15ac47ce4705175f7d8d5b2620426da609c Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Fri, 29 Nov 2013 20:37:58 -0500 Subject: [PATCH 1/3] upgrade github-pages --- Gemfile.lock | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index 50a9ed9..5cc5913 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,53 +8,61 @@ GEM colored (1.2) commander (4.1.5) highline (~> 1.6.11) - directory_watcher (1.4.1) ethon (0.6.1) ffi (>= 1.3.0) mime-types (~> 1.18) fast-stemmer (1.0.2) ffi (1.9.0) - github-pages (8) + github-pages (11) RedCloth (= 4.2.9) - jekyll (= 1.2.0) - kramdown (= 1.0.2) - liquid (= 2.5.1) + jekyll (= 1.3.1) + kramdown (= 1.2.0) + liquid (= 2.5.4) maruku (= 0.6.1) - rdiscount (= 1.6.8) - redcarpet (= 2.2.2) + rdiscount (= 2.1.7) + redcarpet (= 2.3.0) highline (1.6.20) html-proofer (0.2.3) colored (~> 1.2) nokogiri (= 1.6.0) typhoeus (~> 0.6.3) - jekyll (1.2.0) + jekyll (1.3.1) classifier (~> 1.3) colorator (~> 0.1) commander (~> 4.1.3) - directory_watcher (~> 1.4.1) - liquid (~> 2.5.1) - maruku (~> 0.5) + liquid (~> 2.5.2) + listen (~> 1.3) + maruku (~> 0.6.0) pygments.rb (~> 0.5.0) - redcarpet (~> 2.2.2) - safe_yaml (~> 0.7.0) - kramdown (1.0.2) - liquid (2.5.1) + redcarpet (~> 2.3.0) + safe_yaml (~> 0.9.7) + kramdown (1.2.0) + liquid (2.5.4) + listen (1.3.1) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + rb-kqueue (>= 0.2) maruku (0.6.1) syntax (>= 1.0.0) - mime-types (1.25) + mime-types (1.25.1) mini_portile (0.5.2) nokogiri (1.6.0) mini_portile (~> 0.5.0) posix-spawn (0.3.6) - pygments.rb (0.5.2) + pygments.rb (0.5.4) posix-spawn (~> 0.3.6) yajl-ruby (~> 1.1.0) rake (10.1.0) - rdiscount (1.6.8) - redcarpet (2.2.2) - safe_yaml (0.7.1) + rb-fsevent (0.9.3) + rb-inotify (0.9.2) + ffi (>= 0.5.0) + rb-kqueue (0.2.0) + ffi (>= 0.5.0) + rdiscount (2.1.7) + redcarpet (2.3.0) + safe_yaml (0.9.7) syntax (1.0.0) - typhoeus (0.6.5) + typhoeus (0.6.6) ethon (~> 0.6.1) yajl-ruby (1.1.0) From 8ff2565f0b473b0b180fc3aeddde35a1448a2407 Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Fri, 29 Nov 2013 20:57:35 -0500 Subject: [PATCH 2/3] sort rules by label --- _config.yml | 113 ++++++++++++++++---------------- _includes/license-overview.html | 22 ++++--- _includes/sidebar.html | 8 ++- javascripts/annotations.js | 2 +- 4 files changed, 77 insertions(+), 68 deletions(-) diff --git a/_config.yml b/_config.yml index 1d4a27a..9b4d20b 100644 --- a/_config.yml +++ b/_config.yml @@ -1,3 +1,4 @@ +--- title: ChooseALicense.com relative_permalinks: false markdown: kramdown @@ -5,65 +6,65 @@ markdown: kramdown rules: required: - include-copyright: - description: Include a copy of the license and copyright notice with the code. - label: License and copyright notice - document-changes: - description: Indicate significant changes made to the code. - label: State Changes - disclose-source: - description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available. - label: Disclose Source - library-usage: - description: The library may be used within a non-open-source application. - label: Library usage - rename: - description: You must change the name of the software if you modify it. - label: Rename + - description: Include a copy of the license and copyright notice with the code. + label: License and copyright notice + tag: include-copyright + - description: Indicate significant changes made to the code. + label: State Changes + tag: document-changes + - description: Source code must be made available when distributing the software. In the case of LGPL, the source for the library (and not the entire program) must be made available. + label: Disclose Source + tag: disclose-source + - description: The library may be used within a non-open-source application. + label: Library usage + tag: library-usage + - description: You must change the name of the software if you modify it. + label: Rename + tag: rename permitted: - commercial-use: - description: This software and derivatives may be used for commercial purposes. - label: Commercial Use - modifications: - description: This software may be modified. - label: Modification - distribution: - description: You may distribute this software. - label: Distribution - sublicense: - description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. - label: Sublicensing - private-use: - description: You may use and modify the software without distributing it. - label: Private Use - patent-grant: - description: This license provides an express grant of patent rights from the contributor to the recipient. - label: Patent Grant + - description: This software and derivatives may be used for commercial purposes. + label: Commercial Use + tag: commercial-use + - description: This software may be modified. + label: Modification + tag: modifications + - description: You may distribute this software. + label: Distribution + tag: distribution + - description: You may grant a sublicense to modify and distribute this software to third parties not included in the license. + label: Sublicensing + tag: sublicense + - description: You may use and modify the software without distributing it. + label: Private Use + tag: private-use + - description: This license provides an express grant of patent rights from the contributor to the recipient. + label: Patent Grant + tag: patent-grant forbidden: - trademark-use: - description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. - label: Use Trademark - no-liability: - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. - label: Hold Liable - no-sublicense: - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. - label: Sublicensing - modifications: - description: This software may not be modified. - label: Modification - distribution: - description: You may not distribute this software. - label: Distribution - sublicense: - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. - label: Sublicensing + - description: While this may be implicitly true of all licenses, this license explicitly states that you may NOT use the names, logos, or trademarks of contributors. + label: Use Trademark + tag: trademark-use + - description: Software is provided without warranty and the software author/license owner cannot be held liable for damages. + label: Hold Liable + tag: no-liability + - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. + label: Sublicensing + tag: no-sublicense + - description: This software may not be modified. + label: Modification + tag: modifications + - description: You may not distribute this software. + label: Distribution + tag: distribution + - description: You may not grant a sublicense to modify and distribute this software to third parties not included in the license. + label: Sublicensing + tag: sublicense exclude: - - CNAME - - Gemfile* - - script - - vendor - - app.coffee +- CNAME +- Gemfile* +- script +- vendor +- app.coffee diff --git a/_includes/license-overview.html b/_includes/license-overview.html index 91f5e66..d09130c 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -29,15 +29,19 @@ {% endfor %} - {% for type in types %} - - - - {% endfor %} + {% for type in types %} + + + + {% endfor %}

View full {{ variation.title }} license ยป

diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 77a9fa5..cdf0e18 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -24,8 +24,12 @@ {% for type in types %}

{{ type | capitalize }}

{% endfor %} diff --git a/javascripts/annotations.js b/javascripts/annotations.js index 6b0e7ad..ac706c7 100644 --- a/javascripts/annotations.js +++ b/javascripts/annotations.js @@ -4,7 +4,7 @@ var annotations = { {% for type_hash in site.rules %} "{{ type_hash[0] }}": { {% for rule_hash in type_hash[1] %} - "{{ rule_hash[0] }}" : "{{ rule_hash[1].description }}"{% if forloop.rindex0 > 0 %},{% endif %} + "{{ rule_hash.tag }}" : "{{ rule_hash.description }}"{% if forloop.rindex0 > 0 %},{% endif %} {% endfor %} }{% if forloop.rindex0 > 0 %},{% endif %} {% endfor %} From c75fee1469684da8df0502af1e281f0b0fa94adc Mon Sep 17 00:00:00 2001 From: Aidan Feldman Date: Fri, 29 Nov 2013 21:05:49 -0500 Subject: [PATCH 3/3] fix for license variations --- _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 d09130c..6b6c835 100644 --- a/_includes/license-overview.html +++ b/_includes/license-overview.html @@ -35,7 +35,7 @@ {% assign rules = site.rules[type] | sort: 'label' %} {% for rule_obj in rules %} {% assign req = rule_obj.tag %} - {% if page[type] contains req %} + {% if variation[type] contains req %}
  • {{ rule_obj.label }}
    • {% endif %} {% endfor %}