Skip to content

Commit

Permalink
feat(ui): title on delete buttons (#5379)
Browse files Browse the repository at this point in the history
  • Loading branch information
yesnault authored Aug 18, 2020
1 parent 165a2a2 commit 4072a8c
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ui/src/app/shared/action/action.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ <h3 class="inline">{{ 'action_step_title' | translate }}<span *ngIf="steps">{{ '
<div class="item">
<app-delete-button
(event)="sendActionEvent('delete')" [loading]="editableAction.loading"
[class]="'fluid'"></app-delete-button>
[class]="'fluid'" title="job_delete"></app-delete-button>
</div>
</div>
</div>
Expand Down
11 changes: 6 additions & 5 deletions ui/src/app/shared/action/step/form/step.form.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,16 @@
</div>
<div class="field" *ngIf="expended">
<div class="ui buttons fluid">
<button class="ui green button" (click)="clickAddStep()" [disabled]="!selected"><i class="plus icon"></i>{{
'job_add_step' |
translate }}</button>
<button class="ui green button" (click)="clickAddStep()" [disabled]="!selected">
<i class="plus icon"></i>{{ 'job_add_step' | translate }}
</button>
<div class="or"></div>
<button class="ui grey button" (click)="clickCancel()">{{'btn_cancel' | translate}}</button>
</div>
</div>
<div class="field" *ngIf="!expended">
<button class="ui fluid blue button" (click)="showActions()"><i class="plus icon"></i>{{
'job_add_step' | translate }}</button>
<button class="ui fluid blue button" (click)="showActions()">
<i class="plus icon"></i>{{ 'job_add_step' | translate }}
</button>
</div>
</div>
2 changes: 1 addition & 1 deletion ui/src/app/views/settings/action/form/action.form.html
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ <h3 class="inline">{{ 'action_step_title' | translate }}</h3>
</button>
</div>
<div class="eight wide column" *ngIf="action.id">
<app-delete-button (event)="deleteAction()" [loading]="loading" [class]="'fluid'">
<app-delete-button (event)="deleteAction()" [loading]="loading" [class]="'fluid'" title="action_delete">
</app-delete-button>
</div>
<div class="sixteen wide column" *ngIf="!action.id">
Expand Down
1 change: 1 addition & 0 deletions ui/src/assets/i18n/en.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
"action_step_title": "Job steps",
"action_list_title": "Actions",
"action_deleted": "Action deleted",
"action_delete": "Delete action",
"action_name": "Action name",
"action_saved": "Action saved",
"action_optional": "Optional",
Expand Down
1 change: 1 addition & 0 deletions ui/src/assets/i18n/fr.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@
"action_builtin": "Prédéfinie",
"action_custom": "Personnalisée",
"action_deleted": "Action supprimée",
"action_delete": "Supprimer l'action",
"action_help_add_from": "L'action courante a été initialisée à partir des données du job \"{{jobName}}\" du pipeline \"{{pipelineName}}\" dans le projet \"{{projectKey}}\". Ces données ne seront pas enregistrées tant que l'action n'aura pas été sauvegardée.",
"action_help_line_1": "Qu'est-ce qu'une action ?",
"action_list_title": "Actions",
Expand Down

0 comments on commit 4072a8c

Please sign in to comment.