Skip to content

W
website

openeuler / website

通知 1
Star 0
Fork 0
W
website

体验新版 GitCode，发现更多精彩内容 >>

提交 dd51f2dd 编写于 作者: L Librahang
浏览文件
操作

1.修改cla.md（中英文）2.修改sig不能出来的bug

上级 fce5f7fb
隐藏空白更改
内联 并排
Showing with 115 addition and 100 deletion
content/en/cla.md
浏览文件 @ dd51f2dd
......@@ -3,33 +3,38 @@ title = "Signing CLA"
+++
<div class="clanote">
<p>
Before submitting any Contributions, you have to agree with all the terms and conditions of this Agreement and sign it as indicated below, and then upload the signed Agreement to designated place on openEuler official website. By signing this Agreement as indicated below, you agree to accept and be legally bound by this Agreement. The rights that you grant under this Agreement are effective on the date you first submitted a Contribution to the openEuler, even if your submission took place before the date you sign these Agreement.
<p style="text-indent:2em;">
By signing this Agreement For Contribution (this Agreement), the undersigned Contributor agrees to accept and be legally bound by this Agreement. This Agreement applies to the Contribution submitted by Contributor to all the projects of openEuler Community (“Project”), whether provided before, on or after the signing date.
</p>
<ol>
<li>
You agree to be legally bound by openEuler Intellectual Property Rights Policy published on openEuler official website.
</li>
<li>
You represent that:
<ul>
<li>
Each of your Contributions is your original creation and you can legally grant the rights set out in this Agreement;
</li>
<li>
To the best of your knowledge, each Contribution will not infringe any third party's copyrights, trademarks, patents, or other intellectual property rights.
</li>
</ul>
</li>
<li>
This Agreement and any rights and liabilities herein shall be governed, construed and interpreted in accordance with the laws of P.R. China, without giving effect to principles of conflicts of law. Any dispute arising from or related to this Agreement shall be submitted to Shenzhen Longgang District People’s court and parties waive all objections to that jurisdiction and venue.
</li>
<li>
Please select one applicable statement from the following and fill in the blanks. DO NOT MARK BOTH:
</li>
</ol>
<p style="text-indent:2em;">
<strong>Contribution</strong> shall mean any work protectable under copyright lawthat is intentionally submitted by Contributor for inclusion in the software distributed by the Project. "submitted" means any form of electronic, verbal, or written communication sent to the hoster of the openEuler Community (Hoster) or its representatives, including but not limited to communication on electronic mailing lists, source code control systems, and issue tracking systems that are managed by, or on behalf of, the Hoster for the purpose of discussing and improving the Project, but excluding communication that is conspicuously marked or otherwise designated in writing by Me as "Not a Contribution."
</p>
<p style="text-indent:2em;">
<strong>Contributor or I or Me or My</strong> shall mean the individual or legal entity identified in the signature block below. For legal entity, the entity making a Contribution and all other entities that control, are controlled by, or are under common control with that entity are considered to be a single Contributor. For the purposes of this definition, ‘control’ means direct or indirect ownership of at least fifty percent (50%) of the voting power, capital or other securities of controlled or commonly controlled entity.
</p>
<p style="text-indent:2em;">
Each Contributor hereby grants to the Hoster and the recipients of software distributed by the Project a perpetual, worldwide, royalty-free, non-exclusive, irrevocable, sub-licensable copyright license to reproduce, use, modify, or distribute its Contribution, with modification or not.
</p>
<p style="text-indent:2em;">
Each Contributor hereby grants to the Hoster and recipients of the software distributed by the Project a perpetual, worldwide, royalty-free, non-exclusive, irrevocable patent license to make, have made, use, offer for sale, sell, import or otherwise transfer its Contribution where such patent license is only limited to the patent claims owned or controlled by such Contributor now or in future which will be necessarily infringed by its Contribution alone, or by combination of the Contribution with the Project software to which the Contribution was contributed, excluding of any patent claims solely be infringed by your or others’ modification or other combinations. In case the license adopted by the specific software distributed by the Project has further restriction on the patent license granted to the software recipients, for example, restricts the recipients to file patent litigation or enforcement against Contribution or such software, then the patent license to the recipients of the specific Project license prevails.
</p>
<p style="text-indent:2em;">
Contributor represents that I’m the copyright owner of the Contribution or I’m authorized by the copyright owner to make such Contribution, and I’m legally entitled to grant the rights set out in this Agreement and the License;
</p>
<p style="text-indent:2em;">
Contributor represents that I’ m not aware any of My Contribution has infringed or will infringe any third party's copyrights, trademarks, patents, or other intellectual property rights.
</p>
<p style="text-indent:2em;">
Except as otherwise stated in the Agreement, Contribution is provided without warranties of any kind, either express or implied. In no event shall any Contributor or copyright holder be liable to you for any damages, including, but not limited to any direct, or indirect, special or consequential damages arising from your use or inability to use the software or the Contribution in it, no matter how it’s caused or based on which legal theory, even if advised of the possibility of such damages.
</p>
<p style="text-indent:2em;">
Please select one applicable statement from the following and fill in the blanks.
</p>
</div>
<table id="cla-type-table">
<tr>
<td>
......@@ -44,8 +49,7 @@ Please select one applicable statement from the following and fill in the blanks
<table id="individual-table">
<tr>
<td colspan="2">
I am individual and no other person or entity, including my employer,
has or will have rights with respect my Contributions.
I am an individual, and no other individual or legal entity, including my employer, has or will have rights with respect to My Contribution.
</td>
</tr>
<tr>
......@@ -58,42 +62,42 @@ Please select one applicable statement from the following and fill in the blanks
</tr>
<tr>
<td>
Address*:
E-Mail*:
</td>
<td>
<input type="text" id="individual-address" class = "require" maxlength="100" />
<input type="text" id="individual-email" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<tr>
<td>
Date*:
Telephone:
</td>
<td>
<input type="text" id="individual-date" class = "require" maxlength="100" />
<input type="text" id="individual-telephone" maxlength="100" />
</td>
</tr>
<tr>
<td>
E-Mail*:
Fax:
</td>
<td>
<input type="text" id="individual-email" class = "require" maxlength="100" />
<input type="text" id="individual-fax" maxlength="100" />
</td>
</tr>
<tr>
<td>
Telephone:
Address*:
</td>
<td>
<input type="text" id="individual-telephone" maxlength="100" />
<input type="text" id="individual-address" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td>
Fax:
Date*:
</td>
<td>
<input type="text" id="individual-fax" maxlength="100" />
<input type="text" id="individual-date" class = "require" maxlength="100" />
</td>
</tr>
<tr>
......@@ -106,7 +110,7 @@ Please select one applicable statement from the following and fill in the blanks
<table id="legalentity-table">
<tr>
<td colspan="2">
I am a legal entity, the individual below signing this Agreement is authorized by and on behalf of me.
<p>I am a legal entity, the individual below signing this Agreement is authorized by and on behalf of me.</p>
</td>
</tr>
<tr>
......@@ -135,20 +139,12 @@ Please select one applicable statement from the following and fill in the blanks
</tr>
<tr>
<td>
Address*:
Mailing Address*:
</td>
<td>
<input type="text" id="legalentity-address" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td>
Date*:
</td>
<td>
<input type="text" id="legalentity-date" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td>
E-Mail*:
......@@ -173,6 +169,14 @@ Please select one applicable statement from the following and fill in the blanks
<input type="text" id="legalentity-fax" maxlength="100" />
</td>
</tr>
<tr>
<td>
Date*:
</td>
<td>
<input type="text" id="legalentity-date" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td colspan="2">
* require field. Please make sure the E-Mail is related with your gitee account.
......
content/zh/cla.md
浏览文件 @ dd51f2dd
......@@ -3,35 +3,35 @@ title = "签署CLA"
+++
<div class="clanote">
<p>
在提交任何贡献前，你必须同意本协议规定的所有条款并签署本协议，
并将签署后的协议上传到openEuler官网指定地点。
按照如下指示签署本协议后，表明你接受本协议并同意受其约束。
你在本协议下授予的权利从你首次向openEuler提交代码之日起生效，
即使你的代码贡献行为发生在本协议签署前。
<p style="text-indent:2em;">
通过签署贡献协议（“本协议”），签署的“贡献者”同意接受“本协议”并受“本协议”约束。“本协议”适用于“贡献者”提交给openEuler社区 （“社区”）的全部项目（后称“项目”）的“贡献”，无论“贡献”是在签署日期之前，签署时还是之后提供。
</p>
<ol>
<li>
你同意接受openEuler 知识产权政策的法律约束。该政策公布在openEuler官方网站上。
</li>
<li>
你承诺：
<ul>
<li>
你的每次贡献都是你原创的你有根据本协议授权的法律权利；
</li>
<li>
尽你所知，每次贡献均不侵犯第三方的版权，商标，专利或其他知识产权。
</li>
</ul>
</li>
<li>
本贡献协议适用中华人民共和国法律并由深圳市龙岗区人民法院管辖。
</li>
<li>
请选择一个可适用的陈述并填空。注意：不要同时选两个：
</li>
</ol>
<p style="text-indent:2em;">
<strong>“贡献”</strong> 是指受版权法保护的，由“贡献者”有意“提交”以包含在“项目”所分发软件中任何作品。“提交”是指以电子，口头或书面交流的任何形式送给“社区”管理方或其代表，包括但不限于“社区”管理方为管理的为讨论和改进项目所提供的电子邮件列表上的交流，源代码控制系统以及由“社区”管理方或其代表管理的问题跟踪系统，但不包括由“我”明确标记或以书面形式指定为“非贡献”的交流。
</p>
<p style="text-indent:2em;">
<strong>“贡献者”或“我”</strong>是指下面签名栏中标明的个人或法人实体。对于法人实体，做出“贡献”的实体以及由该实体控制、受其控制或受其共同控制的所有其他实体均被视为“贡献者”。就本定义而言，“控制”是指有受控方或共同受控方至少50%直接或间接的投票权，资金或其他有价证券。
</p>
<p style="text-indent:2em;">
“贡献者”授予“社区”管理方和由“项目”所分发的软件的每个接收者一个永久性的、全球性的、免费的、非独占的、不可撤销的、有分许可权的版权许可，供其复制、使用、修改、分发其“贡献”，不论修改与否。
</p>
<p style="text-indent:2em;">
“贡献者”授予“社区”管理方和由“项目”所分发的软件的每个接收者一个永久性的、全球性的、免费的、非独占的、不可撤销的、有分许可权的专利许可，供其制造、委托制造、使用、许诺销售、销售、进口其“贡献”或以其他方式转移其“贡献”。前述专利许可仅限于“贡献者”现在或将来拥有或控制的其“贡献”本身或其“贡献”与“提交”“贡献”时所针对的“项目”软件的结合而将必然会侵犯的专利权利要求，不包括仅因“贡献者”之外的人修改“贡献”或其他结合而将必然会侵犯到的专利权利要求。如由“项目”所分发的软件实际采用的许可证对软件接收者的专利授权有进一步限制规定的，如限制接收者对“贡献”或前述软件发起专利诉讼或其他维权等，则对前述软件接收者的专利授权以具体项目许可证的对应规定为准。
</p>
<p style="text-indent:2em;">
“贡献者”保证“我”是“贡献”的版权所有者，或者“我”经版权所有者授权进行“贡献”，并且“我”在法律上授予“本协议”规定的权利。
</p>
<p style="text-indent:2em;">
“贡献者”保证“我”不知晓“我”的任何“贡献”已经侵犯或将侵犯任何第三方的版权，商标，专利或其他知识产权。
</p>
<p style="text-indent:2em;">
除“本协议”明确约定外，“贡献者”的 “贡献”在提供时不带任何明示或默示的担保，“贡献者”或版权所有者不对任何人因使用“项目”所分发的软件或其中的“贡献”而引发的任何直接或间接损失承担责任，不论因何种原因导致或者基于何种法律理论，即使其曾被建议有此种损失的可能性。
</p>
<p style="text-indent:2em;">
请选择一个可适用的陈述并填空。
</p>
</div>
<table id="cla-type-table">
......@@ -48,7 +48,7 @@ title = "签署CLA"
<table id="individual-table">
<tr>
<td colspan="2">
我是一个个人，没有其他人或实体，包括我的雇员，有或者将有对我贡献的权利。
“我”是一个个人，没有其他人或实体，包括“我的”雇主有或者将有对“我”的“贡献”的权利。
</td>
</tr>
<tr>
......@@ -61,42 +61,42 @@ title = "签署CLA"
</tr>
<tr>
<td>
地址*:
邮箱*:
</td>
<td>
<input type="text" id="individual-address" class = "require" maxlength="100" />
<input type="text" id="individual-email" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<tr>
<td>
日期*:
电话:
</td>
<td>
<input type="text" id="individual-date" class = "require" maxlength="100" />
<input type="text" id="individual-telephone" maxlength="100" />
</td>
</tr>
<tr>
<tr>
<td>
邮箱*:
传真:
</td>
<td>
<input type="text" id="individual-email" class = "require" maxlength="100" />
<input type="text" id="individual-fax" maxlength="100" />
</td>
</tr>
<tr>
<tr>
<td>
电话:
地址*:
</td>
<td>
<input type="text" id="individual-telephone" maxlength="100" />
<input type="text" id="individual-address" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td>
传真:
日期*:
</td>
<td>
<input type="text" id="individual-fax" maxlength="100" />
<input type="text" id="individual-date" class = "require" maxlength="100" />
</td>
</tr>
<tr>
......@@ -109,7 +109,7 @@ title = "签署CLA"
<table id="legalentity-table">
<tr>
<td colspan="2">
我是一个法律实体，如下签字的个人是我授权并代表我的。
<p>“我”是一个法律实体，如下签字的个人是“我”授权并代表“我”。</p>
</td>
</tr>
<tr>
......@@ -120,6 +120,16 @@ title = "签署CLA"
<input type="text" id="legalentity-name" class = "require" maxlength="100" />
</td>
</tr>
<!--new start-->
<tr>
<td>
授权贡献者（姓名）*:
</td>
<td>
<input type="text" id="legalentity-name-contributer" class = "require" maxlength="100" />
</td>
</tr>
<!--new end-->
<tr>
<td>
职位*:
......@@ -144,14 +154,6 @@ title = "签署CLA"
<input type="text" id="legalentity-address" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td>
日期*:
</td>
<td>
<input type="text" id="legalentity-date" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td>
邮箱*:
......@@ -176,13 +178,20 @@ title = "签署CLA"
<input type="text" id="legalentity-fax" maxlength="100" />
</td>
</tr>
<tr>
<td>
日期*:
</td>
<td>
<input type="text" id="legalentity-date" class = "require" maxlength="100" />
</td>
</tr>
<tr>
<td colspan="2">
* 必填。请确保邮箱与你的gitee账号绑定。
</td>
</tr>
</table>
<table id="cla-table">
<tr>
<td>
......
themes/project/layouts/sig/list.html
浏览文件 @ dd51f2dd
......@@ -22,14 +22,16 @@
<div class="col-md-12" id="sigSection" style="margin-bottom: 30px;">
{{ range where $.Page.Site.Pages "Type" "sig" }}
{{ if .Params }}
{{ if .Params.mission }}
{{ if .Params.name}}
<div class="row">
<div class="col-md-12" >
<div class="blockTitle">{{ .Params.name}}</div>
</div>
<div class="col-md-12">
<div class="blockContent">
{{ if .Params.mission}}
<div class="dataBlock">{{ .Params.mission}}</div>
{{ end }}
<div class="dataBlock">{{ i18n "sig_mail_list"}}<a href="mailto:{{ .Params.mailList}}">{{ .Params.mailList}}</a></div>
<div class="dataBlock">{{ i18n "sig_IRC_channel"}}{{ .Params.ircChannel}}</div>
<div class="dataBlock">{{ i18n "sig_maintainers"}}{{ .Params.maintainers}}</div>
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或