Merge pull request #2464 from mslourens/make_labels_more_consistent

make labels for editing more consistent
This commit is contained in:
Martin McKeaveney 2021-08-25 16:51:33 +01:00 committed by GitHub
commit 368edeb84b
5 changed files with 7 additions and 9 deletions

View File

@ -42,9 +42,9 @@
<Modal bind:this={modal} on:hide={onCancel}> <Modal bind:this={modal} on:hide={onCancel}>
<ModalContent <ModalContent
title="Update Datasource" title="Edit Datasource"
size="L" size="L"
confirmText="Update" confirmText="Save"
onConfirm={updateDatasource} onConfirm={updateDatasource}
disabled={error || !name || !datasource?.type} disabled={error || !name || !datasource?.type}
> >

View File

@ -26,7 +26,7 @@
<div slot="control" class="icon"> <div slot="control" class="icon">
<Icon size="S" hoverable name="MoreSmallList" /> <Icon size="S" hoverable name="MoreSmallList" />
</div> </div>
<MenuItem icon="Edit" on:click={updateDatasourceDialog.show}>Update</MenuItem> <MenuItem icon="Edit" on:click={updateDatasourceDialog.show}>Edit</MenuItem>
<MenuItem icon="Delete" on:click={confirmDeleteDialog.show}>Delete</MenuItem> <MenuItem icon="Delete" on:click={confirmDeleteDialog.show}>Delete</MenuItem>
</ActionMenu> </ActionMenu>

View File

@ -54,9 +54,7 @@
</MenuItem> </MenuItem>
{/if} {/if}
{#if !app.deployed} {#if !app.deployed}
<MenuItem on:click={() => updateApp(app)} icon="Edit"> <MenuItem on:click={() => updateApp(app)} icon="Edit">Edit</MenuItem>
Update
</MenuItem>
<MenuItem on:click={() => deleteApp(app)} icon="Delete"> <MenuItem on:click={() => deleteApp(app)} icon="Delete">
Delete Delete
</MenuItem> </MenuItem>

View File

@ -83,7 +83,7 @@
</MenuItem> </MenuItem>
{/if} {/if}
{#if !app.deployed} {#if !app.deployed}
<MenuItem on:click={() => updateApp(app)} icon="Edit">Update</MenuItem> <MenuItem on:click={() => updateApp(app)} icon="Edit">Edit</MenuItem>
<MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem> <MenuItem on:click={() => deleteApp(app)} icon="Delete">Delete</MenuItem>
{/if} {/if}
</ActionMenu> </ActionMenu>

View File

@ -103,8 +103,8 @@
<Modal bind:this={modal} on:hide={onCancel} on:show={onShow}> <Modal bind:this={modal} on:hide={onCancel} on:show={onShow}>
<ModalContent <ModalContent
title={"Update app"} title={"Edit app"}
confirmText={"Update app"} confirmText={"Save"}
onConfirm={updateApp} onConfirm={updateApp}
disabled={!(valid && dirty)} disabled={!(valid && dirty)}
> >