Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Update cla.html to clarify signin flow #1034

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

srl295
Copy link

@srl295 srl295 commented Dec 18, 2023

fyi @annebright @markusicu @sffc @dbaron

- Change "agree" to "continue" for buttons that won't actually agree but require sign-in
- Change "Sign-in" to "login" to avoid confusion with "signing a CLA"
- Hide the privacy checkbox if there are custom fields AND the user isn't signed in
- for: cla-assistant#1033
Copy link

cla-assistant bot commented Dec 18, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

cla-assistant bot commented Dec 18, 2023

CLA assistant check
Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.
You have signed the CLA already but the status is still pending? Let us recheck it.

Comment on lines +22 to 26
<label ng-class="required" ng-show="linkedItem.privacyPolicy && (!hasCustomFields || user.value)">
<input ng-disabled="signed" ng-model="privacyPolicyAccepted" type="checkbox" /> I accept that the information I provide to sign this CLA will be maintained in accordance with project
owner's
<a class="highlighted-link" ng-href="{{linkedItem.privacyPolicy}}" target="space">privacy policy</a> *
</label>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Don't show this checkbox unless there are no custom fields OR if the user's signed in. Otherwise, they'll just have to click it again.

<input ng-disabled="signed" ng-model="privacyPolicyAccepted" type="checkbox" /> I accept that the information I provide to sign this CLA will be maintained in accordance with project
owner's
<a class="highlighted-link" ng-href="{{linkedItem.privacyPolicy}}" target="space">privacy policy</a> *
</label>
<form class="row" ng-if="hasCustomFields">
<p>
<button class="btn btn-info btn-lg" ng-show="hasCustomFields && !signed && linkedItem && claText && !user.value" ng-click="signIn()">Sign in with GitHub to agree</button>
<button class="btn btn-info btn-lg" ng-show="hasCustomFields && !signed && linkedItem && claText && !user.value" ng-click="signIn()">Login with GitHub to continue</button>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the major change. Clicking this button does not agree, it just signs you in so you can see the custom fields, and enables the real "I agree" button.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree that this change (changing "to agree" to "to continue") fixes the part that I found confusing.

@@ -36,8 +36,8 @@ <h4>{{titleMsg()}}</h4>
</form>
<p class="row" ng-hide="signed">
<button class="btn btn-info btn-lg" ng-show="hasCustomFields && !signed && linkedItem && claText && user.value" ng-disabled="(hasCustomFields && !isValid()) || (linkedItem.privacyPolicy && !privacyPolicyAccepted)"
ng-click="agree()">I agree</button>
<button class="btn btn-info btn-lg" ng-show="!hasCustomFields && !signed && linkedItem && claText" ng-click="agree()">Sign in with GitHub to agree</button>
ng-click="agree()">I Agree</button>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the real "I agree" button when there are custom fields.

ng-click="agree()">I agree</button>
<button class="btn btn-info btn-lg" ng-show="!hasCustomFields && !signed && linkedItem && claText" ng-click="agree()">Sign in with GitHub to agree</button>
ng-click="agree()">I Agree</button>
<button class="btn btn-info btn-lg" ng-show="!hasCustomFields && !signed && linkedItem && claText" ng-click="agree()">Login with GitHub to agree</button>
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the "I agree" button when there are NO custom fields.

@srl295
Copy link
Author

srl295 commented Dec 18, 2023

CLA assistant check Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you sign our Contributor License Agreement before we can accept your contribution.You have signed the CLA already but the status is still pending? Let us recheck it.

Is it signed or not? :)

@srl295
Copy link
Author

srl295 commented Dec 18, 2023

CLA assistant check All committers have signed the CLA.

seems signed…

@srl295
Copy link
Author

srl295 commented Jan 12, 2024

Anyone able to look at this? This flow has confused our users.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants