linden123/githaven-fork
1
1
Fork 0
forked from Shiloh/githaven
Code Pull Requests Activity

finish user delete page ui

Browse Source
This commit is contained in:
FuXiaoHei 2014-03-11 11:41:38 +08:00
parent 6ce9d800d0
commit 7f92579905
7 changed files with 38 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public/css/gogs.css
View File

@ -32,7 +32,7 @@ body {
background-color: transparent; background-color: transparent;
} }
.btn{ .btn {
cursor: pointer; cursor: pointer;
} }
@ -234,7 +234,7 @@ body {
/* gogits user setting */ /* gogits user setting */
#gogs-user-setting-nav > h4, #gogs-user-setting-container > h4 ,#gogs-ssh-keys > h4{ #gogs-user-setting-nav > h4, #gogs-user-setting-container > h4, #gogs-ssh-keys > h4, #gogs-user-delete > h4 {
padding-bottom: 18px; padding-bottom: 18px;
margin-bottom: 18px; margin-bottom: 18px;
border-bottom: 1px solid #CCC; border-bottom: 1px solid #CCC;
@ -263,11 +263,11 @@ body {
border-bottom: 1px solid #DDD; border-bottom: 1px solid #DDD;
} }
#gogs-ssh-keys .list-group-item:after{ #gogs-ssh-keys .list-group-item:after {
clear: both; clear: both;
} }
#gogs-ssh-keys .list-group-item:hover a.delete{ #gogs-ssh-keys .list-group-item:hover a.delete {
display: block; display: block;
} }
@ -298,6 +298,6 @@ body {
border-radius: 3px; border-radius: 3px;
} }
#gogs-ssh-form textarea{ #gogs-ssh-form textarea {
height: 16em; height: 16em;
} }

2
public/js/app.js
View File

@ -104,7 +104,7 @@ function initUserSetting(){
var $this = $(this); var $this = $(this);
Gogits.ajaxDelete("",{"id":$this.data("del")},function(json){ Gogits.ajaxDelete("",{"id":$this.data("del")},function(json){
if(json.ok){ if(json.ok){
$this.parent().remove(); window.location.reload();
}else{ }else{
alert(json.err); alert(json.err);
} }

1
routers/user/setting.go
View File

@ -56,6 +56,7 @@ func SettingSSHKeys(form auth.AddSSHKeyForm, r render.Render, data base.TmplData
"ok": true, "ok": true,
}) })
} }
return
} }
// Add new SSH key. // Add new SSH key.

2
routers/user/user.go
View File

@ -134,7 +134,7 @@ func SignUp(form auth.RegisterForm, data base.TmplData, req *http.Request, r ren
// TODO: unfinished // TODO: unfinished
func Delete(data base.TmplData, req *http.Request, r render.Render) { func Delete(data base.TmplData, req *http.Request, r render.Render) {
data["Title"] = "Delete user" data["Title"] = "Delete Account"
if req.Method == "GET" { if req.Method == "GET" {
r.HTML(200, "user/delete", data) r.HTML(200, "user/delete", data)

35
templates/user/delete.tmpl
View File

@ -1,12 +1,33 @@
{{template "base/head" .}} {{template "base/head" .}}
{{template "base/navbar" .}} {{template "base/navbar" .}}
<div id="gogs-body" class="container">
<div id="gogs-user-setting-nav" class="col-md-3">
<h4>Account Setting</h4>
<ul class="list-group">
<li class="list-group-item"><a href="/user/setting">Account Profile</a></li>
<li class="list-group-item"><a href="#">Emails and Password</a></li>
<li class="list-group-item"><a href="#">Notifications</a></li>
<li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
<li class="list-group-item"><a href="#">Security</a></li>
<li class="list-group-item list-group-item-success"><a href="/user/delete">Delete Account</a></li>
</ul>
</div>
<div id="gogs-user-setting-container" class="col-md-9">
<form action="/user/delete" method="post" class="form-horizontal" id="gogs-user-delete">
<h4>Delete Account</h4>
<p class="alert alert-danger">Deleting your account is permanent. Sorry to see you go, if you have any feedback you can contact us.</p>
<div class="form-group">
<div class="col-md-3">
<button type="submit" class="btn btn-danger btn-lg">Delete Account</button>
</div>
</div>
</form>
</div>
</div>
{{template "base/footer" .}}
{{template "base/head" .}}
{{template "base/navbar" .}}
<div class="container" id="gogs-body"> <div class="container" id="gogs-body">
<form action="/user/delete" method="post" class="form-horizontal">
<div class="form-group">
<div class="col-md-offset-4 col-md-3">
<button type="submit" class="btn btn-danger">Delete user</button>
</div>
</div>
</form>
</div> </div>
{{template "base/footer" .}} {{template "base/footer" .}}

2
templates/user/publickey.tmpl
View File

@ -9,7 +9,7 @@
<li class="list-group-item"><a href="#">Notifications</a></li> <li class="list-group-item"><a href="#">Notifications</a></li>
<li class="list-group-item list-group-item-success"><a href="/user/setting/ssh/">SSH Keys</a></li> <li class="list-group-item list-group-item-success"><a href="/user/setting/ssh/">SSH Keys</a></li>
<li class="list-group-item"><a href="#">Security</a></li> <li class="list-group-item"><a href="#">Security</a></li>
<li class="list-group-item"><a href="#">Kill Myself</a></li> <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
</ul> </ul>
</div> </div>

2
templates/user/setting.tmpl
View File

@ -9,7 +9,7 @@
<li class="list-group-item"><a href="#">Notifications</a></li> <li class="list-group-item"><a href="#">Notifications</a></li>
<li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li> <li class="list-group-item"><a href="/user/setting/ssh/">SSH Keys</a></li>
<li class="list-group-item"><a href="#">Security</a></li> <li class="list-group-item"><a href="#">Security</a></li>
<li class="list-group-item"><a href="#">Kill Myself</a></li> <li class="list-group-item"><a href="/user/delete">Delete Account</a></li>
</ul> </ul>
</div> </div>
<div id="gogs-user-setting-container" class="col-md-9"> <div id="gogs-user-setting-container" class="col-md-9">