##// END OF EJS Templates
upstream » kallithea
RSS

Clone from https://kallithea-scm.org/repos/kallithea

Migrate to Mergely 3.3.4....
Migrate to Mergely 3.3.4. RhodeCode 2.2.5 distributed Mergely 3.3.4 with some of the changes that Mergely 3.3.3 in RhodeCode 1.7.2 also had. That do however not seem to be changes we want for Kallithea this way and we take the 3.3.4 files as they are. I've also included the Mergely license file, as downloaded from: http://www.mergely.com/license.php That LICENSE file is kept in HTML just as it was downloaded from their website. While it's a bit annoying to keep the license file in HTML, this is the way it came from upstream so we'll leave it that way. Since the Javascript code is used with other GPLv3 Javascript, we are using the GPL option of Mergely's tri-license. Finally, note that previously, this was incorrectly called "mergerly", so the opportunity is taken here to correct the name. That required changes to diff_2way.html. As commands:: $ wget -N --output-document LICENSE-MERGELY.html http://www.mergely.com/license.php $ hg add LICENSE-MERGELY.html $ hg mv rhodecode/public/css/mergerly.css rhodecode/public/css/mergely.css $ hg mv rhodecode/public/js/mergerly.js rhodecode/public/js/mergely.js $ sed -i 's,mergerly\.,mergely,g' rhodecode/templates/files/diff_2way.html $ ( cd /tmp; \ wget -N http://www.mergely.com/releases/mergely-3.3.4.zip; \ unzip mergely-3.3.4.zip ) $ sha256sum /tmp/mergely-3.3.4.zip 87415d30494bbe829c248881aa7cdc0303f7e70b458a5f687615564d4498cc82 mergely-3.3.4.zip $ cp /tmp/mergely-3.3.4/lib/mergely.js rhodecode/public/js/mergely.js $ cp /tmp/mergely-3.3.4/lib/mergely.css rhodecode/public/css/mergely.css $ sed -i -e '/^ \* Version/a\ *\n * NOTE by bkuhn@sfconservancy.org for Kallithea:\n * Mergely license appears at http://www.mergely.com/license.php and in LICENSE-MERGELY.html' rhodecode/public/js/mergely.js rhodecode/public/css/mergely.css
Bradley M. Kuhn - - Load All Authors

File last commit:

r4116:ffd45b18 rhodecode-2.2.5-gpl
r4125:aa3b5594 rhodecode-2.2.5-gpl
Show More
register.html
134 lines | 4.5 KiB | text/html | HtmlLexer
/ rhodecode / templates / register.html
History | Source | Raw |Copy content |Copy permalink
marcink
renamed project to rhodecode
 r547 ## -*- coding: utf-8 -*-
marcink
rewrote templates, all small pages will inherit from root for easier changes and controll
 r1157 <%inherit file="base/root.html"/>
marcink
renamed project to rhodecode
 r547
marcink
rewrote templates, all small pages will inherit from root for easier changes and controll
 r1157 <%def name="title()">
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 ${_('Sign Up')}
%if c.rhodecode_name:
&middot; ${c.rhodecode_name}
%endif
marcink
rewrote templates, all small pages will inherit from root for easier changes and controll
 r1157 </%def>
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 <div id="header">
<div id="header-inner" class="title">
<div id="logo">
<div class="header">
<a href="${h.url('home')}"><img src="/images/rhodecode-logo-white-216x60.png" alt="RhodeCode"/></a>
</div>
%if c.rhodecode_name:
<div class="branding">- ${c.rhodecode_name}</div>
%endif
</div>
</div>
</div>
marcink
White-space cleanup
 r1888
marcink
rewrote templates, all small pages will inherit from root for easier changes and controll
 r1157 <div id="register">
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 <%include file="/base/flash_msg.html"/>
<div class="title withlogo">
%if c.rhodecode_name:
<h5>${_('Sign Up to %s') % c.rhodecode_name}</h5>
%else:
<h5>${_('Sign Up')}</h5>
%endif
Mads Kiilerich
html: don't use tabs
 r3197 </div>
<div class="inner">
${h.form(url('register'))}
<div class="form">
<!-- fields -->
<div class="fields">
Mads Kiilerich
html: random indentation fixes
 r3198 <div class="field">
Mads Kiilerich
html: don't use tabs
 r3197 <div class="label">
<label for="username">${_('Username')}:</label>
</div>
<div class="input">
${h.text('username',class_="medium")}
</div>
Mads Kiilerich
html: random indentation fixes
 r3198 </div>
marcink
White-space cleanup
 r1888
Mads Kiilerich
html: random indentation fixes
 r3198 <div class="field">
Mads Kiilerich
html: don't use tabs
 r3197 <div class="label">
<label for="password">${_('Password')}:</label>
</div>
<div class="input">
${h.password('password',class_="medium")}
</div>
Mads Kiilerich
html: random indentation fixes
 r3198 </div>
marcink
White-space cleanup
 r1888
Mads Kiilerich
html: random indentation fixes
 r3198 <div class="field">
<div class="label">
<label for="password">${_('Re-enter password')}:</label>
</div>
<div class="input">
${h.password('password_confirmation',class_="medium")}
</div>
</div>
marcink
White-space cleanup
 r1888
Mads Kiilerich
html: random indentation fixes
 r3198 <div class="field">
Mads Kiilerich
html: don't use tabs
 r3197 <div class="label">
<label for="firstname">${_('First Name')}:</label>
</div>
<div class="input">
${h.text('firstname',class_="medium")}
</div>
Mads Kiilerich
html: random indentation fixes
 r3198 </div>
marcink
White-space cleanup
 r1888
Mads Kiilerich
html: random indentation fixes
 r3198 <div class="field">
Mads Kiilerich
html: don't use tabs
 r3197 <div class="label">
<label for="lastname">${_('Last Name')}:</label>
</div>
<div class="input">
${h.text('lastname',class_="medium")}
</div>
Mads Kiilerich
html: random indentation fixes
 r3198 </div>
marcink
White-space cleanup
 r1888
Mads Kiilerich
html: random indentation fixes
 r3198 <div class="field">
Mads Kiilerich
html: don't use tabs
 r3197 <div class="label">
<label for="email">${_('Email')}:</label>
</div>
<div class="input">
${h.text('email',class_="medium")}
</div>
Mads Kiilerich
html: random indentation fixes
 r3198 </div>
marcink
White-space cleanup
 r1888
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 %if c.captcha_active:
<div class="field">
<div class="label">
<label for="email">${_('Captcha')}:</label>
</div>
<div class="input">
${h.hidden('recaptcha_field')}
<div id="recaptcha"></div>
</div>
</div>
%endif
Mads Kiilerich
html: don't use tabs
 r3197 <div class="buttons">
<div class="nohighlight">
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 ${h.submit('sign_up',_('Sign Up'),class_="btn")}
Mads Kiilerich
html: don't use tabs
 r3197 %if c.auto_active:
<div class="activation_msg">${_('Your account will be activated right after registration')}</div>
%else:
<div class="activation_msg">${_('Your account must wait for activation by administrator')}</div>
%endif
</div>
</div>
</div>
</div>
${h.end_form()}
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 %if c.captcha_active:
<script type="text/javascript" src="https://www.google.com/recaptcha/api/js/recaptcha_ajax.js"></script>
%endif
marcink
added focus to login register password reminder forms
 r1202 <script type="text/javascript">
Bradley M. Kuhn
Imported some of the GPLv3'd changes from RhodeCode v2.2.5....
 r4116 $(document).ready(function(){
$('#username').focus();
%if c.captcha_active:
Recaptcha.create("${c.captcha_public_key}", "recaptcha",
{
theme: "white",
}
);
%endif
});
marcink
White-space cleanup
 r1888 </script>
Mads Kiilerich
html: don't use tabs
 r3197 </div>
marcink
rewrote templates, all small pages will inherit from root for easier changes and controll
 r1157 </div>