Skip to content

Commit

Permalink
Proofreading edits, UI text consistency (elastic#24016)
Browse files Browse the repository at this point in the history
  • Loading branch information
Ryan Keairns authored Oct 16, 2018
1 parent e79533d commit f59f1cc
Show file tree
Hide file tree
Showing 48 changed files with 88 additions and 88 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import header from './header.png';
export const image = () => ({
name: 'image',
displayName: 'Image',
help: 'A static image.',
help: 'A static image',
image: header,
expression: `image dataurl=null mode="contain"
| render`,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,18 +13,18 @@ export const markdown = () => ({
image: header,
expression: `filters
| demodata
| markdown "### Welcome to the Markdown Element.
| markdown "### Welcome to the Markdown element
Good news! You're already connected to some demo data!
The datatable contains
The data table contains
**{{rows.length}} rows**, each containing
the following columns:
{{#each columns}}
**{{name}}**
{{/each}}
You can use standard Markdown in here, but you can also access your piped-in data using Handlebars. If you want to know more, check out the [Handlebars Documentation](http://handlebarsjs.com/expressions.html)
You can use standard Markdown in here, but you can also access your piped-in data using Handlebars. If you want to know more, check out the [Handlebars documentation](http://handlebarsjs.com/expressions.html).
#### Enjoy!" | render`,
});
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ export const markdown = () => ({
},
font: {
types: ['style'],
help: 'Font settings. Technically you can stick other styles in here too!',
help: 'Font settings. Technically, you can add other styles in here as well',
default: '{font}',
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ export const alterColumn = () => ({
},
type: {
types: ['string'],
help: 'The type to convert the column to. Leave blank to not change type.',
help: 'The type to convert the column to. Leave blank to not change type',
default: null,
},
name: {
types: ['string'],
help: 'The resultant column name. Leave blank to not rename.',
help: 'The resultant column name. Leave blank to not rename',
default: null,
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const axisConfig = () => ({
},
position: {
types: ['string'],
help: 'Position of the axis labels. Eg, top, bottom, left, and right.',
help: 'Position of the axis labels - top, bottom, left, and right',
default: '',
},
min: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
export const caseFn = () => ({
name: 'case',
type: 'case',
help: 'Build a case (including a condition/result) to pass to the switch function.',
help: 'Build a case (including a condition/result) to pass to the switch function',
args: {
when: {
aliases: ['_'],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,19 +20,19 @@ export const date = () => ({
context: {
types: ['null'],
},
help: 'Returns the current time, or a time parsed from a string, as milliseconds since epoch.',
help: 'Returns the current time, or a time parsed from a string, as milliseconds since epoch',
args: {
value: {
aliases: ['_'],
types: ['string', 'null'],
help:
'An optional date string to parse into milliseconds since epoch. ' +
'Can be either a valid Javascript Date input or a string to parse using the format argument. Must be an ISO 8601 string or you must provide the format.',
'An optional date string to parse into milliseconds since epoch ' +
'Can be either a valid Javascript Date input or a string to parse using the format argument. Must be an ISO 8601 string or you must provide the format',
},
format: {
types: ['string'],
help:
'The momentJS format for parsing the optional date string (See https://momentjs.com/docs/#/displaying/).',
'The momentJS format for parsing the optional date string (See https://momentjs.com/docs/#/displaying/)',
},
},
fn: (context, args) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ export const seriesStyle = () => ({
args: {
label: {
types: ['string'],
displayName: 'Series Label',
displayName: 'Series label',
help:
'The label of the line this style applies to, not the name you would like to give the line.',
'The label of the line this style applies to, not the name you would like to give the line',
},
color: {
types: ['string', 'null'],
Expand All @@ -33,12 +33,12 @@ export const seriesStyle = () => ({
},
bars: {
types: ['number'],
displayName: 'Bar Width',
displayName: 'Bar width',
help: 'Width of bars',
},
points: {
types: ['number'],
displayName: 'Show Points',
displayName: 'Show points',
help: 'Size of points on line',
},
fill: {
Expand All @@ -48,13 +48,13 @@ export const seriesStyle = () => ({
},
stack: {
types: ['number', 'null'],
displayName: 'Stack Series',
displayName: 'Stack series',
help:
'Should we stack the series? This is the stack "id". Series with the same stack id will be stacked together',
},
horizontalBars: {
types: ['boolean'],
displayName: 'Horizontal Bars Orientation',
displayName: 'Horizontal bars orientation',
help: 'Sets the orientation of bars in the chart to horizontal',
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getType } from '../../../common/lib/get_type';
export const staticColumn = () => ({
name: 'staticColumn',
type: 'datatable',
help: 'Add a column with a static value.',
help: 'Add a column with a static value',
context: {
types: ['datatable'],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const table = () => ({
paginate: {
types: ['boolean'],
default: true,
help: 'Show pagination controls. If set to false only the first page will be displayed.',
help: 'Show pagination controls. If set to false only the first page will be displayed',
},
perPage: {
types: ['number'],
Expand All @@ -31,7 +31,7 @@ export const table = () => ({
showHeader: {
types: ['boolean'],
default: true,
help: 'Show or hide the header row with titles for each column.',
help: 'Show or hide the header row with titles for each column',
},
},
fn: (context, args) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ export const demodata = () => ({
name: 'demodata',
aliases: [],
type: 'datatable',
help: 'A mock data set that includes project CI times with usernames, countries and run phases.',
help: 'A mock data set that includes project CI times with usernames, countries and run phases',
context: {
types: ['filter'],
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ export const esdocs = () => ({
help: 'Sort directions as "field, direction". Eg "@timestamp, desc" or "bytes, asc"',
},
fields: {
help: 'Comma separated list of fields. Fewer fields will perform better.',
help: 'Comma separated list of fields. Fewer fields will perform better',
types: ['string', 'null'],
},
metaFields: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ export const timelion = () => ({
},
},
type: 'datatable',
help: 'Use timelion to extract one or more timeseries from many sources.',
help: 'Use timelion to extract one or more timeseries from many sources',
fn: (context, args, handlers) => {
// Timelion requires a time range. Use the time range from the timefilter element in the
// workpad, if it exists. Otherwise fall back on the function args.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { AdvancedFilter } from './component';

export const advancedFilter = () => ({
name: 'advanced_filter',
displayName: 'Advanced Filter',
displayName: 'Advanced filter',
help: 'Render a Canvas filter expression',
reuseDomNode: true,
height: 50,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { DropdownFilter } from './component';

export const dropdownFilter = () => ({
name: 'dropdown_filter',
displayName: 'Dropdown Filter',
displayName: 'Dropdown filter',
help: 'A dropdown from which you can select values for an "exactly" filter',
reuseDomNode: true,
height: 50,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { Popover } from '../../../public/components/popover';

export const error = () => ({
name: 'error',
displayName: 'Error Information',
displayName: 'Error information',
help: 'Render error data in a way that is helpful to users',
reuseDomNode: true,
render(domNode, config, handlers) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { isValid } from '../../common/lib/url';

export const repeatImage = () => ({
name: 'repeatImage',
displayName: 'Image Repeat',
displayName: 'Image repeat',
help: 'Repeat an image a given number of times',
reuseDomNode: true,
render(domNode, config, handlers) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import './reveal_image.scss';

export const revealImage = () => ({
name: 'revealImage',
displayName: 'Image Reveal',
displayName: 'Image reveal',
help: 'Reveal a percentage of an image to make a custom gauge-style chart',
reuseDomNode: true,
render(domNode, config, handlers) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/canvas_plugin_src/renderers/table.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import { Datatable } from '../../public/components/datatable';

export const table = () => ({
name: 'table',
displayName: 'Data Table',
displayName: 'Data table',
help: 'Render tabular data as HTML',
reuseDomNode: true,
render(domNode, config, handlers) {
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/canvas_plugin_src/renderers/text.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import React from 'react';

export const text = () => ({
name: 'text',
displayName: 'Plain Text',
displayName: 'Plain text',
help: 'Render output as plain text',
reuseDomNode: true,
render(domNode, { text }, handlers) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import { TimeFilter } from './components/time_filter';

export const timeFilter = () => ({
name: 'time_filter',
displayName: 'Time Filter',
displayName: 'Time filter',
help: 'Set a time window',
reuseDomNode: true,
render(domNode, config, handlers) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { ExtendedTemplate } from './extended_template';

export const axisConfig = () => ({
name: 'axisConfig',
displayName: 'Axis Config',
displayName: 'Axis config',
help: 'Visualization axis configuration',
simpleTemplate: templateFromReactComponent(SimpleTemplate),
template: templateFromReactComponent(ExtendedTemplate),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ class ImageUpload extends React.Component {

export const imageUpload = () => ({
name: 'imageUpload',
displayName: 'Image Upload',
displayName: 'Image upload',
help: 'Select or upload an image',
resolveArgValue: true,
template: templateFromReactComponent(ImageUpload),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ PaletteArgInput.propTypes = {

export const palette = () => ({
name: 'palette',
displayName: 'Color Palette',
displayName: 'Color palette',
help: 'Choose a color palette',
default:
'{palette #882E72 #B178A6 #D6C1DE #1965B0 #5289C7 #7BAFDE #4EB265 #90C987 #CAE0AB #F7EE55 #F6C141 #F1932D #E8601C #DC050C}',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ EnhancedStringArgInput.propTypes = {

export const string = () => ({
name: 'string',
displayName: 'string',
displayName: 'String',
help: 'Input short strings',
simpleTemplate: templateFromReactComponent(EnhancedStringArgInput),
});
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ EnhancedTextAreaArgInput.propTypes = {

export const textarea = () => ({
name: 'textarea',
displayName: 'textarea',
displayName: 'Textarea',
help: 'Input long strings',
template: templateFromReactComponent(EnhancedTextAreaArgInput),
});
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,16 @@ const DemodataDatasource = () => (
<p>
This data source is connected to every Canvas element by default. Its purpose is to give you
some playground data to get started. The demo set contains 4 strings, 3 numbers and a date.
Feel free to experiment and, when you're ready, click the <strong>Change Datasource</strong>{' '}
link below to connect to your own data.
Feel free to experiment and, when you're ready, click <strong>Change your data source</strong>{' '}
above to connect to your own data.
</p>
</EuiText>
);

export const demodata = () => ({
name: 'demodata',
displayName: 'Demo Data',
help: 'Mock data set with with usernames, prices, projects, countries and phases.',
displayName: 'Demo data',
help: 'Mock data set with usernames, prices, projects, countries, and phases',
// Replace this with a better icon when we have time.
image: 'logoElasticStack',
template: templateFromReactComponent(DemodataDatasource),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ EssqlDatasource.propTypes = {
export const essql = () => ({
name: 'essql',
displayName: 'Elasticsearch SQL',
help: 'Use Elasticsearch SQL to get a datatable',
help: 'Use Elasticsearch SQL to get a data table',
// Replace this with a SQL logo when we have one in EUI
image: 'logoElasticsearch',
template: templateFromReactComponent(EssqlDatasource),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ TimelionDatasource.propTypes = {
export const timelion = () => ({
name: 'timelion',
displayName: 'Timelion',
help: 'Use timelion syntax to retrieve a timeseries',
help: 'Use Timelion syntax to retrieve a timeseries',
image: 'timelionApp',
template: templateFromReactComponent(TimelionDatasource),
});
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { getState, getValue } from '../../../public/lib/resolved_arg';

export const pointseries = () => ({
name: 'pointseries',
displayName: 'Dimensions & Measures',
displayName: 'Dimensions & measures',
args: [
{
name: 'x',
Expand All @@ -20,7 +20,7 @@ export const pointseries = () => ({
{
name: 'y',
displayName: 'Y-axis',
help: 'Data along the vertical axis. Usually a number.',
help: 'Data along the vertical axis. Usually a number',
argType: 'datacolumn',
},
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ import { getState, getValue } from '../../../public/lib/resolved_arg';

export const sort = () => ({
name: 'sort',
displayName: 'Datatable Sorting',
displayName: 'Datatable sorting',
args: [
{
name: '_',
displayName: 'Sort Field',
displayName: 'Sort field',
argType: 'datacolumn',
},
{
Expand Down
Loading

0 comments on commit f59f1cc

Please sign in to comment.