diff options
Diffstat (limited to 'templates/repo')
32 files changed, 227 insertions, 233 deletions
diff --git a/templates/repo/activity.tmpl b/templates/repo/activity.tmpl index bcf64a3fa1..08e2a31115 100644 --- a/templates/repo/activity.tmpl +++ b/templates/repo/activity.tmpl @@ -93,7 +93,7 @@ {{if gt .Activity.Code.CommitCountInAllBranches 0}} <div class="ui attached segment horizontal segments"> <div class="ui attached segment text"> - {{.i18n.Tr "repo.activity.git_stats_exclude_merges" }} + {{.i18n.Tr "repo.activity.git_stats_exclude_merges" }} <strong>{{.i18n.Tr (TrN .i18n.Lang .Activity.Code.AuthorCount "repo.activity.git_stats_author_1" "repo.activity.git_stats_author_n") .Activity.Code.AuthorCount }}</strong> {{.i18n.Tr (TrN .i18n.Lang .Activity.Code.AuthorCount "repo.activity.git_stats_pushed_1" "repo.activity.git_stats_pushed_n") }} <strong>{{.i18n.Tr (TrN .i18n.Lang .Activity.Code.CommitCount "repo.activity.git_stats_commit_1" "repo.activity.git_stats_commit_n") .Activity.Code.CommitCount }}</strong> diff --git a/templates/repo/blame.tmpl b/templates/repo/blame.tmpl index 5dd93d3d46..638683b25e 100644 --- a/templates/repo/blame.tmpl +++ b/templates/repo/blame.tmpl @@ -19,7 +19,7 @@ </div> </div> </h4> - <div class="ui attached table unstackable segment"> + <div class="ui attached table unstackable segment"> <div class="file-view code-view"> <table> <tbody> @@ -31,5 +31,5 @@ </tbody> </table> </div> - </div> + </div> </div> diff --git a/templates/repo/branch/list.tmpl b/templates/repo/branch/list.tmpl index de4f0fb57e..caddcf69e4 100644 --- a/templates/repo/branch/list.tmpl +++ b/templates/repo/branch/list.tmpl @@ -25,11 +25,11 @@ </td> <td class="right aligned overflow-visible"> <div class="ui basic jump dropdown icon button poping up" data-content="{{$.i18n.Tr "repo.branch.download" ($.DefaultBranch)}}" data-variation="tiny inverted" data-position="top right"> - {{svg "octicon-download"}} - <div class="menu"> - <a class="item archive-link" data-url="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.zip">{{svg "octicon-file-zip"}} ZIP</a> - <a class="item archive-link" data-url="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.tar.gz">{{svg "octicon-file-zip"}} TAR.GZ</a> - </div> + {{svg "octicon-download"}} + <div class="menu"> + <a class="item archive-link" data-url="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.zip">{{svg "octicon-file-zip"}} ZIP</a> + <a class="item archive-link" data-url="{{$.RepoLink}}/archive/{{EscapePound $.DefaultBranch}}.tar.gz">{{svg "octicon-file-zip"}} TAR.GZ</a> + </div> </div> </td> </tr> diff --git a/templates/repo/commit_page.tmpl b/templates/repo/commit_page.tmpl index 6260d2e965..01cbd5182d 100644 --- a/templates/repo/commit_page.tmpl +++ b/templates/repo/commit_page.tmpl @@ -113,13 +113,13 @@ <span class="ui text">{{.i18n.Tr .Verification.Reason}}</span> <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="warning icon"></i>{{.Verification.SigningKey.KeyID}}</span> {{else}} - <i class="unlock icon"></i> - {{.i18n.Tr .Verification.Reason}} - {{if .Verification.SigningKey}} - {{if ne .Verification.SigningKey.KeyID ""}} - <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="warning icon"></i>{{.Verification.SigningKey.KeyID}}</span> - {{end}} - {{end}} + <i class="unlock icon"></i> + {{.i18n.Tr .Verification.Reason}} + {{if .Verification.SigningKey}} + {{if ne .Verification.SigningKey.KeyID ""}} + <span class="pull-right"><span class="ui text">{{.i18n.Tr "repo.commits.gpg_key_id"}}:</span> <i class="warning icon"></i>{{.Verification.SigningKey.KeyID}}</span> + {{end}} + {{end}} {{end}} </div> {{end}} @@ -130,9 +130,9 @@ {{if .NoteAuthor}} <a href="{{.NoteAuthor.HomeLink}}"> {{if .NoteAuthor.FullName}} - <strong>{{.NoteAuthor.FullName}}</strong> + <strong>{{.NoteAuthor.FullName}}</strong> {{else}} - <strong>{{.NoteCommit.Author.Name}}</strong> + <strong>{{.NoteCommit.Author.Name}}</strong> {{end}} </a> {{else}} diff --git a/templates/repo/commits_table.tmpl b/templates/repo/commits_table.tmpl index 623df6f63e..3ef2339843 100644 --- a/templates/repo/commits_table.tmpl +++ b/templates/repo/commits_table.tmpl @@ -28,7 +28,7 @@ </h4> {{if and .Commits (gt .CommitCount 0)}} - {{template "repo/commits_list" .}} + {{template "repo/commits_list" .}} {{end}} {{template "base/paginate" .}} diff --git a/templates/repo/diff/compare.tmpl b/templates/repo/diff/compare.tmpl index fdf65aaad3..124b4e5d1c 100644 --- a/templates/repo/diff/compare.tmpl +++ b/templates/repo/diff/compare.tmpl @@ -117,9 +117,9 @@ {{end}} {{else if and .PageIsComparePull (gt .CommitCount 0)}} {{if .HasPullRequest}} - <div class="ui segment"> - {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} - </div> + <div class="ui segment"> + {{.i18n.Tr "repo.pulls.has_pull_request" $.RepoLink $.RepoRelPath .PullRequest.Index | Safe}} + </div> {{else}} {{if and $.IsSigned (not .Repository.IsArchived)}} <div class="ui info message show-form-container"> diff --git a/templates/repo/diff/csv_diff.tmpl b/templates/repo/diff/csv_diff.tmpl index c4af70461f..b86e9d2a72 100644 --- a/templates/repo/diff/csv_diff.tmpl +++ b/templates/repo/diff/csv_diff.tmpl @@ -43,4 +43,4 @@ </table> {{end}} </td> -</tr>
\ No newline at end of file +</tr> diff --git a/templates/repo/diff/image_diff.tmpl b/templates/repo/diff/image_diff.tmpl index 01f7e3f8e8..91092c412f 100644 --- a/templates/repo/diff/image_diff.tmpl +++ b/templates/repo/diff/image_diff.tmpl @@ -106,4 +106,4 @@ </div> </td> </tr> -{{end}}
\ No newline at end of file +{{end}} diff --git a/templates/repo/diff/new_review.tmpl b/templates/repo/diff/new_review.tmpl index 6304369416..9e65d6d420 100644 --- a/templates/repo/diff/new_review.tmpl +++ b/templates/repo/diff/new_review.tmpl @@ -13,16 +13,12 @@ <a class="muted close px-3">{{svg "octicon-x" 16}}</a> </div> <div class="ui field"> - <textarea name="content" tabindex="0" rows="2" - placeholder="{{$.i18n.Tr "repo.diff.review.placeholder"}}"></textarea> + <textarea name="content" tabindex="0" rows="2" placeholder="{{$.i18n.Tr "repo.diff.review.placeholder"}}"></textarea> </div> <div class="ui divider"></div> - <button type="submit" name="type" value="approve" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }} - class="ui submit green tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.approve"}}</button> - <button type="submit" name="type" value="comment" - class="ui submit tiny basic button btn-submit">{{$.i18n.Tr "repo.diff.review.comment"}}</button> - <button type="submit" name="type" value="reject" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }} - class="ui submit red tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.reject"}}</button> + <button type="submit" name="type" value="approve" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }} class="ui submit green tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.approve"}}</button> + <button type="submit" name="type" value="comment" class="ui submit tiny basic button btn-submit">{{$.i18n.Tr "repo.diff.review.comment"}}</button> + <button type="submit" name="type" value="reject" {{ if and $.IsSigned ($.Issue.IsPoster $.SignedUser.ID) }} disabled {{ end }} class="ui submit red tiny button btn-submit">{{$.i18n.Tr "repo.diff.review.reject"}}</button> </form> </div> </div> diff --git a/templates/repo/editor/edit.tmpl b/templates/repo/editor/edit.tmpl index 695574cd99..3efde70f50 100644 --- a/templates/repo/editor/edit.tmpl +++ b/templates/repo/editor/edit.tmpl @@ -59,7 +59,7 @@ <div class="ui small basic modal" id="edit-empty-content-modal"> <div class="ui icon header"> <i class="file icon"></i> - {{.i18n.Tr "repo.editor.commit_empty_file_header"}} + {{.i18n.Tr "repo.editor.commit_empty_file_header"}} </div> <div class="center content"> <p>{{.i18n.Tr "repo.editor.commit_empty_file_text"}}</p> @@ -67,11 +67,11 @@ <div class="actions"> <div class="ui red basic cancel inverted button"> <i class="remove icon"></i> - {{.i18n.Tr "repo.editor.cancel"}} + {{.i18n.Tr "repo.editor.cancel"}} </div> <div class="ui green basic ok inverted button"> <i class="save icon"></i> - {{.i18n.Tr "repo.editor.commit_changes"}} + {{.i18n.Tr "repo.editor.commit_changes"}} </div> </div> </div> diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl index 71963d698c..188fc87b6a 100644 --- a/templates/repo/header.tmpl +++ b/templates/repo/header.tmpl @@ -32,7 +32,7 @@ {{end}} {{end}} {{if .IsArchived}} - <span class="ui basic label">{{$.i18n.Tr "repo.desc.archived"}}</span> + <span class="ui basic label">{{$.i18n.Tr "repo.desc.archived"}}</span> {{end}} </div> </div> diff --git a/templates/repo/issue/branch_selector_field.tmpl b/templates/repo/issue/branch_selector_field.tmpl index 7ca18508d9..e115b4a3f4 100644 --- a/templates/repo/issue/branch_selector_field.tmpl +++ b/templates/repo/issue/branch_selector_field.tmpl @@ -34,7 +34,7 @@ <div id="branch-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}"> {{if .Issue.Ref}} <div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{$.i18n.Tr "repo.clear_ref"}}</a></strong></div> - {{end}} + {{end}} {{range .Branches}} <div class="item" data-id="refs/heads/{{.}}" data-name="{{.}}" data-id-selector="#ref_selector">{{.}}</div> {{end}} @@ -42,7 +42,7 @@ <div id="tag-list" class="scrolling menu reference-list-menu {{if not .Issue}}new-issue{{end}}" style="display: none"> {{if .Issue.Ref}} <div class="item text small" data-id="" data-id-selector="#ref_selector"><strong><a href="#">{{.i18n.Tr "repo.clear_ref"}}</a></strong></div> - {{end}} + {{end}} {{range .Tags}} <div class="item" data-id="refs/tags/{{.}}" data-name="tags/{{.}}" data-id-selector="#ref_selector">{{.}}</div> {{end}} diff --git a/templates/repo/issue/comment_tab.tmpl b/templates/repo/issue/comment_tab.tmpl index 28a9b24edc..ab874bdd13 100644 --- a/templates/repo/issue/comment_tab.tmpl +++ b/templates/repo/issue/comment_tab.tmpl @@ -4,7 +4,7 @@ </div> <div class="field"> <div class="ui bottom active tab" data-tab="write"> - <textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.Repo.RepoLink}}"> + <textarea id="content" class="edit_area js-quick-submit" name="content" tabindex="4" data-id="issue-{{.RepoName}}" data-url="{{.Repository.APIURL}}/markdown" data-context="{{.Repo.RepoLink}}"> {{- if .BodyQuery}}{{.BodyQuery}}{{else if .IssueTemplate}}{{.IssueTemplate}}{{else if .PullRequestTemplate}}{{.PullRequestTemplate}}{{else}}{{.content}}{{end -}} </textarea> </div> diff --git a/templates/repo/issue/labels/edit_delete_label.tmpl b/templates/repo/issue/labels/edit_delete_label.tmpl index 8e1f914d5f..19f422cdfe 100644 --- a/templates/repo/issue/labels/edit_delete_label.tmpl +++ b/templates/repo/issue/labels/edit_delete_label.tmpl @@ -55,4 +55,3 @@ </div> </div> </div> - diff --git a/templates/repo/issue/labels/label_load_template.tmpl b/templates/repo/issue/labels/label_load_template.tmpl index 76ee77658a..037069c29b 100644 --- a/templates/repo/issue/labels/label_load_template.tmpl +++ b/templates/repo/issue/labels/label_load_template.tmpl @@ -3,8 +3,7 @@ <div class="ui attached left aligned segment"> <!-- <h4 class="ui header"> {{.i18n.Tr "repo.issues.label_templates.title"}} - <a target="_blank" rel="noopener noreferrer" - href="https://discuss.gogs.io/t/how-to-use-predefined-label-templates/599"> + <a target="_blank" rel="noopener noreferrer" href="https://discuss.gogs.io/t/how-to-use-predefined-label-templates/599"> <span class="octicon octicon-question"></span> </a> </h4> --> diff --git a/templates/repo/issue/milestone_issues.tmpl b/templates/repo/issue/milestone_issues.tmpl index f977074fea..8c2f36f04b 100644 --- a/templates/repo/issue/milestone_issues.tmpl +++ b/templates/repo/issue/milestone_issues.tmpl @@ -14,29 +14,29 @@ {{if not .Repository.IsArchived}} <div class="column right aligned"> {{if or .CanWriteIssues .CanWritePulls}} - <a class="ui button" href="{{.RepoLink}}/milestones/{{.MilestoneID}}/edit">{{.i18n.Tr "repo.milestones.edit"}}</a> + <a class="ui button" href="{{.RepoLink}}/milestones/{{.MilestoneID}}/edit">{{.i18n.Tr "repo.milestones.edit"}}</a> {{end}} <a class="ui primary button" href="{{.RepoLink}}/issues/new{{if .NewIssueChooseTemplate}}/choose{{end}}?milestone={{.MilestoneID}}">{{.i18n.Tr "repo.issues.new"}}</a> </div> {{end}} </div> - <div class="ui one column stackable grid"> - <div class="column"> - {{ $closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.Lang }} - {{if .IsClosed}} + <div class="ui one column stackable grid"> + <div class="column"> + {{ $closedDate:= TimeSinceUnix .Milestone.ClosedDateUnix $.Lang }} + {{if .IsClosed}} {{svg "octicon-clock"}} {{$.i18n.Tr "repo.milestones.closed" $closedDate|Str2html}} - {{else}} + {{else}} {{svg "octicon-calendar"}} - {{if .Milestone.DeadlineString}} - <span {{if .IsOverdue}}class="overdue"{{end}}>{{.Milestone.DeadlineString}}</span> - {{else}} - {{$.i18n.Tr "repo.milestones.no_due_date"}} - {{end}} - {{end}} - - <b>{{.i18n.Tr "repo.milestones.completeness" .Milestone.Completeness}}</b> - </div> - </div> + {{if .Milestone.DeadlineString}} + <span {{if .IsOverdue}}class="overdue"{{end}}>{{.Milestone.DeadlineString}}</span> + {{else}} + {{$.i18n.Tr "repo.milestones.no_due_date"}} + {{end}} + {{end}} + + <b>{{.i18n.Tr "repo.milestones.completeness" .Milestone.Completeness}}</b> + </div> + </div> <div class="ui divider"></div> <div id="issue-filters" class="ui stackable grid"> <div class="six wide column"> diff --git a/templates/repo/issue/milestones.tmpl b/templates/repo/issue/milestones.tmpl index c572e0c3f3..c7d3522abc 100644 --- a/templates/repo/issue/milestones.tmpl +++ b/templates/repo/issue/milestones.tmpl @@ -14,7 +14,7 @@ {{template "base/alert" .}} <div class="ui three column stackable grid"> - <div class="column"> + <div class="column"> <div class="ui compact tiny menu"> <a class="item{{if not .IsShowClosed}} active{{end}}" href="{{.RepoLink}}/milestones?state=open&q={{$.Keyword}}"> {{svg "octicon-milestone" 16 "mr-3"}} diff --git a/templates/repo/issue/view_content.tmpl b/templates/repo/issue/view_content.tmpl index 233893be0b..0482604b70 100644 --- a/templates/repo/issue/view_content.tmpl +++ b/templates/repo/issue/view_content.tmpl @@ -66,9 +66,9 @@ </div> <div id="comment-{{.Issue.ID}}" class="raw-content hide">{{.Issue.Content}}</div> <div class="edit-content-zone hide" data-write="issue-{{.Issue.ID}}-write" data-preview="issue-{{.Issue.ID}}-preview" data-update-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/content" data-context="{{.RepoLink}}" data-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/attachments" data-view-attachment-url="{{$.RepoLink}}/issues/{{.Issue.Index}}/view-attachments"></div> - {{if .Issue.Attachments}} - {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}} - {{end}} + {{if .Issue.Attachments}} + {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Issue.Attachments "Content" .Issue.RenderedContent}} + {{end}} </div> {{$reactions := .Issue.Reactions.GroupByType}} {{if $reactions}} diff --git a/templates/repo/issue/view_content/attachments.tmpl b/templates/repo/issue/view_content/attachments.tmpl index 16d77847d0..343d1d8358 100644 --- a/templates/repo/issue/view_content/attachments.tmpl +++ b/templates/repo/issue/view_content/attachments.tmpl @@ -1,42 +1,42 @@ <div class="dropzone-attachments"> - {{if .Attachments}} - <div class="ui clearing divider"></div> - {{end}} - <div class="ui middle aligned padded grid"> - {{$hasThumbnails := false}} - {{- range .Attachments -}} - <div class="twelve wide column" style="padding: 6px;"> - <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> - {{if FilenameIsImage .Name}} - {{if not (containGeneric $.Content .UUID)}} - {{$hasThumbnails = true}} - {{end}} - <span class="ui image">{{svg "octicon-file"}}</span> - {{else}} - <span class="ui image">{{svg "octicon-desktop-download"}}</span> - {{end}} - <span><strong>{{.Name}}</strong></span> - </a> - </div> - <div class="four wide column" style="padding: 0px;"> - <span class="ui text grey right">{{.Size | FileSize}}</span> - </div> - {{end -}} - </div> + {{if .Attachments}} + <div class="ui clearing divider"></div> + {{end}} + <div class="ui middle aligned padded grid"> + {{$hasThumbnails := false}} + {{- range .Attachments -}} + <div class="twelve wide column" style="padding: 6px;"> + <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> + {{if FilenameIsImage .Name}} + {{if not (containGeneric $.Content .UUID)}} + {{$hasThumbnails = true}} + {{end}} + <span class="ui image">{{svg "octicon-file"}}</span> + {{else}} + <span class="ui image">{{svg "octicon-desktop-download"}}</span> + {{end}} + <span><strong>{{.Name}}</strong></span> + </a> + </div> + <div class="four wide column" style="padding: 0px;"> + <span class="ui text grey right">{{.Size | FileSize}}</span> + </div> + {{end -}} + </div> - {{if $hasThumbnails}} - <div class="ui clearing divider"></div> - <div class="ui small images thumbnails"> - {{- range .Attachments -}} - {{if FilenameIsImage .Name}} - {{if not (containGeneric $.Content .UUID)}} - <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> - <img class="ui image" src="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> - </a> - {{end}} - {{end}} - {{end -}} - </div> - {{end}} + {{if $hasThumbnails}} + <div class="ui clearing divider"></div> + <div class="ui small images thumbnails"> + {{- range .Attachments -}} + {{if FilenameIsImage .Name}} + {{if not (containGeneric $.Content .UUID)}} + <a target="_blank" rel="noopener noreferrer" href="{{.DownloadURL}}"> + <img class="ui image" src="{{.DownloadURL}}" title='{{$.ctx.i18n.Tr "repo.issues.attachment.open_tab" .Name}}'> + </a> + {{end}} + {{end}} + {{end -}} + </div> + {{end}} </div> diff --git a/templates/repo/issue/view_content/comments.tmpl b/templates/repo/issue/view_content/comments.tmpl index c86689400e..81f0d0434a 100644 --- a/templates/repo/issue/view_content/comments.tmpl +++ b/templates/repo/issue/view_content/comments.tmpl @@ -3,13 +3,13 @@ {{ $createdStr:= TimeSinceUnix .CreatedUnix $.Lang }} <!-- 0 = COMMENT, 1 = REOPEN, 2 = CLOSE, 3 = ISSUE_REF, 4 = COMMIT_REF, - 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING, - 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE, - 18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE, - 22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED, - 26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST, - 29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED - 32 = DISMISSED_REVIEW --> + 5 = COMMENT_REF, 6 = PULL_REF, 7 = COMMENT_LABEL, 12 = START_TRACKING, + 13 = STOP_TRACKING, 14 = ADD_TIME_MANUAL, 16 = ADDED_DEADLINE, 17 = MODIFIED_DEADLINE, + 18 = REMOVED_DEADLINE, 19 = ADD_DEPENDENCY, 20 = REMOVE_DEPENDENCY, 21 = CODE, + 22 = REVIEW, 23 = ISSUE_LOCKED, 24 = ISSUE_UNLOCKED, 25 = TARGET_BRANCH_CHANGED, + 26 = DELETE_TIME_MANUAL, 27 = REVIEW_REQUEST, 28 = MERGE_PULL_REQUEST, + 29 = PULL_PUSH_EVENT, 30 = PROJECT_CHANGED, 31 = PROJECT_BOARD_CHANGED + 32 = DISMISSED_REVIEW --> {{if eq .Type 0}} <div class="timeline-item comment" id="{{.HashTag}}"> {{if .OriginalAuthor }} @@ -73,9 +73,9 @@ </div> <div id="comment-{{.ID}}" class="raw-content hide">{{.Content}}</div> <div class="edit-content-zone hide" data-write="issuecomment-{{.ID}}-write" data-preview="issuecomment-{{.ID}}-preview" data-update-url="{{$.RepoLink}}/comments/{{.ID}}" data-context="{{$.RepoLink}}" data-attachment-url="{{$.RepoLink}}/comments/{{.ID}}/attachments"></div> - {{if .Attachments}} - {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}} - {{end}} + {{if .Attachments}} + {{template "repo/issue/view_content/attachments" Dict "ctx" $ "Attachments" .Attachments "Content" .RenderedContent}} + {{end}} </div> {{$reactions := .Reactions.GroupByType}} {{if $reactions}} diff --git a/templates/repo/issue/view_title.tmpl b/templates/repo/issue/view_title.tmpl index f6cbb9206c..b6bf965a15 100644 --- a/templates/repo/issue/view_title.tmpl +++ b/templates/repo/issue/view_title.tmpl @@ -57,34 +57,34 @@ </span> {{end}} <span id="pull-desc-edit" style="display: none"> - <div class="ui floating filter dropdown"> - <div class="ui basic small button"> - <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span> - </div> - </div> - {{svg "octicon-arrow-right"}} - <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> - <div class="ui basic small button"> - <span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - </div> - <div class="menu"> - <div class="ui icon search input"> - <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i> - <input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}..."> - </div> - <div class="scrolling menu" id="branch-select"> - {{range .Branches}} - {{ $sameBase := ne $.BaseName $.HeadUserName }} - {{ $differentBranch := ne . $.HeadBranch }} - {{ if or $sameBase $differentBranch }} - <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-branch="{{.}}">{{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}</div> - {{ end }} - {{end}} - </div> - </div> - </div> - </span> + <div class="ui floating filter dropdown"> + <div class="ui basic small button"> + <span class="text">{{.i18n.Tr "repo.pulls.compare_compare"}}: {{$.HeadTarget}}</span> + </div> + </div> + {{svg "octicon-arrow-right"}} + <div class="ui floating filter dropdown" data-no-results="{{.i18n.Tr "repo.pulls.no_results"}}"> + <div class="ui basic small button"> + <span class="text" id="pull-target-branch" data-basename="{{$.BaseName}}" data-branch="{{$.BaseBranch}}">{{.i18n.Tr "repo.pulls.compare_base"}}: {{$.BaseName}}:{{$.BaseBranch}}</span> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + </div> + <div class="menu"> + <div class="ui icon search input"> + <i class="icon df ac jc m-0">{{svg "octicon-filter" 16}}</i> + <input name="search" placeholder="{{.i18n.Tr "repo.pulls.filter_branch"}}..."> + </div> + <div class="scrolling menu" id="branch-select"> + {{range .Branches}} + {{ $sameBase := ne $.BaseName $.HeadUserName }} + {{ $differentBranch := ne . $.HeadBranch }} + {{ if or $sameBase $differentBranch }} + <div class="item {{if eq $.BaseBranch .}}selected{{end}}" data-branch="{{.}}">{{$.BaseName}}{{if $.HeadRepo}}/{{$.HeadRepo}}{{end}}:{{.}}</div> + {{ end }} + {{end}} + </div> + </div> + </div> + </span> {{end}} {{else}} {{ $createdStr:= TimeSinceUnix .Issue.CreatedUnix $.Lang }} diff --git a/templates/repo/migrate/github.tmpl b/templates/repo/migrate/github.tmpl index b7c5bd5b0d..156f8896fc 100644 --- a/templates/repo/migrate/github.tmpl +++ b/templates/repo/migrate/github.tmpl @@ -6,7 +6,7 @@ {{.CsrfTokenHtml}} <h3 class="ui top attached header"> {{.i18n.Tr "repo.migrate.migrate" .service.Title}} - <input id="service_type" type="hidden" name="service" value="{{.service}}"> + <input id="service_type" type="hidden" name="service" value="{{.service}}"> </h3> <div class="ui attached segment"> {{template "base/alert" .}} diff --git a/templates/repo/migrate/gitlab.tmpl b/templates/repo/migrate/gitlab.tmpl index 26eebd18bb..e1424c250f 100644 --- a/templates/repo/migrate/gitlab.tmpl +++ b/templates/repo/migrate/gitlab.tmpl @@ -6,7 +6,7 @@ {{.CsrfTokenHtml}} <h3 class="ui top attached header"> {{.i18n.Tr "repo.migrate.migrate" .service.Title}} - <input id="service_type" type="hidden" name="service" value="{{.service}}"> + <input id="service_type" type="hidden" name="service" value="{{.service}}"> </h3> <div class="ui attached segment"> {{template "base/alert" .}} diff --git a/templates/repo/migrate/gogs.tmpl b/templates/repo/migrate/gogs.tmpl index dc83ac5bb8..b1900e83d1 100644 --- a/templates/repo/migrate/gogs.tmpl +++ b/templates/repo/migrate/gogs.tmpl @@ -62,7 +62,7 @@ <label>{{.i18n.Tr "repo.migrate_items_releases" | Safe}}</label> </div> </div> - --> + --> </div> <div class="ui divider"></div> diff --git a/templates/repo/pulls/status.tmpl b/templates/repo/pulls/status.tmpl index e48f5f3fe3..f029d5cb6c 100644 --- a/templates/repo/pulls/status.tmpl +++ b/templates/repo/pulls/status.tmpl @@ -1,32 +1,32 @@ {{if $.LatestCommitStatus}} - {{if not $.Issue.PullRequest.HasMerged}} - <div class="ui top attached header"> - {{if eq .LatestCommitStatus.State "pending"}} - {{$.i18n.Tr "repo.pulls.status_checking"}} - {{else if eq .LatestCommitStatus.State "success"}} - {{$.i18n.Tr "repo.pulls.status_checks_success"}} - {{else if eq .LatestCommitStatus.State "warning"}} - {{$.i18n.Tr "repo.pulls.status_checks_warning"}} - {{else if eq .LatestCommitStatus.State "failure"}} - {{$.i18n.Tr "repo.pulls.status_checks_failure"}} - {{else if eq .LatestCommitStatus.State "error"}} - {{$.i18n.Tr "repo.pulls.status_checks_error"}} - {{else}} - {{$.i18n.Tr "repo.pulls.status_checking"}} - {{end}} - </div> - {{end}} + {{if not $.Issue.PullRequest.HasMerged}} + <div class="ui top attached header"> + {{if eq .LatestCommitStatus.State "pending"}} + {{$.i18n.Tr "repo.pulls.status_checking"}} + {{else if eq .LatestCommitStatus.State "success"}} + {{$.i18n.Tr "repo.pulls.status_checks_success"}} + {{else if eq .LatestCommitStatus.State "warning"}} + {{$.i18n.Tr "repo.pulls.status_checks_warning"}} + {{else if eq .LatestCommitStatus.State "failure"}} + {{$.i18n.Tr "repo.pulls.status_checks_failure"}} + {{else if eq .LatestCommitStatus.State "error"}} + {{$.i18n.Tr "repo.pulls.status_checks_error"}} + {{else}} + {{$.i18n.Tr "repo.pulls.status_checking"}} + {{end}} + </div> + {{end}} - {{range $.LatestCommitStatuses}} - <div class="ui attached segment"> - <span>{{template "repo/commit_status" .}}</span> - <span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span> - <div class="ui right"> - {{if $.is_context_required}} - {{if (call $.is_context_required .Context)}}<div class="ui label">{{$.i18n.Tr "repo.pulls.status_checks_requested"}}</div>{{end}} - {{end}} - <span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">{{$.i18n.Tr "repo.pulls.status_checks_details"}}</a>{{end}}</span> - </div> - </div> - {{end}} + {{range $.LatestCommitStatuses}} + <div class="ui attached segment"> + <span>{{template "repo/commit_status" .}}</span> + <span class="ui">{{.Context}} <span class="text grey">{{.Description}}</span></span> + <div class="ui right"> + {{if $.is_context_required}} + {{if (call $.is_context_required .Context)}}<div class="ui label">{{$.i18n.Tr "repo.pulls.status_checks_requested"}}</div>{{end}} + {{end}} + <span class="ui">{{if .TargetURL}}<a href="{{.TargetURL}}">{{$.i18n.Tr "repo.pulls.status_checks_details"}}</a>{{end}}</span> + </div> + </div> + {{end}} {{end}} diff --git a/templates/repo/release/list.tmpl b/templates/repo/release/list.tmpl index 72a69a756a..ce4de3ddfa 100644 --- a/templates/repo/release/list.tmpl +++ b/templates/repo/release/list.tmpl @@ -127,7 +127,7 @@ {{$.i18n.Tr "repo.released_this"}} </span> {{if .CreatedUnix}} - <span class="time">{{TimeSinceUnix .CreatedUnix $.Lang}}</span> | + <span class="time">{{TimeSinceUnix .CreatedUnix $.Lang}}</span> | {{end}} <span class="ahead"><a href="{{$.RepoLink}}/compare/{{.TagName | EscapePound}}...{{.Target}}">{{$.i18n.Tr "repo.release.ahead.commits" .NumCommitsBehind | Str2html}}</a> {{$.i18n.Tr "repo.release.ahead.target" .Target}}</span> </p> diff --git a/templates/repo/settings/branches.tmpl b/templates/repo/settings/branches.tmpl index 81e80215c5..fbe9a7463e 100644 --- a/templates/repo/settings/branches.tmpl +++ b/templates/repo/settings/branches.tmpl @@ -9,37 +9,37 @@ {{.i18n.Tr "repo.settings.archive.branchsettings_unavailable"}} </div> {{else}} - <h4 class="ui top attached header"> - {{.i18n.Tr "repo.default_branch"}} - </h4> - <div class="ui attached segment"> - <p> - {{.i18n.Tr "repo.settings.default_branch_desc"}} - </p> - <form class="ui form" action="{{.Link}}" method="post"> - {{.CsrfTokenHtml}} - <input type="hidden" name="action" value="default_branch"> - {{if not .Repository.IsEmpty}} - <div class="required inline field"> - <div class="ui dropdown selection" tabindex="0"> - <select name="branch"> - <option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option> - {{range .Branches}} - <option value="{{.}}">{{.}}</option> - {{end}} - </select>{{svg "octicon-triangle-down" 14 "dropdown icon"}} - <div class="default text">{{.Repository.DefaultBranch}}</div> - <div class="menu transition hidden" tabindex="-1" style="display: block !important;"> - {{range .Branches}} - <div class="item" data-value="{{.}}">{{.}}</div> - {{end}} - </div> - </div> - <button class="ui green button">{{$.i18n.Tr "repo.settings.update_settings"}}</button> - </div> - {{end}} - </form> - </div> + <h4 class="ui top attached header"> + {{.i18n.Tr "repo.default_branch"}} + </h4> + <div class="ui attached segment"> + <p> + {{.i18n.Tr "repo.settings.default_branch_desc"}} + </p> + <form class="ui form" action="{{.Link}}" method="post"> + {{.CsrfTokenHtml}} + <input type="hidden" name="action" value="default_branch"> + {{if not .Repository.IsEmpty}} + <div class="required inline field"> + <div class="ui dropdown selection" tabindex="0"> + <select name="branch"> + <option value="{{.Repository.DefaultBranch}}">{{.Repository.DefaultBranch}}</option> + {{range .Branches}} + <option value="{{.}}">{{.}}</option> + {{end}} + </select>{{svg "octicon-triangle-down" 14 "dropdown icon"}} + <div class="default text">{{.Repository.DefaultBranch}}</div> + <div class="menu transition hidden" tabindex="-1" style="display: block !important;"> + {{range .Branches}} + <div class="item" data-value="{{.}}">{{.}}</div> + {{end}} + </div> + </div> + <button class="ui green button">{{$.i18n.Tr "repo.settings.update_settings"}}</button> + </div> + {{end}} + </form> + </div> <h4 class="ui top attached header"> {{.i18n.Tr "repo.settings.protected_branch"}} diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 8e052ac303..7dfc27c64f 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -19,12 +19,12 @@ <div class="ui key list"> {{range .Deploykeys}} <div class="item"> - <div class="right floated content"> + <div class="right floated content"> <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> {{$.i18n.Tr "settings.delete_key"}} </button> - </div> - <div class="left floated content"> + </div> + <div class="left floated content"> <i class="{{if .HasRecentActivity}}green{{end}}" {{if .HasRecentActivity}}data-content="{{$.i18n.Tr "settings.key_state_desc"}}" data-variation="inverted"{{end}}>{{svg "octicon-key" 32}}</i> </div> <div class="content"> diff --git a/templates/repo/settings/webhook/matrix.tmpl b/templates/repo/settings/webhook/matrix.tmpl index fa23bb73e8..a99f8e09b5 100644 --- a/templates/repo/settings/webhook/matrix.tmpl +++ b/templates/repo/settings/webhook/matrix.tmpl @@ -7,25 +7,25 @@ <input id="homeserver_url" name="homeserver_url" type="url" value="{{.MatrixHook.HomeserverURL}}" autofocus required> </div> <div class="required field {{if .Err_Room}}error{{end}}"> - <label for="room_id">{{.i18n.Tr "repo.settings.matrix.room_id"}}</label> - <input id="room_id" name="room_id" type="text" value="{{.MatrixHook.Room}}" required> - </div> - <div class="required field {{if .Err_AccessToken}}error{{end}}"> - <label for="access_token">{{.i18n.Tr "repo.settings.matrix.access_token"}}</label> - <input id="access_token" name="access_token" type="text" value="{{.MatrixHook.AccessToken}}" required> - </div> - <div class="field"> - <label>{{.i18n.Tr "repo.settings.matrix.message_type"}}</label> - <div class="ui selection dropdown"> - <input type="hidden" id="message_type" name="message_type" value="{{if .MatrixHook.MessageType}}{{.MatrixHook.MessageType}}{{else}}1{{end}}"> - <div class="default text"></div> - {{svg "octicon-triangle-down" 14 "dropdown icon"}} - <div class="menu"> - <div class="item" data-value="1">m.notice</div> - <div class="item" data-value="2">m.text</div> - </div> - </div> - </div> + <label for="room_id">{{.i18n.Tr "repo.settings.matrix.room_id"}}</label> + <input id="room_id" name="room_id" type="text" value="{{.MatrixHook.Room}}" required> + </div> + <div class="required field {{if .Err_AccessToken}}error{{end}}"> + <label for="access_token">{{.i18n.Tr "repo.settings.matrix.access_token"}}</label> + <input id="access_token" name="access_token" type="text" value="{{.MatrixHook.AccessToken}}" required> + </div> + <div class="field"> + <label>{{.i18n.Tr "repo.settings.matrix.message_type"}}</label> + <div class="ui selection dropdown"> + <input type="hidden" id="message_type" name="message_type" value="{{if .MatrixHook.MessageType}}{{.MatrixHook.MessageType}}{{else}}1{{end}}"> + <div class="default text"></div> + {{svg "octicon-triangle-down" 14 "dropdown icon"}} + <div class="menu"> + <div class="item" data-value="1">m.notice</div> + <div class="item" data-value="2">m.text</div> + </div> + </div> + </div> {{template "repo/settings/webhook/settings" .}} </form> {{end}} diff --git a/templates/repo/settings/webhook/telegram.tmpl b/templates/repo/settings/webhook/telegram.tmpl index 598ac44822..d062e7aac4 100644 --- a/templates/repo/settings/webhook/telegram.tmpl +++ b/templates/repo/settings/webhook/telegram.tmpl @@ -6,10 +6,10 @@ <label for="bot_token">{{.i18n.Tr "repo.settings.bot_token"}}</label> <input id="bot_token" name="bot_token" type="text" value="{{.TelegramHook.BotToken}}" autofocus required> </div> - <div class="required field {{if .Err_ChatID}}error{{end}}"> - <label for="chat_id">{{.i18n.Tr "repo.settings.chat_id"}}</label> - <input id="chat_id" name="chat_id" type="text" value="{{.TelegramHook.ChatID}}" required> - </div> + <div class="required field {{if .Err_ChatID}}error{{end}}"> + <label for="chat_id">{{.i18n.Tr "repo.settings.chat_id"}}</label> + <input id="chat_id" name="chat_id" type="text" value="{{.TelegramHook.ChatID}}" required> + </div> {{template "repo/settings/webhook/settings" .}} </form> {{end}} diff --git a/templates/repo/view_file.tmpl b/templates/repo/view_file.tmpl index 76c0ac76fe..889cb5a691 100644 --- a/templates/repo/view_file.tmpl +++ b/templates/repo/view_file.tmpl @@ -128,10 +128,10 @@ <script> function submitDeleteForm() { - var message = prompt("{{.i18n.Tr "repo.delete_confirm_message"}}\n\n{{.i18n.Tr "repo.delete_commit_summary"}}", "Delete '{{.TreeName}}'"); - if (message != null) { - $("#delete-message").val(message); - $("#delete-file-form").submit() - } + var message = prompt("{{.i18n.Tr "repo.delete_confirm_message"}}\n\n{{.i18n.Tr "repo.delete_commit_summary"}}", "Delete '{{.TreeName}}'"); + if (message != null) { + $("#delete-message").val(message); + $("#delete-file-form").submit() + } } </script> diff --git a/templates/repo/wiki/revision.tmpl b/templates/repo/wiki/revision.tmpl index 9838b2c11c..d74c99152a 100644 --- a/templates/repo/wiki/revision.tmpl +++ b/templates/repo/wiki/revision.tmpl @@ -29,7 +29,7 @@ </h4> {{if and .Commits (gt .CommitCount 0)}} - {{template "repo/commits_list" .}} + {{template "repo/commits_list" .}} {{end}} {{template "base/paginate" .}} |