Skip to content

GitLab

Commit d4e67216 authored by Jon Phillips's avatar Jon Phillips
Browse files

fixes

parent 6a7eb53e
Hide whitespace changes
Inline Side-by-side
agreement-template-entity.html
View file @ d4e67216
......@@ -38,7 +38,7 @@
<h3>2. LICENSE GRANT</h3>
<section id="license-option-1"><!-- Exclusive License Agreement -->
<section id="e-tmp-license-option-1"><!-- Exclusive License Agreement -->
<p>2.1 Copyright License to Us<p>
<p>Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, exclusive, perpetual and irrevocable license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contribution to use the Contribution by all means, including, but not limited to:</p>
......@@ -67,7 +67,7 @@
</section>
<section id="license-option-2"><!-- Non-Exclusive License Agreement -->
<section id="e-tmp-license-option-2"><!-- Non-Exclusive License Agreement -->
<p>2.1 Copyright License to Us</p>
......@@ -87,7 +87,7 @@
<h3>3. PATENTS</h3>
<section id="patent-option-1"><!-- Traditional Patent License -->
<section id="e-tmp-patent-option-1"><!-- Traditional Patent License -->
<p>3.1 Patent License</p>
......@@ -100,7 +100,7 @@
</section>
<section id="patent-option-2"><!-- Patent Pledge -->
<section id="e-tmp-patent-option-2"><!-- Patent Pledge -->
<p>3.1 Pledge of Identified Patents</p>
......@@ -118,21 +118,21 @@ Country</p>
</section>
<section id="outbound-section-all">
<section id="e-tmp-outbound-section-all">
<h3>4. License Obligations by US</h3>
<p id="outbound-option-1">
<p id="e-tmp-outbound-option-1">
We agree to license the Contribution only under the terms of the license or licenses that We are using on the Submission Date for the Material (including any rights to adopt any future version of a license).</p>
<p id="outbound-option-2">
<p id="e-tmp-outbound-option-2">
We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or the following additional licenses: <span id="e-tmp-licenses">[LIST_OF_LICENSES]</span> (including any right to adopt any future version of a license if permitted).</p>
<p id="outbound-option-3">We agree to license the Contribution only under the terms of the license or licenses that We are using on the Submission Date for the Material or any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative on or after the Submission Date, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license).</p>
<p id="e-tmp-outbound-option-3">We agree to license the Contribution only under the terms of the license or licenses that We are using on the Submission Date for the Material or any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative on or after the Submission Date, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license).</p>
<p id="outbound-media-license">
<p id="e-tmp-outbound-media-license">
In addition, We may use the following licenses for Documentation in the Contribution: <span id="e-tmp-media-licenses">[LIST_OF_MEDIA_LICENSES]</span> (including any right to adopt any future version of a license).</p>
<p id="outbound-special">We agree to license patents owned or controlled by you only to the extent necessary to (sub)license Your Contribution(s) and the combination of Your Contribution(s) with the Material under the terms of the <span id="e-tmp-licenses-2">[display licenses as chosen above]</span> license(s).</p>
<p id="e-tmp-outbound-special">We agree to license patents owned or controlled by you only to the extent necessary to (sub)license Your Contribution(s) and the combination of Your Contribution(s) with the Material under the terms of the <span id="e-tmp-licenses-2">[display licenses as chosen above]</span> license(s).</p>
</section>
......
agreement-template-individual.html
View file @ d4e67216
......@@ -33,7 +33,7 @@
<h3>2. LICENSE GRANT</h3>
<section id="license-option-1"><!-- Exclusive License Agreement -->
<section id="i-tmp-license-option-1"><!-- Exclusive License Agreement -->
<p>2.1 Copyright License to Us<p>
<p>Subject to the terms and conditions of this Agreement, You hereby grant to Us a worldwide, royalty-free, exclusive, perpetual and irrevocable license, with the right to transfer an unlimited number of non-exclusive licenses or to grant sublicenses to third parties, under the Copyright covering the Contribution to use the Contribution by all means, including, but not limited to:</p>
......@@ -62,7 +62,7 @@
</section>
<section id="license-option-2"><!-- Non-Exclusive License Agreement -->
<section id="i-tmp-license-option-2"><!-- Non-Exclusive License Agreement -->
<p>2.1 Copyright License to Us</p>
......@@ -82,7 +82,7 @@
<h3>3. PATENTS</h3>
<section id="patent-option-1"><!-- Traditional Patent License -->
<section id="i-tmp-patent-option-1"><!-- Traditional Patent License -->
<p>3.1 Patent License</p>
......@@ -95,7 +95,7 @@
</section>
<section id="patent-option-2"><!-- Patent Pledge -->
<section id="i-tmp-patent-option-2"><!-- Patent Pledge -->
<p>3.1 Pledge of Identified Patents</p>
......@@ -113,21 +113,21 @@ Country</p>
</section>
<section id="outbound-section-all">
<section id="i-tmp-outbound-section-all">
<h3>4. License Obligations by US</h3>
<p id="outbound-option-1">
<p id="i-tmp-outbound-option-1">
We agree to license the Contribution only under the terms of the license or licenses that We are using on the Submission Date for the Material (including any rights to adopt any future version of a license).</p>
<p id="outbound-option-2">
<p id="i-tmp-outbound-option-2">
We agree to license the Contribution only under the terms of the license or licenses which We are using on the Submission Date for the Material or the following additional licenses: <span id="i-tmp-licenses">[LIST_OF_LICENSES]</span> (including any right to adopt any future version of a license if permitted).</p>
<p id="outbound-option-3">We agree to license the Contribution only under the terms of the license or licenses that We are using on the Submission Date for the Material or any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative on or after the Submission Date, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license).</p>
<p id="i-tmp-outbound-option-3">We agree to license the Contribution only under the terms of the license or licenses that We are using on the Submission Date for the Material or any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative on or after the Submission Date, whether or not such licenses are subsequently disapproved (including any right to adopt any future version of a license).</p>
<p id="outbound-media-license">
<p id="i-tmp-outbound-media-license">
In addition, We may use the following licenses for Documentation in the Contribution: <span id="i-tmp-media-licenses">[LIST_OF_MEDIA_LICENSES]</span> (including any right to adopt any future version of a license).</p>
<p id="outbound-special">We agree to license patents owned or controlled by you only to the extent necessary to (sub)license Your Contribution(s) and the combination of Your Contribution(s) with the Material under the terms of the <span id="i-tmp-licenses-2">[display licenses as chosen above]</span> license(s).</p>
<p id="i-tmp-outbound-special">We agree to license patents owned or controlled by you only to the extent necessary to (sub)license Your Contribution(s) and the combination of Your Contribution(s) with the Material under the terms of the <span id="i-tmp-licenses-2">[display licenses as chosen above]</span> license(s).</p>
</section>
......
js/chooser.js
View file @ d4e67216
......@@ -51,6 +51,15 @@ var mediaLicenses = '';
var naField = 'Not Applicable';
var emptyField = '____________________';
var dictionary = {
'traditional': 'Traditional Patent License',
'Traditional': 'Traditional Patent License',
'patent-pledge': 'Patent Pledge',
'Patent-Pledge': 'Patent Pledge',
'non-exclusive': 'Non-Exclusive'
};
/** could even set defaults here
*
* Query String Possible Parameters:
......@@ -295,6 +304,14 @@ function ucFirst(string)
return string.charAt(0).toUpperCase() + string.slice(1);
}
function ucWords(string) {
return (string + '').
replace(/^([a-z\u00E0-\u00FC])|\s+([a-z\u00E0-\u00FC])/g,
function($1) {
return $1.toUpperCase();
});
}
function validateEmail(email)
{
var re = /\S+@\S+\.\S+/;
......@@ -331,8 +348,10 @@ function setOutboundOptionSame ()
$("#outbound-option-same").val() );
*/
$("#outbound-section-all").show();
$("#outbound-section-all").removeClass("nuke");
$("#i-tmp-outbound-section-all").show();
$("#i-tmp-outbound-section-all").removeClass("nuke");
$("#e-tmp-outbound-section-all").show();
$("#e-tmp-outbound-section-all").removeClass("nuke");
/* put back order of sections after section 4 */
$("#i-tmp-digit-disclaimer").html( '5' );
......@@ -377,12 +396,18 @@ function setOutboundOptionSame ()
$("#e-tmp-licenses-2").addClass("nuke");
$("#outbound-option-1").show();
$("#outbound-option-1").removeClass("nuke");
$("#outbound-option-2").hide();
$("#outbound-option-2").addClass("nuke");
$("#outbound-option-3").hide();
$("#outbound-option-3").addClass("nuke");
$("#i-tmp-outbound-option-1").show();
$("#i-tmp-outbound-option-1").removeClass("nuke");
$("#i-tmp-outbound-option-2").hide();
$("#i-tmp-outbound-option-2").addClass("nuke");
$("#i-tmp-outbound-option-3").hide();
$("#i-tmp-outbound-option-3").addClass("nuke");
$("#e-tmp-outbound-option-1").show();
$("#e-tmp-outbound-option-1").removeClass("nuke");
$("#e-tmp-outbound-option-2").hide();
$("#e-tmp-outbound-option-2").addClass("nuke");
$("#e-tmp-outbound-option-3").hide();
$("#e-tmp-outbound-option-3").addClass("nuke");
}
function setOutboundOptionSameLicenses ()
......@@ -394,8 +419,10 @@ function setOutboundOptionSameLicenses ()
configs['outbound-option'] = 'same-licenses';
$("#outbound-section-all").show();
$("#outbound-section-all").removeClass("nuke");
$("#i-tmp-outbound-section-all").show();
$("#i-tmp-outbound-section-all").removeClass("nuke");
$("#e-tmp-outbound-section-all").show();
$("#e-tmp-outbound-section-all").removeClass("nuke");
/* put back order of sections after section 4 */
$("#i-tmp-digit-disclaimer").html( '5' );
......@@ -440,12 +467,18 @@ function setOutboundOptionSameLicenses ()
$("#e-tmp-licenses-2").removeClass("nuke");
$("#outbound-option-1").hide();
$("#outbound-option-1").addClass("nuke");
$("#outbound-option-2").show();
$("#outbound-option-2").removeClass("nuke");
$("#outbound-option-3").hide();
$("#outbound-option-3").addClass("nuke");
$("#i-tmp-outbound-option-1").hide();
$("#i-tmp-outbound-option-1").addClass("nuke");
$("#i-tmp-outbound-option-2").show();
$("#i-tmp-outbound-option-2").removeClass("nuke");
$("#i-tmp-outbound-option-3").hide();
$("#i-tmp-outbound-option-3").addClass("nuke");
$("#e-tmp-outbound-option-1").hide();
$("#e-tmp-outbound-option-1").addClass("nuke");
$("#e-tmp-outbound-option-2").show();
$("#e-tmp-outbound-option-2").removeClass("nuke");
$("#e-tmp-outbound-option-3").hide();
$("#e-tmp-outbound-option-3").addClass("nuke");
}
function setOutboundOptionFsf ()
......@@ -462,8 +495,10 @@ function setOutboundOptionFsf ()
$("#outbound-option-fsf").val() );
*/
$("#outbound-section-all").show();
$("#outbound-section-all").removeClass("nuke");
$("#i-tmp-outbound-section-all").show();
$("#i-tmp-outbound-section-all").removeClass("nuke");
$("#e-tmp-outbound-section-all").show();
$("#e-tmp-outbound-section-all").removeClass("nuke");
/* put back order of sections after section 4 */
$("#i-tmp-digit-disclaimer").html( '5' );
......@@ -509,12 +544,18 @@ function setOutboundOptionFsf ()
$("#e-tmp-licenses-2").addClass("nuke");
$("#outbound-option-1").hide();
$("#outbound-option-1").addClass("nuke");
$("#outbound-option-2").hide();
$("#outbound-option-2").addClass("nuke");
$("#outbound-option-3").show();
$("#outbound-option-3").removeClass("nuke");
$("#i-tmp-outbound-option-1").hide();
$("#i-tmp-outbound-option-1").addClass("nuke");
$("#i-tmp-outbound-option-2").hide();
$("#i-tmp-outbound-option-2").addClass("nuke");
$("#i-tmp-outbound-option-3").show();
$("#i-tmp-outbound-option-3").removeClass("nuke");
$("#e-tmp-outbound-option-1").hide();
$("#e-tmp-outbound-option-1").addClass("nuke");
$("#e-tmp-outbound-option-2").hide();
$("#e-tmp-outbound-option-2").addClass("nuke");
$("#e-tmp-outbound-option-3").show();
$("#e-tmp-outbound-option-3").removeClass("nuke");
}
function setOutboundOptionNoCommitment ()
......@@ -529,16 +570,24 @@ function setOutboundOptionNoCommitment ()
$("#outbound-option-no-commitment").val() );
*/
$("#outbound-option-1").hide();
$("#outbound-option-1").addClass("nuke");
$("#outbound-option-2").hide();
$("#outbound-option-2").addClass("nuke");
$("#outbound-option-3").hide();
$("#outbound-option-3").addClass("nuke");
$("#i-tmp-outbound-option-1").hide();
$("#i-tmp-outbound-option-1").addClass("nuke");
$("#i-tmp-outbound-option-2").hide();
$("#i-tmp-outbound-option-2").addClass("nuke");
$("#i-tmp-outbound-option-3").hide();
$("#i-tmp-outbound-option-3").addClass("nuke");
$("#e-tmp-outbound-option-1").hide();
$("#e-tmp-outbound-option-1").addClass("nuke");
$("#e-tmp-outbound-option-2").hide();
$("#e-tmp-outbound-option-2").addClass("nuke");
$("#e-tmp-outbound-option-3").hide();
$("#e-tmp-outbound-option-3").addClass("nuke");
/* remove entire section 4 */
$("#outbound-section-all").hide();
$("#outbound-section-all").addClass("nuke");
$("#i-tmp-outbound-section-all").hide();
$("#i-tmp-outbound-section-all").addClass("nuke");
$("#e-tmp-outbound-section-all").hide();
$("#e-tmp-outbound-section-all").addClass("nuke");
/* reorder sections now that section 4 gone */
$("#i-tmp-digit-disclaimer").html( '4' );
......@@ -840,13 +889,23 @@ function testReviewPage ()
$("#e-tmp-contributor-exclusivity").html( emptyField );
configs['agreement-exclusivity'] = '';
} else{
var cleanVersion = '';
if ( $("#agreement-exclusivity").val() in dictionary )
{
cleanVersion =
dictionary[$("#agreement-exclusivity").val()];
} else {
cleanVersion = $("#agreement-exclusivity").val();
}
$("#review-agreement-exclusivity").html(
ucFirst( $("#agreement-exclusivity").val() ) );
cleanVersion );
$("#i-tmp-contributor-exclusivity").html(
ucFirst( $("#agreement-exclusivity").val() ) );
cleanVersion );
$("#e-tmp-contributor-exclusivity").html(
ucFirst( $("#agreement-exclusivity").val() ) );
cleanVersion );
configs['agreement-exclusivity'] =
$("#agreement-exclusivity").val();
}
......@@ -854,15 +913,25 @@ function testReviewPage ()
if ( $("#agreement-exclusivity").val() == 'exclusive' )
{
$("#license-option-1").show();
$("#license-option-1").removeClass("nuke");
$("#license-option-2").hide();
$("#license-option-2").addClass("nuke");
$("#i-tmp-license-option-1").show();
$("#i-tmp-license-option-1").removeClass("nuke");
$("#i-tmp-license-option-2").hide();
$("#i-tmp-license-option-2").addClass("nuke");
$("#e-tmp-license-option-1").show();
$("#e-tmp-license-option-1").removeClass("nuke");
$("#e-tmp-license-option-2").hide();
$("#e-tmp-license-option-2").addClass("nuke");
} else {
$("#license-option-1").hide();
$("#license-option-1").addClass("nuke");
$("#license-option-2").show();
$("#license-option-2").removeClass("nuke");
$("#i-tmp-license-option-1").hide();
$("#i-tmp-license-option-1").addClass("nuke");
$("#i-tmp-license-option-2").show();
$("#i-tmp-license-option-2").removeClass("nuke");
$("#e-tmp-license-option-1").hide();
$("#e-tmp-license-option-1").addClass("nuke");
$("#e-tmp-license-option-2").show();
$("#e-tmp-license-option-2").removeClass("nuke");
}
......@@ -925,31 +994,47 @@ function testReviewPage ()
setOutboundOptionNoCommitment();
var cleanVersion = '';
if ( $("#patent-type").val() in dictionary )
{
cleanVersion =
dictionary[$("#patent-type").val()];
} else {
cleanVersion = $("#patent-type").val();
}
$("#review-patent-type").html(
$("#patent-type").val() );
configs['patent-option'] = $("#patent-type").val();
cleanVersion );
$("#i-tmp-patent-option").html(
$("#patent-type").val() );
cleanVersion );
$("#e-tmp-patent-option").html(
$("#patent-type").val() );
cleanVersion );
configs['patent-option'] = $("#patent-type").val();
if ( $("#patent-type").val() == 'Traditional' )
{
$("#patent-option-1").show();
$("#patent-option-1").removeClass("nuke");
$("#patent-option-2").hide();
$("#patent-option-2").addClass("nuke");
$("#i-tmp-patent-option-1").show();
$("#i-tmp-patent-option-1").removeClass("nuke");
$("#i-tmp-patent-option-2").hide();
$("#i-tmp-patent-option-2").addClass("nuke");
$("#e-tmp-patent-option-1").show();
$("#e-tmp-patent-option-1").removeClass("nuke");
$("#e-tmp-patent-option-2").hide();
$("#e-tmp-patent-option-2").addClass("nuke");
$("#outbound-special").show();
$("#outbound-special").removeClass("nuke");
} else {
$("#patent-option-1").hide();
$("#patent-option-1").addClass("nuke");
$("#patent-option-2").show();
$("#patent-option-2").removeClass("nuke");
$("#i-tmp-patent-option-1").hide();
$("#i-tmp-patent-option-1").addClass("nuke");
$("#i-tmp-patent-option-2").show();
$("#i-tmp-patent-option-2").removeClass("nuke");
$("#e-tmp-patent-option-1").hide();
$("#e-tmp-patent-option-1").addClass("nuke");
$("#e-tmp-patent-option-2").show();
$("#e-tmp-patent-option-2").removeClass("nuke");
$("#outbound-special").hide();
$("#outbound-special").addClass("nuke");
......@@ -1014,6 +1099,7 @@ function testApplyPage ()
'_action[0]=' + serviceUrl + '/query2email/&' +
'_action[1]=' + serviceUrl + '/query2update/&' +
'_next=View%20More%20Contributor%20License%20Agreement%20Signers.&' +
'_success=Thank you for using contributoragreements.org. The agreement has been signed and sent via E-Mail and will not be stored.&' +
'_submit=Sign Your Contributor License Agreement.';
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment