diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/base/head.tmpl | 2 | ||||
| -rw-r--r-- | templates/base/navbar.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/signin.tmpl | 4 | ||||
| -rw-r--r-- | templates/user/signup.tmpl | 7 |
4 files changed, 9 insertions, 6 deletions
diff --git a/templates/base/head.tmpl b/templates/base/head.tmpl index 4358bf02bf..0294ba49a5 100644 --- a/templates/base/head.tmpl +++ b/templates/base/head.tmpl @@ -16,7 +16,7 @@ <script src="/js/jquery-1.10.1.min.js"></script> <script src="/js/bootstrap.min.js"></script> <script src="/js/app.js"></script> - <title>{{.Title}} | {{AppName}}</title> + <title>{{.Title}} - {{AppName}}</title> </head> <body> <noscript>Please enable JavaScript in your browser!</noscript>
\ No newline at end of file diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl index c4bd3a7a51..00112c03d3 100644 --- a/templates/base/navbar.tmpl +++ b/templates/base/navbar.tmpl @@ -7,7 +7,7 @@ <a class="gogs-nav-item" href="#">Help</a> <!--<a class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/login/">Sign in</a>--> - <a id="gogs-nav-out" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/login/"><i class="fa fa-power-off fa-lg"></i></a> + <a id="gogs-nav-out" class="gogs-nav-item navbar-right navbar-btn btn btn-danger" href="/user/login/"><i class="fa fa-power-off fa-lg"></i></a> <a id="gogs-nav-avatar" class="gogs-nav-item navbar-right" href="/user/profile" data-toggle="tooltip" data-placement="bottom" title="Username"> <img src="http://1.gravatar.com/avatar/x?s=28" alt="user-avatar" title="username"/> </a> diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl index 6527ae53f2..f80b3199a2 100644 --- a/templates/user/signin.tmpl +++ b/templates/user/signin.tmpl @@ -1,7 +1,7 @@ {{template "base/head" .}} {{template "base/navbar" .}} <div class="container" id="gogs-body"> - <form action="/user/signin" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> + <form action="/user/login" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> <h3>Log in</h3>{{if .Error}} <div class="form-group"> <div class="col-md-6 col-md-offset-3 alert alert-danger text-center"><strong>{{.Error}}</strong></div> @@ -26,7 +26,7 @@ </div> <div class="form-group"> <div class="col-md-offset-4 col-md-6"> - <a href="/sign-up/">Need an account? Sign up free.</a> + <a href="/user/sign_up">Need an account? Sign up free.</a> </div> </div> <div class="form-group text-center" id="gogs-social-login"> diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl index 48e50a0037..e8854e4aca 100644 --- a/templates/user/signup.tmpl +++ b/templates/user/signup.tmpl @@ -1,8 +1,11 @@ {{template "base/head" .}} {{template "base/navbar" .}} <div class="container" id="gogs-body"> - <form action="/user/signup" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> + <form action="/user/sign_up" method="post" class="form-horizontal gogs-card" id="gogs-login-card"> <h3>Sign Up</h3> + {{if .HasError}} + <div class="alert alert-danger">{{.ErrorMsg}}</div> + {{end}} <div class="form-group"> <label class="col-md-4 control-label">Username: </label> <div class="col-md-6"> @@ -37,7 +40,7 @@ <div class="form-group"> <div class="col-md-offset-4 col-md-6"> - <a href="/login/">Already have an account? Sign in now!</a> + <a href="/user/login">Already have an account? Sign in now!</a> </div> </div> </form> |