Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -602,8 +602,14 @@ test-mssql\#%: integrations.mssql.test generate-ini-mssql
test-mssql-migration: migrations.mssql.test migrations.individual.mssql.test

.PHONY: playwright
# Set SKIP_PLAYWRIGHT_INSTALL to skip the browser installation, for environments
# where the browsers are already provisioned out of band.
playwright: deps-frontend
ifdef SKIP_PLAYWRIGHT_INSTALL
@echo "Skipping 'playwright install' (SKIP_PLAYWRIGHT_INSTALL is set)"
else
$(NODE_VARS) pnpm exec playwright install $(PLAYWRIGHT_FLAGS)
endif

.PHONY: test-e2e%
test-e2e%: TEST_TYPE ?= e2e
Expand Down
49 changes: 49 additions & 0 deletions custom/options/locale/locale_en-US.ini
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,7 @@ password_uppercase_one = At least one uppercase character
password_digit_one = At least one digit
password_special_one = At least one special character (punctuation, brackets, quotes, etc.)
enterred_invalid_repo_name = The repository name you entered is incorrect.
enterred_invalid_article_name = The article owner and subject you entered are incorrect.
enterred_invalid_org_name = The organization name you entered is incorrect.
enterred_invalid_owner_name = The new owner name is not valid.
enterred_invalid_password = The password you entered is incorrect.
Expand Down Expand Up @@ -2301,6 +2302,54 @@ contributors.contribution_type.deletions = Deletions

settings = Settings
settings.desc = Settings is where you can manage the settings for the repository.
settings.sidebar_header = Take settings
settings.article_general = General
settings.article_subject_name = Subject Name
settings.article_transfer = Transfer ownership
settings.article_transfer_desc = Transfer ownership of this article to another user.
settings.article_transfer_button = Transfer article
settings.article_transfer_modal_header = Transfer this article
settings.article_transfer_notice = This action cannot be undone by you once the new owner accepts the transfer.
settings.article_transfer_modal_desc = The new owner becomes responsible for this article. You keep your account, but you lose owner permissions over the article and its settings.
settings.article_transfer_new_owner = New owner
settings.article_transfer_new_owner_placeholder = First and last name
settings.article_transfer_new_owner_clear = Clear the selected owner
settings.article_transfer_confirm_label = Article owner and subject
settings.article_transfer_modal_confirm_desc = Enter the article owner and subject as confirmation:
settings.article_transfer_confirm = Transfer this article
settings.article_transfer_started = This article has been marked for transfer and awaits confirmation from %s.
settings.article_transfer_succeed = This article has been transferred to %s.
settings.article_transfer_pending = A transfer of this article is pending, awaiting confirmation from %s.
settings.article_transfer_cancel = Cancel transfer
settings.article_transfer_abort_success = The article transfer to %s was successfully canceled.
settings.article_transfer_in_progress = There is currently an ongoing transfer. Please cancel it if you would like to transfer this article to another user.
settings.article_transfer_owner_not_found = No user was found with that first and last name.
settings.article_transfer_owner_ambiguous = More than one user has that first and last name. Please contact the article administrator.
settings.article_transfer_owner_is_current = This article already belongs to that user.
settings.article_transfer_owner_has_article = The new owner already has an article on this subject.
settings.article_transfer_recipient_notice = %[1]s wants to transfer the article %[2]s to you.
settings.article_transfer_accept = Accept transfer
settings.article_transfer_reject = Reject transfer
settings.article_archive = Archive
settings.article_archive_desc = Archive article to read-only mode.
settings.article_archive_button = Archive article
settings.article_archive_modal_header = Archive article
settings.article_archive_notice = Archiving the article will make it entirely read-only. It will be hidden from the dashboard. Nobody (not even you!) will be able to make new Change requests.
settings.article_archive_modal_desc = Enter the article owner and subject as confirmation:
settings.article_archive_confirm_label = Article owner and subject
settings.article_archive_confirm = Archive this article
settings.article_archive_success = This article has been archived.
settings.article_archived_notice = This article has been archived by the owner on %s. It is read-only.
settings.article_delete = Delete
settings.article_delete_desc = Deleting this article is permanent and cannot be undone.
settings.article_delete_button = Delete article
settings.article_delete_modal_header = Delete this article
settings.article_delete_notices_1 = This operation <strong>CANNOT</strong> be undone.
settings.article_delete_notices_2 = This operation will permanently delete the <strong>%s</strong> article including content, change requests, and collaborator settings.
settings.article_delete_modal_desc = Enter the article owner and subject as confirmation:
settings.article_delete_confirm_label = Article owner and subject
settings.article_delete_confirm = Delete this article
settings.article_delete_success = The article has been deleted.
settings.options = Repository
settings.public_access = Public Access
settings.public_access_desc = Configure public visitor's access permissions to override the defaults of this repository.
Expand Down
37 changes: 36 additions & 1 deletion custom/templates/explore/repo_history.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,42 @@
}
</style>
<div role="main" aria-label="{{.Title}}" class="page-content repository file list">
{{/* Rendered outside the article section so it stays visible on every article
mode (read, edit, history, settings); repo-history.ts keeps it in sync when the
article section is swapped or another view is selected. */}}
{{/* tw-hidden, not the hidden attribute: tw-flex would otherwise win over the UA [hidden] rule */}}
<div class="ui warning message tw-mt-0 tw-flex tw-items-start tw-gap-2{{if not (and .Repository.IsArchived .IsArticleView)}} tw-hidden{{end}}" id="article-archived-notice">
{{svg "octicon-alert" 16 "tw-mt-1 tw-flex-shrink-0"}}
<span data-role="article-archived-text">
{{- if .Repository.IsArchived -}}
{{ctx.Locale.Tr "repo.settings.article_archived_notice" (DateUtils.AbsoluteLong (Iif .Repository.ArchivedUnix.IsZero .Repository.UpdatedUnix .Repository.ArchivedUnix))}}
{{- end -}}
</span>
</div>

{{/* Shown to the pending transfer's recipient so the article can be accepted or
rejected without visiting the settings of an article they do not own yet. */}}
{{if and .RepoTransfer .CanUserAcceptOrRejectTransfer}}
<div class="ui info message tw-mt-0 tw-flex tw-items-center tw-justify-between tw-gap-4" id="article-transfer-notice">
<div class="tw-flex tw-items-center tw-gap-2">
{{svg "octicon-info" 16 "tw-flex-shrink-0"}}
<span>{{ctx.Locale.Tr "repo.settings.article_transfer_recipient_notice"
(HTMLFormat `<a href="%s">%s</a>` .RepoTransfer.Doer.HomeLink .RepoTransfer.Doer.DisplayName)
(HTMLFormat `<a href="%s">%s</a>` .RepoLink (.Repository.GetSubject ctx))}}</span>
</div>
<div class="tw-flex tw-items-center tw-gap-2">
<form class="tw-m-0" method="post" action="{{.RepoOperationsLink}}/action/accept_transfer">
{{.CsrfTokenHtml}}
<button type="submit" class="ui primary button tw-m-0 tw-whitespace-nowrap">{{ctx.Locale.Tr "repo.settings.article_transfer_accept"}}</button>
</form>
<form class="tw-m-0" method="post" action="{{.RepoOperationsLink}}/action/reject_transfer">
{{.CsrfTokenHtml}}
<button type="submit" class="ui button tw-m-0 tw-text-red tw-font-bold tw-whitespace-nowrap">{{ctx.Locale.Tr "repo.settings.article_transfer_reject"}}</button>
</form>
</div>
</div>
{{end}}

{{/* Login banner for non-authenticated users */}}
{{if and .IsArticleModeEdit (not .IsSigned)}}
<div class="ui warning message tw-mt-0">
Expand All @@ -155,7 +191,6 @@
{{end}}
{{template "repo/header" .}}


<div class="ui container">
{{ $subjectPath := printf "%s/subject/%s" AppSubUrl (PathEscapeSegments (.Repository.GetSubject ctx)) }}
<div id="repo-history-app"
Expand Down
22 changes: 16 additions & 6 deletions custom/templates/shared/repo/article.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -46,16 +46,25 @@
data-article-tab="read">
{{svg "octicon-book" 16}} Read
</a>
<a class="{{if .IsArticleModeEdit}}active {{end}}item"
href="{{QueryBuild (printf "%s/article/%s/%s" AppSubUrl .Repository.Owner.Name (.Repository.GetSubject ctx)) "view" "article" "mode" "edit"}}"
data-article-tab="edit">
{{svg "octicon-pencil" 16}} Edit
</a>
{{if not .Repository.IsArchived}}
<a class="{{if .IsArticleModeEdit}}active {{end}}item"
href="{{QueryBuild (printf "%s/article/%s/%s" AppSubUrl .Repository.Owner.Name (.Repository.GetSubject ctx)) "view" "article" "mode" "edit"}}"
data-article-tab="edit">
{{svg "octicon-pencil" 16}} Edit
</a>
{{end}}
<a class="{{if .IsArticleModeHistory}}active {{end}}item"
href="{{QueryBuild (printf "%s/article/%s/%s" AppSubUrl .Repository.Owner.Name (.Repository.GetSubject ctx)) "view" "article" "mode" "history"}}"
data-article-tab="history">
{{svg "octicon-history" 16}} History
</a>
{{if .IsRepoOwner}}
<a class="{{if .IsArticleModeSettings}}active {{end}}item"
href="{{QueryBuild (printf "%s/article/%s/%s" AppSubUrl .Repository.Owner.Name (.Repository.GetSubject ctx)) "view" "article" "mode" "settings"}}"
data-article-tab="settings">
{{svg "octicon-gear" 16}} {{ctx.Locale.Tr "repo.settings"}}
</a>
{{end}}
<div class="tw-flex tw-items-center tw-gap-2 tw-ml-auto">
{{if .IsArticleModeRead}}
<div class="ui icon top left pointing dropdown button mini tw-px-3">
Expand All @@ -65,7 +74,7 @@
</div>
</div>
{{end}}
{{if .IsArticleModeEdit}}
{{if and .IsArticleModeEdit (not .Repository.IsArchived)}}
<div class="tw-flex tw-items-center tw-justify-between tw-mb-4">
<div class="tw-flex tw-items-center tw-gap-2">
{{if .IsSigned}}
Expand Down Expand Up @@ -152,6 +161,7 @@
{{template "shared/repo/read" .}}
{{template "shared/repo/edit" .}}
{{template "shared/repo/history" .}}
{{template "shared/repo/settings" .}}
{{end}}
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion custom/templates/shared/repo/edit.tmpl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{{define "shared/repo/edit"}}
{{if .IsArticleModeEdit}}
{{if and .IsArticleModeEdit (not .Repository.IsArchived)}}
<div class="ui bottom attached">
<div class="tw-mb-4 tw-flex tw-items-center tw-justify-between">
<div>
Expand Down
Loading
Loading