1
0
mirror of https://github.com/github/choosealicense.com synced 2024-12-22 12:50:24 +01:00

minor suggest-license edits

This commit is contained in:
Mike Linksvayer 2018-10-19 08:23:57 +02:00
parent a5d8c68fe6
commit 09f172e22e
4 changed files with 7 additions and 7 deletions

View File

@ -21,6 +21,7 @@
<script src="/assets/vendor/clipboard/dist/clipboard.min.js"></script> <script src="/assets/vendor/clipboard/dist/clipboard.min.js"></script>
<script> <script>
window.annotations = {{ site.data.rules | jsonify }}; window.annotations = {{ site.data.rules | jsonify }};
{% if page.collection == "licenses" %}
window.licenses = [ window.licenses = [
{% for license in site.licenses %} {% for license in site.licenses %}
{ {
@ -29,6 +30,7 @@
}{% unless forloop.last %},{% endunless %} }{% unless forloop.last %},{% endunless %}
{% endfor %} {% endfor %}
]; ];
{% endif %}
</script> </script>
<script src="/assets/js/app.js"></script> <script src="/assets/js/app.js"></script>
{% endif %} {% endif %}

View File

@ -1,13 +1,11 @@
<div class="sidebar"> <div class="sidebar">
<a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a> <a href="#" data-clipboard-target="#license-text" data-proofer-ignore="true" class="js-clipboard-button button">Copy license text to clipboard</a>
<h3>Suggest this license</h3> <h3 id="suggest-this-license">Suggest this license</h3>
<div class="repository-suggestion"> <div class="repository-suggestion">
<p>You can suggest this license to a Github repository to make it easier for other people to <p>Make a pull request to suggest this license fo 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 communicaton with project maintainers friendly.</p>
contribute - this is done by opening a pull request, therefore you need to authenticate with
your Github account to do this.</p>
<div class="input-wrapper"> <div class="input-wrapper">
<input type="text" data-license-id="{{ page.spdx-id }}" placeholder="Type a repository URL" id="repository-url" title="status" /> <input type="text" data-license-id="{{ page.spdx-id }}" placeholder="Enter GitHub repository URL" id="repository-url" title="status" />
<div class="status-indicator"></div> <div class="status-indicator"></div>
</div> </div>
</div> </div>

View File

@ -120,7 +120,7 @@ class LicenseSuggestion
if repositoryInfo.license # The repository already has a license if repositoryInfo.license # The repository already has a license
license = repositoryInfo.license license = repositoryInfo.license
@setStatus "Error", @repositoryLicense repositoryFullName, license @setStatus "Error", @repositoryLicense repositoryFullName, license
else # The repository is unlicensed else # The repository is not licensed
licenseUrl = encodeURIComponent "https://github.com/#{repositoryFullName}/community/license/new?template=#{@licenseId}" licenseUrl = encodeURIComponent "https://github.com/#{repositoryFullName}/community/license/new?template=#{@licenseId}"
# Provide the chance to the user log-in, since the URL to suggest a license is restricted # Provide the chance to the user log-in, since the URL to suggest a license is restricted
window.location.href = "https://github.com/login?return_to=#{licenseUrl}" window.location.href = "https://github.com/login?return_to=#{licenseUrl}"

View File

@ -22,7 +22,7 @@ If you find software that doesn't have a license, that generally means you have
Your options: Your options:
**Ask the maintainers nicely to add a license.** Unless the software includes strong indications to the contrary, lack of a license is probably an oversight. If the software is hosted on a site like GitHub, open an issue requesting a license and include a link to this site, or if you're bold and it's fairly obvious what license is most appropriate, open a pull request to add a license. **Ask the maintainers nicely to add a license.** Unless the software includes strong indications to the contrary, lack of a license is probably an oversight. If the software is hosted on a site like GitHub, open an issue requesting a license and include a link to this site. If you're bold and it's fairly obvious what license is most appropriate, open a pull request to add a license see "suggest this license" in the sidebar of the page for each license on this site (e.g., [MIT](/licenses/mit#suggest-this-license)).
**Don't use the software.** Find or create an alternative that is under an open source license. **Don't use the software.** Find or create an alternative that is under an open source license.