diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/org/settings/actions.tmpl | 2 | ||||
| -rw-r--r-- | templates/org/settings/navbar.tmpl | 5 | ||||
| -rw-r--r-- | templates/repo/settings/actions.tmpl | 2 | ||||
| -rw-r--r-- | templates/repo/settings/navbar.tmpl | 5 | ||||
| -rw-r--r-- | templates/shared/secrets/add_list.tmpl | 104 | ||||
| -rw-r--r-- | templates/shared/variables/variable_list.tmpl | 85 | ||||
| -rw-r--r-- | templates/user/settings/actions.tmpl | 2 | ||||
| -rw-r--r-- | templates/user/settings/navbar.tmpl | 5 |
8 files changed, 161 insertions, 49 deletions
diff --git a/templates/org/settings/actions.tmpl b/templates/org/settings/actions.tmpl index b3b24e0517..abb9c98435 100644 --- a/templates/org/settings/actions.tmpl +++ b/templates/org/settings/actions.tmpl @@ -4,6 +4,8 @@ {{template "shared/actions/runner_list" .}} {{else if eq .PageType "secrets"}} {{template "shared/secrets/add_list" .}} + {{else if eq .PageType "variables"}} + {{template "shared/variables/variable_list" .}} {{end}} </div> {{template "org/settings/layout_footer" .}} diff --git a/templates/org/settings/navbar.tmpl b/templates/org/settings/navbar.tmpl index 6bea9f5f60..e22d1b0f80 100644 --- a/templates/org/settings/navbar.tmpl +++ b/templates/org/settings/navbar.tmpl @@ -23,7 +23,7 @@ </a> {{end}} {{if .EnableActions}} - <details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets}}open{{end}}> + <details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables}}open{{end}}> <summary>{{.locale.Tr "actions.actions"}}</summary> <div class="menu"> <a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{.OrgLink}}/settings/actions/runners"> @@ -32,6 +32,9 @@ <a class="{{if .PageIsSharedSettingsSecrets}}active {{end}}item" href="{{.OrgLink}}/settings/actions/secrets"> {{.locale.Tr "secrets.secrets"}} </a> + <a class="{{if .PageIsSharedSettingsVariables}}active {{end}}item" href="{{.OrgLink}}/settings/actions/variables"> + {{.locale.Tr "actions.variables"}} + </a> </div> </details> {{end}} diff --git a/templates/repo/settings/actions.tmpl b/templates/repo/settings/actions.tmpl index 72944234a3..f38ab5b658 100644 --- a/templates/repo/settings/actions.tmpl +++ b/templates/repo/settings/actions.tmpl @@ -4,6 +4,8 @@ {{template "shared/actions/runner_list" .}} {{else if eq .PageType "secrets"}} {{template "shared/secrets/add_list" .}} + {{else if eq .PageType "variables"}} + {{template "shared/variables/variable_list" .}} {{end}} </div> {{template "repo/settings/layout_footer" .}} diff --git a/templates/repo/settings/navbar.tmpl b/templates/repo/settings/navbar.tmpl index e21f23f6a0..5426a1b1fa 100644 --- a/templates/repo/settings/navbar.tmpl +++ b/templates/repo/settings/navbar.tmpl @@ -34,7 +34,7 @@ </a> {{end}} {{if and .EnableActions (not .UnitActionsGlobalDisabled) (.Permission.CanRead $.UnitTypeActions)}} - <details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets}}open{{end}}> + <details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables}}open{{end}}> <summary>{{.locale.Tr "actions.actions"}}</summary> <div class="menu"> <a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{.RepoLink}}/settings/actions/runners"> @@ -43,6 +43,9 @@ <a class="{{if .PageIsSharedSettingsSecrets}}active {{end}}item" href="{{.RepoLink}}/settings/actions/secrets"> {{.locale.Tr "secrets.secrets"}} </a> + <a class="{{if .PageIsSharedSettingsVariables}}active {{end}}item" href="{{.RepoLink}}/settings/actions/variables"> + {{.locale.Tr "actions.variables"}} + </a> </div> </details> {{end}} diff --git a/templates/shared/secrets/add_list.tmpl b/templates/shared/secrets/add_list.tmpl index 8a6b7db907..ce5351d22b 100644 --- a/templates/shared/secrets/add_list.tmpl +++ b/templates/shared/secrets/add_list.tmpl @@ -1,52 +1,40 @@ <h4 class="ui top attached header"> {{.locale.Tr "secrets.management"}} <div class="ui right"> - <button class="ui primary tiny show-panel button" data-panel="#add-secret-panel">{{.locale.Tr "secrets.creation"}}</button> + <button class="ui primary tiny button show-modal" + data-modal="#add-secret-modal" + data-modal-form.action="{{.Link}}" + data-modal-header="{{.locale.Tr "secrets.creation"}}" + > + {{.locale.Tr "secrets.creation"}} + </button> </div> </h4> <div class="ui attached segment"> - <div class="{{if not .HasError}}gt-hidden {{end}}gt-mb-4" id="add-secret-panel"> - <form class="ui form" action="{{.Link}}" 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-url="{{$.Link}}/delete" data-id="{{.ID}}"> - {{$.locale.Tr "settings.delete_key"}} - </button> - </div> - <div class="left floated content"> - <i>{{svg "octicon-key" 32}}</i> + {{range $i, $v := .Secrets}} + <div class="item gt-df gt-ac gt-fw {{if gt $i 0}} gt-py-4{{end}}"> + <div class="content gt-f1 gt-df gt-js"> + <div class="content"> + <i>{{svg "octicon-key" 32}}</i> + </div> + <div class="content gt-ml-3 gt-ellipsis"> + <strong>{{$v.Name}}</strong> + <div class="print meta">******</div> + </div> </div> <div class="content"> - <strong>{{.Name}}</strong> - <div class="print meta">******</div> - <div class="activity meta"> - <i> - {{$.locale.Tr "settings.added_on" (DateTime "short" .CreatedUnix) | Safe}} - </i> - </div> + <span class="color-text-light-2 gt-mr-5"> + {{$.locale.Tr "settings.added_on" (DateTime "short" $v.CreatedUnix) | Safe}} + </span> + <button class="ui btn interact-bg link-action gt-p-3" + data-url="{{$.Link}}/delete?id={{.ID}}" + data-modal-confirm="{{$.locale.Tr "secrets.deletion.description"}}" + data-tooltip-content="{{$.locale.Tr "secrets.deletion"}}" + > + {{svg "octicon-trash"}} + </button> </div> </div> {{end}} @@ -55,13 +43,37 @@ {{.locale.Tr "secrets.none"}} {{end}} </div> -<div class="ui g-modal-confirm delete modal"> + +{{/* Add secret dialog */}} +<div class="ui small modal" id="add-secret-modal"> <div class="header"> - {{svg "octicon-trash"}} - {{.locale.Tr "secrets.deletion"}} - </div> - <div class="content"> - <p>{{.locale.Tr "secrets.deletion.description"}}</p> + <span id="actions-modal-header"></span> </div> - {{template "base/modal_actions_confirm" .}} + <form class="ui form form-fetch-action" method="post"> + <div class="content"> + {{.CsrfTokenHtml}} + <div class="field"> + {{.locale.Tr "secrets.description"}} + </div> + <div class="field"> + <label for="secret-name">{{.locale.Tr "name"}}</label> + <input autofocus required + id="secret-name" + name="name" + value="{{.name}}" + pattern="^[a-zA-Z_][a-zA-Z0-9_]*$" + placeholder="{{.locale.Tr "secrets.creation.name_placeholder"}}" + > + </div> + <div class="field"> + <label for="secret-data">{{.locale.Tr "value"}}</label> + <textarea required + id="secret-data" + name="data" + placeholder="{{.locale.Tr "secrets.creation.value_placeholder"}}" + ></textarea> + </div> + </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} + </form> </div> diff --git a/templates/shared/variables/variable_list.tmpl b/templates/shared/variables/variable_list.tmpl new file mode 100644 index 0000000000..5941902dbb --- /dev/null +++ b/templates/shared/variables/variable_list.tmpl @@ -0,0 +1,85 @@ +<h4 class="ui top attached header"> + {{.locale.Tr "actions.variables.management"}} + <div class="ui right"> + <button class="ui primary tiny button show-modal" + data-modal="#edit-variable-modal" + data-modal-form.action="{{.Link}}/new" + data-modal-header="{{.locale.Tr "actions.variables.creation"}}" + data-modal-dialog-variable-name="" + data-modal-dialog-variable-data="" + > + {{.locale.Tr "actions.variables.creation"}} + </button> + </div> +</h4> +<div class="ui attached segment"> + {{if .Variables}} + <div class="ui list"> + {{range $i, $v := .Variables}} + <div class="item gt-df gt-ac gt-fw {{if gt $i 0}} gt-py-4{{end}}"> + <div class="content gt-f1 gt-ellipsis"> + <strong>{{$v.Name}}</strong> + <div class="print meta gt-ellipsis">{{$v.Data}}</div> + </div> + <div class="content"> + <span class="color-text-light-2 gt-mr-5"> + {{$.locale.Tr "settings.added_on" (DateTime "short" $v.CreatedUnix) | Safe}} + </span> + <button class="btn interact-bg gt-p-3 show-modal" + data-tooltip-content="{{$.locale.Tr "variables.edit"}}" + data-modal="#edit-variable-modal" + data-modal-form.action="{{$.Link}}/{{$v.ID}}/edit" + data-modal-header="{{$.locale.Tr "actions.variables.edit"}}" + data-modal-dialog-variable-name="{{$v.Name}}" + data-modal-dialog-variable-data="{{$v.Data}}" + > + {{svg "octicon-pencil"}} + </button> + <button class="btn interact-bg gt-p-3 link-action" + data-tooltip-content="{{$.locale.Tr "actions.variables.deletion"}}" + data-url="{{$.Link}}/{{$v.ID}}/delete" + data-modal-confirm="{{$.locale.Tr "actions.variables.deletion.description"}}" + > + {{svg "octicon-trash"}} + </button> + </div> + </div> + {{end}} + </div> + {{else}} + {{.locale.Tr "actions.variables.none"}} + {{end}} +</div> + +{{/** Edit variable dialog */}} +<div class="ui small modal" id="edit-variable-modal"> + <div class="header"></div> + <form class="ui form form-fetch-action" method="post"> + <div class="content"> + {{.CsrfTokenHtml}} + <div class="field"> + {{.locale.Tr "actions.variables.description"}} + </div> + <div class="field"> + <label for="dialog-variable-name">{{.locale.Tr "name"}}</label> + <input autofocus required + name="name" + id="dialog-variable-name" + value="{{.name}}" + pattern="^[a-zA-Z_][a-zA-Z0-9_]*$" + placeholder="{{.locale.Tr "secrets.creation.name_placeholder"}}" + > + </div> + <div class="field"> + <label for="dialog-variable-data">{{.locale.Tr "value"}}</label> + <textarea required + name="data" + id="dialog-variable-data" + placeholder="{{.locale.Tr "secrets.creation.value_placeholder"}}" + ></textarea> + </div> + </div> + {{template "base/modal_actions_confirm" (dict "locale" $.locale "ModalButtonTypes" "confirm")}} + </form> +</div> + diff --git a/templates/user/settings/actions.tmpl b/templates/user/settings/actions.tmpl index 57cdae4469..abc5443383 100644 --- a/templates/user/settings/actions.tmpl +++ b/templates/user/settings/actions.tmpl @@ -4,6 +4,8 @@ {{template "shared/secrets/add_list" .}} {{else if eq .PageType "runners"}} {{template "shared/actions/runner_list" .}} + {{else if eq .PageType "variables"}} + {{template "shared/variables/variable_list" .}} {{end}} </div> diff --git a/templates/user/settings/navbar.tmpl b/templates/user/settings/navbar.tmpl index 4ef2abeaab..7612e41ba5 100644 --- a/templates/user/settings/navbar.tmpl +++ b/templates/user/settings/navbar.tmpl @@ -20,7 +20,7 @@ {{.locale.Tr "settings.ssh_gpg_keys"}} </a> {{if .EnableActions}} - <details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets}}open{{end}}> + <details class="item toggleable-item" {{if or .PageIsSharedSettingsRunners .PageIsSharedSettingsSecrets .PageIsSharedSettingsVariables}}open{{end}}> <summary>{{.locale.Tr "actions.actions"}}</summary> <div class="menu"> <a class="{{if .PageIsSharedSettingsRunners}}active {{end}}item" href="{{AppSubUrl}}/user/settings/actions/runners"> @@ -29,6 +29,9 @@ <a class="{{if .PageIsSharedSettingsSecrets}}active {{end}}item" href="{{AppSubUrl}}/user/settings/actions/secrets"> {{.locale.Tr "secrets.secrets"}} </a> + <a class="{{if .PageIsSharedSettingsVariables}}active {{end}}item" href="{{AppSubUrl}}/user/settings/actions/variables"> + {{.locale.Tr "actions.variables"}} + </a> </div> </details> {{end}} |