diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/repo/fork.tmpl | 65 | ||||
| -rw-r--r-- | templates/repo/header.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/header_old.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/pulls/fork.tmpl | 69 |
4 files changed, 71 insertions, 67 deletions
diff --git a/templates/repo/fork.tmpl b/templates/repo/fork.tmpl deleted file mode 100644 index 1d096a75d8..0000000000 --- a/templates/repo/fork.tmpl +++ /dev/null @@ -1,65 +0,0 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="repo-wrapper"> - <form id="repo-create-form" class="form form-align panel panel-radius" action="{{AppSubUrl}}/repo/fork?fork_id={{.ForkId}}" method="post"> - {{.CsrfTokenHtml}} - <div class="panel-header"> - <h2>{{.i18n.Tr "new_fork"}}</h2> - </div> - <div class="panel-content"> - {{template "ng/base/alert" .}} - <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 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>{{.i18n.Tr "repo.fork_from"}}</label> - <span><a target="_blank" href="{{AppSubUrl}}/{{.ForkFrom}}">{{.ForkFrom}}</a></span> - </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 /> - <span class="form-label"></span> - <span class="help">{{.i18n.Tr "repo.repo_name_helper" | Str2html}}</span> - </div> - <div class="field"> - <label for="visibility">{{.i18n.Tr "repo.visibility"}}</label> - <span>{{.i18n.Tr "repo.fork_visiblity_helper"}}</span> - </div> - <div class="field clear"> - <label class="left" for="desc">{{.i18n.Tr "repo.repo_desc"}}</label> - <textarea class="ipt ipt-large ipt-radius {{if .Err_Description}}ipt-error{{end}}" id="desc" name="desc">{{.desc}}</textarea> - </div> - <div class="field"> - <label></label> - <button class="btn btn-large btn-blue btn-radius">{{.i18n.Tr "repo.fork_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" .}}
\ No newline at end of file diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 4e307a092d..514fef6b7b 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -19,7 +19,7 @@ <i class="fa fa-star{{if not $.IsStaringRepo}}-o{{end}}"></i> {{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} <span class="num">{{.NumStars}}</span> </a> - <a class="ui black basic button {{if $.IsRepositoryOwner}}poping up{{end}}" {{if not $.IsRepositoryOwner}}href="{{AppSubUrl}}/repo/fork?fork_id={{.Id}}"{{end}} {{if $.IsRepositoryOwner}}data-content="{{$.i18n.Tr "repo.fork_from_self"}}"{{end}}> + <a class="ui black basic button {{if $.IsRepositoryOwner}}poping up{{end}}" {{if not $.IsRepositoryOwner}}href="{{AppSubUrl}}/repo/fork/{{.Id}}"{{end}} {{if $.IsRepositoryOwner}}data-content="{{$.i18n.Tr "repo.fork_from_self"}}"{{end}}> <i class="octicon octicon-repo-forked"></i> {{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span> </a> diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl index 21f9cea882..420cd12537 100644 --- a/templates/repo/header_old.tmpl +++ b/templates/repo/header_old.tmpl @@ -49,7 +49,7 @@ </a> </li> <li id="repo-header-fork"> - <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork?fork_id={{.Id}}"{{end}}> + <a id="repo-header-fork-btn" {{if or (not $.IsRepositoryAdmin) $.Owner.IsOrganization}}href="{{AppSubUrl}}/repo/fork/{{.Id}}"{{end}}> <button class="btn btn-gray text-bold btn-radius"> <i class="octicon octicon-repo-forked"></i>{{$.i18n.Tr "repo.fork"}} <span class="num">{{.NumForks}}</span> diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl new file mode 100644 index 0000000000..acac9040f0 --- /dev/null +++ b/templates/repo/pulls/fork.tmpl @@ -0,0 +1,69 @@ +{{template "base/head" .}} +<div class="repository new fork"> + <div class="ui middle very relaxed page grid"> + <div class="column"> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <h3 class="ui top attached header"> + {{.i18n.Tr "new_fork"}} + </h3> + <div class="ui attached segment"> + {{template "base/alert" .}} + <div class="inline required field {{if .Err_Owner}}error{{end}}"> + <label>{{.i18n.Tr "repo.owner"}}</label> + <div class="ui selection dropdown"> + <input type="hidden" id="uid" name="uid" value="{{.ContextUser.Id}}" required> + <span class="text"> + <img class="ui mini avatar image" src="{{.ContextUser.AvatarLink}}"> + {{.ContextUser.Name}} + </span> + <i class="dropdown icon"></i> + <div class="menu"> + <div class="item" data-value="{{.SignedUser.Id}}"> + <img class="ui mini avatar image" src="{{.SignedUser.AvatarLink}}"> + {{.SignedUser.Name}} + </div> + {{range .Orgs}} + <div class="item" data-value="{{.Id}}"> + <img class="ui mini avatar image" src="{{.AvatarLink}}"> + {{.Name}} + </div> + {{end}} + </div> + </div> + </div> + + <div class="inline field"> + <label>{{.i18n.Tr "repo.fork_from"}}</label> + <a href="{{AppSubUrl}}/{{.ForkFrom}}">{{.ForkFrom}}</a> + </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 class="inline field"> + <label>{{.i18n.Tr "repo.visibility"}}</label> + <div class="ui read-only toggle checkbox"> + <input type="checkbox" {{if .IsPrivate}}checked{{end}}> + <label>{{.i18n.Tr "repo.visiblity_helper" | Safe}}</label> + </div> + <span class="help">{{.i18n.Tr "repo.fork_visiblity_helper"}}</span> + </div> + <div class="inline field {{if .Err_Description}}error{{end}}"> + <label for="desc">{{.i18n.Tr "repo.repo_desc"}}</label> + <textarea id="desc" name="desc">{{.desc}}</textarea> + </div> + + <div class="inline field"> + <label></label> + <button class="ui green button"> + {{.i18n.Tr "repo.fork_repo"}} + </button> + <a class="ui button" href="{{AppSubUrl}}/{{.ForkFrom}}">{{.i18n.Tr "cancel"}}</a> + </div> + </div> + </form> + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file |