Skip to content

Commit

Permalink
Merge pull request #55 from qlik-oss/DEB-204/NewString
Browse files Browse the repository at this point in the history
Updated string according to Ralf Narfeldt
  • Loading branch information
AlbertBackenhof authored May 3, 2019
2 parents b8d6b0a + ef7926d commit 2f59d97
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 23 deletions.
16 changes: 8 additions & 8 deletions src/definition/conditional-coloring.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const conditionalColoring = {
type: 'items',
label: 'Color by condition',
label: 'Color by performance',
items: {
Enabled: {
ref: 'conditionalcoloring.enabled',
Expand All @@ -22,7 +22,7 @@ const conditionalColoring = {
ColorAllRows: {
ref: 'conditionalcoloring.colorall',
type: 'boolean',
label: 'Color all rows by condition',
label: 'Color all rows',
component: 'switch',
defaultValue: true,
options: [
Expand Down Expand Up @@ -83,7 +83,7 @@ const conditionalColoring = {
},
Measures: {
ref: 'conditionalcoloring.measures',
translation: 'Measure indices (ex: 0,3)',
translation: 'Measures by index (ex: 0,3)',
type: 'string',
defaultValue: '',
show (data) {
Expand All @@ -93,7 +93,7 @@ const conditionalColoring = {
},
ThresholdPoor: {
ref: 'conditionalcoloring.threshold_poor',
translation: 'Poor is less than',
translation: 'Poor range limit',
type: 'number',
defaultValue: -0.1,
show (data) {
Expand All @@ -102,7 +102,7 @@ const conditionalColoring = {
},
ColorPoor: {
ref: 'conditionalcoloring.color_poor',
label: 'Poor color fill',
label: 'Poor background color',
type: 'object',
component: 'color-picker',
dualOutput: true,
Expand Down Expand Up @@ -130,7 +130,7 @@ const conditionalColoring = {
},
ThresholdFair: {
ref: 'conditionalcoloring.threshold_fair',
translation: 'Fair is less than',
translation: 'Fair range limit',
type: 'number',
defaultValue: 0,
show (data) {
Expand All @@ -139,7 +139,7 @@ const conditionalColoring = {
},
ColorFair: {
ref: 'conditionalcoloring.color_fair',
label: 'Fair color fill',
label: 'Fair background color',
type: 'object',
component: 'color-picker',
dualOutput: true,
Expand Down Expand Up @@ -167,7 +167,7 @@ const conditionalColoring = {
},
ColorGood: {
ref: 'conditionalcoloring.color_good',
label: 'Good color fill',
label: 'Good background color',
type: 'object',
component: 'color-picker',
dualOutput: true,
Expand Down
10 changes: 5 additions & 5 deletions src/definition/header.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
const header = {
type: 'items',
label: 'Header Format',
label: 'Header format',
items: {
Align: {
ref: 'HeaderAlign',
translation: 'Header Alignment',
translation: 'Header alignment',
type: 'number',
component: 'buttongroup',
options: [
Expand All @@ -29,14 +29,14 @@ const header = {
index: 6,
color: '#4477aa'
},
label: 'Background Header Color',
label: 'Background color',
ref: 'HeaderColorSchema',
type: 'object',
dualOutput: true
},
HeaderTextColor: {
ref: 'HeaderTextColorSchema',
label: 'Text Header Color',
label: 'Text color',
component: 'color-picker',
defaultValue: {
index: 1,
Expand All @@ -47,7 +47,7 @@ const header = {
},
HeaderFontSize: {
ref: 'lettersizeheader',
translation: 'Font Size',
translation: 'Font size',
type: 'number',
component: 'buttongroup',
options: [
Expand Down
2 changes: 1 addition & 1 deletion src/definition/pagination.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const pagination = {
ref: 'maxloops',
type: 'number',
component: 'dropdown',
label: 'Max Pagination Loops',
label: 'Max pagination loops',
options: [
{
value: 1,
Expand Down
18 changes: 9 additions & 9 deletions src/definition/table-format.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ function getFieldList () {

const tableFormat = {
type: 'items',
label: 'Table Format',
label: 'Table format',
items: {
StylingField: {
ref: 'stylingfield',
disabledRef: '',
type: 'string',
component: 'dropdown',
label: 'Style with field',
label: 'Style template field',
options: function () {
return getFieldList().then(function (items) {
items.unshift(
Expand All @@ -58,7 +58,7 @@ const tableFormat = {
SeparatorColumns: {
ref: 'separatorcols',
type: 'boolean',
label: 'Separator Columns',
label: 'Column separators',
defaultValue: false
},
rowEvenBGColor: {
Expand Down Expand Up @@ -89,7 +89,7 @@ const tableFormat = {
ref: 'BodyTextColorSchema',
type: 'string',
component: 'dropdown',
label: 'Text Body Color',
label: 'Text body color',
options: [
{
value: 'Black',
Expand Down Expand Up @@ -139,7 +139,7 @@ const tableFormat = {
ref: 'FontFamily',
type: 'string',
component: 'dropdown',
label: 'FontFamily',
label: 'Font family',
options: [
{
value: 'QlikView Sans, -apple-system, sans-serif',
Expand Down Expand Up @@ -174,7 +174,7 @@ const tableFormat = {
},
DataFontSize: {
ref: 'lettersize',
translation: 'Font Size',
translation: 'Font size',
type: 'number',
component: 'buttongroup',
options: [
Expand All @@ -191,7 +191,7 @@ const tableFormat = {
},
textAlignment: {
ref: 'cellTextAlignment',
label: 'Cell Text alignment',
label: 'Cell text alignment',
component: 'buttongroup',
options: [
{
Expand All @@ -212,7 +212,7 @@ const tableFormat = {
ColumnWidthSlider: {
type: 'number',
component: 'slider',
label: 'Column Width',
label: 'Column width',
ref: 'columnwidthslider',
min: 1,
max: 3,
Expand Down Expand Up @@ -246,7 +246,7 @@ const tableFormat = {
ref: 'filteroncellclick',
type: 'boolean',
component: 'switch',
label: 'Filter data when cell clicked',
label: 'Allow selection in cells',
options: [
{
value: true,
Expand Down

0 comments on commit 2f59d97

Please sign in to comment.