pub-solar/forgejo
5
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

#1180 and #1250: migration

Browse source
This commit is contained in:
Unknwon 2015-08-15 16:03:20 +08:00
parent b35d7eee31
commit e633425f27
10 changed files with 231 additions and 116 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
conf/locale/locale_en-US.ini
View file

@ -324,9 +324,10 @@ form.name_pattern_not_allowed = Repository name pattern '%s' is not allowed.
need_auth = Need Authorization need_auth = Need Authorization
migrate_type = Migration Type migrate_type = Migration Type
migrate_type_helper = This repository will be a <span class="label label-blue label-radius">mirror</span> migrate_type_helper = This repository will be a <span class="text blue">mirror</span>
migrate_repo = Migrate Repository migrate_repo = Migrate Repository
migrate.clone_address = Clone Address migrate.clone_address = Clone Address
migrate.clone_address_desc = This can be a HTTP/HTTPS/GIT URL or local server path.
migrate.invalid_local_path = Invalid local path, it does not exist or not a directory. migrate.invalid_local_path = Invalid local path, it does not exist or not a directory.
forked_from = forked from forked_from = forked from

4
modules/bindata/bindata.go
View file

File diff suppressed because one or more lines are too long

2
public/css/gogs.min.css vendored
View file

File diff suppressed because one or more lines are too long

10
public/js/gogs.js
View file

@ -118,7 +118,6 @@ function initCommentForm() {
$(this).removeClass('selected active') $(this).removeClass('selected active')
}); });
if (has_update_action) { if (has_update_action) {
updateIssueMeta($menu.data('update-url'), '', ''); updateIssueMeta($menu.data('update-url'), '', '');
} }
@ -173,6 +172,15 @@ function initRepository() {
return; return;
} }
// New migrate
if ($('.repository.new.migrate').length > 0) {
// Clear browser autocomplete.
if ($('#auth_username').data('need-clear')) {
$('#auth_username').val('');
$('#auth_password').val('');
}
}
// Labels // Labels
if ($('.repository.labels').length > 0) { if ($('.repository.labels').length > 0) {
// Create label // Create label

3
public/less/_base.less
View file

@ -74,6 +74,9 @@ img {
&.red { &.red {
color: #d95c5c!important; color: #d95c5c!important;
} }
&.blue {
color: #428bca!important;
}
&.grey { &.grey {
color: #767676!important; color: #767676!important;
a { a {

64
public/less/_form.less
View file

@ -12,39 +12,45 @@
margin-top: -5px; margin-top: -5px;
} }
} }
.repository.new.fork { .repository {
form { &.new.migrate,
margin: auto; &.new.fork {
width: 800px!important; form {
.ui.message { margin: auto;
text-align: center; width: 800px!important;
} .ui.message {
@input-padding: 250px !important; text-align: center;
.header {
padding-left: @input-padding+30px;
}
.inline.field > label {
text-align: right;
width: @input-padding;
word-wrap: break-word;
}
.help {
margin-left: @input-padding+10px;
}
.dropdown {
.dropdown.icon {
margin-top: -7px!important;
} }
.text { @input-padding: 250px !important;
margin-right: 0!important; .header {
i { padding-left: @input-padding+30px;
}
.inline.field > label {
text-align: right;
width: @input-padding;
word-wrap: break-word;
}
.help {
margin-left: @input-padding+15px;
}
.dropdown {
.dropdown.icon {
margin-top: -7px!important;
}
.text {
margin-right: 0!important; margin-right: 0!important;
i {
margin-right: 0!important;
}
} }
} }
} .optional .title {
input, margin-left: @input-padding;
textarea { }
width: 50%!important; input,
textarea {
width: 50%!important;
}
} }
} }
} }

2
routers/repo/repo.go
View file

@ -216,7 +216,7 @@ func MigratePost(ctx *middleware.Context, form auth.MigrateRepoForm) {
if strings.Contains(err.Error(), "Authentication failed") { if strings.Contains(err.Error(), "Authentication failed") {
ctx.Data["Err_Auth"] = true ctx.Data["Err_Auth"] = true
ctx.RenderWithErr(ctx.Tr("form.auth_failed", err), MIGRATE, &form) ctx.RenderWithErr(ctx.Tr("form.auth_failed", strings.Replace(err.Error(), ":"+form.AuthPassword+"@", ":<password>@", 1)), MIGRATE, &form)
return return
} }

4
templates/install.tmpl
View file

@ -108,7 +108,7 @@
<!-- Optional Settings --> <!-- Optional Settings -->
<h4 class="ui dividing header">{{.i18n.Tr "install.optional_title"}}</h4> <h4 class="ui dividing header">{{.i18n.Tr "install.optional_title"}}</h4>
<div class="ui accordion optional field"> <div class="ui accordion optional field">
<div class="title {{if .Err_SMTP}}text-error{{end}}"> <div class="title {{if .Err_SMTP}}text red{{end}}">
<i class="icon dropdown"></i> <i class="icon dropdown"></i>
{{.i18n.Tr "install.email_title"}} {{.i18n.Tr "install.email_title"}}
</div> </div>
@ -173,7 +173,7 @@
</div> </div>
<div class="ui accordion optional field"> <div class="ui accordion optional field">
<div class="title {{if .Err_Admin}}text-error{{end}}"> <div class="title {{if .Err_Admin}}text red{{end}}">
<i class="icon dropdown"></i> <i class="icon dropdown"></i>
{{.i18n.Tr "install.admin_title"}} {{.i18n.Tr "install.admin_title"}}
</div> </div>

173
templates/repo/migrate.tmpl
View file

@ -1,82 +1,97 @@
{{template "ng/base/head" .}} {{template "base/head" .}}
{{template "ng/base/header" .}} <div class="repository new migrate">
<div id="repo-wrapper"> <div class="ui middle very relaxed page grid">
<form id="repo-migrate-form" class="form form-align panel panel-radius" action="{{AppSubUrl}}/repo/migrate" method="post"> <div class="column">
{{.CsrfTokenHtml}} <form class="ui form" action="{{.Link}}" method="post">
<div class="panel-header"><h2>{{.i18n.Tr "new_migrate"}}</h2></div> {{.CsrfTokenHtml}}
<div class="panel-content"> <h3 class="ui top attached header">
{{template "ng/base/alert" .}} {{.i18n.Tr "new_migrate"}}
<div class="field"> </h3>
<label class="req" for="clone_addr">{{.i18n.Tr "repo.migrate.clone_address"}}</label> <div class="ui attached segment">
<input class="ipt ipt-large ipt-radius {{if .Err_CloneAddr}}ipt-error{{end}}" id="clone_addr" name="clone_addr" type="text" value="{{.clone_addr}}" required /> {{template "base/alert" .}}
<div class="inline required field {{if .Err_CloneAddr}}error{{end}}">
<label for="clone_addr">{{.i18n.Tr "repo.migrate.clone_address"}}</label>
<input id="clone_addr" name="clone_addr" value="{{.clone_addr}}" autofocus required>
<span class="help">{{.i18n.Tr "repo.migrate.clone_address_desc"}}</span>
</div>
<div class="ui accordion optional field">
<div class="title {{if .Err_Auth}}text red active{{end}}">
<i class="icon dropdown"></i>
{{.i18n.Tr "repo.need_auth"}}
</div> </div>
<div class="field"> <div class="content {{if .Err_Auth}}active{{end}}">
<span class="form-label"></span> <div class="inline field {{if .Err_Auth}}error{{end}}">
<button class="btn btn-large btn-gray btn-radius" id="auth-button" data-toggle="collapse" data-target="#repo-import-auth">{{.i18n.Tr "repo.need_auth"}}</button> <label for="auth_username">{{.i18n.Tr "username"}}</label>
<div id="repo-migrate-auth" {{if not .Err_Auth}}class="hide"{{end}}> <input id="auth_username" name="auth_username" value="{{.auth_username}}123" {{if not .auth_username}}data-need-clear="true"{{end}}>
<div class="field"> </div>
<label for="auth_username">{{.i18n.Tr "username"}}</label> <div class="inline field {{if .Err_Auth}}error{{end}}">
<input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_username" name="auth_username" type="text" value="{{.auth_username}}" /> <label for="auth_password">{{.i18n.Tr "password"}}</label>
</div> <input id="auth_password" name="auth_password" type="password" value="{{.auth_password}}">
<div class="field"> </div>
<label for="auth_password">{{.i18n.Tr "password"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_password" name="auth_password" type="password" value="{{.auth_password}}" />
</div>
</div>
</div> </div>
<hr/> </div>
<div class="field">
<label for="owner" class="req">{{.i18n.Tr "repo.owner"}}</label> <div class="ui divider"></div>
<input id="repo-owner-id" type="hidden" name="uid" value="{{.ContextUser.Id}}" />
<div class="inline-block drop"> <div class="inline required field {{if .Err_Owner}}error{{end}}">
<a href="#" class="drop-bottom"> <label>{{.i18n.Tr "repo.owner"}}</label>
<img class="avatar" src="{{.ContextUser.AvatarLink}}" id="repo-owner-avatar" alt="user-avatar"> <div class="ui selection dropdown">
<strong id="repo-owner-name">{{.ContextUser.Name}}</strong> <input type="hidden" id="uid" name="uid" value="{{.ContextUser.Id}}" required>
</a> <span class="text">
<ul class="drop-down menu menu-vertical menu-radius switching-list" id="repo-create-owner-list"> <img class="ui mini image" src="{{.ContextUser.AvatarLink}}">
<li {{if eq $.ContextUser.Id .SignedUser.Id}}class="checked"{{end}} data-uid="{{.SignedUser.Id}}"> {{.ContextUser.Name}}
<a> </span>
<i class="octicon octicon-check"></i> <i class="dropdown icon"></i>
<img class="avatar" src="{{.SignedUser.AvatarLink}}" alt="user-avatar"> <div class="menu">
<strong>{{.SignedUser.Name}}</strong> <div class="item" data-value="{{.SignedUser.Id}}">
</a> <img class="ui mini image" src="{{.SignedUser.AvatarLink}}">
</li> {{.SignedUser.Name}}
{{range .Orgs}} </div>
<li {{if eq $.ContextUser.Id .Id}}class="checked"{{end}} data-uid="{{.Id}}"> {{range .Orgs}}
<a> {{if .IsOwnedBy $.SignedUser.Id}}
<i class="octicon octicon-check"></i> <div class="item" data-value="{{.Id}}">
<img class="avatar" src="{{.AvatarLink}}" alt="user-avatar"> <img class="ui mini image" src="{{.AvatarLink}}">
<strong>{{.Name}}</strong> {{.Name}}
</a> </div>
</li> {{end}}
{{end}} {{end}}
</ul> </div>
</div> </div>
</div> </div>
<div class="field">
<label class="req" for="repo-name">{{.i18n.Tr "repo.repo_name"}}</label> <div class="inline required field {{if .Err_RepoName}}error{{end}}">
<input class="ipt ipt-large ipt-radius {{if .Err_RepoName}}ipt-error{{end}}" id="repo-name" name="repo_name" type="text" value="{{.repo_name}}" required /> <label for="repo_name">{{.i18n.Tr "repo.repo_name"}}</label>
</div> <input id="repo_name" name="repo_name" value="{{.repo_name}}" required>
<div class="field"> </div>
<label for="visibility">{{.i18n.Tr "repo.visibility"}}</label> <div class="inline field">
<input class="ipt-chk" id="visibility" name="private" type="checkbox" {{if .private}}checked{{end}} /> <label>{{.i18n.Tr "repo.visibility"}}</label>
<span>{{.i18n.Tr "repo.visiblity_helper" | Str2html}}</span> <div class="ui toggle checkbox">
</div> <input name="private" type="checkbox" {{if .private}}checked{{end}}>
<div class="field"> <label>{{.i18n.Tr "repo.visiblity_helper" | Safe}}</label>
<label for="migrate_type">{{.i18n.Tr "repo.migrate_type"}}</label> </div>
<input class="ipt-chk" id="migrate_type" name="mirror" type="checkbox" {{if .mirror}}checked{{end}} /> </div>
<span>{{.i18n.Tr "repo.migrate_type_helper" | Str2html}}</span> <div class="inline field">
</div> <label>{{.i18n.Tr "repo.migrate_type"}}</label>
<div class="field clear"> <div class="ui toggle checkbox">
<label class="left" for="description">{{.i18n.Tr "repo.repo_desc"}}</label> <input name="mirror" type="checkbox" {{if .mirror}}checked{{end}}>
<textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="description" name="description">{{.description}}</textarea> <label>{{.i18n.Tr "repo.migrate_type_helper" | Safe}}</label>
</div> </div>
<div class="field"> </div>
<label for="repo-create-submit"></label> <div class="inline field {{if .Err_Description}}error{{end}}">
<button class="btn btn-large btn-blue btn-radius" id="repo-create-submit">{{.i18n.Tr "repo.migrate_repo"}}</button> <label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
<a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a> <textarea id="description" name="description">{{.description}}</textarea>
</div> </div>
</div>
</form> <div class="inline field">
<label></label>
<button class="ui green button">
{{.i18n.Tr "repo.migrate_repo"}}
</button>
<a class="ui button" href="{{AppSubUrl}}/">{{.i18n.Tr "cancel"}}</a>
</div>
</div>
</form>
</div>
</div>
</div> </div>
{{template "ng/base/footer" .}} {{template "base/footer" .}}

82
templates/repo/migrate_old.tmpl Normal file
View file

@ -0,0 +1,82 @@
{{template "ng/base/head" .}}
{{template "ng/base/header" .}}
<div id="repo-wrapper">
<form id="repo-migrate-form" class="form form-align panel panel-radius" action="{{AppSubUrl}}/repo/migrate" method="post">
{{.CsrfTokenHtml}}
<div class="panel-header"><h2>{{.i18n.Tr "new_migrate"}}</h2></div>
<div class="panel-content">
{{template "ng/base/alert" .}}
<div class="field">
<label class="req" for="clone_addr">{{.i18n.Tr "repo.migrate.clone_address"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_CloneAddr}}ipt-error{{end}}" id="clone_addr" name="clone_addr" type="text" value="{{.clone_addr}}" required />
</div>
<div class="field">
<span class="form-label"></span>
<button class="btn btn-large btn-gray btn-radius" id="auth-button" data-toggle="collapse" data-target="#repo-import-auth">{{.i18n.Tr "repo.need_auth"}}</button>
<div id="repo-migrate-auth" {{if not .Err_Auth}}class="hide"{{end}}>
<div class="field">
<label for="auth_username">{{.i18n.Tr "username"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_username" name="auth_username" type="text" value="{{.auth_username}}" />
</div>
<div class="field">
<label for="auth_password">{{.i18n.Tr "password"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Auth}}ipt-error{{end}}" id="auth_password" name="auth_password" type="password" value="{{.auth_password}}" />
</div>
</div>
</div>
<hr/>
<div class="field">
<label for="owner" class="req">{{.i18n.Tr "repo.owner"}}</label>
<input id="repo-owner-id" type="hidden" name="uid" value="{{.ContextUser.Id}}" />
<div class="inline-block drop">
<a href="#" class="drop-bottom">
<img class="avatar" src="{{.ContextUser.AvatarLink}}" id="repo-owner-avatar" alt="user-avatar">
<strong id="repo-owner-name">{{.ContextUser.Name}}</strong>
</a>
<ul class="drop-down menu menu-vertical menu-radius switching-list" id="repo-create-owner-list">
<li {{if eq $.ContextUser.Id .SignedUser.Id}}class="checked"{{end}} data-uid="{{.SignedUser.Id}}">
<a>
<i class="octicon octicon-check"></i>
<img class="avatar" src="{{.SignedUser.AvatarLink}}" alt="user-avatar">
<strong>{{.SignedUser.Name}}</strong>
</a>
</li>
{{range .Orgs}}
<li {{if eq $.ContextUser.Id .Id}}class="checked"{{end}} data-uid="{{.Id}}">
<a>
<i class="octicon octicon-check"></i>
<img class="avatar" src="{{.AvatarLink}}" alt="user-avatar">
<strong>{{.Name}}</strong>
</a>
</li>
{{end}}
</ul>
</div>
</div>
<div class="field">
<label class="req" for="repo-name">{{.i18n.Tr "repo.repo_name"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_RepoName}}ipt-error{{end}}" id="repo-name" name="repo_name" type="text" value="{{.repo_name}}" required />
</div>
<div class="field">
<label for="visibility">{{.i18n.Tr "repo.visibility"}}</label>
<input class="ipt-chk" id="visibility" name="private" type="checkbox" {{if .private}}checked{{end}} />
<span>{{.i18n.Tr "repo.visiblity_helper" | Str2html}}</span>
</div>
<div class="field">
<label for="migrate_type">{{.i18n.Tr "repo.migrate_type"}}</label>
<input class="ipt-chk" id="migrate_type" name="mirror" type="checkbox" {{if .mirror}}checked{{end}} />
<span>{{.i18n.Tr "repo.migrate_type_helper" | Str2html}}</span>
</div>
<div class="field clear">
<label class="left" for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
<textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="description" name="description">{{.description}}</textarea>
</div>
<div class="field">
<label for="repo-create-submit"></label>
<button class="btn btn-large btn-blue btn-radius" id="repo-create-submit">{{.i18n.Tr "repo.migrate_repo"}}</button>
<a class="btn btn-small btn-gray btn-radius" id="repo-create-cancel" href="{{AppSubUrl}}/"><strong>{{.i18n.Tr "cancel"}}</strong></a>
</div>
</div>
</form>
</div>
{{template "ng/base/footer" .}}