Skip to content

Add helper descriptions on new repo page #14591

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 21, 2021
Merged

Add helper descriptions on new repo page #14591

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
955a6ab
Add helper descriptions on new repo page
bagasme Feb 6, 2021
cdb29d1
Oops, rename trust_model_helper
bagasme Feb 21, 2021
e71f482
Merge branch 'master' into new-repo-helper-desc
bagasme Feb 21, 2021
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
11 changes: 11 additions & 0 deletions options/locale/locale_en-US.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,7 @@ email_notifications.disable = Disable Email Notifications
email_notifications.submit = Set Email Preference

[repo]
new_repo_helper = A repository contains all project files, including revision history. Already have it elsewhere? <a href="%s">Migrate repository.</a>
owner = Owner
owner_helper = Some organizations may not show up in the dropdown due to a maximum repository count limit.
repo_name = Repository Name
Expand All @@ -687,17 +688,27 @@ use_template = Use this template
generate_repo = Generate Repository
generate_from = Generate From
repo_desc = Description
repo_desc_helper = Enter short description (optional)
repo_lang = Language
repo_gitignore_helper = Select .gitignore templates.
repo_gitignore_helper_desc = Choose which files not to track from a list of templates for common languages. Typical artifacts generated by each language's build tools are included on .gitignore by default.
issue_labels = Issue Labels
issue_labels_helper = Select an issue label set.
license = License
license_helper = Select a license file.
license_helper_desc = A license governs what others can and can't do with your code. Not sure which one is right for your project? See <a target="_blank" rel="noopener noreferrer" href="%s">Choose a license.</a>
readme = README
readme_helper = Select a README file template.
readme_helper_desc = This is the place where you can write a complete description for your project.
auto_init = Initialize Repository (Adds .gitignore, License and README)
trust_model_helper = Select trust model for signature verification. Possible options are:
trust_model_helper_collaborator = Collaborator: Trust signatures by collaborators
trust_model_helper_committer = Committer: Trust signatures that match committers
trust_model_helper_collaborator_committer = Collaborator+Committer: Trust signatures by collaborators which match the committer
trust_model_helper_default = Default: Use the default trust model for this installation
create_repo = Create Repository
default_branch = Default Branch
default_branch_helper = The default branch is the base branch for pull requests and code commits.
mirror_prune = Prune
mirror_prune_desc = Remove obsolete remote-tracking references
mirror_interval = Mirror Interval (valid time units are 'h', 'm', 's'). 0 to disable automatic sync.
Expand Down
18 changes: 17 additions & 1 deletion templates/repo/create.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
</h3>
<div class="ui attached segment">
{{template "base/alert" .}}

<p class="ui center">{{.i18n.Tr "repo.new_repo_helper" "/repo/migrate" | Safe}}</p>

{{if not .CanCreateRepo}}
<div class="ui negative message">
<p>{{.i18n.Tr (TrN .i18n.Lang .MaxCreationLimit "repo.form.reach_limit_of_creation_1" "repo.form.reach_limit_of_creation_n") .MaxCreationLimit}}</p>
Expand Down Expand Up @@ -59,7 +62,7 @@
</div>
<div class="inline field {{if .Err_Description}}error{{end}}">
<label for="description">{{.i18n.Tr "repo.repo_desc"}}</label>
<textarea id="description" name="description">{{.description}}</textarea>
<textarea id="description" name="description" placeholder="{{.i18n.Tr "repo.repo_desc_helper"}}">{{.description}}</textarea>
</div>
<div class="inline field">
<label>{{.i18n.Tr "repo.template"}}</label>
Expand Down Expand Up @@ -135,6 +138,7 @@
{{end}}
</div>
</div>
<span class="help">{{.i18n.Tr "repo.repo_gitignore_helper_desc"}}</span>
</div>
<div class="inline field">
<label>{{.i18n.Tr "repo.license"}}</label>
Expand All @@ -148,6 +152,7 @@
{{end}}
</div>
</div>
<span class="help">{{.i18n.Tr "repo.license_helper_desc" "https://choosealicense.com/" | Str2html}}</span>
</div>

<div class="inline field">
Expand All @@ -161,6 +166,7 @@
{{end}}
</div>
</div>
<span class="help">{{.i18n.Tr "repo.readme_helper_desc"}}</span>
</div>
<div class="inline field">
<div class="ui checkbox" id="auto-init">
Expand All @@ -171,6 +177,7 @@
<div class="inline field">
<label for="default_branch">{{.i18n.Tr "repo.default_branch"}}</label>
<input id="default_branch" name="default_branch" value="{{.default_branch}}" placeholder="{{.default_branch}}">
<span class="help">{{.i18n.Tr "repo.default_branch_helper"}}</span>
</div>
<div class="inline field">
<label>{{.i18n.Tr "repo.settings.trust_model"}}</label>
Expand All @@ -185,6 +192,15 @@
<div class="item" data-value="collaboratorcommitter">{{.i18n.Tr "repo.settings.trust_model.collaboratorcommitter"}}</div>
</div>
</div>
<div class="help">
{{.i18n.Tr "repo.trust_model_helper"}}
<ul>
<li>{{.i18n.Tr "repo.trust_model_helper_collaborator"}}</li>
<li>{{.i18n.Tr "repo.trust_model_helper_committer"}}</li>
<li>{{.i18n.Tr "repo.trust_model_helper_collaborator_committer"}}</li>
<li>{{.i18n.Tr "repo.trust_model_helper_default"}}</li>
</ul>
</div>
</div>
<div class="inline field">
<label>{{.i18n.Tr "repo.template"}}</label>
Expand Down