diff options
author | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-19 22:03:31 +0800 |
---|---|---|
committer | FuXiaoHei <fuxiaohei@hexiaz.com> | 2014-03-19 22:03:31 +0800 |
commit | 42b85a969894e7dbd4273d678b478228155905e2 (patch) | |
tree | d46c0f99c7dd668db8af9f701c7650c0a20dc4a3 /templates | |
parent | 89041248d4848038b91d6cffd67120cb4f4cf567 (diff) | |
parent | 56af7e99a819758c6bedc6d745a9f810f3fc050d (diff) | |
download | gitea-42b85a969894e7dbd4273d678b478228155905e2.tar.gz gitea-42b85a969894e7dbd4273d678b478228155905e2.zip |
Merge branch 'master' of https://github.com/gogits/gogs
Diffstat (limited to 'templates')
-rw-r--r-- | templates/base/footer.tmpl | 4 | ||||
-rw-r--r-- | templates/user/active.tmpl | 23 |
2 files changed, 26 insertions, 1 deletions
diff --git a/templates/base/footer.tmpl b/templates/base/footer.tmpl index 841af680bd..fe0ea93027 100644 --- a/templates/base/footer.tmpl +++ b/templates/base/footer.tmpl @@ -3,7 +3,9 @@ <footer id="footer"> <div class="container footer-wrap"> <p>© 2014 Gogs · ver {{AppVer}} · - <i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a> + All: {{LoadTimes .PageStartTime}} · + Tmpl: {{call .TmplLoadTimes}} · + <i class="fa fa-github"></i><a target="_blank" href="https://github.com/gogits/gogs">GitHub</a> · </p> <p class="desc"></p> </div> diff --git a/templates/user/active.tmpl b/templates/user/active.tmpl new file mode 100644 index 0000000000..319db6cfa5 --- /dev/null +++ b/templates/user/active.tmpl @@ -0,0 +1,23 @@ +{{template "base/head" .}} +{{template "base/navbar" .}} +<div id="gogs-body" class="container"> + <form action="/user/activate" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> + <h3>Activate Your Account</h3> + {{if .IsActivatePage}} + {{if .ServiceNotEnabled}} + <p>Sorry, Register Mail Confirmation has been disabled.</p> + {{else}} + <p>New confirmation e-mail has been sent to <b>{{.SignedUser.Email}}</b>, please check your inbox within 3 days.</p> + {{end}} + {{else}} + <p>Hi, {{.SignedUser.Name}}, you have an unconfirmed email address(<b>{{.SignedUser.Email}}</b>). If you haven't received a confirmation e-mail or need to resend a new one, please click botton below.</p> + <hr/> + <div class="form-group"> + <div class="col-md-offset-4 col-md-6"> + <button type="submit" class="btn btn-lg btn-primary">Click here to resend your active e-mail</button> + </div> + </div> + {{end}} + </form> +</div> +{{template "base/footer" .}}
\ No newline at end of file |