Skip to content

Commit

Permalink
CLDR-18165 cla: ui: UI cleanup
Browse files Browse the repository at this point in the history
- re-add CLA to main menu
- hide CLA text for corp and GH users
- add link back to cla-assistant on success
  • Loading branch information
srl295 committed Dec 16, 2024
1 parent 9347d02 commit fff6b45
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 10 deletions.
6 changes: 4 additions & 2 deletions tools/cldr-apps/js/src/views/MainMenu.vue
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
<li>
<ul>
<li><a href="#account///">Account Settings</a></li>
<li v-if="showClaMenu"><a href="#cla///">Sign CLA</a></li>
<li v-if="showClaMenu">
<a href="#cla///">CLA (Contributor License Agreement) Status</a>
</li>
</ul>
</li>
<li v-if="!isAdmin && !accountLocked">
Expand Down Expand Up @@ -155,7 +157,7 @@ export default {
recentActivityUrl: null,
uploadXmlUrl: null,
userId: 0,
showClaMenu: false, // off by default, see CLDR-16499
showClaMenu: true,
};
},
Expand Down
30 changes: 22 additions & 8 deletions tools/cldr-apps/js/src/views/SignCla.vue
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,11 @@
<p>
Your GitHub account, @{{ githubSessionId }}, was not detected as signing
the <a href="https://cla-assistant.io/unicode-org/.github">CLA</a>.
</p>
</p>

<p>Note that it
is possible that you have signed, but that our records are out of date.
<p>
Note that it is possible that you have signed, but that our records are
out of date.
</p>
<a-row>
<a-col :span="8">
Expand Down Expand Up @@ -66,7 +67,7 @@
<a-alert
v-else-if="readonlyCla"
type="info"
message="Your organization has signed the CLA, it may not be modified."
message="Your organization has signed a Unicode Corporate CLA."
show-icon
/>
<a-alert
Expand All @@ -82,8 +83,14 @@
show-icon
/>

<!-- CLA text -->
<div class="cla" v-html="claHtml" />
<!-- CLA text. Hide it if a github or corp cla -->
<div
v-if="!userGithubSign && !readonlyCla"
class="cla"
v-html="claHtml"
/>

<br />

<a-form
name="claform"
Expand Down Expand Up @@ -119,7 +126,14 @@
agreement.</i
>

<a-form-item>
<p v-if="userGithubSign">
To view the CLA signed via GitHub, click
<a href="https://cla-assistant.io/unicode-org/.github">here</a> and
choose the Login with GitHub button at the bottom.
</p>

<!-- don't show the radio button for github or corp -->
<a-form-item v-if="!userGithubSign && !readonlyCla">
<a-radio-group :disabled="!needCla" v-model:value="userSign">
<a-radio :style="radioStyle" :value="2">
I am contributing as an individual because I am self-employed or
Expand Down Expand Up @@ -175,8 +189,8 @@
/>
</a-form-item>
</a-form>
<hr />
<div v-if="false && !needCla">
<hr />
<!-- revocation is not allowed at present -->
<a-alert
v-if="!readonlyCla"
Expand Down

0 comments on commit fff6b45

Please sign in to comment.