Skip to content

Commit 13d2b7b

Browse files
committed
feat: add plain language summaries to Contributor License Agreement, Content Contributor Agreement, Cookie Policy, Privacy Policy, and Terms of Service for improved clarity
1 parent 3fcaacf commit 13d2b7b

File tree

5 files changed

+257
-17
lines changed

5 files changed

+257
-17
lines changed

app/views/better_together/static_pages/code_contributor_agreement.html.erb

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,20 @@
118118

119119
<hr class="my-5">
120120

121+
<div class="alert alert-info" role="alert">
122+
<h4 class="alert-heading"><i class="fas fa-lightbulb me-2" aria-hidden="true"></i>Plain Language Summary</h4>
123+
<p>This agreement might seem complicated, but here's what it means in simple terms:</p>
124+
<ul class="mb-0">
125+
<li>You keep ownership of your code contributions</li>
126+
<li>You give us permission to use, modify, and distribute your contributions as part of the project</li>
127+
<li>You promise that your contributions are your own work and you have the right to contribute them</li>
128+
<li>If someone else owns patents related to your code, you give us a license to use those too</li>
129+
<li>We can change the project's license in the future, but your contributions stay under open source licenses</li>
130+
<li>You're not required to provide support for your contributions</li>
131+
<li>This protects both you and the project legally</li>
132+
</ul>
133+
</div>
134+
121135
<p class="text-muted"><small>This Contributor License Agreement is adapted from the Harmony Contributor License Agreement and other industry-standard contributor agreements. Last updated: November 20, 2025.</small></p>
122136
</div>
123137
</div>

app/views/better_together/static_pages/content_contributor_agreement.html.erb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@
106106

107107
<h3>4.3 Follow Platform Policies</h3>
108108
<ul>
109-
<li>Comply with our <%= link_to 'Terms of Service', better_together.static_page_path('terms-of-service', locale: I18n.locale) %></li>
110-
<li>Follow our <%= link_to 'Code of Conduct', better_together.static_page_path('code-of-conduct', locale: I18n.locale) %></li>
109+
<li>Comply with our <%= link_to 'Terms of Service', better_together.render_page_path('terms-of-service', locale: I18n.locale) %></li>
110+
<li>Follow our <%= link_to 'Code of Conduct', better_together.render_page_path('code-of-conduct', locale: I18n.locale) %></li>
111111
<li>Respect community-specific guidelines and rules</li>
112112
</ul>
113113

@@ -214,7 +214,7 @@
214214

215215
<h2>Data Privacy and Your Content</h2>
216216

217-
<p>Please review our <%= link_to 'Privacy Policy', better_together.static_page_path('privacy', locale: I18n.locale) %> to understand how we collect, use, and protect data associated with your content contributions, including:</p>
217+
<p>Please review our <%= link_to 'Privacy Policy', better_together.render_page_path('privacy', locale: I18n.locale) %> to understand how we collect, use, and protect data associated with your content contributions, including:</p>
218218
<ul>
219219
<li>Metadata about your content (timestamps, location data, device information)</li>
220220
<li>Search indexing of your public content</li>
@@ -229,14 +229,14 @@
229229
<address>
230230
<strong><%= host_platform.name %></strong><br>
231231
Email: <%= mail_to host_community.primary_email if host_community.has_contact_details? %><br>
232-
<%= link_to 'Contact Page', better_together.static_page_path('contact', locale: I18n.locale) %>
232+
<%= link_to 'Contact Page', better_together.render_page_path('contact', locale: I18n.locale) %>
233233
</address>
234234

235235
<hr class="my-5">
236236

237237
<div class="alert alert-info" role="alert">
238-
<h4 class="alert-heading">Summary (Not Legal Advice)</h4>
239-
<p>In plain language, this agreement means:</p>
238+
<h4 class="alert-heading"><i class="fas fa-lightbulb me-2" aria-hidden="true"></i>Plain Language Summary</h4>
239+
<p>This agreement might seem complicated, but here's what it means in simple terms:</p>
240240
<ul class="mb-0">
241241
<li>You keep ownership of your content</li>
242242
<li>You give us permission to host, display, and share your public content on the platform</li>
@@ -245,6 +245,7 @@
245245
<li>We can remove content that violates our policies</li>
246246
<li>You can delete your content at any time</li>
247247
</ul>
248+
<p class="mb-0 mt-3"><em>This summary is for your convenience only and doesn't replace the full legal terms above. If there's a conflict, the full terms apply.</em></p>
248249
</div>
249250

250251
<p class="text-muted"><small>Last updated: November 20, 2025</small></p>

app/views/better_together/static_pages/cookie_consent.html.erb

Lines changed: 51 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
<li><a href="#optional-cookies">Optional Cookies</a></li>
1818
<li><a href="#your-choices">Your Choices Regarding Cookies</a></li>
1919
<li><a href="#cookie-management">How to Manage Cookies</a></li>
20+
<li><a href="#privacy-laws">Canadian and International Privacy Laws</a></li>
2021
<li><a href="#contact">Contact Us</a></li>
2122
</ol>
2223
</nav>
@@ -141,7 +142,37 @@
141142
<h3>Mobile Device Cookie Management</h3>
142143
<p>Most mobile devices allow you to control cookies through their settings. Please refer to your device manufacturer's instructions for specific guidance.</p>
143144

144-
<h2 id="gdpr-rights">8. Your Rights Under GDPR</h2>
145+
<h2 id="privacy-laws">8. Canadian and International Privacy Laws</h2>
146+
147+
<h3>Canadian Privacy Law Compliance (PIPEDA)</h3>
148+
149+
<p>This Cookie Policy is part of our compliance with Canada's Personal Information Protection and Electronic Documents Act (PIPEDA). Under PIPEDA:</p>
150+
151+
<ul>
152+
<li><strong>Consent:</strong> We obtain your meaningful consent for the collection and use of personal information through cookies, except for essential cookies necessary for the platform to function</li>
153+
<li><strong>Purpose:</strong> We clearly identify why we use cookies and how they support platform functionality</li>
154+
<li><strong>Access:</strong> You have the right to access information about what cookies we use and how they collect data about you</li>
155+
<li><strong>Withdrawal:</strong> You can withdraw consent for optional cookies at any time through your browser settings or account preferences</li>
156+
<li><strong>Safeguards:</strong> We implement appropriate security measures to protect data collected through cookies</li>
157+
</ul>
158+
159+
<p><strong>Your Rights:</strong> Under PIPEDA, you have the right to:</p>
160+
<ul>
161+
<li>Know what personal information we collect through cookies and why</li>
162+
<li>Access information about our cookie practices</li>
163+
<li>Withdraw consent for optional cookies (essential cookies are required for platform operation)</li>
164+
<li>File a complaint about our cookie practices with our Privacy Officer or the Office of the Privacy Commissioner of Canada</li>
165+
</ul>
166+
167+
<p><strong>Privacy Officer Contact:</strong> If you have questions about our cookie practices under Canadian privacy law, contact our Privacy Officer at <a href="mailto:[email protected]">[email protected]</a>.</p>
168+
169+
<p><strong>Filing a Complaint:</strong> You may file complaints with the Office of the Privacy Commissioner of Canada:</p>
170+
<ul>
171+
<li>Website: <a href="https://www.priv.gc.ca" target="_blank" rel="noopener noreferrer">www.priv.gc.ca</a></li>
172+
<li>Phone: 1-800-282-1376 (toll-free) or (819) 994-5444</li>
173+
</ul>
174+
175+
<h3 id="gdpr-rights">GDPR Rights (European Economic Area)</h3>
145176

146177
<p>If you are located in the European Economic Area (EEA), you have certain data protection rights. We aim to take reasonable steps to allow you to correct, amend, delete, or limit the use of your personal data.</p>
147178

@@ -171,16 +202,30 @@
171202
<address>
172203
<strong>Better Together Solutions</strong><br>
173204
Email: <a href="mailto:[email protected]">[email protected]</a><br>
174-
<%= link_to 'Privacy Policy', better_together.static_page_path('privacy', locale: I18n.locale) %><br>
175-
<%= link_to 'Terms of Service', better_together.static_page_path('terms_of_service', locale: I18n.locale) %>
205+
<%= link_to 'Privacy Policy', better_together.render_page_path('privacy', locale: I18n.locale) %><br>
206+
<%= link_to 'Terms of Service', better_together.render_page_path('terms-of-service', locale: I18n.locale) %>
176207
</address>
177208

178209
<hr class="my-5">
179210

180211
<div class="alert alert-info" role="alert">
181-
<h4 class="alert-heading">Your Privacy Matters</h4>
182-
<p>We are committed to transparency about how we collect and use data. This Cookie Policy is part of our broader commitment to your privacy.</p>
183-
<p class="mb-0">For more comprehensive information about how we handle your personal data, please review our <%= link_to 'Privacy Policy', better_together.static_page_path('privacy', locale: I18n.locale) %>.</p>
212+
<h4 class="alert-heading"><i class="fas fa-lightbulb me-2" aria-hidden="true"></i>Plain Language Summary</h4>
213+
<p>Here's what you need to know about cookies on our platform:</p>
214+
<ul class="mb-2">
215+
<li><strong>Essential cookies:</strong> Required for login and basic platform functions (we must use these)</li>
216+
<li><strong>Analytics cookies:</strong> Help us understand how people use the platform (you can opt out)</li>
217+
<li><strong>Your choice:</strong> You can manage cookie preferences in your browser or account settings</li>
218+
<li><strong>Third parties:</strong> We only use trusted services (listed above) and they follow strict privacy rules</li>
219+
<li><strong>Your rights:</strong> You can see, export, or delete data collected via cookies at any time</li>
220+
<li><strong>Canadian compliance (PIPEDA):</strong> We follow Canadian privacy law for cookie data</li>
221+
<li><strong>GDPR (EU) compliance:</strong> European users have full GDPR rights for cookie data</li>
222+
</ul>
223+
<p class="mb-0">For more comprehensive information about how we handle your personal data, please review our <%= link_to 'Privacy Policy', better_together.render_page_path('privacy', locale: I18n.locale) %>.</p>
224+
</div>
225+
226+
<div class="alert alert-secondary mt-3" role="alert">
227+
<h5 class="alert-heading">Your Privacy Matters</h5>
228+
<p class="mb-0">We are committed to transparency about how we collect and use data. This Cookie Policy is part of our broader commitment to your privacy.</p>
184229
</div>
185230
</div>
186231
</div>

0 commit comments

Comments
 (0)