diff options
Diffstat (limited to 'templates/repo')
| -rw-r--r-- | templates/repo/settings/deploy_keys.tmpl | 6 | ||||
| -rw-r--r-- | templates/repo/settings/nav.tmpl | 3 | ||||
| -rw-r--r-- | templates/repo/settings/navbar.tmpl | 3 | ||||
| -rw-r--r-- | templates/repo/settings/secrets.tmpl | 86 |
4 files changed, 15 insertions, 83 deletions
diff --git a/templates/repo/settings/deploy_keys.tmpl b/templates/repo/settings/deploy_keys.tmpl index 32a1258b3a..44c916eefb 100644 --- a/templates/repo/settings/deploy_keys.tmpl +++ b/templates/repo/settings/deploy_keys.tmpl @@ -51,7 +51,7 @@ {{range .Deploykeys}} <div class="item"> <div class="right floated content"> - <button class="ui red tiny button delete-button" data-modal-id="delete-deploy_keys-modal" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> + <button class="ui red tiny button delete-button" data-url="{{$.Link}}/delete" data-id="{{.ID}}"> {{$.locale.Tr "settings.delete_key"}} </button> </div> @@ -75,11 +75,9 @@ {{end}} </div> </div> - <br/> - {{template "repo/settings/secrets" .}} </div> -<div class="ui small basic delete modal" id="delete-deploy_keys-modal"> +<div class="ui small basic delete modal"> <div class="ui icon header"> {{svg "octicon-trash"}} {{.locale.Tr "repo.settings.deploy_key_deletion"}} diff --git a/templates/repo/settings/nav.tmpl b/templates/repo/settings/nav.tmpl index 3c00c5e188..3156d9b159 100644 --- a/templates/repo/settings/nav.tmpl +++ b/templates/repo/settings/nav.tmpl @@ -12,7 +12,8 @@ {{if or .SignedUser.AllowGitHook .SignedUser.IsAdmin}} <li {{if .PageIsSettingsGitHooks}}class="current"{{end}}><a href="{{.RepoLink}}/settings/hooks/git">{{.locale.Tr "repo.settings.githooks"}}</a></li> {{end}} - <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "secrets.secrets"}}</a></li> + <li {{if .PageIsSettingsKeys}}class="current"{{end}}><a href="{{.RepoLink}}/settings/keys">{{.locale.Tr "repo.settings.deploy_keys"}}</a></li> + <li {{if .PageIsSettingsSecrets}}class="current"{{end}}><a href="{{.RepoLink}}/settings/secrets">{{.locale.Tr "secrets.secrets"}}</a></li> </ul> </div> </div> diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index 2119f6b5a4..bdfbb6bf10 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -25,6 +25,9 @@ </a> {{end}} <a class="{{if .PageIsSettingsKeys}}active {{end}}item" href="{{.RepoLink}}/settings/keys"> + {{.locale.Tr "repo.settings.deploy_keys"}} + </a> + <a class="{{if .PageIsSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/secrets"> {{.locale.Tr "secrets.secrets"}} </a> {{if .LFSStartServer}} diff --git a/templates/repo/settings/secrets.tmpl b/templates/repo/settings/secrets.tmpl index 5eb917a83b..71c5c51157 100644 --- a/templates/repo/settings/secrets.tmpl +++ b/templates/repo/settings/secrets.tmpl @@ -1,80 +1,10 @@ -<div class="ui container"> - <h4 class="ui top attached header"> - {{.locale.Tr "secrets.secrets"}} - <div class="ui right"> - <div class="ui primary tiny show-panel button" data-panel="#add-secret-panel">{{.locale.Tr "secrets.creation"}}</div> - </div> - </h4> - <div class="ui attached segment"> - <div class="{{if not .HasError}}hide {{end}}mb-4" id="add-secret-panel"> - <form class="ui form" action="{{.Link}}/secrets" method="post"> - {{.CsrfTokenHtml}} - <div class="field"> - {{.locale.Tr "secrets.description"}} - </div> - <div class="field{{if .Err_Title}} error{{end}}"> - <label for="secret-title">{{.locale.Tr "secrets.name"}}</label> - <input id="secret-title" name="title" value="{{.title}}" autofocus required pattern="^[a-zA-Z_][a-zA-Z0-9_]*$" placeholder="{{.locale.Tr "secrets.creation.name_placeholder"}}"> - </div> - <div class="field{{if .Err_Content}} error{{end}}"> - <label for="secret-content">{{.locale.Tr "secrets.value"}}</label> - <textarea id="secret-content" name="content" required placeholder="{{.locale.Tr "secrets.creation.value_placeholder"}}">{{.content}}</textarea> - </div> - <button class="ui green button"> - {{.locale.Tr "secrets.creation"}} - </button> - <button class="ui hide-panel button" data-panel="#add-secret-panel"> - {{.locale.Tr "cancel"}} - </button> - </form> - </div> - {{if .Secrets}} - <div class="ui key list"> - {{range .Secrets}} - <div class="item"> - <div class="right floated content"> - <button class="ui red tiny button delete-button" data-modal-id="delete-secret-modal" data-url="{{$.Link}}/secrets/delete" data-id="{{.ID}}"> - {{$.locale.Tr "settings.delete_key"}} - </button> - </div> - <div class="left floated content"> - <i>{{svg "octicon-key" 32}}</i> - </div> - <div class="content"> - <strong>{{.Name}}</strong> - <div class="print meta">******</div> - <div class="activity meta"> - <i> - {{$.locale.Tr "settings.add_on"}} - <span>{{.CreatedUnix.FormatShort}}</span> - </i> - </div> - </div> - </div> - {{end}} - </div> - {{else}} - {{.locale.Tr "secrets.none"}} - {{end}} - </div> -</div> - -<div class="ui small basic delete modal" id="delete-secret-modal"> - <div class="ui icon header"> - {{svg "octicon-trash"}} - {{.locale.Tr "secrets.deletion"}} - </div> - <div class="content"> - <p>{{.locale.Tr "secrets.deletion.description"}}</p> - </div> - <div class="actions"> - <div class="ui red basic inverted cancel button"> - <i class="remove icon"></i> - {{.locale.Tr "modal.no"}} - </div> - <div class="ui green basic inverted ok button"> - <i class="checkmark icon"></i> - {{.locale.Tr "modal.yes"}} - </div> +{{template "base/head" .}} +<div class="page-content repository settings"> + {{template "repo/header" .}} + {{template "repo/settings/navbar" .}} + <div class="ui container"> + {{template "base/alert" .}} + {{template "shared/secrets/add_list" .}} </div> </div> +{{template "base/footer" .}} |