diff options
Diffstat (limited to 'templates/repo')
38 files changed, 786 insertions, 684 deletions
diff --git a/templates/repo/commits.tmpl b/templates/repo/commits.tmpl index 2f68f1e0..9d5af311 100644 --- a/templates/repo/commits.tmpl +++ b/templates/repo/commits.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div class="container clear"> {{template "repo/commits_table" .}} </div> diff --git a/templates/repo/diff.tmpl b/templates/repo/diff.tmpl index f261da55..268bbc16 100644 --- a/templates/repo/diff.tmpl +++ b/templates/repo/diff.tmpl @@ -1,12 +1,12 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div class="container clear" id="diff-page"> {{if .IsDiffCompare }} <div class="panel panel-info panel-radius compare-head-box"> <div class="panel-header"> - <a class="pull-right btn btn-blue btn-header btn-medium btn-radius" rel="nofollow" href="{{.SourcePath}}">{{.i18n.Tr "repo.diff.browse_source"}}</a> + <a class="pull-right btn btn-blue btn-header btn-medium btn-radius" rel="nofollow" href="{{EscapePound .SourcePath}}">{{.i18n.Tr "repo.diff.browse_source"}}</a> <h4><a href="{{$.RepoLink}}/commit/{{.BeforeCommitId}}" class="label label-green">{{ShortSha .BeforeCommitId}}</a> ... <a href="{{$.RepoLink}}/commit/{{.AfterCommitId}}" class="label label-green">{{ShortSha .AfterCommitId}}</a></h4> </div> <div class="panel-body compare"> @@ -16,7 +16,7 @@ {{else}} <div class="panel panel-info panel-radius diff-head-box"> <div class="panel-header"> - <a class="pull-right btn btn-blue btn-header btn-medium btn-radius" rel="nofollow" href="{{.SourcePath}}">{{.i18n.Tr "repo.diff.browse_source"}}</a> + <a class="pull-right btn btn-blue btn-header btn-medium btn-radius" rel="nofollow" href="{{EscapePound .SourcePath}}">{{.i18n.Tr "repo.diff.browse_source"}}</a> <h4 class="commit-message">{{RenderCommitMessage .Commit.Message $.RepoLink}}</h4> </div> <div class="panel-body"> @@ -37,7 +37,7 @@ <img class="avatar-30" src="{{AvatarLink .Commit.Author.Email}}" /> <strong>{{.Commit.Author.Name}}</strong> {{end}} - <span class="text-grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> + <span class="text-grey" id="authored-time">{{TimeSince .Commit.Author.When $.Lang}}</span> </p> </div> </div> @@ -90,9 +90,9 @@ {{end}} </div> {{if $file.IsDeleted}} - <a class="btn btn-gray btn-header btn-radius text-black pull-right" rel="nofollow" href="{{$.BeforeSourcePath}}/{{.Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + <a class="btn btn-gray btn-header btn-radius text-black pull-right" rel="nofollow" href="{{EscapePound $.BeforeSourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> {{else}} - <a class="btn btn-gray btn-header btn-radius text-black pull-right" rel="nofollow" href="{{$.SourcePath}}/{{.Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> + <a class="btn btn-gray btn-header btn-radius text-black pull-right" rel="nofollow" href="{{EscapePound $.SourcePath}}/{{EscapePound .Name}}">{{$.i18n.Tr "repo.diff.view_file"}}</a> {{end}} <span class="file">{{$file.Name}}</span> </div> @@ -100,7 +100,7 @@ <div class="panel-body file-body file-code code-view code-diff"> {{if $isImage}} <div class="text-center"> - <img src="{{$.RawPath}}/{{.Name}}"> + <img src="{{$.RawPath}}/{{EscapePound .Name}}"> </div> {{else}} <table> @@ -114,7 +114,7 @@ <td class="lines-num lines-num-new"> <span rel="{{if $line.RightIdx}}diff-{{Sha1 $file.Name}}R{{$line.RightIdx}}{{end}}">{{if $line.RightIdx}}{{$line.RightIdx}}{{end}}</span> </td> - + <td class="lines-code"> <pre>{{$line.Content}}</pre> </td> @@ -126,7 +126,7 @@ {{end}} </div> </div> - <br> + <br> {{end}} {{end}} </div> diff --git a/templates/repo/fork.tmpl b/templates/repo/fork.tmpl deleted file mode 100644 index 1d096a75..00000000 --- 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 21f9cea8..514fef6b 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -1,63 +1,29 @@ {{with .Repository}} -<div id="repo-header" class="clear"> - <div class="container clear"> - <h1 id="repo-header-name" class="left public"> - <i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i> - <a class="author" href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> - <span class="divider">/</span> - <a class="repo text-bold" href="{{$.RepoLink}}">{{.Name}}</a> - {{if .IsMirror}}<span class="label label-gray">{{$.i18n.Tr "mirror"}}</span>{{end}} - {{if .IsFork}}<span class="fork-flag">forked from <a href="{{.ForkRepo.RepoLink}}">{{SubStr .ForkRepo.RepoLink 1 -1}}</a></span>{{end}} - </h1> - <ul id="repo-header-meta" class="right menu menu-line"> - <li id="repo-header-download" class="drop"> - <a id="repo-header-download-btn" href="#"> - <button class="btn btn-black text-bold btn-radius"> - <i class="octicon octicon-cloud-download"></i> - </button> - </a> - <div id="repo-header-download-drop" class="drop-down"> - <div id="repo-clone" class="clear"> - {{if not $.DisableSSH}} - <button class="btn btn-blue left btn-left-radius" id="repo-clone-ssh" data-link="{{$.CloneLink.SSH}}">SSH</button> - {{end}} - <button class="btn {{if $.DisableSSH}}btn-blue{{else}}btn-gray{{end}} left" id="repo-clone-https" data-link="{{$.CloneLink.HTTPS}}">HTTPS</button> - <input id="repo-clone-url" class="ipt ipt-disabled left" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" onclick="this.select();" readonly /> - <button id="repo-clone-copy" class="btn btn-black left btn-right-radius" data-copy-val="val" data-copy-from="#repo-clone-url" original-title="{{$.i18n.Tr "repo.click_to_copy"}}" data-original-title="{{$.i18n.Tr "repo.click_to_copy"}}" data-after-title="{{$.i18n.Tr "repo.copied"}}">{{$.i18n.Tr "repo.copy_link"}}</button> - <p class="text-center" id="repo-clone-help">{{$.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}</p> - <hr/> - <div class="text-center" id="repo-clone-zip"> - <a class="btn btn-green btn-radius" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip"><i class="octicon octicon-file-zip"></i>ZIP</a> - <a class="btn btn-green btn-radius" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz"><i class="octicon octicon-file-zip"></i>TAR.GZ</a> - </div> - </div> - </div> - </li> - <li id="repo-header-watch"> - <a id="repo-header-watch-btn" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch"> - <button class="btn btn-gray text-bold btn-radius"> - <i class="octicon octicon-eye-watch"></i>{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}}<span class="num">{{.NumWatches}}</span> - </button> - </a> - </li> - <li id="repo-header-star"> - <a id="repo-header-star-btn" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star"> - <button class="btn btn-gray text-bold btn-radius"> - <i class="octicon octicon-star"></i>{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} - <span class="num">{{.NumStars}}</span> - </button> - </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}}> - <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> - </button> - </a> - - </li> - </ul> - </div> +<div class="ui middle page head grid"> + <h2 class="ui left"> + <div class="ui breadcrumb"> + <i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i> + <a href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> + <div class="divider"> / </div> + <a href="{{$.RepoLink}}">{{.Name}}</a> + {{if .IsMirror}}<div class="ui label">{{$.i18n.Tr "mirror"}}</div>{{end}} + {{if .IsFork}}<div class="fork-flag">{{$.i18n.Tr "repo.forked_from"}} <a href="{{.ForkRepo.RepoLink}}">{{SubStr .ForkRepo.RepoLink 1 -1}}</a></div>{{end}} + </div> + </h2> + <div class="ui right floated secondary menu"> + <a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}"> + <i class="fa fa-eye{{if not $.IsWatchingRepo}}-slash{{end}}"></i> + {{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}} <span class="num">{{.NumWatches}}</span> + </a> + <a class="ui black basic button" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}"> + <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/{{.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> + </div> </div> -{{end}} +<div class="ui divider"></div> +{{end}}
\ No newline at end of file diff --git a/templates/repo/header_old.tmpl b/templates/repo/header_old.tmpl new file mode 100644 index 00000000..420cd125 --- /dev/null +++ b/templates/repo/header_old.tmpl @@ -0,0 +1,63 @@ +{{with .Repository}} +<div id="repo-header" class="clear"> + <div class="container clear"> + <h1 id="repo-header-name" class="left public"> + <i class="mega-octicon octicon-{{if .IsPrivate}}lock{{else if .IsMirror}}repo-clone{{else if .IsFork}}repo-forked{{else}}repo{{end}}"></i> + <a class="author" href="{{AppSubUrl}}/{{.Owner.Name}}">{{.Owner.Name}}</a> + <span class="divider">/</span> + <a class="repo text-bold" href="{{$.RepoLink}}">{{.Name}}</a> + {{if .IsMirror}}<span class="label label-gray">{{$.i18n.Tr "mirror"}}</span>{{end}} + {{if .IsFork}}<span class="fork-flag">forked from <a href="{{.ForkRepo.RepoLink}}">{{SubStr .ForkRepo.RepoLink 1 -1}}</a></span>{{end}} + </h1> + <ul id="repo-header-meta" class="right menu menu-line"> + <li id="repo-header-download" class="drop"> + <a id="repo-header-download-btn" href="#"> + <button class="btn btn-black text-bold btn-radius"> + <i class="octicon octicon-cloud-download"></i> + </button> + </a> + <div id="repo-header-download-drop" class="drop-down"> + <div id="repo-clone" class="clear"> + {{if not $.DisableSSH}} + <button class="btn btn-blue left btn-left-radius" id="repo-clone-ssh" data-link="{{$.CloneLink.SSH}}">SSH</button> + {{end}} + <button class="btn {{if $.DisableSSH}}btn-blue{{else}}btn-gray{{end}} left" id="repo-clone-https" data-link="{{$.CloneLink.HTTPS}}">HTTPS</button> + <input id="repo-clone-url" class="ipt ipt-disabled left" value="{{if $.DisableSSH}}{{$.CloneLink.HTTPS}}{{else}}{{$.CloneLink.SSH}}{{end}}" onclick="this.select();" readonly /> + <button id="repo-clone-copy" class="btn btn-black left btn-right-radius" data-copy-val="val" data-copy-from="#repo-clone-url" original-title="{{$.i18n.Tr "repo.click_to_copy"}}" data-original-title="{{$.i18n.Tr "repo.click_to_copy"}}" data-after-title="{{$.i18n.Tr "repo.copied"}}">{{$.i18n.Tr "repo.copy_link"}}</button> + <p class="text-center" id="repo-clone-help">{{$.i18n.Tr "repo.clone_helper" "http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository" | Str2html}}</p> + <hr/> + <div class="text-center" id="repo-clone-zip"> + <a class="btn btn-green btn-radius" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.zip"><i class="octicon octicon-file-zip"></i>ZIP</a> + <a class="btn btn-green btn-radius" href="{{$.RepoLink}}/archive/{{EscapePound $.BranchName}}.tar.gz"><i class="octicon octicon-file-zip"></i>TAR.GZ</a> + </div> + </div> + </div> + </li> + <li id="repo-header-watch"> + <a id="repo-header-watch-btn" href="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch"> + <button class="btn btn-gray text-bold btn-radius"> + <i class="octicon octicon-eye-watch"></i>{{if $.IsWatchingRepo}}{{$.i18n.Tr "repo.unwatch"}}{{else}}{{$.i18n.Tr "repo.watch"}}{{end}}<span class="num">{{.NumWatches}}</span> + </button> + </a> + </li> + <li id="repo-header-star"> + <a id="repo-header-star-btn" href="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star"> + <button class="btn btn-gray text-bold btn-radius"> + <i class="octicon octicon-star"></i>{{if $.IsStaringRepo}}{{$.i18n.Tr "repo.unstar"}}{{else}}{{$.i18n.Tr "repo.star"}}{{end}} + <span class="num">{{.NumStars}}</span> + </button> + </a> + </li> + <li id="repo-header-fork"> + <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> + </button> + </a> + + </li> + </ul> + </div> +</div> +{{end}} diff --git a/templates/repo/home.tmpl b/templates/repo/home.tmpl index 0eb2bea1..831a3962 100644 --- a/templates/repo/home.tmpl +++ b/templates/repo/home.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="repo-content" class="clear container"> <div id="repo-main" class="left grid-5-6"> <p id="repo-desc"> @@ -48,9 +48,10 @@ {{ $l := Subtract $n 1}} {{range $i, $v := .Treenames}} {{if eq $i $l}} - <span class="bread">{{EscapePound $v}}</span> + <span class="bread">{{$v}}</span> {{else}} - <span class="bread"><a href="{{EscapePound $.BranchLink}}/{{index $.Paths $i}}">{{$v}}</a></span> + {{ $p := index $.Paths $i}} + <span class="bread"><a href="{{EscapePound $.BranchLink}}/{{EscapePound $p}}">{{$v}}</a></span> {{end}} {{end}} </li> diff --git a/templates/repo/issue/alert.tmpl b/templates/repo/issue/alert.tmpl new file mode 100644 index 00000000..bdc32ce4 --- /dev/null +++ b/templates/repo/issue/alert.tmpl @@ -0,0 +1,5 @@ +{{if .Flash}} +<div class="sixteen wide center aligned centered column"> + {{template "base/alert" .}} +</div> +{{end}}
\ No newline at end of file diff --git a/templates/repo/issue/create.tmpl b/templates/repo/issue/create.tmpl index ed7ba355..307be6aa 100644 --- a/templates/repo/issue/create.tmpl +++ b/templates/repo/issue/create.tmpl @@ -12,7 +12,7 @@ </div> <div class="col-md-8 panel panel-default"> <div class="form-group panel-body"> - <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" /> + <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" autofocus /> </div> <div class="form-group panel-body"> {{if .IsRepositoryOwner}} @@ -54,7 +54,7 @@ {{else}} <ul class="list-unstyled"> {{range .OpenMilestones}} - <li class="milestone-item" data-id="{{.Id}}"> + <li class="milestone-item" data-id="{{.ID}}"> <p><strong>{{.Name}}</strong></p> <!-- <p>due to 3 days later</p> --> </li> @@ -69,7 +69,7 @@ {{else}} <ul class="list-unstyled"> {{range .ClosedMilestones}} - <li class="milestone-item" data-id="{{.Id}}"> + <li class="milestone-item" data-id="{{.ID}}"> <p><strong>{{.Name}}</strong></p> <p>Closed {{TimeSince .ClosedDate $.Lang}}</p> </li> diff --git a/templates/repo/issue/label_precolors.tmpl b/templates/repo/issue/label_precolors.tmpl new file mode 100644 index 00000000..378281b3 --- /dev/null +++ b/templates/repo/issue/label_precolors.tmpl @@ -0,0 +1,16 @@ +<a class="color" style="background-color:#e11d21" data-color-hex="#e11d21"></a> +<a class="color" style="background-color:#eb6420" data-color-hex="#eb6420"></a> +<a class="color" style="background-color:#fbca04" data-color-hex="#fbca04"></a> +<a class="color" style="background-color:#009800" data-color-hex="#009800"></a> +<a class="color" style="background-color:#006b75" data-color-hex="#006b75"></a> +<a class="color" style="background-color:#207de5" data-color-hex="#207de5"></a> +<a class="color" style="background-color:#0052cc" data-color-hex="#0052cc"></a> +<a class="color" style="background-color:#53e917" data-color-hex="#53e917"></a> +<a class="color" style="background-color:#f6c6c7" data-color-hex="#f6c6c7"></a> +<a class="color" style="background-color:#fad8c7" data-color-hex="#fad8c7"></a> +<a class="color" style="background-color:#fef2c0" data-color-hex="#fef2c0"></a> +<a class="color" style="background-color:#bfe5bf" data-color-hex="#bfe5bf"></a> +<a class="color" style="background-color:#bfdadc" data-color-hex="#bfdadc"></a> +<a class="color" style="background-color:#c7def8" data-color-hex="#c7def8"></a> +<a class="color" style="background-color:#bfd4f2" data-color-hex="#bfd4f2"></a> +<a class="color" style="background-color:#d4c5f9" data-color-hex="#d4c5f9"></a>
\ No newline at end of file diff --git a/templates/repo/issue/labels.tmpl b/templates/repo/issue/labels.tmpl new file mode 100644 index 00000000..4fcaec07 --- /dev/null +++ b/templates/repo/issue/labels.tmpl @@ -0,0 +1,111 @@ +{{template "base/head" .}} +<div class="repository labels"> + {{template "repo/header" .}} + <div class="ui middle page grid body"> + <div class="navbar"> + {{template "repo/issue/navbar" .}} + {{if .IsRepositoryAdmin}} + <form class="ui right form" action="{{$.RepoLink}}/labels/new" method="post"> + {{.CsrfTokenHtml}} + <div class="ui right floated secondary menu"> + <div class="input item"> + <div class="ui large input"> + <input class="new-label-input" name="title" placeholder="{{.i18n.Tr "repo.issues.new_label_placeholder"}}" required> + </div> + </div> + <div class="item"> + <div class="ui large input"> + <input class="color-picker" name="color" value="#70c24a" required> + </div> + </div> + <div class="item precolors"> + {{template "repo/issue/label_precolors"}} + </div> + <button class="ui green button">{{.i18n.Tr "repo.issues.new_label"}}</button> + </div> + </form> + {{end}} + </div> + <div class="ui divider"></div> + {{template "repo/issue/alert" .}} + <div class="ui left"> + <div class="ui black label">{{.i18n.Tr "repo.issues.label_count" .NumLabels}}</div> + </div> + + <div class="sixteen wide column"> + <div class="label list"> + {{range .Labels}} + <li class="item"> + <div class="ui label" style="background-color: {{.Color}}"><i class="octicon octicon-tag"></i> {{.Name}}</div> + {{if $.IsRepositoryAdmin}} + <a class="ui right delete-button" href="#" data-url="{{$.RepoLink}}/labels/delete" data-id="{{.ID}}"><i class="octicon octicon-trashcan"></i> {{$.i18n.Tr "repo.issues.label_delete"}}</a> + <a class="ui right edit-label-button" href="#" data-id={{.ID}} data-title={{.Name}} data-color={{.Color}}><i class="octicon octicon-pencil"></i> {{$.i18n.Tr "repo.issues.label_edit"}}</a> + {{end}} + <a class="ui right open-issues" href="{{$.RepoLink}}/issues?labels={{.ID}}"><i class="octicon octicon-issue-opened"></i> {{$.i18n.Tr "repo.issues.label_open_issues" .NumOpenIssues}}</a> + </li> + {{end}} + </div> + </div> + </div> +</div> + +{{if .IsRepositoryAdmin}} +<div class="ui basic delete modal"> + <div class="header"> + {{.i18n.Tr "repo.issues.label_deletion"}} + </div> + <div class="content"> + <div class="image"> + <i class="trash icon"></i> + </div> + <div class="description"> + <p>{{.i18n.Tr "repo.issues.label_deletion_desc"}}</p> + </div> + </div> + <div class="actions"> + <div class="two fluid ui inverted buttons"> + <div class="ui red basic inverted button"> + <i class="remove icon"></i> + {{.i18n.Tr "modal.no"}} + </div> + <div class="ui green basic inverted positive button"> + <i class="checkmark icon"></i> + {{.i18n.Tr "modal.yes"}} + </div> + </div> + </div> +</div> + +<div class="ui small edit-label modal"> + <div class="header"> + {{.i18n.Tr "repo.issues.label_modify"}} + </div> + <div class="content"> + <form class="ui edit-label form" action="{{$.RepoLink}}/labels/edit" method="post"> + {{.CsrfTokenHtml}} + <input id="label-modal-id" name="id" type="hidden"> + <div class="inline fields"> + <div class="field"> + <input id="label-modal-title" name="title" placeholder="{{.i18n.Tr "repo.issues.new_label_placeholder"}}" required> + </div> + <div class="field"> + <input id="label-modal-color" class="color-picker" name="color" value="#70c24a" required> + </div> + <div class="field precolors"> + {{template "repo/issue/label_precolors"}} + </div> + </div> + </form> + </div> + <div class="actions"> + <div class="ui negative button"> + {{.i18n.Tr "modal.no"}} + </div> + <div class="ui positive right labeled icon button"> + {{.i18n.Tr "modal.modify"}} + <i class="checkmark icon"></i> + </div> + </div> +</div> +{{end}} +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/issue/list.tmpl b/templates/repo/issue/list.tmpl index 0c817bc1..128b3c0b 100644 --- a/templates/repo/issue/list.tmpl +++ b/templates/repo/issue/list.tmpl @@ -1,120 +1,128 @@ -{{template "base/head_old" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -<div id="body" class="container"> - <div id="issue"> - <div class="col-md-3 filters"> - <div class="filter-list"> - <ul class="list-unstyled"> - <li><a href="{{.RepoLink}}/issues?state={{.State}}"{{if eq .ViewType "all"}} class="active"{{end}}>All Issues <strong class="pull-right">{{..IssueStats.AllCount}}</strong></a></li> - <li><a href="{{.RepoLink}}/issues?type=assigned&state={{.State}}"{{if eq .ViewType "assigned"}} class="active"{{end}}>Assigned to you <strong class="pull-right">{{.IssueStats.AssignCount}}</strong></a></li> - <li><a href="{{.RepoLink}}/issues?type=created_by&state={{.State}}"{{if eq .ViewType "created_by"}} class="active"{{end}}>Created by you <strong class="pull-right">{{.IssueStats.CreateCount}}</strong></a></li> - <li><a href="{{.RepoLink}}/issues?type=mentioned&state={{.State}}"{{if eq .ViewType "mentioned"}} class="active"{{end}}>Mentioning you <strong class="pull-right">{{.IssueStats.MentionCount}}</strong></a></li> - </ul> - </div> - <div class="label-filter"> - <h4>Label</h4> - <ul class="list-unstyled" id="label-list" data-ajax="{{$.RepoLink}}/issues/labels/delete"> - {{range .Labels}} - <li class="label-item{{if eq $.SelectLabels .Id}} label-selected{{end}}" id="label-{{.Id}}" data-id="{{.Id}}"> - <a href="?type={{$.ViewType}}&state={{$.State}}{{if not (eq $.SelectLabels .Id)}}&labels={{.Id}}{{end}}"> - <span class="pull-right count">{{if $.IsShowClosed}}{{.NumClosedIssues}}{{else}}{{.NumOpenIssues}}{{end}}</span> - <span class="color" style="background-color: {{.Color}}" data-color="{{.Color}}"></span> - <span class="name">{{.Name}}</span> - </a> - <a class="del pull-right" href="#" data-id="{{.Id}}"><i class="fa fa-times-circle-o"></i></a> - </li> - {{end}} - {{if or .IsRepositoryOwner .IsAdmin}} - <li class="label-change-li" style="display: none"> - <form id="label-change-form" action="{{$.RepoLink}}/issues/labels/edit" method="post"> - {{.CsrfTokenHtml}} - <div class="input-group label-change-color-picker form-group" style="margin-bottom: 2px"> - <input type="text" class="form-control" name="title" required="required" id="label-name-change-ipt"/> - <input type="hidden" name="color" id="label-color-change-ipt" value="#444444"/> - <span class="input-group-addon"><i></i></span> - <input type="hidden" name="id" id="label-change-id-ipt" value="0"/> - </div> - <div class="form-group text-right"> - <input class="form-control input-sm" type="text" id="label-color-change-ipt2" value="#444444"/> - <button class="btn btn-default btn-sm">Save</button> - </div> - </form> - </li> - {{end}} - </ul> - {{if or .IsRepositoryOwner .IsAdmin}} - <button class="btn btn-default btn-block label-button" id="label-manage-btn">Manage Labels</button> - <hr/> - <form id="label-add-form" action="{{$.RepoLink}}/issues/labels/new" method="post"> - {{.CsrfTokenHtml}} - <h5><strong>New Label</strong></h5> - <div class="input-group label-color-picker form-group"> - <input type="text" class="form-control" name="title" required="required" id="label-name-ipt"/> - <input type="hidden" name="color" id="label-color-ipt" value="#444444"/> - <span class="input-group-addon"><i></i></span> - </div> - <div class="form-group text-right"> - <input class="form-control input-sm" type="text" id="label-color-ipt2" value="#444444"/> - <button class="btn btn-default btn-sm">Create</button> - </div> - </form> - {{end}} - </div> - </div> - <div class="col-md-9"> - {{template "base/alert" .}} - <div class="filter-option"> - <div class="btn-group"> - <a class="btn btn-default issue-open{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/issues?type={{.ViewType}}">{{.IssueStats.OpenCount}} Open</a> - <a class="btn btn-default issue-close{{if .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/issues?type={{.ViewType}}&state=closed">{{.IssueStats.ClosedCount}} Closed</a> - </div> - </div> - <div class="issues list-group"> - {{range .Issues}}{{if .Poster}} - <div class="list-group-item issue-item{{if not .IsRead}} unread{{end}}" id="issue-{{.Id}}"> - <span class="number pull-right">#{{.Index}}</span> - <h5 class="title"> - <a href="{{$.RepoLink}}/issues/{{.Index}}">{{.Name}}</a> - <span class="labels"> - {{range .Labels}} - <span class="label" style="background-color: {{.Color}}">{{.Name}}</span> - {{end}} - </span> - </h5> - <p class="info"> - <span class="author"><img class="avatar" src="{{.Poster.AvatarLink}}" alt="" width="20"/> - <a href="{{AppSubUrl}}/{{.Poster.Name}}">{{.Poster.Name}}</a></span> - <span class="time">{{TimeSince .Created $.Lang}}</span> - <span class="comment"><i class="fa fa-comments"></i> {{.NumComments}}</span> - </p> - </div> - {{end}}{{end}} - </div> - </div> - </div> - </div> +{{template "base/head" .}} +<div class="repository"> + {{template "repo/header" .}} + <div class="ui middle page grid body"> + <div class="navbar"> + {{template "repo/issue/navbar" .}} + <div class="ui right floated secondary menu"> + <a class="ui green button" href="{{$.RepoLink}}/issues/new">{{.i18n.Tr "repo.issues.new"}}</a> + </div> + </div> + <div class="ui divider"></div> + <div class="ui left"> + <div class="ui tiny buttons"> + <a class="ui green basic button {{if not .IsShowClosed}}active{{end}}" href="{{.RepoLink}}/issues?type={{$.ViewType}}&state=open&labels={{.SelectLabels}}&milestone={{.MilestoneID}}"> + <i class="octicon octicon-issue-opened"></i> + {{.i18n.Tr "repo.issues.open_tab" .IssueStats.OpenCount}} + </a> + <a class="ui red basic button {{if .IsShowClosed}}active{{end}}" href="{{.RepoLink}}/issues?type={{.ViewType}}&state=closed&labels={{.SelectLabels}}&milestone={{.MilestoneID}}"> + <i class="octicon octicon-issue-closed"></i> + {{.i18n.Tr "repo.issues.close_tab" .IssueStats.ClosedCount}} + </a> + </div> + </div> + <div class="ui right floated secondary filter menu"> + <div class="ui {{if not .Labels}}disabled{{end}} pointing dropdown jump item"> + <span class="text"> + {{.i18n.Tr "repo.issues.filter_label"}} + <i class="dropdown icon"></i> + </span> + <div class="menu"> + <a class="item" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_label_no_select"}}</a> + {{range .Labels}} + <a class="item" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}"><span class="octicon {{if eq $.SelectLabels .ID}}octicon-check{{end}}"></span><span class="label color" style="background-color: {{.Color}}"></span> {{.Name}}</a> + {{end}} + </div> + </div> + <div class="ui {{if not .Milestones}}disabled{{end}} pointing dropdown jump item"> + <span class="text"> + {{.i18n.Tr "repo.issues.filter_milestone"}} + <i class="dropdown icon"></i> + </span> + <div class="menu"> + <a class="item" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{.SelectLabels}}">{{.i18n.Tr "repo.issues.filter_milestone_no_select"}}</a> + {{range .Milestones}} + <a class="clickable item" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}"><span class="octicon {{if eq $.MilestoneID .ID}}octicon-check{{end}}"></span> <span class="name">{{.Name}}</span></a> + {{end}} + </div> + </div> + <!-- <div class="ui {{if not .Assignees}}disabled{{end}} pointing dropdown jump item"> + <span class="text"> + {{.i18n.Tr "repo.issues.filter_assignee"}} + <i class="dropdown icon"></i> + </span> + <div class="menu"> + {{range .Assignees}} + <a class="item" href="{{$.RepoLink}}/issues">{{.Name}}</a> + {{end}} + </div> + </div> --> + <div class="ui pointing dropdown type jump item"> + <span class="text"> + {{.i18n.Tr "repo.issues.filter_type"}} + <i class="dropdown icon"></i> + </span> + <div class="menu"> + <a class="{{if eq .ViewType "all"}}active{{end}} item" href="{{$.RepoLink}}/issues?type=all&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_type.all_issues"}}</a> + <a class="{{if eq .ViewType "assigned"}}active{{end}} item" href="{{$.RepoLink}}/issues?type=assigned&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_type.assigned_to_you"}}</a> + <a class="{{if eq .ViewType "created_by"}}active{{end}} item" href="{{$.RepoLink}}/issues?type=created_by&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_type.created_by_you"}}</a> + <a class="{{if eq .ViewType "mentioned"}}active{{end}} item" href="{{$.RepoLink}}/issues?type=mentioned&state={{$.State}}&labels={{.SelectLabels}}&milestone={{$.MilestoneID}}">{{.i18n.Tr "repo.issues.filter_type.mentioning_you"}}</a> + </div> + </div> + </div> + + <div class="sixteen wide column"> + <div class="issue list"> + {{range .Issues}} + {{ $timeStr:= TimeSince .Created $.Lang }} + <li class="item"> + <div class="ui {{if .IsRead}}black{{else}}green{{end}} label">#{{.Index}}</div> + <a class="title" href="{{$.RepoLink}}/issues/{{.Index}}">{{.Name}}</a> + + {{range .Labels}} + <a class="ui label" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{.ID}}&milestone={{$.MilestoneID}}" style="background-color: {{.Color}}">{{.Name}}</a> + {{end}} + + {{if .NumComments}} + <span class="comment ui right"><i class="octicon octicon-comment"></i> {{.NumComments}}</span> + {{end}} + + <p class="desc"> + {{$.i18n.Tr "repo.issues.opened_by" $timeStr .Poster.Name|Str2html}} + {{if .Milestone}} + {{with .Milestone}} + <a class="milestone" href="{{$.RepoLink}}/issues?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{.ID}}"> + <span class="octicon octicon-milestone"></span> {{.Name}} + </a> + {{end}} + {{end}} + </p> + </li> + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} + <div class="center page buttons"> + <div class="ui borderless pagination menu"> + <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&page={{.Previous}}"{{end}}> + <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}} + </a> + {{range .Pages}} + {{if eq .Num -1}} + <a class="disabled item">...</a> + {{else}} + <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&page={{.Num}}"{{end}}>{{.Num}}</a> + {{end}} + {{end}} + <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?type={{$.ViewType}}&state={{$.State}}&labels={{$.SelectLabels}}&milestone={{$.MilestoneID}}&page={{.Next}}"{{end}}> + {{$.i18n.Tr "repo.issues.next"}} <i class="icon right arrow"></i> + </a> + </div> + </div> + {{end}} + {{end}} + </div> + </div> + </div> </div> -<script src="/js/bootstrap-colorpicker.min.js"></script> -<script> - $(function(){ - $('.label-color-picker').colorpicker({ - input: $('#label-color-ipt') - }).on('changeColor', function (ev) { - var $ipt = $('#label-color-ipt2'); - if ($ipt.val().length != 4) { - $ipt.val(ev.color.toHex()); - } - }); - $('.label-change-color-picker').colorpicker({ - input:$('#label-color-change-ipt') - }).on('changeColor', function (ev) { - var $ipt = $('#label-color-change-ipt2'); - if ($ipt.val().length != 4) { - $ipt.val(ev.color.toHex()); - } - }); - }); -</script> -{{template "base/footer_old" .}} +{{template "base/footer" .}} diff --git a/templates/repo/issue/milestone.tmpl b/templates/repo/issue/milestone.tmpl deleted file mode 100644 index a09b2600..00000000 --- a/templates/repo/issue/milestone.tmpl +++ /dev/null @@ -1,43 +0,0 @@ -{{template "base/head_old" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -<div id="body" class="container"> - <div id="issue"> - <div class="col-md-3 filter-list"> - <ul class="list-unstyled"> - <li><a href="{{.RepoLink}}/issues/milestones"{{if eq .State "open"}} class="active"{{end}}>Open Milestones <strong class="pull-right">{{.Repository.NumOpenMilestones}}</strong></a></li> - <li><a href="{{.RepoLink}}/issues/milestones?state=closed"{{if eq .State "closed"}} class="active"{{end}}>Close Milestones <strong class="pull-right">{{.Repository.NumClosedMilestones}}</strong></a></li> - </ul> - <hr/> - <a href="{{.RepoLink}}/issues/milestones/new" class="text-center"> - <button class="btn btn-default btn-block">Create new milestone</button> - </a> - </div> - <div class="col-md-9"> - <div class="milestones list-group"> - {{range .Milestones}} - <div class="list-group-item milestone-item"> - <h4 class="title pull-left"><a href="{{$.RepoLink}}/issues?milestone={{.Index}}{{if .IsClosed}}&state=closed{{end}}">{{.Name}}</a></h4> - <span class="issue-open label label-success">{{.NumOpenIssues}}</span> - <span class="issue-close label label-warning">{{.NumClosedIssues}}</span> - <p class="actions pull-right"> - <a href="{{$.RepoLink}}/issues/milestones/{{.Index}}/edit">Edit</a> - {{if .IsClosed}} - <a href="{{$.RepoLink}}/issues/milestones/{{.Index}}/open">Open</a> - {{else}} - <a href="{{$.RepoLink}}/issues/milestones/{{.Index}}/close">Close</a> - {{end}} - <a class="text-danger" href="{{$.RepoLink}}/issues/milestones/{{.Index}}/delete">Delete</a> - <a href="{{$.RepoLink}}/issues?milestone={{.Index}}{{if .IsClosed}}&state=closed{{end}}">Issues</a> - </p> - <hr/> - <p class="description">{{.RenderedContent | Str2html}}</p> - </div> - {{end}} - </div> - </div> - </div> -</div> -</div> -{{template "base/footer_old" .}} diff --git a/templates/repo/issue/milestone_edit.tmpl b/templates/repo/issue/milestone_edit.tmpl deleted file mode 100644 index f3898fa8..00000000 --- a/templates/repo/issue/milestone_edit.tmpl +++ /dev/null @@ -1,61 +0,0 @@ -{{template "base/head_old" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -<div id="body" class="container"> - <div id="issue"> - <form class="form" action="{{.RepoLink}}/issues/milestones/{{.Milestone.Index}}/edit" method="post" id="issue-create-form"> - {{.CsrfTokenHtml}} - {{template "base/alert" .}} - <div class="col-md-1"> - <img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/> - </div> - <div class="col-md-8 panel panel-default"> - <div class="form-group panel-body"> - <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.Milestone.Name}}" /> - </div> - <div class="form-group panel-body"> - <div class="md-help pull-right"><!-- todo help link --> - Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a> - </div> - <ul class="nav nav-tabs" data-init="tabs"> - <li class="active issue-write"><a href="#issue-textarea" data-toggle="tab">Write</a></li> - <li class="issue-preview"><a href="#issue-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-preview">Preview</a></li> - </ul> - <div class="tab-content"> - <div class="tab-pane" id="issue-textarea"> - <div class="form-group"> - <textarea class="form-control" name="content" id="issue-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-preview" data-ajax-val="val" data-ajax-field="text">{{.Milestone.Content}}</textarea> - </div> - </div> - <div class="tab-pane issue-preview-content" id="issue-preview">loading...</div> - </div> - </div> - <div class="text-right panel-body"> - <div class="form-group"> - <input type="hidden" value="id" name="repo-id"/> - <button class="btn-success btn">Update milestone</button> - </div> - </div> - </div> - <div class="col-md-3"> - <h4>Milestone Due Date</h4> - <div class="form-group"> - <input name="due_date" type="text" class="form-control" id="milestone-due-date" value="{{.Milestone.DeadlineString}}"> - </div> - </div> - </form> - </div> -</div> -<script src="/js/bootstrap-datepicker.js"></script> -<script> - $(function(){ - $('#milestone-due-date').datepicker({ - weekStart: 1, - todayBtn: "linked", - calendarWeeks: true, - todayHighlight: true - }); - }); -</script> -{{template "base/footer_old" .}} diff --git a/templates/repo/issue/milestone_new.tmpl b/templates/repo/issue/milestone_new.tmpl index 2d9f60f4..8fd4d1bb 100644 --- a/templates/repo/issue/milestone_new.tmpl +++ b/templates/repo/issue/milestone_new.tmpl @@ -1,62 +1,70 @@ -{{template "base/head_old" .}} -{{template "base/navbar" .}} -{{template "repo/nav" .}} -{{template "repo/toolbar" .}} -<div id="body" class="container"> - <div id="issue"> - <form class="form" action="{{.RepoLink}}/issues/milestones/new" method="post" id="issue-create-form"> - {{.CsrfTokenHtml}} - {{template "base/alert" .}} - <div class="col-md-1"> - <img class="avatar" src="{{.SignedUser.AvatarLink}}" alt=""/> - </div> - <div class="col-md-8 panel panel-default"> - <div class="form-group panel-body"> - <input class="form-control input-lg" type="text" name="title" required="required" placeholder="Title" value="{{.title}}" /> - </div> - <div class="form-group panel-body"> - <div class="md-help pull-right"><!-- todo help link --> - Content with <a href="https://help.github.com/articles/markdown-basics">Markdown</a> - </div> - <ul class="nav nav-tabs" data-init="tabs"> - <li class="active issue-write"><a href="#issue-textarea" data-toggle="tab">Write</a></li> - <li class="issue-preview"><a href="#issue-preview" data-toggle="tab" data-ajax="/api/v1/markdown" data-ajax-name="issue-preview" data-ajax-context="{{.RepoLink}}" data-ajax-method="post" data-preview="#issue-preview">Preview</a></li> - </ul> - <div class="tab-content"> - <div class="tab-pane" id="issue-textarea"> - <div class="form-group"> - <textarea class="form-control" name="content" id="issue-content" rows="10" placeholder="Write some content" data-ajax-rel="issue-preview" data-ajax-val="val" data-ajax-field="text">{{.content}}</textarea> - </div> - </div> - <div class="tab-pane issue-preview-content" id="issue-preview">loading...</div> - </div> - </div> - <div class="text-right panel-body"> - <div class="form-group"> - <input type="hidden" value="id" name="repo-id"/> - <button class="btn-success btn">Create new milestone</button> - </div> - </div> - </div> - <div class="col-md-3"> - <h4>Milestone Due Date</h4> - - <div class="form-group"> - <input name="due_date" type="text" class="form-control" id="milestone-due-date"> - </div> - </div> - </form> - </div> +{{template "base/head" .}} +<div class="repository new milestone"> + {{template "repo/header" .}} + <div class="ui middle page grid body"> + <div class="navbar"> + {{template "repo/issue/navbar" .}} + {{if and .IsRepositoryAdmin .PageIsEditMilestone}} + <div class="ui right floated secondary menu"> + <a class="ui green button" href="{{$.RepoLink}}/milestones/new">{{.i18n.Tr "repo.milestones.new"}}</a> + </div> + {{end}} + </div> + <div class="ui divider"></div> + <div class="sixteen wide column page grid"> + <h2 class="ui dividing header"> + {{if .PageIsEditMilestone}} + {{.i18n.Tr "repo.milestones.edit"}} + <div class="sub header">{{.i18n.Tr "repo.milestones.edit_subheader"}}</div> + {{else}} + {{.i18n.Tr "repo.milestones.new"}} + <div class="sub header">{{.i18n.Tr "repo.milestones.new_subheader"}}</div> + {{end}} + </h2> + <form class="ui form grid" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + {{if .Flash}} + <div class="sixteen wide column"> + {{template "base/alert" .}} + </div> + {{end}} + <div class="eleven wide column"> + <div class="field {{if .Err_Title}}error{{end}}"> + <label>{{.i18n.Tr "repo.milestones.title"}}</label> + <input name="title" placeholder="{{.i18n.Tr "repo.milestones.title"}}" value="{{.title}}" autofocus required> + </div> + <div class="field"> + <label>{{.i18n.Tr "repo.milestones.desc"}}</label> + <textarea name="content">{{.content}}</textarea> + </div> + </div> + <div class="three wide column"> + <div class="field {{if .Err_Deadline}}error{{end}}"> + <label> + {{.i18n.Tr "repo.milestones.due_date"}} + <a id="clear-date" href="#">{{.i18n.Tr "repo.milestones.clear"}}</a> + </label> + <input id="deadline" name="deadline" value="{{.deadline}}"> + </div> + <div class="field"> + <input class="milestone datepicker" data-lang="{{.DateLang}}" data-start-date="{{.deadline}}"> + </div> + </div> + <div class="ui divider"></div> + {{if .PageIsEditMilestone}} + <button class="ui right green button"> + {{.i18n.Tr "repo.milestones.modify"}} + </button> + <a class="ui right blue basic button" href="{{.RepoLink}}/milestones"> + {{.i18n.Tr "repo.milestones.cancel"}} + </a> + {{else}} + <button class="ui right green button"> + {{.i18n.Tr "repo.milestones.create"}} + </button> + {{end}} + </form> + </div> + </div> </div> -<script src="/js/bootstrap-datepicker.js"></script> -<script> - $(function(){ - $('#milestone-due-date').datepicker({ - weekStart: 1, - todayBtn: "linked", - calendarWeeks: true, - todayHighlight: true - }); - }); -</script> -{{template "base/footer_old" .}} +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl new file mode 100644 index 00000000..b9b159ea --- /dev/null +++ b/templates/repo/issue/milestones.tmpl @@ -0,0 +1,127 @@ +{{template "base/head" .}} +<div class="repository milestones"> + {{template "repo/header" .}} + <div class="ui middle page grid body"> + <div class="navbar"> + {{template "repo/issue/navbar" .}} + {{if .IsRepositoryAdmin}} + <div class="ui right floated secondary menu"> + <a class="ui green button" href="{{$.Link}}/new">{{.i18n.Tr "repo.milestones.new"}}</a> + </div> + {{end}} + </div> + <div class="ui divider"></div> + {{template "repo/issue/alert" .}} + <div class="ui left"> + <div class="ui tiny buttons"> + <a class="ui green basic button {{if not .IsShowClosed}}active{{end}}" href="{{.RepoLink}}/milestones?state=open"> + <i class="octicon octicon-milestone"></i> + {{.i18n.Tr "repo.milestones.open_tab" .OpenCount}} + </a> + <a class="ui red basic button {{if .IsShowClosed}}active{{end}}" href="{{.RepoLink}}/milestones?state=closed"> + <i class="octicon octicon-milestone"></i> + {{.i18n.Tr "repo.milestones.close_tab" .ClosedCount}} + </a> + </div> + </div> + + <div class="sixteen wide column"> + <div class="milestone list"> + {{range .Milestones}} + <li class="item"> + <i class="octicon octicon-milestone"></i> <a href="{{$.RepoLink}}/issues?state={{$.State}}&milestone={{.ID}}">{{.Name}}</a> + <div class="ui right blue progress" data-percent="{{.Completeness}}"> + <div class="bar" {{if not .Completeness}}style="background-color: transparent"{{end}}> + <div class="progress"></div> + </div> + </div> + <div class="meta"> + {{ $closedDate:= TimeSince .ClosedDate $.Lang }} + {{if .IsClosed}} + <span class="octicon octicon-clock"></span> {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} + {{else}} + <span class="octicon octicon-calendar"></span> + {{if .DeadlineString}} + <span {{if .IsOverDue}}class="overdue"{{end}}>{{.DeadlineString}}</span> + {{else}} + {{$.i18n.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} + <span class="issue-stats"> + <i class="octicon octicon-issue-opened"></i> {{$.i18n.Tr "repo.issues.open_tab" .NumOpenIssues}} + <i class="octicon octicon-issue-closed"></i> {{$.i18n.Tr "repo.issues.close_tab" .NumClosedIssues}} + </span> + </div> + {{if $.IsRepositoryAdmin}} + <div class="ui right operate"> + <a href="{{$.Link}}/{{.ID}}/edit" data-id={{.ID}} data-title={{.Name}}><i class="octicon octicon-pencil"></i> {{$.i18n.Tr "repo.issues.label_edit"}}</a> + {{if .IsClosed}} + <a href="{{$.Link}}/{{.ID}}/open" data-id={{.ID}} data-title={{.Name}}><i class="octicon octicon-check"></i> {{$.i18n.Tr "repo.milestones.open"}}</a> + {{else}} + <a href="{{$.Link}}/{{.ID}}/close" data-id={{.ID}} data-title={{.Name}}><i class="octicon octicon-x"></i> {{$.i18n.Tr "repo.milestones.close"}}</a> + {{end}} + <a class="delete-button" href="#" data-url="{{$.RepoLink}}/milestones/delete" data-id="{{.ID}}"><i class="octicon octicon-trashcan"></i> {{$.i18n.Tr "repo.issues.label_delete"}}</a> + </div> + {{if .Content}} + <div class="content"> + {{.RenderedContent|Str2html}} + </div> + {{end}} + {{end}} + </li> + {{end}} + + {{with .Page}} + {{if gt .TotalPages 1}} + <div class="center page buttons"> + <div class="ui borderless pagination menu"> + <a class="{{if not .HasPrevious}}disabled{{end}} item" {{if .HasPrevious}}href="{{$.Link}}?state={{$.State}}&page={{.Previous}}"{{end}}> + <i class="left arrow icon"></i> {{$.i18n.Tr "repo.issues.previous"}} + </a> + {{range .Pages}} + {{if eq .Num -1}} + <a class="disabled item">...</a> + {{else}} + <a class="{{if .IsCurrent}}active{{end}} item" {{if not .IsCurrent}}href="{{$.Link}}?state={{$.State}}&page={{.Num}}"{{end}}>{{.Num}}</a> + {{end}} + {{end}} + <a class="{{if not .HasNext}}disabled{{end}} item" {{if .HasNext}}href="{{$.Link}}?state={{$.State}}&page={{.Next}}"{{end}}> + {{$.i18n.Tr "repo.issues.next"}} <i class="icon right arrow"></i> + </a> + </div> + </div> + {{end}} + {{end}} + </div> + </div> + </div> +</div> + +{{if .IsRepositoryAdmin}} +<div class="ui basic delete modal"> + <div class="header"> + {{.i18n.Tr "repo.milestones.deletion"}} + </div> + <div class="content"> + <div class="image"> + <i class="trash icon"></i> + </div> + <div class="description"> + <p>{{.i18n.Tr "repo.milestones.deletion_desc"}}</p> + </div> + </div> + <div class="actions"> + <div class="two fluid ui inverted buttons"> + <div class="ui red basic inverted button"> + <i class="remove icon"></i> + {{.i18n.Tr "modal.no"}} + </div> + <div class="ui green basic inverted positive button"> + <i class="checkmark icon"></i> + {{.i18n.Tr "modal.yes"}} + </div> + </div> + </div> +</div> +{{end}} +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/issue/navbar.tmpl b/templates/repo/issue/navbar.tmpl new file mode 100644 index 00000000..509ee5f6 --- /dev/null +++ b/templates/repo/issue/navbar.tmpl @@ -0,0 +1,7 @@ +<div class="ui left"> + <div class="ui compact menu"> + <a class="{{if .PageIsIssueList}}active{{end}} item" href="{{.RepoLink}}/issues">{{.i18n.Tr "repo.issues"}}</a> + <a class="{{if .PageIsLabels}}active{{end}} item" href="{{.RepoLink}}/labels">{{.i18n.Tr "repo.labels"}}</a> + <a class="{{if .PageIsMilestones}}active{{end}} item" href="{{.RepoLink}}/milestones">{{.i18n.Tr "repo.milestones"}}</a> + </div> +</div>
\ No newline at end of file diff --git a/templates/repo/issue/view.tmpl b/templates/repo/issue/view.tmpl index b52ef505..61adfe61 100644 --- a/templates/repo/issue/view.tmpl +++ b/templates/repo/issue/view.tmpl @@ -3,15 +3,15 @@ {{template "repo/nav" .}} {{template "repo/toolbar" .}} <div id="body" class="container"> - <div id="issue" data-id="{{.Issue.Id}}"> - <div id="issue-{{.Issue.Id}}" class="issue-whole issue-is-opening"> + <div id="issue" data-id="{{.Issue.ID}}"> + <div id="issue-{{.Issue.ID}}" class="issue-whole issue-is-opening"> <div class="issue-wrap col-md-10"> <div class="issue-head clearfix"> <div class="number pull-right">#{{.Issue.Index}}</div> <a class="author pull-left" href="{{AppSubUrl}}/{{.Issue.Poster.Name}}"><img class="avatar" src="{{.Issue.Poster.AvatarLink}}" alt="" width="30"/></a> <h1 class="title pull-left">{{.Issue.Name}}</h1> <input id="issue-edit-title" class="form-control input-lg pull-left hidden" type="text" value="{{.Issue.Name}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="title"/> - <input type="hidden" value="{{.Issue.Id}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/> + <input type="hidden" value="{{.Issue.ID}}" data-ajax-rel="issue-edit-save" data-ajax-val="val" data-ajax-field="issue_id"/> <p class="info pull-left"> {{if .IsIssueOwner}}<a class="btn btn-default pull-right issue-edit" href="#" id="issue-edit-btn">Edit</a> <a class="btn btn-danger pull-right issue-edit-cancel hidden" href="#">Cancel</a> @@ -178,7 +178,7 @@ <div class="dropdown-menu dropdown-menu-right no"> <ul class="list-unstyled"> {{range .Labels}} - <li class="{{if not .IsChecked}}no-{{end}}checked" data-id="{{.Id}}"> + <li class="{{if not .IsChecked}}no-{{end}}checked" data-id="{{.ID}}"> {{if .IsChecked}}<span class="check pull-left"><i class="fa fa-check"></i></span>{{end}} <span class="color" style="background-color: {{.Color}}"></span> <span class="name">{{.Name}}</span> @@ -191,13 +191,13 @@ <h4>Labels</h4> {{if .Issue.Labels}} {{range .Issue.Labels}} - <p id="label-{{.Id}}" class="label-item label-white" style="background-color: {{.Color}}"><strong>{{.Name}}</strong></p> + <p id="label-{{.ID}}" class="label-item label-white" style="background-color: {{.Color}}"><strong>{{.Name}}</strong></p> {{end}} {{else}} <p>None yet</p> {{end}} </div> - <div class="milestone" data-milestone="{{.Milestone.Id}}" data-ajax="{{.Issue.Index}}/milestone"> + <div class="milestone" data-milestone="{{.Milestone.ID}}" data-ajax="{{.Issue.Index}}/milestone"> <div class="pull-right action"> {{if .IsRepositoryOwner}} <button class="btn btn-default btn-sm" data-toggle="dropdown"> @@ -219,7 +219,7 @@ {{else}} <ul class="list-unstyled"> {{range .OpenMilestones}} - <li class="milestone-item" data-id="{{.Id}}"> + <li class="milestone-item" data-id="{{.ID}}"> <p><strong>{{.Name}}</strong></p> <!-- <p>due to 3 days later</p> --> </li> @@ -234,7 +234,7 @@ {{else}} <ul class="list-unstyled"> {{range .ClosedMilestones}} - <li class="milestone-item" data-id="{{.Id}}"> + <li class="milestone-item" data-id="{{.ID}}"> <p><strong>{{.Name}}</strong></p> <p>Closed {{TimeSince .ClosedDate $.Lang}}</p> </li> diff --git a/templates/repo/issue2/labels.tmpl b/templates/repo/issue2/labels.tmpl deleted file mode 100644 index 8c656e29..00000000 --- a/templates/repo/issue2/labels.tmpl +++ /dev/null @@ -1,74 +0,0 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="repo-wrapper"> - {{template "repo/header" .}} - <div class="issue-main container repo-wide-wrapper"> - <ul id="issue-list-nav" class="menu menu-line"> - <li><a href="#">Issue</a></li> - <li><a href="#">Pull Request</a></li> - <li class="current"><a href="#">Labels</a></li> - <li><a href="#">Milestones</a></li> - <li class="right" id="label-new"><a href="#"><button id="label-new-btn" class="btn btn-green text-bold">New Label</button></a></li> - </ul> - <form id="label-add-form" action="#" class="form clear hidden"> - <input type="text" class="ipt" name="name" placeholder="label name" id="label-add-name"/> - <div class="inline down drop label-color-drop"> - <label for="label-add-color"></label> - <input class="ipt" name="color" type="text" placeholder="color" id="label-add-color"/> - <div class="drop-down"> - <a href="#" class="color" style="background: red"></a> - <a href="#" class="color" style="background: green"></a> - </div> - </div> - <button class="btn btn-gray right" type="button" id="label-cancel-btn">Cancel</button> - <button class="btn btn-green right" id="label-add-btn">Create</button> - </form> - <div id="issue-list-container"> - <div id="issue-list-menu"> - <div class="left"><span class="label label-black" id="labels-num">6</span><strong>Labels</strong></div> - <div class="clear"></div> - </div> - <ul id="label-list" class="list-no-style"> - <li class="item" id="label-id"> - <a class="right delete" href="#"><i class="octicon octicon-x"></i>Delete</a> - <a class="right edit" href="#"><i class="octicon octicon-pencil"></i>Edit</a> - <a class="right issue-num" href="#"><i class="octicon octicon-issue-opened"></i><strong class="num">12</strong>Issues</a> - <a class="left label clear" href="#" style="background-color: #0052cc" data-color-hex="#0052cc"><i class="octicon octicon-tag"></i><strong>bug</strong></a> - </li> - <li class="item" id="label-id"> - <a class="right" href="#"><i class="octicon octicon-x"></i>Delete</a> - <a class="right" href="#"><i class="octicon octicon-pencil"></i>Edit</a> - <a class="right issue-num" href="#"><i class="octicon octicon-issue-opened"></i><strong class="num">12</strong>Issues</a> - <a class="left label clear" href="#" style="background-color: red"><i class="octicon octicon-tag"></i><strong>bug</strong></a> - </li> - </ul> - </div> - </div> -</div> -<div id="label-edit-form-tpl" class="hidden"> - <li class="item"><form id="label-edit-form" action="#" class="form clear"> - <input type="text" class="ipt" name="name" placeholder="label name" id="label-edit-name"/> - <input type="hidden" name="id" value="id"/> - <div class="inline down drop label-color-drop"> - <label for="label-add-color"></label> - <input class="ipt" name="color" type="text" placeholder="color" id="label-edit-color"/> - <div class="drop-down"> - <a href="#" class="color" style="background: red"></a> - <a href="#" class="color" style="background: green"></a> - </div> - </div> - <button class="btn btn-gray right" type="button" id="label-edit-cancel-btn">Cancel</button> - <button class="btn btn-green right" id="label-edit-btn">Save Changes</button> - </form></li> -</div> -<div id="label-delete-form-tpl" class="hidden"> - <li class="item"> - <form id="label-delete-form" action="#"> - <input type="hidden" name="id" value="id"/> - <span><strong class="text-red">Are you sure?</strong> Deleting a label will remove it from all issues and pull requests.</span> - <button class="btn btn-gray right" type="button" id="label-del-cancel-btn">Cancel</button> - <button class="btn btn-red right" id="label-del-btn">Delete</button> - </form> - </li> -</div> -{{template "ng/base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/issue2/list.tmpl b/templates/repo/issue2/list.tmpl deleted file mode 100644 index c7a271d1..00000000 --- a/templates/repo/issue2/list.tmpl +++ /dev/null @@ -1,101 +0,0 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="repo-wrapper"> - {{template "repo/header" .}} - <div class="issue-main container repo-wide-wrapper"> - <ul id="issue-list-nav" class="menu menu-line"> - <li class="current"><a href="#">Issue</a></li> - <li><a href="#">Pull Request</a></li> - <li><a href="#">Labels</a></li> - <li><a href="#">Milestones</a></li> - <li class="right" id="issue-new"><a href="#"><button id="issue-new-btn" class="btn btn-green text-bold">New Issue</button></a></li> - <!--<li class="right"><a href="#">Filter</a></li>--> - </ul> - <div id="issue-list-container"> - <div id="issue-list-menu"> - <div class="left"> - <span class="mark open hover"><a href="#"> - <i class="octicon octicon-issue-opened"></i> 88 Open - </a></span> - <span class="mark close"><a href=""> - <i class="octicon octicon-issue-closed"></i> 12 Close - </a></span> - </div> - <ul id="issue-list-filter" class="right menu menu-line"> - <li class="down drop label-filter"> - <a href="#">Labels</a> - <div class="drop-down"> - <h4>Labels</h4> - <ul class="labels list-no-style"> - <li class="no-label"><strong>no label</strong></li> - <li><a href="#"><span class="color"></span><span class="name">bug</span></a></li> - <li><a href="#"><span class="color"></span><span class="name">feature</span></a></li> - <li><a href="#"><span class="color"></span><span class="name">roadmap</span></a></li> - </ul> - </div> - </li> - <li class="down drop milestone-filter"> - <a href="#">Milestones</a> - <div class="drop-down"> - <h4>Milestones</h4> - <ul class="milestones list-no-style"> - <li class="no-label"><strong>no milestone</strong></li> - <li><a href="#">v1</a></li> - </ul> - </div> - </li> - <li class="down drop assignee-list"> - <a href="#">Assignee</a> - <div class="drop-down"> - aabbcc - </div> - </li> - </ul> - <div class="clear"></div> - </div> - <ul id="issue-list" class="list-no-style"> - <li class="item" id="issue-id"> - <a class="comment" href="#"> - <i class="octicon octicon-comment"></i> 7 - </a> - <p class="title text-bold"> - <span class="label label-black index-num">#588</span> - <a href="#" class="title-text">Delete account text and/or translations missing</a> - <span class="label label-red issue-label"><a href="#">bug</a></span> - </p> - <p class="desc">opened 7 days ago by <a href="#">marcuspoehls</a></p> - </li> - <li class="item" id="issue-id2"> - <a class="comment" href="#"> - <i class="octicon octicon-comment"></i> 7 - </a> - <p class="title text-bold"> - <span class="label label-black index-num">#588</span> - <a href="#" class="title-text">Delete account text and/or translations missing</a> - <span class="label label-red issue-label"><a href="#">bug</a></span> - </p> - <p class="desc">opened 7 days ago by <a href="#">marcuspoehls</a></p> - </li> - <li class="item" id="issue-id3"> - <a class="comment" href="#"> - <i class="octicon octicon-comment"></i> 7 - </a> - <p class="title text-bold"> - <span class="label label-black index-num">#588</span> - <a href="#" class="title-text">Disabling attachments breaks issues and comments ajax submit</a> - <span class="label label-red issue-label"><a href="#">bug</a></span> - </p> - <p class="desc">opened 7 days ago by <a href="#">marcuspoehls</a></p> - </li> - </ul> - <div id="issue-list-pager" class="pager text-center"> - <a class="prev invalid" href="#">Prev</a> - <a class="page" href="#">1</a> - <a class="page hover" href="#">2</a> - <a class="page" href="#">3</a> - <a class="next" href="#">Next</a> - </div> - </div> - </div> -</div> -{{template "ng/base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/milestone2/list.tmpl b/templates/repo/milestone2/list.tmpl deleted file mode 100644 index 5aa0e646..00000000 --- a/templates/repo/milestone2/list.tmpl +++ /dev/null @@ -1,58 +0,0 @@ -{{template "ng/base/head" .}} -{{template "ng/base/header" .}} -<div id="repo-wrapper"> - {{template "repo/header" .}} - <div class="issue-main container repo-wide-wrapper"> - <ul id="issue-list-nav" class="menu menu-line"> - <li><a href="#">Issue</a></li> - <li><a href="#">Pull Request</a></li> - <li><a href="#">Labels</a></li> - <li class="current"><a href="#">Milestones</a></li> - <li class="right" id="milestone-new"><a href="#"><button id="issue-new-btn" class="btn btn-green text-bold">New Milestone</button></a></li> - </ul> - <div id="issue-list-container"> - <div id="issue-list-menu"> - <div class="left"> - <span class="mark open hover"><a href="#"> - <i class="octicon octicon-milestone"></i> 88 Open - </a></span> - <span class="mark close"><a href=""> - <i class="octicon octicon-issue-closed"></i> 12 Close - </a></span> - </div> - <div class="clear"></div> - </div> - <ul id="milestone-list" class="list-no-style"> - <li class="item" id="milestone-id"> - <!--<a class="comment" href="#"> - <i class="octicon octicon-comment"></i> 7 - </a>--> - <p class="title text-bold"> - <i class="octicon octicon-milestone"></i> - <a href="#" class="title-text">Delete account text</a> - </p> - <p class="desc"> - <i class="octicon octicon-clock"></i> Updated 3 days ago - <i class="octicon octicon-calendar"></i> Due to Dec 31,2014 - </p> - <div class="content"> - In this version of release, users are able to register and log in/out on Gogs, setting up SSH keys and do most of Git operations through SSH with public repositories. And Web UI only for view of Git data, no extra features are supported. - </div> - <div class="action"> - <p class="status-bar"> - <span class="closed">closed 12</span> - <span class="inline-block bar"><span class="inline-block opening"></span></span> - <span class="open">12 open</span> - </p> - <div class="action-bar text-right"> - <a href="#">Edit</a> - <a href="#">Delete</a> - <a href="#" class="text-red">Close</a> - </div> - </div> - </li> - </ul> - </div> - </div> -</div> -{{template "ng/base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/pr2/list.tmpl b/templates/repo/pr2/list.tmpl index 93868256..36c49cc1 100644 --- a/templates/repo/pr2/list.tmpl +++ b/templates/repo/pr2/list.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div class="issue-main container repo-wide-wrapper"> <ul id="issue-list-nav" class="menu menu-line"> <li><a href="#">Issue</a></li> diff --git a/templates/repo/pulls.tmpl b/templates/repo/pulls.tmpl index bfb09055..d5f3276a 100644 --- a/templates/repo/pulls.tmpl +++ b/templates/repo/pulls.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div class="clear container repo-wide-wrapper repo-pr"> <div class="pr-main"> <div class="pr-title clear"> diff --git a/templates/repo/pulls/fork.tmpl b/templates/repo/pulls/fork.tmpl new file mode 100644 index 00000000..2f76cf00 --- /dev/null +++ b/templates/repo/pulls/fork.tmpl @@ -0,0 +1,71 @@ +{{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}} + {{if .IsOwnedBy $.SignedUser.Id}} + <div class="item" data-value="{{.Id}}"> + <img class="ui mini avatar image" src="{{.AvatarLink}}"> + {{.Name}} + </div> + {{end}} + {{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 diff --git a/templates/repo/release/edit.tmpl b/templates/repo/release/edit.tmpl index 44f2d7b7..c1dfd0d9 100644 --- a/templates/repo/release/edit.tmpl +++ b/templates/repo/release/edit.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="repo-content" class="clear container"> <div id="repo-main" class="left grid-5-6"> {{template "ng/base/alert" .}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 5ac1be35..eb3ba91d 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="repo-content" class="clear container"> <div id="repo-main" class="left grid-5-6"> <div id="release"> diff --git a/templates/repo/release/new.tmpl b/templates/repo/release/new.tmpl index 101a2245..82cad3ca 100644 --- a/templates/repo/release/new.tmpl +++ b/templates/repo/release/new.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="repo-content" class="clear container"> <div id="repo-main" class="left grid-5-6"> {{template "ng/base/alert" .}} diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl index 98091c35..4781f667 100644 --- a/templates/repo/settings/collaboration.tmpl +++ b/templates/repo/settings/collaboration.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="repo-setting" class="container clear"> {{template "repo/settings/nav" .}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl new file mode 100644 index 00000000..bed39a73 --- /dev/null +++ b/templates/repo/settings/deploy_keys.tmpl @@ -0,0 +1,97 @@ +{{template "base/head" .}} +<div class="repository settings"> + {{template "repo/header" .}} + <div class="ui page grid"> + {{template "repo/settings/navbar" .}} + <div class="twelve wide column content"> + {{template "base/alert" .}} + <h4 class="ui top attached header"> + {{.i18n.Tr "repo.settings.deploy_keys"}} + <div class="ui right"> + <div id="add-deploy-key" class="ui blue tiny button">{{.i18n.Tr "repo.settings.add_deploy_key"}}</div> + </div> + </h4> + <div class="ui attached segment"> + {{if .Deploykeys}} + <div class="ui key list"> + {{range .Deploykeys}} + <div class="item ui grid"> + <div class="one wide column"> + <i class="ssh-key-state-indicator fa fa-circle{{if .HasRecentActivity}} active invert poping up{{else}}-o{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}></i> + </div> + <div class="one wide column"> + <i class="mega-octicon octicon-key left"></i> + </div> + <div class="eleven wide column"> + <strong>{{.Name}}</strong> + <div class="print meta"> + {{.Fingerprint}} + </div> + <div class="activity meta"> + <i>{{$.i18n.Tr "settings.add_on"}} <span>{{DateFmtShort .Created}}</span> — <i class="octicon octicon-info"></i> {{if .HasUsed}}{{$.i18n.Tr "settings.last_used"}} <span>{{DateFmtShort .Updated}}</span>{{else}}{{$.i18n.Tr "settings.no_activity"}}{{end}}</i> + </div> + </div> + <div class="three wide column"> + <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> + {{$.i18n.Tr "settings.delete_key"}} + </button> + </div> + </div> + {{end}} + </div> + {{else}} + {{.i18n.Tr "repo.settings.no_deploy_keys"}} + {{end}} + </div> + <br> + <div {{if not .HasError}}class="hide"{{end}} id="add-deploy-key-panel"> + <h4 class="ui top attached header"> + {{.i18n.Tr "repo.settings.add_deploy_key"}} + </h4> + <div class="ui attached segment"> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <div class="field {{if .Err_Title}}error{{end}}"> + <label>{{.i18n.Tr "repo.settings.title"}}</label> + <input name="title" value="{{.title}}" autofocus required> + </div> + <div class="field {{if .Err_Content}}error{{end}}"> + <label>{{.i18n.Tr "repo.settings.deploy_key_content"}}</label> + <textarea name="content" required>{{.content}}</textarea> + </div> + <button class="ui green button"> + {{.i18n.Tr "repo.settings.add_deploy_key"}} + </button> + </form> + </div> + </div> + </div> + </div> +</div> + +<div class="ui basic delete modal"> + <div class="header"> + {{.i18n.Tr "repo.settings.deploy_key_deletion"}} + </div> + <div class="content"> + <div class="image"> + <i class="trash icon"></i> + </div> + <div class="description"> + <p>{{.i18n.Tr "repo.settings.deploy_key_deletion_desc"}}</p> + </div> + </div> + <div class="actions"> + <div class="two fluid ui inverted buttons"> + <div class="ui red basic inverted button"> + <i class="remove icon"></i> + {{.i18n.Tr "modal.no"}} + </div> + <div class="ui green basic inverted positive button"> + <i class="checkmark icon"></i> + {{.i18n.Tr "modal.yes"}} + </div> + </div> + </div> +</div> +{{template "base/footer" .}}
\ No newline at end of file diff --git a/templates/repo/settings/githook_edit.tmpl b/templates/repo/settings/githook_edit.tmpl index 23fc26e3..11915c76 100644 --- a/templates/repo/settings/githook_edit.tmpl +++ b/templates/repo/settings/githook_edit.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="repo-setting" class="container clear"> {{template "repo/settings/nav" .}} diff --git a/templates/repo/settings/githooks.tmpl b/templates/repo/settings/githooks.tmpl index a059b0e7..3298d992 100644 --- a/templates/repo/settings/githooks.tmpl +++ b/templates/repo/settings/githooks.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="repo-setting" class="container clear"> {{template "repo/settings/nav" .}} diff --git a/templates/repo/settings/hook_new.tmpl b/templates/repo/settings/hook_new.tmpl index 2bce97a2..e4534a64 100644 --- a/templates/repo/settings/hook_new.tmpl +++ b/templates/repo/settings/hook_new.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="repo-setting" class="container clear"> {{template "repo/settings/nav" .}} diff --git a/templates/repo/settings/hooks.tmpl b/templates/repo/settings/hooks.tmpl index 6fcedab7..e23c0ccd 100644 --- a/templates/repo/settings/hooks.tmpl +++ b/templates/repo/settings/hooks.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="repo-setting" class="container clear"> {{template "repo/settings/nav" .}} diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 6803c563..06bad968 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -8,7 +8,7 @@ {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}} <li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.i18n.Tr "repo.settings.githooks"}}</a></li> {{end}} - <!-- <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> --> + <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.i18n.Tr "repo.settings.deploy_keys"}}</a></li> </ul> </div> </div>
\ No newline at end of file diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl new file mode 100644 index 00000000..cf27980f --- /dev/null +++ b/templates/repo/settings/navbar.tmpl @@ -0,0 +1,19 @@ +<div class="four wide column"> + <div class="ui vertical menu"> + <a class="{{if .PageIsSettingsOptions}}active{{end}} item" href="{{.RepoLink}}/settings"> + {{.i18n.Tr "repo.settings.options"}} + </a> + <a class="{{if .PageIsSettingsCollaboration}}active{{end}} item" href="{.RepoLink}}/settings/collaboration"> + {{.i18n.Tr "repo.settings.collaboration"}} + </a> + <a class="{{if .PageIsSettingsHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks"> + {{.i18n.Tr "repo.settings.hooks"}} + </a> + <a class="{{if .PageIsSettingsGitHooks}}active{{end}} item" href="{{.RepoLink}}/settings/hooks/git"> + {{.i18n.Tr "repo.settings.githooks"}} + </a> + <a class="{{if .PageIsSettingsKeys}}active{{end}} item" href="{{.RepoLink}}/settings/keys"> + {{.i18n.Tr "repo.settings.deploy_keys"}} + </a> + </div> +</div>
\ No newline at end of file diff --git a/templates/repo/settings/options.tmpl b/templates/repo/settings/options.tmpl index 41683f84..0ba86a08 100644 --- a/templates/repo/settings/options.tmpl +++ b/templates/repo/settings/options.tmpl @@ -1,7 +1,7 @@ {{template "ng/base/head" .}} {{template "ng/base/header" .}} <div id="repo-wrapper"> - {{template "repo/header" .}} + {{template "repo/header_old" .}} <div id="setting-wrapper" class="main-wrapper"> <div id="repo-setting" class="container clear"> {{template "repo/settings/nav" .}} diff --git a/templates/repo/toolbar.tmpl b/templates/repo/toolbar.tmpl index f2254d21..44df6815 100644 --- a/templates/repo/toolbar.tmpl +++ b/templates/repo/toolbar.tmpl @@ -12,7 +12,7 @@ {{if .IsRepoToolbarIssues}} <li class="tmp">{{if .IsRepoToolbarIssuesList}} <a href="{{.RepoLink}}/issues/new"><button class="btn btn-primary btn-sm">New Issue</button></a> - <a href="{{.RepoLink}}/issues/milestones"><button class="btn btn-success btn-sm">Milestones</button></a> + <a href="{{.RepoLink}}/milestones"><button class="btn btn-success btn-sm">Milestones</button></a> {{end}}</li> {{end}} <li class="{{if .IsRepoToolbarReleases}}active{{end}}"><a href="{{.RepoLink}}/releases">{{if .Repository.NumTags}}<span class="badge">{{.Repository.NumTags}}</span> {{end}}Releases</a></li> diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index d33cc950..274c7df2 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -12,7 +12,12 @@ <strong class="file-name">{{.FileName}}</strong><span class="file-size">{{FileSize .FileSize}}</span> {{end}} {{if not .ReadmeInList}} - <a class="right" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}/{{.TreeName}}"> + {{if not .IsCommit}} + <a class="right" href="{{.RepoLink}}/src/{{.CommitId}}/{{EscapePound .TreeName}}"> + <button class="btn btn-medium btn-gray btn-right-radius btn-comb">{{.i18n.Tr "repo.file_permalink"}}</button> + </a> + {{end}} + <a class="right" href="{{.RepoLink}}/commits/{{EscapePound .BranchName}}/{{EscapePound .TreeName}}"> <button class="btn btn-medium btn-gray btn-right-radius btn-comb">{{.i18n.Tr "repo.file_history"}}</button> </a> <a class="right" href="{{EscapePound .FileLink}}"> @@ -42,4 +47,4 @@ </table> {{end}} </div> -</div>
\ No newline at end of file +</div> diff --git a/templates/repo/view_list.tmpl b/templates/repo/view_list.tmpl index f51c1002..d3303193 100644 --- a/templates/repo/view_list.tmpl +++ b/templates/repo/view_list.tmpl @@ -50,7 +50,7 @@ <span class="octicon octicon-file-{{if or $entry.IsDir}}directory{{else}}text{{end}}"></span> </td> <td class="name"> - <a href="{{EscapePound $.BranchLink}}/{{$.TreePath}}{{$entry.Name}}" class="text-truncate">{{$entry.Name}}</a> + <a href="{{EscapePound $.BranchLink}}/{{EscapePound $.TreePath}}{{EscapePound $entry.Name}}" class="text-truncate">{{$entry.Name}}</a> </td> {{end}} <td class="sha"> @@ -66,4 +66,4 @@ </table> {{if .ReadmeExist}} {{template "repo/view_file" .}} -{{end}}
\ No newline at end of file +{{end}} |