Merge branch 'main' into lunny/refactor_issue_view

Author: lunny

options/locale/locale_pt-PT.ini

@@ -145,6 +145,7 @@ confirm_delete_selected=Confirma a exclusão de todos os itens marcados?
 
 name=Nome
 value=Valor
+readme=Leia-me
 
 filter=Filtro
 filter.clear=Retirar filtro
@@ -1045,6 +1046,8 @@ generate_repo=Gerar repositório
 generate_from=Gerar a partir de
 repo_desc=Descrição
 repo_desc_helper=Insira uma descrição curta (opcional)
+repo_no_desc=Descrição não fornecida
+repo_lang=Idiomas
 repo_gitignore_helper=Escolher modelos .gitignore.
 repo_gitignore_helper_desc=Escolha os ficheiros que não são para rastrear, a partir de uma lista de modelos de linguagens comuns. Serão incluídos no ficheiro .gitignore, logo à partida, artefactos típicos gerados pelas ferramentas de construção de cada uma das linguagens.
 issue_labels=Rótulos para as questões
@@ -1942,6 +1945,10 @@ pulls.delete.title=Eliminar este pedido de integração?
 pulls.delete.text=Tem a certeza que quer eliminar este pedido de integração? Isso irá remover todo o conteúdo permanentemente. Como alternativa considere fechá-lo, se pretender mantê-lo em arquivo.
 
 pulls.recently_pushed_new_branches=Enviou para o ramo <strong>%[1]s</strong> %[2]s
+pulls.upstream_diverging_prompt_behind_1=Este ramo está %d cometimento atrás de %s
+pulls.upstream_diverging_prompt_behind_n=Este ramo está %d cometimentos atrás de %s
+pulls.upstream_diverging_prompt_base_newer=O ramo base %s tem novas modificações
+pulls.upstream_diverging_merge=Sincronizar derivação
 
 pull.deleted_branch=(eliminado):%s
 pull.agit_documentation=Rever a documentação sobre o AGit

routers/web/repo/projects.go

@@ -425,6 +425,7 @@ func ViewProject(ctx *context.Context) {
 		return
 	}
 
+	ctx.Data["Title"] = project.Title
 	ctx.Data["IsProjectsPage"] = true
 	ctx.Data["CanWriteProjects"] = ctx.Repo.Permission.CanWrite(unit.TypeProjects)
 	ctx.Data["Project"] = project

templates/org/settings/labels.tmpl

@@ -1,15 +1,13 @@
 {{template "org/settings/layout_head" (dict "ctxData" . "pageClass" "organization settings labels")}}
-				<div class="org-setting-content">
-					<div class="tw-flex tw-items-center">
-						<div class="tw-flex-1">
-							{{ctx.Locale.Tr "org.settings.labels_desc"}}
-						</div>
-						<button class="ui small primary new-label button">{{ctx.Locale.Tr "repo.issues.new_label"}}</button>
-					</div>
-					<div class="divider"></div>
-					{{template "repo/issue/labels/label_new" .}}
-					{{template "repo/issue/labels/label_list" .}}
-				</div>
-{{template "repo/issue/labels/edit_delete_label" .}}
+<div class="org-setting-content">
+	<div class="tw-flex tw-items-center">
+		<div class="tw-flex-1">
+			{{ctx.Locale.Tr "org.settings.labels_desc"}}
+		</div>
+		<button class="ui small primary new-label button">{{ctx.Locale.Tr "repo.issues.new_label"}}</button>
+	</div>
+	<div class="divider"></div>
+	{{template "repo/issue/labels/label_list" .}}
+	{{template "repo/issue/labels/label_edit_modal" .}}
+</div>
 {{template "org/settings/layout_footer" .}}
-

templates/repo/issue/labels.tmpl

@@ -8,15 +8,11 @@
 				<button class="ui small primary new-label button">{{ctx.Locale.Tr "repo.issues.new_label"}}</button>
 			{{end}}
 		</div>
-		{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
-			{{template "repo/issue/labels/label_new" .}}
-		{{end}}
 		{{template "base/alert" .}}
 		{{template "repo/issue/labels/label_list" .}}
 	</div>
+	{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
+		{{template "repo/issue/labels/label_edit_modal" .}}
+	{{end}}
 </div>
-
-{{if and (or .CanWriteIssues .CanWritePulls) (not .Repository.IsArchived)}}
-	{{template "repo/issue/labels/edit_delete_label" .}}
-{{end}}
 {{template "base/footer" .}}

templates/repo/issue/labels/edit_delete_label.tmpl renamed to templates/repo/issue/labels/label_edit_modal.tmpl

@@ -1,22 +1,13 @@
-<div class="ui g-modal-confirm delete modal">
-	<div class="header">
-		{{svg "octicon-trash"}}
-		{{ctx.Locale.Tr "repo.issues.label_deletion"}}
-	</div>
-	<div class="content">
-		<p>{{ctx.Locale.Tr "repo.issues.label_deletion_desc"}}</p>
-	</div>
-	{{template "base/modal_actions_confirm" .}}
-</div>
-
-<div class="ui small edit-label modal">
-	<div class="header">
-		{{ctx.Locale.Tr "repo.issues.label_modify"}}
-	</div>
+<div class="ui small modal" id="issue-label-edit-modal"
+		data-current-page-link="{{$.Link}}"{{/*will be used to construct "new label" and "edit label" URLs*/}}
+		data-text-new-label="{{ctx.Locale.Tr "repo.issues.new_label"}}"
+		data-text-edit-label="{{ctx.Locale.Tr "repo.issues.label_modify"}}"
+>
+	<div class="header"></div>
 	<div class="content">
-		<form class="ui edit-label form ignore-dirty" action="{{$.Link}}/edit" method="post">
+		<form class="ui form ignore-dirty" method="post">
 			{{.CsrfTokenHtml}}
-			<input id="label-modal-id" name="id" type="hidden">
+			<input name="id" type="hidden">
 			<div class="required field">
 				<label for="name">{{ctx.Locale.Tr "repo.issues.label_title"}}</label>
 				<div class="ui small input">

templates/repo/issue/labels/label_list.tmpl

@@ -27,6 +27,8 @@
 	{{end}}
 
 	<ul class="issue-label-list">
+		{{$canEditLabel := and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
+		{{$canEditLabel = or $canEditLabel $.PageIsOrgSettingsLabels}}
 		{{range .Labels}}
 		<li class="item">
 			<div class="label-title">
@@ -43,12 +45,16 @@
 			<div class="label-operation tw-flex">
 				{{template "repo/issue/labels/label_archived" .}}
 				<div class="tw-flex tw-ml-auto">
-					{{if and (not $.PageIsOrgSettingsLabels) (not $.Repository.IsArchived) (or $.CanWriteIssues $.CanWritePulls)}}
-						<a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} {{if gt .ArchivedUnix 0}}data-is-archived{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
-						<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
-					{{else if $.PageIsOrgSettingsLabels}}
-						<a class="edit-label-button" href="#" data-id="{{.ID}}" data-title="{{.Name}}" {{if .Exclusive}}data-exclusive{{end}} {{if gt .ArchivedUnix 0}}data-is-archived{{end}} data-num-issues="{{.NumIssues}}" data-description="{{.Description}}" data-color={{.Color}}>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
-						<a class="delete-button" href="#" data-url="{{$.Link}}/delete" data-id="{{.ID}}">{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
+					{{if $canEditLabel}}
+						<a class="edit-label-button" href="#"
+							data-label-id="{{.ID}}" data-label-name="{{.Name}}" data-label-color="{{.Color}}"
+							data-label-exclusive="{{.Exclusive}}" data-label-is-archived="{{gt .ArchivedUnix 0}}"
+							data-label-num-issues="{{.NumIssues}}" data-label-description="{{.Description}}"
+						>{{svg "octicon-pencil"}} {{ctx.Locale.Tr "repo.issues.label_edit"}}</a>
+						<a class="link-action" href="#" data-url="{{$.Link}}/delete?id={{.ID}}"
+							data-modal-confirm-header="{{ctx.Locale.Tr "repo.issues.label_deletion"}}"
+							data-modal-confirm-content="{{ctx.Locale.Tr "repo.issues.label_deletion_desc"}}"
+						>{{svg "octicon-trash"}} {{ctx.Locale.Tr "repo.issues.label_delete"}}</a>
 					{{end}}
 				</div>
 			</div>

templates/repo/issue/labels/label_new.tmpl

@@ -2061,17 +2061,6 @@ td .commit-summary {
   padding: 1em;
 }
 
-.edit-label.modal .form .column,
-.new-label.modal .form .column {
-  padding-right: 0;
-}
-
-.edit-label.modal .form .buttons,
-.new-label.modal .form .buttons {
-  margin-left: auto;
-  padding-top: 15px;
-}
-
 .stats-table {
   display: table;
   width: 100%;

web_src/css/repo.css

@@ -6,8 +6,17 @@ import {fomanticQuery} from '../modules/fomantic/base.ts';
 
 const {appSubUrl, assetUrlPrefix, pageData} = window.config;
 
+type CommitStatus = 'pending' | 'success' | 'error' | 'failure' | 'warning';
+
+type CommitStatusMap = {
+  [status in CommitStatus]: {
+    name: string,
+    color: string,
+  };
+};
+
 // make sure this matches templates/repo/commit_status.tmpl
-const commitStatus = {
+const commitStatus: CommitStatusMap = {
   pending: {name: 'octicon-dot-fill', color: 'yellow'},
   success: {name: 'octicon-check', color: 'green'},
   error: {name: 'gitea-exclamation', color: 'red'},
@@ -281,18 +290,18 @@ const sfc = {
       return 'octicon-repo';
     },
 
-    statusIcon(status) {
+    statusIcon(status: CommitStatus) {
       return commitStatus[status].name;
     },
 
-    statusColor(status) {
+    statusColor(status: CommitStatus) {
       return commitStatus[status].color;
     },
 
     reposFilterKeyControl(e) {
       switch (e.key) {
         case 'Enter':
-          document.querySelector('.repo-owner-name-list li.active a')?.click();
+          document.querySelector<HTMLAnchorElement>('.repo-owner-name-list li.active a')?.click();
           break;
         case 'ArrowUp':
           if (this.activeIndex > 0) {

web_src/js/components/DashboardRepoList.vue

@@ -14,7 +14,7 @@ export default {
       issueLink: el.getAttribute('data-issuelink'),
       locale: {
         filter_changes_by_commit: el.getAttribute('data-filter_changes_by_commit'),
-      },
+      } as Record<string, string>,
       commits: [],
       hoverActivated: false,
       lastReviewCommitSha: null,
@@ -41,16 +41,16 @@ export default {
     this.$el.removeEventListener('keyup', this.onKeyUp);
   },
   methods: {
-    onBodyClick(event) {
+    onBodyClick(event: MouseEvent) {
       // close this menu on click outside of this element when the dropdown is currently visible opened
       if (this.$el.contains(event.target)) return;
       if (this.menuVisible) {
         this.toggleMenu();
       }
     },
-    onKeyDown(event) {
+    onKeyDown(event: KeyboardEvent) {
       if (!this.menuVisible) return;
-      const item = document.activeElement;
+      const item = document.activeElement as HTMLElement;
       if (!this.$el.contains(item)) return;
       switch (event.key) {
         case 'ArrowDown': // select next element
@@ -73,7 +73,7 @@ export default {
         if (commitIdx) this.highlight(this.commits[commitIdx]);
       }
     },
-    onKeyUp(event) {
+    onKeyUp(event: KeyboardEvent) {
       if (!this.menuVisible) return;
       const item = document.activeElement;
       if (!this.$el.contains(item)) return;
@@ -95,7 +95,7 @@ export default {
       }
     },
     /** Focus given element */
-    focusElem(elem, prevElem) {
+    focusElem(elem: HTMLElement, prevElem: HTMLElement) {
       if (elem) {
         elem.tabIndex = 0;
         if (prevElem) prevElem.tabIndex = -1;
@@ -149,7 +149,7 @@ export default {
       window.location.assign(`${this.issueLink}/files/${this.lastReviewCommitSha}..${this.commits.at(-1).id}${this.queryParams}`);
     },
     /** Clicking on a single commit opens this specific commit */
-    commitClicked(commitId, newWindow = false) {
+    commitClicked(commitId: string, newWindow = false) {
       const url = `${this.issueLink}/commits/${commitId}${this.queryParams}`;
       if (newWindow) {
         window.open(url);