Commit 817a6699 authored by Jon Phillips's avatar Jon Phillips
Browse files

some small bug fixes

parent f8735de1
...@@ -104,7 +104,7 @@ ...@@ -104,7 +104,7 @@
<p>Whereas You are aware of certain of Your own patents, which You desire to identify and disclose as the following patents and patent applications ("Pledged Patents"):</p> <p>Whereas You are aware of certain of Your own patents, which You desire to identify and disclose as the following patents and patent applications ("Pledged Patents"):</p>
<p id="e-tmp-patent-more-url"> <p id="e-tmp-patent-more">
Number or Application Number<br /> Number or Application Number<br />
Country</p> Country</p>
...@@ -124,7 +124,7 @@ We agree to license the Contribution only under the terms of the license or lice ...@@ -124,7 +124,7 @@ We agree to license the Contribution only under the terms of the license or lice
<p id="e-tmp-outbound-option-2"> <p id="e-tmp-outbound-option-2">
We agree to license the Contribution only under the terms of the license(s) <span id="e-tmp-licenses">[LIST_OF_LICENSES]</span> (including any right to adop We agree to license the Contribution only under the terms of the following license(s) <span id="e-tmp-licenses">[LIST_OF_LICENSES]</span> (including any right to adop
t any future version of a license if permitted).</p> t any future version of a license if permitted).</p>
<p id="e-tmp-outbound-option-3">We agree to license the Contribution only under the terms of any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative.</p> <p id="e-tmp-outbound-option-3">We agree to license the Contribution only under the terms of any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative.</p>
......
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
<p>Whereas You are aware of certain of Your own patents, which You desire to identify and disclose as the following patents and patent applications ("Pledged Patents"):</p> <p>Whereas You are aware of certain of Your own patents, which You desire to identify and disclose as the following patents and patent applications ("Pledged Patents"):</p>
<p id="i-tmp-patent-more-url"> <p id="i-tmp-patent-more">
Number or Application Number<br /> Number or Application Number<br />
Country</p> Country</p>
...@@ -118,7 +118,7 @@ Country</p> ...@@ -118,7 +118,7 @@ Country</p>
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> 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="i-tmp-outbound-option-2"> <p id="i-tmp-outbound-option-2">
We agree to license the Contribution only under the terms of the license(s) <span id="i-tmp-licenses">[LIST_OF_LICENSES]</span> (including any right to adopt any future version of a license if permitted).</p> We agree to license the Contribution only under the terms of the following license(s) <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="i-tmp-outbound-option-3">We agree to license the Contribution only under the terms of any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative.</p> <p id="i-tmp-outbound-option-3">We agree to license the Contribution only under the terms of any licenses on the Free Software Foundation's list of "Recommended copyleft licenses" or approved by the Open Source Initiative.</p>
......
...@@ -63,6 +63,7 @@ var mediaLicenses = ''; ...@@ -63,6 +63,7 @@ var mediaLicenses = '';
var naField = 'Not Applicable'; var naField = 'Not Applicable';
var emptyField = '____________________'; var emptyField = '____________________';
var noneField = 'None.'
var outBeforeField = 'the following'; var outBeforeField = 'the following';
var outAfterField = 'license(s)'; var outAfterField = 'license(s)';
...@@ -126,6 +127,7 @@ var configs = { ...@@ -126,6 +127,7 @@ var configs = {
'your-name': '', 'your-name': '',
'your-title': '', 'your-title': '',
'your-address': '', 'your-address': '',
'your-patents': '',
'pos': 'apply', 'pos': 'apply',
'action': '' 'action': ''
}; };
...@@ -334,6 +336,17 @@ function updateConfigs () ...@@ -334,6 +336,17 @@ function updateConfigs ()
$("#i-tmp-signing-you-address").html( configs["your-address"] ); $("#i-tmp-signing-you-address").html( configs["your-address"] );
$("#e-tmp-signing-you-address").html( configs["your-address"] ); $("#e-tmp-signing-you-address").html( configs["your-address"] );
} }
if ( configs["your-patents"] )
{
$("#i-tmp-patent-more").html( nl2br( configs["your-patents"],true) );
$("#e-tmp-patent-more").html( nl2br( configs["your-patents"],true) );
}
// let's assume one signed this, but didn't input any patents
if ( configs["your-name"] && ! configs["your-patents"] )
{
$("#i-tmp-patent-more").html( noneField );
$("#e-tmp-patent-more").html( noneField );
}
if ( doDebug) if ( doDebug)
...@@ -404,12 +417,14 @@ function setFakeData () ...@@ -404,12 +417,14 @@ function setFakeData ()
'United States, Hong Kong, and China Mainland.'; 'United States, Hong Kong, and China Mainland.';
} }
/* function nl2br (str, is_xhtml)
function setShortUrl (data)
{ {
shortUrl = data; var breakTag = (is_xhtml || typeof is_xhtml === 'undefined') ?
'<br />' : '<br>';
return (str + '').replace(/([^>\r\n]?)(\r\n|\n\r|\r|\n)/g, '$1' +
breakTag + '$2');
} }
*/
function getShortUrl(uri) function getShortUrl(uri)
{ {
...@@ -428,7 +443,8 @@ function updateQuery4Form () ...@@ -428,7 +443,8 @@ function updateQuery4Form ()
// if need to debug, remove the '&@u2s' which converts to short url // if need to debug, remove the '&@u2s' which converts to short url
var signerFmt = encodeURIComponent(shortUrl + var signerFmt = encodeURIComponent(shortUrl +
'?your-date=@_time&your-name=@fullname&your-title=@title&' + '?your-date=@_time&your-name=@fullname&your-title=@title&' +
'your-address=@email-address&action=sign-@agreement-type&@u2s'); 'your-address=@email-address&your-patents=@Patent-IDs-and-Country_t&'+
'action=sign-@agreement-type&@u2s');
query4form = serviceUrl + '/query2form/?' + query4form = serviceUrl + '/query2form/?' +
'_replyto=' + projectemail + '&' + '_replyto=' + projectemail + '&' +
...@@ -558,12 +574,6 @@ function setOutboundOptionSame () ...@@ -558,12 +574,6 @@ function setOutboundOptionSame ()
$("#i-tmp-term-special").removeClass("nuke"); $("#i-tmp-term-special").removeClass("nuke");
$("#e-tmp-term-special").removeClass("nuke"); $("#e-tmp-term-special").removeClass("nuke");
/*
$("#i-tmp-licenses-2").hide();
$("#e-tmp-licenses-2").hide();
$("#i-tmp-licenses-2").addClass("nuke");
$("#e-tmp-licenses-2").addClass("nuke");
*/
fixPatentParagraph( 'the license or licenses that We ' + fixPatentParagraph( 'the license or licenses that We ' +
'are using on the Submission Date' ); 'are using on the Submission Date' );
...@@ -1209,8 +1219,10 @@ function testReviewPage () ...@@ -1209,8 +1219,10 @@ function testReviewPage ()
$("#e-tmp-patent-option-2").hide(); $("#e-tmp-patent-option-2").hide();
$("#e-tmp-patent-option-2").addClass("nuke"); $("#e-tmp-patent-option-2").addClass("nuke");
$("#outbound-special").show(); $("#i-tmp-outbound-special").show();
$("#outbound-special").removeClass("nuke"); $("#i-tmp-outbound-special").removeClass("nuke");
$("#e-tmp-outbound-special").show();
$("#e-tmp-outbound-special").removeClass("nuke");
} else { } else {
$("#i-tmp-patent-option-1").hide(); $("#i-tmp-patent-option-1").hide();
$("#i-tmp-patent-option-1").addClass("nuke"); $("#i-tmp-patent-option-1").addClass("nuke");
...@@ -1221,8 +1233,10 @@ function testReviewPage () ...@@ -1221,8 +1233,10 @@ function testReviewPage ()
$("#e-tmp-patent-option-2").show(); $("#e-tmp-patent-option-2").show();
$("#e-tmp-patent-option-2").removeClass("nuke"); $("#e-tmp-patent-option-2").removeClass("nuke");
$("#outbound-special").hide(); $("#i-tmp-outbound-special").hide();
$("#outbound-special").addClass("nuke"); $("#i-tmp-outbound-special").addClass("nuke");
$("#e-tmp-outbound-special").hide();
$("#e-tmp-outbound-special").addClass("nuke");
} }
......
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