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

fixes

parent 66347f9c
...@@ -65,6 +65,7 @@ ...@@ -65,6 +65,7 @@
</ul> </ul>
<!--
<label class="radio"> <label class="radio">
<input type="radio" name="contributor-options" id="contributor-option-entity" value="entity" checked> <input type="radio" name="contributor-options" id="contributor-option-entity" value="entity" checked>
This is an Entity Contributor Agreement. This is an Entity Contributor Agreement.
...@@ -74,7 +75,7 @@ ...@@ -74,7 +75,7 @@
This is an Individual Contributor Agreement. This is an Individual Contributor Agreement.
</label> </label>
<hr /> <hr /> -->
<label for="beneficiary-name" id="beneficiary-name-label" data-toggle="popover" data-trigger="hover" data-title="Entity" data-content="Enter the name of the entity hosting your project. If you don't have an entity that can be listed here, try to set up an entity or find a trustee."> <label for="beneficiary-name" id="beneficiary-name-label" data-toggle="popover" data-trigger="hover" data-title="Entity" data-content="Enter the name of the entity hosting your project. If you don't have an entity that can be listed here, try to set up an entity or find a trustee.">
Entity</label> Entity</label>
...@@ -306,11 +307,6 @@ class="input-block-level" placeholder="If one or more of your preferred licenses ...@@ -306,11 +307,6 @@ class="input-block-level" placeholder="If one or more of your preferred licenses
<th>Option</th><th>Choice</th> <th>Option</th><th>Choice</th>
</tr> </tr>
<tr>
<td>Agreement Type</td>
<td id="review-agreement-type"></td>
</tr>
<tr> <tr>
<td>Entity Name</td> <td>Entity Name</td>
<td id="review-beneficiary-name"></td> <td id="review-beneficiary-name"></td>
......
...@@ -24,6 +24,9 @@ ...@@ -24,6 +24,9 @@
var doDebug = false; var doDebug = false;
var debugNeedle = 1337; var debugNeedle = 1337;
// var serviceUrl = 'http://service.fabricatorz.com';
var serviceUrl = 'http://service.localhost';
var generalPageIndex = 0; var generalPageIndex = 0;
var isGeneralPageOk = false; var isGeneralPageOk = false;
...@@ -635,6 +638,7 @@ function testReviewPage () ...@@ -635,6 +638,7 @@ function testReviewPage ()
if ( doDebug) if ( doDebug)
console.log("At testReviewPage"); console.log("At testReviewPage");
/*
if ( $("#contributor-option-entity").prop("checked") ) if ( $("#contributor-option-entity").prop("checked") )
{ {
$("#review-agreement-type").text( $("#review-agreement-type").text(
...@@ -663,6 +667,7 @@ function testReviewPage () ...@@ -663,6 +667,7 @@ function testReviewPage ()
$("#definition-option-2").show(); $("#definition-option-2").show();
$("#definition-option-1").removeClass("nuke"); $("#definition-option-1").removeClass("nuke");
} }
*/
if ( !$("#beneficiary-name").val() ) if ( !$("#beneficiary-name").val() )
$("#review-beneficiary-name").html( emptyField ); $("#review-beneficiary-name").html( emptyField );
...@@ -840,6 +845,7 @@ function testApplyPage () ...@@ -840,6 +845,7 @@ function testApplyPage ()
isApplyPageOk = true; isApplyPageOk = true;
/* NEED TO REVIEW AFTER DECISIONS */ /* NEED TO REVIEW AFTER DECISIONS */
/*
if ( $("#contributor-option-entity").prop("checked") ) if ( $("#contributor-option-entity").prop("checked") )
{ {
$("#apply-individual").hide(); $("#apply-individual").hide();
...@@ -850,6 +856,9 @@ function testApplyPage () ...@@ -850,6 +856,9 @@ function testApplyPage ()
$("#apply-individual").show(); $("#apply-individual").show();
$("#apply-entity").hide(); $("#apply-entity").hide();
} }
*/
$("#apply-individual").show();
$("#apply-entity").show();
// creates the querystring to recreate current wizard state // creates the querystring to recreate current wizard state
finalQueryString = $.param(configs); finalQueryString = $.param(configs);
...@@ -864,9 +873,9 @@ function testApplyPage () ...@@ -864,9 +873,9 @@ function testApplyPage ()
var projectemail = ( configs["project-email"] ) ? configs["project-email"] : ""; var projectemail = ( configs["project-email"] ) ? configs["project-email"] : "";
var query4form = 'http://service.fabricatorz.com/query2form/?' + var query4form = serviceUrl + '/query2form/?' +
'_replyto=' + projectemail + '&' + '_replyto=' + projectemail + '&' +
'_subject=Contributor License Agreement E-Signing Form' + '&' + '_subject=Contributor License Agreement E-Signing' + '&' +
'_body=Fill out the following form, then sign your initials to complete the Contributor License Agreement.' + '&' + '_body=Fill out the following form, then sign your initials to complete the Contributor License Agreement.' + '&' +
'fullname=&' + 'fullname=&' +
'title=&' + 'title=&' +
...@@ -874,12 +883,17 @@ function testApplyPage () ...@@ -874,12 +883,17 @@ function testApplyPage ()
'email-address=&' + 'email-address=&' +
'physical-address=&' + 'physical-address=&' +
'your-initials=&' + 'your-initials=&' +
'_action=http://service.fabricatorz.com/query2email/&' + '_action[0]=' + serviceUrl + '/query2email/&' +
'_submit=sign'; '_action[1]=' + serviceUrl + '/query2update/&' +
'_next=View%20More%20Contributor%20License%20Agreement%20Signers.&' +
'_submit=Sign Your Contributor License Agreement.';
if ( "" != configs["project-email"] ) if ( "" != configs["project-email"] )
{ {
$("#link-esign").attr("href", query4form); $("#link-esign").attr("href", query4form);
$("#link-esign").addClass('btn-success');
$("#link-esign").removeClass('btn-danger');
$("#link-esign").html("Link to E-Signing Form");
} else { } else {
$("#link-esign").html( 'Need Project Email' ); $("#link-esign").html( 'Need Project Email' );
$("#link-esign").removeClass('btn-success'); $("#link-esign").removeClass('btn-success');
......
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