1
0
mirror of https://github.com/github/choosealicense.com synced 2024-11-12 22:48:54 +01:00

Merge pull request #710 from github/rmtrailingwhitespace

rm unneeded trailing whitespace from various files
This commit is contained in:
Mike Linksvayer 2019-12-26 11:59:52 -08:00 committed by GitHub
commit e32336e5a8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 52 additions and 52 deletions

View File

@ -23,7 +23,7 @@
window.annotations = {{ site.data.rules | jsonify }};
{% if page.collection == "licenses" %}
window.licenses = [
{% for license in site.licenses %}
{% for license in site.licenses %}
{
"title": "{{ license.title | escape }}",
"spdx_id": "{{ license.spdx-id | escape }}"

View File

@ -2,7 +2,7 @@
<a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a>
<h3 id="suggest-this-license">Suggest this license</h3>
<div class="repository-suggestion">
<div class="repository-suggestion">
<p>Make a pull request to suggest this license for a project that is <a href="/no-permission/">not licensed</a>. Please be polite: see if a license has already been suggested, try to suggest a license fitting for the project's <a href="/community/">community</a>, and keep your communication with project maintainers friendly.</p>
<div class="input-wrapper">
<input type="text" data-license-id="{{ page.spdx-id }}" placeholder="Enter GitHub repository URL" id="repository-url" title="status" />

View File

@ -1,9 +1,9 @@
{% include header.html %}
<div class="clearfix">
<div class="license-body">
{% if page.nickname %}
<p class="license-nickname">
{{ page.nickname }}
@ -13,9 +13,9 @@
<p>
{{ page.description }}
</p>
<div class="license-page-details">
<table class="license-rules">
<tr>
{% assign types = "permissions|conditions|limitations" | split: "|" %}
@ -42,11 +42,11 @@
{% endfor %}
</tr>
</table>
</div>
<pre id="license-text">{{ content | replace:"<", "&lt;" | replace:">", "&gt;" }}</pre>
</div> <!-- /license-body -->
{% include sidebar.html %}

View File

@ -4,7 +4,7 @@ spdx-id: CECILL-2.1
description: Strong copyleft license made by three French public research organisations, CEA, CNRS, and Inria, compatible with AGPL-3.0, EUPL-1.1, and GPL-2.0, or later versions of those licenses.
how: Create a text file (typically named LICENSE or LICENCE) in the root of your source code and copy the text of the license into the file.
how: Create a text file (typically named LICENSE or LICENCE) in the root of your source code and copy the text of the license into the file.
using:
- BMC-Tools: https://github.com/ANSSI-FR/bmc-tools/blob/master/LICENCE.txt
@ -22,7 +22,7 @@ conditions:
- include-copyright
- disclose-source
- same-license
limitations:
- liability
- warranty
@ -102,7 +102,7 @@ titulaire des droits patrimoniaux décide de soumettre l'exploitation aux
dispositions qu'il contient.
Une liste de questions fréquemment posées se trouve sur le site web
officiel de la famille des licences CeCILL
officiel de la famille des licences CeCILL
(http://www.cecill.info/index.fr.html) pour toute clarification qui
serait nécessaire.

View File

@ -294,8 +294,8 @@ No third-party beneficiary rights are created under this Agreement.
Exhibit A - Form of Secondary Licenses Notice
"This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set forth
"This Source Code may also be made available under the following
Secondary Licenses when the conditions for such availability set forth
in the Eclipse Public License, v. 2.0 are satisfied: {name license(s),
version(s), and exceptions or additional permissions here}."

View File

@ -7,7 +7,7 @@ description: The University of Illinois/NCSA Open Source License, or UIUC licens
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 [project] with the project organization, if any, that sponsors this work.
using:
using:
- LLDB: https://github.com/llvm-mirror/lldb/blob/master/LICENSE.TXT
- ROCR-Runtime: https://github.com/RadeonOpenCompute/ROCR-Runtime/blob/master/LICENSE.txt
- RLTK: https://github.com/chriswailes/RLTK/blob/master/LICENSE
@ -27,37 +27,37 @@ limitations:
---
University of Illinois/NCSA Open Source License
University of Illinois/NCSA Open Source License
Copyright (c) [year] [fullname]. All rights reserved.
Copyright (c) [year] [fullname]. All rights reserved.
Developed by: [project]
[fullname]
Developed by: [project]
[fullname]
[projecturl]
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal with the Software without restriction,
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation files
(the "Software"), to deal with the Software without restriction,
including without limitation the rights to use, copy, modify, merge,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
publish, distribute, sublicense, and/or sell copies of the Software,
and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:
* Redistributions of source code must retain the above copyright notice,
* Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimers.
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimers in the
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimers in the
documentation and/or other materials provided with the distribution.
* Neither the names of [fullname], [project] nor the names of its
* Neither the names of [fullname], [project] nor the names of its
contributors may be used to endorse or promote products derived from
this Software without specific prior written permission.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
CONTRIBUTORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS WITH
THE SOFTWARE.

View File

@ -2,7 +2,7 @@
title: PostgreSQL License
spdx-id: PostgreSQL
description: A very short, BSD-style license, used specifically for PostgreSQL.
description: A very short, BSD-style license, used specifically for PostgreSQL.
how: To use it, say that it is The PostgreSQL License, and then substitute the copyright year and name of the copyright holder into the body of the license. Then put the license into a prominent file ("COPYRIGHT", "LICENSE" or "COPYING" are common names for this file) in your software distribution.

View File

@ -315,16 +315,16 @@ strong {
border-radius: 50%;
background: #fff;
animation: none;
border: 4px solid #ddd;
border: 4px solid #ddd;
}
.input-wrapper .status-indicator.fetching {
.input-wrapper .status-indicator.fetching {
border-right-color: transparent;
animation: rotate 0.8s infinite linear;
}
.input-wrapper .status-indicator.error {
border: 4px solid #c6403d;
.input-wrapper .status-indicator.error {
border: 4px solid #c6403d;
}
@keyframes rotate {

View File

@ -71,7 +71,7 @@ class Choosealicense
# Post-copy user feedback callback
clipboardComplete: (client, args) ->
@textContent = "Copied!"
# Initializes the repository suggestion feature
initLicenseSuggestion: ->
inputEl = $("#repository-url")
@ -83,7 +83,7 @@ class LicenseSuggestion
constructor: (@inputEl, @licenseId, @statusIndicator) ->
@setupTooltips()
@bindEventHandlers()
# Initializes tooltips on the input element
setupTooltips: =>
@inputEl.qtip
@ -98,12 +98,12 @@ class LicenseSuggestion
at: "bottom center"
style:
classes: "qtip-shadow"
# Main event handlers for user input
bindEventHandlers: =>
bindEventHandlers: =>
@inputEl.on "input", (event) =>
@setStatus ""
.on "keyup", (event) =>
.on "keyup", (event) =>
if event.keyCode == 13 and event.target.value
# Validate the user input first
try
@ -111,8 +111,8 @@ class LicenseSuggestion
catch
@setStatus "Error", "Invalid URL."
return
@setStatus "Fetching"
@setStatus "Fetching"
@fetchInfoFromGithubAPI repositoryFullName, (err, repositoryInfo=null) =>
if (err)
@setStatus "Error", err.message
@ -137,7 +137,7 @@ class LicenseSuggestion
.slice 0, 1
.join ""
return username + '/' + project
# Displays an indicator and tooltips to the user about the current status
setStatus: (status="", message="") =>
statusClass = status.toLowerCase()
@ -157,25 +157,25 @@ class LicenseSuggestion
else
@inputEl.qtip("api").hide()
@statusIndicator.removeClass('fetching error')
# Fetches information about a repository from the Github API
fetchInfoFromGithubAPI: (repositoryFullName, callback) ->
$.getJSON "https://api.github.com/repos/"+repositoryFullName, (info) ->
callback null, info
.fail (e) ->
.fail (e) ->
if e.status == 404
callback new Error "Repository <b>#{repositoryFullName}</b> not found."
else
callback new Error "Network error when trying to get information about <b>#{repositoryFullName}</b>."
# Generates a message showing that a repository is already licensed
repositoryLicense: (repositoryFullName, license) ->
foundLicense = window.licenses.find (lic) -> lic.spdx_id == license.spdx_id
if foundLicense # Links the license to its page on this site
"The repository <b> #{repositoryFullName}</b> is already licensed under the
"The repository <b> #{repositoryFullName}</b> is already licensed under the
<a href='/licenses/#{foundLicense.spdx_id.toLowerCase()}'><b>#{foundLicense.title}</b></a>."
else
"The repository <b> #{repositoryFullName}</b> is already licensed."
$ ->
new Choosealicense()