playground
/
gogs
mirror of https://github.com/gogits/gogs.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

#1180 and #1250: migration

pull/1490/head
Unknwon 10 years ago
parent
b35d7eee31
commit
e633425f27
10 changed files with 231 additions and 116 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      conf/locale/locale_en-US.ini
  2. 4
      modules/bindata/bindata.go
  3. 2
      public/css/gogs.min.css
  4. 10
      public/js/gogs.js
  5. 3
      public/less/_base.less
  6. 10
      public/less/_form.less
  7. 2
      routers/repo/repo.go
  8. 4
      templates/install.tmpl
  9. 147
      templates/repo/migrate.tmpl
  10. 82
      templates/repo/migrate_old.tmpl

3
conf/locale/locale_en-US.ini
Unescape 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
Unescape 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
Unescape 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 {

10
public/less/_form.less
Unescape View File

@ -12,7 +12,9 @@
margin-top: -5px; margin-top: -5px;
} }
} }
.repository.new.fork { .repository {
&.new.migrate,
&.new.fork {
form { form {
margin: auto; margin: auto;
width: 800px!important; width: 800px!important;
@ -29,7 +31,7 @@
word-wrap: break-word; word-wrap: break-word;
} }
.help { .help {
margin-left: @input-padding+10px; margin-left: @input-padding+15px;
} }
.dropdown { .dropdown {
.dropdown.icon { .dropdown.icon {
@ -42,9 +44,13 @@
} }
} }
} }
.optional .title {
margin-left: @input-padding;
}
input, input,
textarea { textarea {
width: 50%!important; width: 50%!important;
} }
} }
}
} }

2
routers/repo/repo.go
Unescape 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
Unescape 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>

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

82
templates/repo/migrate_old.tmpl
Unescape 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" .}}
Write Preview
Loading…
Cancel
Save