From 37e3a00efbe5105abd011137ca8d03f46b4f4be6 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 30 May 2016 18:20:45 -0700 Subject: [PATCH 1/4] add spdx id w/hint about adding to pkg description to sidebar --- _includes/sidebar.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index fc174ba..32ee06a 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -12,7 +12,9 @@ Note: {{ page.note | markdownify | remove: '

' | remove: '

' }}

{% endif %} +

You can also add {{ page.spdx-id }}, the standard identifier for this license, to your project's package description, if applicable. Examples: Node.js, Ruby, and Rust.

+ {% if page.source %}
From 6b2eaebac570c98f84813453f2635b31daa41ef6 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Mon, 30 May 2016 18:34:51 -0700 Subject: [PATCH 2/4] add '+' to spdx id if _GPL --- _includes/sidebar.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 32ee06a..865b81a 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -12,7 +12,9 @@ Note: {{ page.note | markdownify | remove: '

' | remove: '

' }}

{% endif %} -

You can also add {{ page.spdx-id }}, the standard identifier for this license, to your project's package description, if applicable. Examples: Node.js, Ruby, and Rust.

+ {% assign xgpl = false %} + {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} +

You can also add {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} to disallow future versions){% endif %}, the standard identifier for this license, to your project's package description, if applicable. Examples: Node.js, Ruby, and Rust.

{% if page.source %} From 2e7b84b816c981e50ed24068329d6db31b5b65c9 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 2 Jun 2016 11:57:32 -0700 Subject: [PATCH 3/4] reword: note optional, mention effect; make slightly less prominent --- _includes/sidebar.html | 2 +- assets/css/application.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 865b81a..6922068 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -14,7 +14,7 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

You can also add {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} to disallow future versions){% endif %}, the standard identifier for this license, to your project's package description, if applicable. Examples: Node.js, Ruby, and Rust.

+

The standard identifier for this license is {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} to disallow future versions){% endif %}. Optionally, you can add this to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

{% if page.source %} diff --git a/assets/css/application.scss b/assets/css/application.scss index 5380ccd..02ae702 100644 --- a/assets/css/application.scss +++ b/assets/css/application.scss @@ -286,6 +286,10 @@ strong { width: 100%; } +.note { + color: #687072; +} + .button { -webkit-border-radius: 3px; -moz-border-radius: 3px; From f09d10922f4264ded719e54d7be122f13fecd629 Mon Sep 17 00:00:00 2001 From: Mike Linksvayer Date: Thu, 2 Jun 2016 12:17:20 -0700 Subject: [PATCH 4/4] reword, emphasize optional --- _includes/sidebar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/sidebar.html b/_includes/sidebar.html index 6922068..9b4bacc 100644 --- a/_includes/sidebar.html +++ b/_includes/sidebar.html @@ -14,7 +14,7 @@ {% endif %} {% assign xgpl = false %} {% if page.spdx-id contains 'GPL' %}{% assign xgpl = true %}{% endif %} -

The standard identifier for this license is {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} to disallow future versions){% endif %}. Optionally, you can add this to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

+

Optional: Add {{ page.spdx-id }}{% if xgpl %}+{% endif %}{% if xgpl %} (or {{ page.spdx-id }} to disallow future versions){% endif %} to your project's package description, if applicable (e.g., Node.js, Ruby, and Rust). This will ensure the license is displayed in package directories.

{% if page.source %}