Commit 8236640b authored by Nick Kipling's avatar Nick Kipling Committed by Mike Greiling

Updating wording as per desgn guidelines

Shortened descriptive text
Added copy button to code snippets
parent 3d9dc7db
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
import { mapGetters, mapActions } from 'vuex'; import { mapGetters, mapActions } from 'vuex';
import { GlLoadingIcon } from '@gitlab/ui'; import { GlLoadingIcon } from '@gitlab/ui';
import store from '../stores'; import store from '../stores';
import clipboardButton from '../../vue_shared/components/clipboard_button.vue';
import CollapsibleContainer from './collapsible_container.vue'; import CollapsibleContainer from './collapsible_container.vue';
import SvgMessage from './svg_message.vue'; import SvgMessage from './svg_message.vue';
import { s__, sprintf } from '../../locale'; import { s__, sprintf } from '../../locale';
...@@ -9,6 +10,7 @@ import { s__, sprintf } from '../../locale'; ...@@ -9,6 +10,7 @@ import { s__, sprintf } from '../../locale';
export default { export default {
name: 'RegistryListApp', name: 'RegistryListApp',
components: { components: {
clipboardButton,
CollapsibleContainer, CollapsibleContainer,
GlLoadingIcon, GlLoadingIcon,
SvgMessage, SvgMessage,
...@@ -46,10 +48,10 @@ export default { ...@@ -46,10 +48,10 @@ export default {
dockerConnectionErrorText() { dockerConnectionErrorText() {
return sprintf( return sprintf(
s__(`ContainerRegistry|We are having trouble connecting to Docker, which could be due to an s__(`ContainerRegistry|We are having trouble connecting to Docker, which could be due to an
issue with your project name or path. For more information, please review the issue with your project name or path.
%{docLinkStart}Container Registry documentation%{docLinkEnd}.`), %{docLinkStart}More Information%{docLinkEnd}`),
{ {
docLinkStart: `<a href="${this.helpPagePath}#docker-connection-error">`, docLinkStart: `<a href="${this.helpPagePath}#docker-connection-error" target="_blank">`,
docLinkEnd: '</a>', docLinkEnd: '</a>',
}, },
false, false,
...@@ -58,10 +60,10 @@ export default { ...@@ -58,10 +60,10 @@ export default {
introText() { introText() {
return sprintf( return sprintf(
s__(`ContainerRegistry|With the Docker Container Registry integrated into GitLab, every s__(`ContainerRegistry|With the Docker Container Registry integrated into GitLab, every
project can have its own space to store its Docker images. Learn more about the project can have its own space to store its Docker images.
%{docLinkStart}Container Registry%{docLinkEnd}.`), %{docLinkStart}More Information%{docLinkEnd}`),
{ {
docLinkStart: `<a href="${this.helpPagePath}">`, docLinkStart: `<a href="${this.helpPagePath}" target="_blank">`,
docLinkEnd: '</a>', docLinkEnd: '</a>',
}, },
false, false,
...@@ -70,14 +72,20 @@ export default { ...@@ -70,14 +72,20 @@ export default {
noContainerImagesText() { noContainerImagesText() {
return sprintf( return sprintf(
s__(`ContainerRegistry|With the Container Registry, every project can have its own space to s__(`ContainerRegistry|With the Container Registry, every project can have its own space to
store its Docker images. Learn more about the %{docLinkStart}Container Registry%{docLinkEnd}.`), store its Docker images. %{docLinkStart}More Information%{docLinkEnd}`),
{ {
docLinkStart: `<a href="${this.helpPagePath}">`, docLinkStart: `<a href="${this.helpPagePath}" target="_blank">`,
docLinkEnd: '</a>', docLinkEnd: '</a>',
}, },
false, false,
); );
}, },
dockerBuildCommand() {
return `docker build -t ${this.repositoryUrl} .`;
},
dockerPushCommand() {
return `docker push ${this.repositoryUrl}`;
},
}, },
created() { created() {
this.setMainEndpoint(this.endpoint); this.setMainEndpoint(this.endpoint);
...@@ -99,7 +107,7 @@ export default { ...@@ -99,7 +107,7 @@ export default {
<p v-html="dockerConnectionErrorText"></p> <p v-html="dockerConnectionErrorText"></p>
</svg-message> </svg-message>
<gl-loading-icon v-else-if="isLoading" size="md" class="prepend-top-16" /> <gl-loading-icon v-else-if="isLoading && !characterError" size="md" class="prepend-top-16" />
<div v-else-if="!isLoading && !characterError && repos.length"> <div v-else-if="!isLoading && !characterError && repos.length">
<h4>{{ s__('ContainerRegistry|Container Registry') }}</h4> <h4>{{ s__('ContainerRegistry|Container Registry') }}</h4>
...@@ -126,10 +134,27 @@ export default { ...@@ -126,10 +134,27 @@ export default {
}} }}
</p> </p>
<pre> <div class="input-group append-bottom-10">
docker build -t {{ repositoryUrl }} . <input :value="dockerBuildCommand" type="text" class="form-control monospace" readonly />
docker push {{ repositoryUrl }} <span class="input-group-append">
</pre> <clipboard-button
:text="dockerBuildCommand"
:title="s__('ContainerRegistry|Copy build command to clipboard')"
class="input-group-text"
/>
</span>
</div>
<div class="input-group">
<input :value="dockerPushCommand" type="text" class="form-control monospace" readonly />
<span class="input-group-append">
<clipboard-button
:text="dockerPushCommand"
:title="s__('ContainerRegistry|Copy push command to clipboard')"
class="input-group-text"
/>
</span>
</div>
</svg-message> </svg-message>
</div> </div>
</template> </template>
...@@ -15,10 +15,12 @@ export default { ...@@ -15,10 +15,12 @@ export default {
</script> </script>
<template> <template>
<div :id="id" class="empty-state container-message mw-70p"> <div :id="id" class="empty-state container-message">
<div class="svg-content"> <div class="svg-content">
<img :src="svgPath" class="flex-align-self-center" /> <img :src="svgPath" class="flex-align-self-center" />
</div> </div>
<div class="text-content">
<slot></slot> <slot></slot>
</div> </div>
</div>
</template> </template>
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
pre { pre {
white-space: pre-line; white-space: pre-line;
} }
span .btn {
margin: 0;
}
} }
.container-image { .container-image {
......
---
title: Alignign empty container registry message with design guidelines
merge_request: 30502
author:
type: other
...@@ -2978,6 +2978,12 @@ msgstr "" ...@@ -2978,6 +2978,12 @@ msgstr ""
msgid "ContainerRegistry|Container Registry" msgid "ContainerRegistry|Container Registry"
msgstr "" msgstr ""
msgid "ContainerRegistry|Copy build command to clipboard"
msgstr ""
msgid "ContainerRegistry|Copy push command to clipboard"
msgstr ""
msgid "ContainerRegistry|Docker connection error" msgid "ContainerRegistry|Docker connection error"
msgstr "" msgstr ""
...@@ -3011,13 +3017,13 @@ msgstr "" ...@@ -3011,13 +3017,13 @@ msgstr ""
msgid "ContainerRegistry|There are no container images stored for this project" msgid "ContainerRegistry|There are no container images stored for this project"
msgstr "" msgstr ""
msgid "ContainerRegistry|We are having trouble connecting to Docker, which could be due to an issue with your project name or path. For more information, please review the %{docLinkStart}Container Registry documentation%{docLinkEnd}." msgid "ContainerRegistry|We are having trouble connecting to Docker, which could be due to an issue with your project name or path. %{docLinkStart}More Information%{docLinkEnd}"
msgstr "" msgstr ""
msgid "ContainerRegistry|With the Container Registry, every project can have its own space to store its Docker images. Learn more about the %{docLinkStart}Container Registry%{docLinkEnd}." msgid "ContainerRegistry|With the Container Registry, every project can have its own space to store its Docker images. %{docLinkStart}More Information%{docLinkEnd}"
msgstr "" msgstr ""
msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images. Learn more about the %{docLinkStart}Container Registry%{docLinkEnd}." msgid "ContainerRegistry|With the Docker Container Registry integrated into GitLab, every project can have its own space to store its Docker images. %{docLinkStart}More Information%{docLinkEnd}"
msgstr "" msgstr ""
msgid "ContainerRegistry|You are about to delete the image <b>%{title}</b>. This will delete the image and all tags pointing to this image." msgid "ContainerRegistry|You are about to delete the image <b>%{title}</b>. This will delete the image and all tags pointing to this image."
......
...@@ -90,7 +90,7 @@ describe('Registry List', () => { ...@@ -90,7 +90,7 @@ describe('Registry List', () => {
.textContent.trim() .textContent.trim()
.replace(/[\r\n]+/g, ' '), .replace(/[\r\n]+/g, ' '),
).toEqual( ).toEqual(
'With the Container Registry, every project can have its own space to store its Docker images. Learn more about the Container Registry.', 'With the Container Registry, every project can have its own space to store its Docker images. More Information',
); );
done(); done();
}, 0); }, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment