Skip to content

W
web-apps
Commit 3fe8ee25 authored by Julia Radzhabova's avatar Julia Radzhabova
Browse files
Options

Changed layout for chart/sparkline type menu. 

[SSE] Select chart/sparkline type from toolbar.
parent 3612a758
Hide whitespace changes
Inline Side-by-side
Showing with 246 additions and 289 deletions
apps/common/main/lib/component/DataView.js
View file @ 3fe8ee25
......@@ -84,7 +84,9 @@ define([
defaults: function() {
return {
id: Common.UI.getId(),
caption: ''
caption: '',
inline: false,
headername: undefined
}
}
});
......@@ -190,10 +192,15 @@ define([
template: _.template([
'<div class="dataview inner" style="<%= style %>">',
'<% _.each(groups, function(group) { %>',
'<div class="grouped-data" id="<%= group.id %>">',
'<div class="group-description">',
'<span><b><%= group.caption %></b></span>',
'</div>',
'<% if (group.headername !== undefined) { %>',
'<div class="header-name"><%= group.headername %></div>',
'<% } %>',
'<div class="grouped-data <% if (group.inline) { %> inline <% } %> <% if (!_.isEmpty(group.caption)) { %> margin <% } %>" id="<%= group.id %>">',
'<% if (!_.isEmpty(group.caption)) { %>',
'<div class="group-description">',
'<span><%= group.caption %></span>',
'</div>',
'<% } %>',
'<div class="group-items-container">',
'</div>',
'</div>',
......@@ -696,39 +703,29 @@ define([
fillIndexesArray: function() {
if (this.dataViewItems.length<=0) return;
var top, left,
el = $(this.dataViewItems[0].el),
itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
itemH = el.outerHeight() + parseInt(el.css('margin-top')) + parseInt(el.css('margin-bottom')),
offsetLeft = this.$el.offset().left,
offsetTop = this.$el.offset().top,
idxOffset = 0;
this._layoutParams = {
itemsIndexes: [],
columns: 0,
rows: 0
};
if (this.groups && this.groups.length > 0) {
var group_desc = this.cmpEl.find('.group-description:first');
if (group_desc.length>0)
offsetLeft += group_desc.width();
}
var el = $(this.dataViewItems[0].el),
itemW = el.outerWidth() + parseInt(el.css('margin-left')) + parseInt(el.css('margin-right')),
offsetLeft = this.$el.offset().left,
prevtop = -1, topIdx = 0, leftIdx = 0;
for (var i=0; i<this.dataViewItems.length; i++) {
top = Math.floor(($(this.dataViewItems[i].el).offset().top - offsetTop)/itemH) + idxOffset;
left = Math.floor(($(this.dataViewItems[i].el).offset().left - offsetLeft)/itemW);
if (top<0) {
idxOffset = -top;
top += idxOffset;
}
if (top > this._layoutParams.itemsIndexes.length-1) {
var top = $(this.dataViewItems[i].el).offset().top;
leftIdx = Math.floor(($(this.dataViewItems[i].el).offset().left - offsetLeft)/itemW);
if (top>prevtop) {
prevtop = top;
this._layoutParams.itemsIndexes.push([]);
topIdx = this._layoutParams.itemsIndexes.length-1;
}
this._layoutParams.itemsIndexes[top][left] = i;
this.dataViewItems[i].topIdx = top;
this.dataViewItems[i].leftIdx = left;
if (this._layoutParams.columns<left) this._layoutParams.columns = left;
this._layoutParams.itemsIndexes[topIdx][leftIdx] = i;
this.dataViewItems[i].topIdx = topIdx;
this.dataViewItems[i].leftIdx = leftIdx;
if (this._layoutParams.columns<leftIdx) this._layoutParams.columns = leftIdx;
}
this._layoutParams.rows = this._layoutParams.itemsIndexes.length;
this._layoutParams.columns++;
......
apps/common/main/resources/less/dataview.less
View file @ 3fe8ee25
......@@ -31,17 +31,21 @@
clear: left;
overflow: hidden;
& > div {
&.inline {
display: inline-block;
&.margin .group-items-container {
margin-right: 20px;
}
}
.group-items-container {
overflow: hidden;
margin-bottom: 5px;
& > div {
display: inline-block;
float: left;
margin: 4px;
margin: 2px 4px 4px;
cursor: pointer;
.box-shadow(0 0 0 1px @gray);
......@@ -53,4 +57,10 @@
}
}
}
.header-name {
padding: 10px 2px 12px 4px;
font-weight: bold;
cursor: default;
}
}
\ No newline at end of file
apps/documenteditor/main/app/view/ChartSettings.js
View file @ 3fe8ee25
......@@ -244,7 +244,7 @@ define([
cls : 'btn-large-dataview',
iconCls : 'item-chartlist bar-normal',
menu : new Common.UI.Menu({
style: 'width: 560px;',
style: 'width: 435px; padding-top: 12px;',
items: [
{ template: _.template('<div id="id-chart-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
......@@ -254,15 +254,15 @@ define([
me.mnuChartTypePicker = new Common.UI.DataView({
el: $('#id-chart-menu-type'),
parentMenu: btn.menu,
restoreHeight: 411,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: me.textColumn },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea },
{ id: 'menu-chart-group-scatter', caption: me.textPoint },
{ id: 'menu-chart-group-stock', caption: me.textStock }
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
......@@ -545,13 +545,13 @@ define([
txtInFront: 'In front',
textEditData: 'Edit Data',
textChartType: 'Change Chart Type',
textLine: 'Line Chart',
textColumn: 'Column Chart',
textBar: 'Bar Chart',
textArea: 'Area Chart',
textPie: 'Pie Chart',
textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style'
}, DE.Views.ChartSettings || {}));
......
apps/documenteditor/main/app/view/Toolbar.js
View file @ 3fe8ee25
......@@ -489,7 +489,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'btn-insertchart',
menu : new Common.UI.Menu({
style: 'width: 560px;',
style: 'width: 435px;',
items: [
{ template: _.template('<div id="id-toolbar-menu-insertchart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
......@@ -1362,15 +1362,15 @@ define([
el: $('#id-toolbar-menu-insertchart'),
parentMenu: this.btnInsertChart.menu,
showLast: false,
restoreHeight: 411,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: me.textColumn },
{ id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea },
{ id: 'menu-chart-group-scatter', caption: me.textPoint },
{ id: 'menu-chart-group-stock', caption: me.textStock }
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true},
......@@ -1827,13 +1827,13 @@ define([
textNewColor: 'Add New Custom Color',
textAutoColor: 'Automatic',
tipInsertChart: 'Insert Chart',
textLine: 'Line Chart',
textColumn: 'Column Chart',
textBar: 'Bar Chart',
textArea: 'Area Chart',
textPie: 'Pie Chart',
textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
tipColorSchemas: 'Change Color Scheme',
tipInsertText: 'Insert Text',
tipHAligh: 'Horizontal Align',
......@@ -1910,7 +1910,8 @@ define([
textPageSizeCustom: 'Custom Page Size',
textPortrait: 'Portrait',
textLandscape: 'Landscape',
textInsertPageCount: 'Insert number of pages'
textInsertPageCount: 'Insert number of pages',
textCharts: 'Charts'
}, DE.Views.Toolbar || {}));
});
apps/documenteditor/main/locale/en.json
View file @ 3fe8ee25
......@@ -637,18 +637,18 @@
"DE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
"DE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
"DE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"DE.Views.ChartSettings.textArea": "Area Chart",
"DE.Views.ChartSettings.textBar": "Bar Chart",
"DE.Views.ChartSettings.textArea": "Area",
"DE.Views.ChartSettings.textBar": "Bar",
"DE.Views.ChartSettings.textChartType": "Change Chart Type",
"DE.Views.ChartSettings.textColumn": "Column Chart",
"DE.Views.ChartSettings.textColumn": "Column",
"DE.Views.ChartSettings.textEditData": "Edit Data",
"DE.Views.ChartSettings.textHeight": "Height",
"DE.Views.ChartSettings.textLine": "Line Chart",
"DE.Views.ChartSettings.textLine": "Line",
"DE.Views.ChartSettings.textOriginalSize": "Default Size",
"DE.Views.ChartSettings.textPie": "Pie Chart",
"DE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
"DE.Views.ChartSettings.textPie": "Pie",
"DE.Views.ChartSettings.textPoint": "XY (Scatter)",
"DE.Views.ChartSettings.textSize": "Size",
"DE.Views.ChartSettings.textStock": "Stock Chart",
"DE.Views.ChartSettings.textStock": "Stock",
"DE.Views.ChartSettings.textStyle": "Style",
"DE.Views.ChartSettings.textUndock": "Undock from panel",
"DE.Views.ChartSettings.textWidth": "Width",
......@@ -1430,12 +1430,13 @@
"DE.Views.Toolbar.mniImageFromFile": "Picture from File",
"DE.Views.Toolbar.mniImageFromUrl": "Picture from URL",
"DE.Views.Toolbar.strMenuNoFill": "No Fill",
"DE.Views.Toolbar.textArea": "Area Chart",
"DE.Views.Toolbar.textArea": "Area",
"DE.Views.Toolbar.textAutoColor": "Automatic",
"DE.Views.Toolbar.textBar": "Bar Chart",
"DE.Views.Toolbar.textBar": "Bar",
"DE.Views.Toolbar.textBold": "Bold",
"DE.Views.Toolbar.textBottom": "Bottom: ",
"DE.Views.Toolbar.textColumn": "Column Chart",
"DE.Views.Toolbar.textCharts": "Charts",
"DE.Views.Toolbar.textColumn": "Column",
"DE.Views.Toolbar.textColumnsLeft": "Left",
"DE.Views.Toolbar.textColumnsOne": "One",
"DE.Views.Toolbar.textColumnsRight": "Right",
......@@ -1461,7 +1462,7 @@
"DE.Views.Toolbar.textItalic": "Italic",
"DE.Views.Toolbar.textLandscape": "Landscape",
"DE.Views.Toolbar.textLeft": "Left: ",
"DE.Views.Toolbar.textLine": "Line Chart",
"DE.Views.Toolbar.textLine": "Line",
"DE.Views.Toolbar.textMarginsLast": "Last Custom",
"DE.Views.Toolbar.textMarginsModerate": "Moderate",
"DE.Views.Toolbar.textMarginsNarrow": "Narrow",
......@@ -1474,11 +1475,11 @@
"DE.Views.Toolbar.textOddPage": "Odd Page",
"DE.Views.Toolbar.textPageMarginsCustom": "Custom margins",
"DE.Views.Toolbar.textPageSizeCustom": "Custom Page Size",
"DE.Views.Toolbar.textPie": "Pie Chart",
"DE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
"DE.Views.Toolbar.textPie": "Pie",
"DE.Views.Toolbar.textPoint": "XY (Scatter)",
"DE.Views.Toolbar.textPortrait": "Portrait",
"DE.Views.Toolbar.textRight": "Right: ",
"DE.Views.Toolbar.textStock": "Stock Chart",
"DE.Views.Toolbar.textStock": "Stock",
"DE.Views.Toolbar.textStrikeout": "Strikeout",
"DE.Views.Toolbar.textStyleMenuDelete": "Delete style",
"DE.Views.Toolbar.textStyleMenuDeleteAll": "Delete all custom styles",
......
apps/documenteditor/main/resources/less/leftmenu.less
View file @ 3fe8ee25
......@@ -375,8 +375,6 @@ button.notify .btn-menu-comments {background-position: -0*@toolbar-icon-size -60
.header-name {
padding: 7px 2px 7px 10px;
font-weight: bold;
cursor: default;
}
}
}
......
apps/documenteditor/main/resources/less/toolbar.less
View file @ 3fe8ee25
......@@ -163,20 +163,12 @@
// charts
.menu-insertchart {
.group-description {
float: left;
width: 125px;
line-height: 58px;
padding-left: 6px;
padding-left: 4px;
}
.group-items-container {
float: left;
position: relative;
// & > div {
// float: left;
// margin: 0 0 0 14px;
// }
}
}
......
apps/presentationeditor/main/app/view/ChartSettings.js
View file @ 3fe8ee25
......@@ -200,7 +200,7 @@ define([
cls : 'btn-large-dataview',
iconCls : 'item-chartlist bar-normal',
menu : new Common.UI.Menu({
style: 'width: 560px;',
style: 'width: 435px; padding-top: 12px;',
items: [
{ template: _.template('<div id="id-chart-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
......@@ -210,15 +210,15 @@ define([
me.mnuChartTypePicker = new Common.UI.DataView({
el: $('#id-chart-menu-type'),
parentMenu: btn.menu,
restoreHeight: 411,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: me.textColumn },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea },
{ id: 'menu-chart-group-scatter', caption: me.textPoint },
{ id: 'menu-chart-group-stock', caption: me.textStock }
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
......@@ -487,13 +487,13 @@ define([
textHeight: 'Height',
textEditData: 'Edit Data',
textChartType: 'Change Chart Type',
textLine: 'Line Chart',
textColumn: 'Column Chart',
textBar: 'Bar Chart',
textArea: 'Area Chart',
textPie: 'Pie Chart',
textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style'
}, PE.Views.ChartSettings || {}));
});
\ No newline at end of file
apps/presentationeditor/main/app/view/Toolbar.js
View file @ 3fe8ee25
......@@ -554,7 +554,7 @@ define([
iconCls : 'btn-insertchart',
lock : [_set.slideDeleted, _set.lostConnect, _set.noSlides, _set.disableOnStart],
menu : new Common.UI.Menu({
style: 'width: 560px;',
style: 'width: 435px;',
items: [
{ template: _.template('<div id="id-toolbar-menu-insertchart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
......@@ -564,15 +564,15 @@ define([
el: $('#id-toolbar-menu-insertchart'),
parentMenu: btn.menu,
showLast: false,
restoreHeight: 411,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: me.textColumn },
{ id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea },
{ id: 'menu-chart-group-scatter', caption: me.textPoint },
{ id: 'menu-chart-group-stock', caption: me.textStock }
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true},
......@@ -1676,13 +1676,13 @@ define([
textFitWidth: 'Fit to Width',
textZoom: 'Zoom',
tipInsertChart: 'Insert Chart',
textLine: 'Line Chart',
textColumn: 'Column Chart',
textBar: 'Bar Chart',
textArea: 'Area Chart',
textPie: 'Pie Chart',
textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
tipSynchronize: 'The document has been changed by another user. Please click to save your changes and reload the updates.',
txtScheme1: 'Office',
txtScheme2: 'Grayscale',
......@@ -1712,6 +1712,7 @@ define([
textShowBegin: 'Show from Beginning',
textShowCurrent: 'Show from Current slide',
textShowSettings: 'Show Settings',
tipInsertEquation: 'Insert Equation'
tipInsertEquation: 'Insert Equation',
textCharts: 'Charts'
}, PE.Views.Toolbar || {}));
});
\ No newline at end of file
apps/presentationeditor/main/locale/en.json
View file @ 3fe8ee25
......@@ -578,18 +578,18 @@
"PE.Controllers.Toolbar.txtSymbol_vdots": "Vertical Ellipsis",
"PE.Controllers.Toolbar.txtSymbol_xsi": "Xi",
"PE.Controllers.Toolbar.txtSymbol_zeta": "Zeta",
"PE.Views.ChartSettings.textArea": "Area Chart",
"PE.Views.ChartSettings.textBar": "Bar Chart",
"PE.Views.ChartSettings.textArea": "Area",
"PE.Views.ChartSettings.textBar": "Bar",
"PE.Views.ChartSettings.textChartType": "Change Chart Type",
"PE.Views.ChartSettings.textColumn": "Column Chart",
"PE.Views.ChartSettings.textColumn": "Column",
"PE.Views.ChartSettings.textEditData": "Edit Data",
"PE.Views.ChartSettings.textHeight": "Height",
"PE.Views.ChartSettings.textKeepRatio": "Constant Proportions",
"PE.Views.ChartSettings.textLine": "Line Chart",
"PE.Views.ChartSettings.textPie": "Pie Chart",
"PE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
"PE.Views.ChartSettings.textLine": "Line",
"PE.Views.ChartSettings.textPie": "Pie",
"PE.Views.ChartSettings.textPoint": "XY (Scatter)",
"PE.Views.ChartSettings.textSize": "Size",
"PE.Views.ChartSettings.textStock": "Stock Chart",
"PE.Views.ChartSettings.textStock": "Stock",
"PE.Views.ChartSettings.textStyle": "Style",
"PE.Views.ChartSettings.textWidth": "Width",
"PE.Views.DocumentHolder.aboveText": "Above",
......@@ -1190,15 +1190,16 @@
"PE.Views.Toolbar.textAlignMiddle": "Align text to the middle",
"PE.Views.Toolbar.textAlignRight": "Align text right",
"PE.Views.Toolbar.textAlignTop": "Align text to the top",
"PE.Views.Toolbar.textArea": "Area Chart",
"PE.Views.Toolbar.textArea": "Area",
"PE.Views.Toolbar.textArrangeBack": "Send to Background",
"PE.Views.Toolbar.textArrangeBackward": "Move Backward",
"PE.Views.Toolbar.textArrangeForward": "Move Forward",
"PE.Views.Toolbar.textArrangeFront": "Bring To Foreground",
"PE.Views.Toolbar.textBar": "Bar Chart",
"PE.Views.Toolbar.textBar": "Bar",
"PE.Views.Toolbar.textBold": "Bold",
"PE.Views.Toolbar.textCancel": "Cancel",
"PE.Views.Toolbar.textColumn": "Column Chart",
"PE.Views.Toolbar.textCharts": "Charts",
"PE.Views.Toolbar.textColumn": "Column",
"PE.Views.Toolbar.textCompactView": "View Compact Toolbar",
"PE.Views.Toolbar.textFitPage": "Fit to Slide",
"PE.Views.Toolbar.textFitWidth": "Fit to Width",
......@@ -1208,11 +1209,11 @@
"PE.Views.Toolbar.textInsText": "Insert text box",
"PE.Views.Toolbar.textInsTextArt": "Insert Text Art",
"PE.Views.Toolbar.textItalic": "Italic",
"PE.Views.Toolbar.textLine": "Line Chart",
"PE.Views.Toolbar.textLine": "Line",
"PE.Views.Toolbar.textNewColor": "Custom Color",
"PE.Views.Toolbar.textOK": "OK",
"PE.Views.Toolbar.textPie": "Pie Chart",
"PE.Views.Toolbar.textPoint": "XY (Scatter) Chart",
"PE.Views.Toolbar.textPie": "Pie",
"PE.Views.Toolbar.textPoint": "XY (Scatter)",
"PE.Views.Toolbar.textShapeAlignBottom": "Align Bottom",
"PE.Views.Toolbar.textShapeAlignCenter": "Align Center",
"PE.Views.Toolbar.textShapeAlignLeft": "Align Left",
......@@ -1222,7 +1223,7 @@
"PE.Views.Toolbar.textShowBegin": "Show from Beginning",
"PE.Views.Toolbar.textShowCurrent": "Show from Current slide",
"PE.Views.Toolbar.textShowSettings": "Show Settings",
"PE.Views.Toolbar.textStock": "Stock Chart",
"PE.Views.Toolbar.textStock": "Stock",
"PE.Views.Toolbar.textStrikeout": "Strikeout",
"PE.Views.Toolbar.textSubscript": "Subscript",
"PE.Views.Toolbar.textSuperscript": "Superscript",
......
apps/presentationeditor/main/resources/less/leftmenu.less
View file @ 3fe8ee25
......@@ -394,8 +394,6 @@
.header-name {
padding: 7px 2px 7px 10px;
font-weight: bold;
cursor: default;
}
}
}
......
apps/presentationeditor/main/resources/less/toolbar.less
View file @ 3fe8ee25
......@@ -174,20 +174,12 @@
// charts
.menu-insertchart {
.group-description {
float: left;
width: 125px;
line-height: 58px;
padding-left: 6px;
padding-left: 4px;
}
.group-items-container {
float: left;
position: relative;
& > div {
float: left;
margin: 0 0 0 14px;
}
}
}
......
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file @ 3fe8ee25
......@@ -205,10 +205,8 @@ define([
toolbar.btnTextOrient.menu.on('item:click', _.bind(this.onTextOrientationMenu, this));
toolbar.btnInsertImage.menu.on('item:click', _.bind(this.onInsertImageMenu, this));
toolbar.btnInsertHyperlink.on('click', _.bind(this.onHyperlink, this));
toolbar.btnInsertChart.on('click', _.bind(this.onInsertChart, this));
// if (toolbar.mnuInsertChartPicker) toolbar.mnuInsertChartPicker.on('item:click', _.bind(this.onSelectChart, this));
// if (toolbar.mnuInsertSparkPicker) toolbar.mnuInsertSparkPicker.on('item:click', _.bind(this.onSelectSpark, this));
toolbar.btnEditChart.on('click', _.bind(this.onInsertChart, this));
toolbar.mnuInsertChartPicker.on('item:click', _.bind(this.onSelectChart, this));
toolbar.btnEditChart.on('click', _.bind(this.onEditChart, this));
toolbar.btnInsertText.on('click', _.bind(this.onBtnInsertTextClick, this));
toolbar.btnInsertText.menu.on('item:click', _.bind(this.onInsertTextClick, this));
toolbar.btnInsertShape.menu.on('hide:after', _.bind(this.onInsertShapeHide, this));
......@@ -743,7 +741,7 @@ define([
Common.component.Analytics.trackEvent('ToolBar', 'Add Hyperlink');
},
onInsertChart: function(btn) {
onEditChart: function(btn) {
if (!this.editMode) return;
var me = this, info = me.api.asc_getCellInfo();
if (info.asc_getFlags().asc_getSelectionType()!=Asc.c_oAscSelectionType.RangeImage) {
......@@ -774,37 +772,30 @@ define([
onSelectChart: function(picker, item, record, e) {
if (!this.editMode) return;
var me = this, info = me.api.asc_getCellInfo();
if (info.asc_getFlags().asc_getSelectionType()!=Asc.c_oAscSelectionType.RangeImage) {
var me = this,
info = me.api.asc_getCellInfo(),
type = info.asc_getFlags().asc_getSelectionType(),
group = record.get('group'),
isSpark = (group == 'menu-chart-group-sparkcolumn' || group == 'menu-chart-group-sparkline' || group == 'menu-chart-group-sparkwin');
if (type!=Asc.c_oAscSelectionType.RangeImage && me.api) {
var win, props;
if (me.api){
var ischartedit = ( info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChart || info.asc_getFlags().asc_getSelectionType() == Asc.c_oAscSelectionType.RangeChartText);
if (ischartedit) {
if (isSpark && (type==Asc.c_oAscSelectionType.RangeCells || type==Asc.c_oAscSelectionType.RangeCol ||
type==Asc.c_oAscSelectionType.RangeRow || type==Asc.c_oAscSelectionType.RangeMax)) {
var sparkLineInfo = info.asc_getSparklineInfo();
if (!!sparkLineInfo) {
var props = new Asc.sparklineGroup();
props.asc_setType(record.get('type'));
this.api.asc_setSparklineGroup(sparkLineInfo.asc_getId(), props);
} else {
props = me.api.asc_getChartObject();
if (props) {
props.putType(record.get('type'));
me.api.asc_addChartDrawingObject(props);
}
// add sparkline
}
}
}
if (e.type !== 'click')
me.toolbar.btnInsertChart.menu.hide();
Common.NotificationCenter.trigger('edit:complete', this.toolbar);
},
onSelectSpark: function(picker, item, record, e) {
if (!this.editMode) return;
var me = this, info = me.api.asc_getCellInfo(), type = info.asc_getFlags().asc_getSelectionType();
if (type==Asc.c_oAscSelectionType.RangeCells || type==Asc.c_oAscSelectionType.RangeCol ||
type==Asc.c_oAscSelectionType.RangeRow || type==Asc.c_oAscSelectionType.RangeMax) {
var props;
if (me.api){
} else if (!isSpark) {
var ischartedit = ( type == Asc.c_oAscSelectionType.RangeChart || type == Asc.c_oAscSelectionType.RangeChartText);
props = me.api.asc_getChartObject();
if (props) {
props.putType(record.get('type'));
me.api.asc_addChartDrawingObject(props);
(ischartedit) ? me.api.asc_editChartDrawingObject(props) : me.api.asc_addChartDrawingObject(props);
}
}
}
......@@ -1440,7 +1431,7 @@ define([
},
onApiChartDblClick: function() {
this.onInsertChart(this.btnInsertChart);
this.onEditChart(this.btnInsertChart);
},
onApiCanRevert: function(which, can) {
......
apps/spreadsheeteditor/main/app/view/ChartSettings.js
View file @ 3fe8ee25
......@@ -654,7 +654,7 @@ define([
cls : 'btn-large-dataview',
iconCls : 'item-chartlist bar-normal',
menu : new Common.UI.Menu({
style: 'width: 560px;',
style: 'width: 435px; padding-top: 12px;',
items: [
{ template: _.template('<div id="id-chart-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
......@@ -665,15 +665,15 @@ define([
me.mnuChartTypePicker = new Common.UI.DataView({
el: $('#id-chart-menu-type'),
parentMenu: btn.menu,
restoreHeight: 411,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: me.textColumn },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea },
{ id: 'menu-chart-group-scatter', caption: me.textPoint },
{ id: 'menu-chart-group-stock', caption: me.textStock }
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
......@@ -762,9 +762,9 @@ define([
cls : 'btn-large-dataview',
iconCls : 'item-chartlist spark-column',
menu : new Common.UI.Menu({
style: 'width: 210px;',
style: 'width: 200px; padding-top: 12px;',
items: [
{ template: _.template('<div id="id-spark-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
{ template: _.template('<div id="id-spark-menu-type" class="menu-insertchart" style="margin: 5px 5px 0 10px;"></div>') }
]
})
});
......@@ -772,17 +772,17 @@ define([
me.mnuSparkTypePicker = new Common.UI.DataView({
el: $('#id-spark-menu-type'),
parentMenu: btn.menu,
restoreHeight: 200,
restoreHeight: 120,
allowScrollbar: false,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-sparkcolumn', caption: me.textColumnSpark },
{ id: 'menu-chart-group-sparkline', caption: me.textLineSpark },
{ id: 'menu-chart-group-sparkwin', caption: me.textWinLossSpark }
{ id: 'menu-chart-group-sparkcolumn', inline: true },
{ id: 'menu-chart-group-sparkline', inline: true },
{ id: 'menu-chart-group-sparkwin', inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column'},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line'},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win'}
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
});
......@@ -1305,13 +1305,13 @@ define([
textHeight: 'Height',
textEditData: 'Edit Data and Location',
textChartType: 'Change Chart Type',
textLine: 'Line Chart',
textColumn: 'Column Chart',
textBar: 'Bar Chart',
textArea: 'Area Chart',
textPie: 'Pie Chart',
textPoint: 'XY (Scatter) Chart',
textStock: 'Stock Chart',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textStyle: 'Style',
textAdvanced: 'Show advanced settings',
strSparkColor: 'Color',
......
apps/spreadsheeteditor/main/app/view/ChartSettingsDlg.js
View file @ 3fe8ee25
......@@ -127,7 +127,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
cls : 'btn-large-dataview',
iconCls : 'item-chartlist bar-normal',
menu : new Common.UI.Menu({
style: 'width: 560px;',
style: 'width: 435px; padding-top: 12px;',
additionalAlign: menuAddAlign,
items: [
{ template: _.template('<div id="id-chart-dlg-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
......@@ -138,15 +138,15 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
me.mnuChartTypePicker = new Common.UI.DataView({
el: $('#id-chart-dlg-menu-type'),
parentMenu: btn.menu,
restoreHeight: 411,
restoreHeight: 421,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: me.textColumn },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea },
{ id: 'menu-chart-group-scatter', caption: me.textPoint },
{ id: 'menu-chart-group-stock', caption: me.textStock }
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, iconCls: 'column-normal', selected: true},
......@@ -784,10 +784,10 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
cls : 'btn-large-dataview',
iconCls : 'item-chartlist spark-column',
menu : new Common.UI.Menu({
style: 'width: 210px;',
style: 'width: 200px; padding-top: 12px;',
additionalAlign: menuAddAlign,
items: [
{ template: _.template('<div id="id-spark-dlg-menu-type" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
{ template: _.template('<div id="id-spark-dlg-menu-type" class="menu-insertchart" style="margin: 5px 5px 0 10px;"></div>') }
]
})
});
......@@ -795,16 +795,16 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
me.mnuSparkTypePicker = new Common.UI.DataView({
el: $('#id-spark-dlg-menu-type'),
parentMenu: btn.menu,
restoreHeight: 200,
restoreHeight: 120,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-sparkcolumn', caption: me.textColumnSpark },
{ id: 'menu-chart-group-sparkline', caption: me.textLineSpark },
{ id: 'menu-chart-group-sparkwin', caption: me.textWinLossSpark }
{ id: 'menu-chart-group-sparkcolumn', inline: true },
{ id: 'menu-chart-group-sparkline', inline: true },
{ id: 'menu-chart-group-sparkwin', inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column'},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line'},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win'}
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
});
......@@ -1594,7 +1594,7 @@ define([ 'text!spreadsheeteditor/main/app/template/ChartSettingsDlg.template'
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'Point',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textDataRows: 'in rows',
textDataColumns: 'in columns',
......
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file @ 3fe8ee25
......@@ -505,33 +505,13 @@ define([
id : 'id-toolbar-btn-insertchart',
cls : 'btn-toolbar',
iconCls : 'btn-insertchart',
lock : [_set.editCell, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth]
/*,menu : new Common.UI.Menu({
items : [
this.mnuInsertChart = new Common.UI.MenuItem({
caption: this.textInsCharts,
value: 'chart',
menu: new Common.UI.Menu({
menuAlign: 'tl-tr',
style: 'width: 560px;',
items: [
{ template: _.template('<div id="id-toolbar-menu-insertchart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
})
}),
this.mnuInsertSparkline = new Common.UI.MenuItem({
caption: this.textInsSparklines,
value: 'chart',
menu: new Common.UI.Menu({
menuAlign: 'tl-tr',
style: 'width: 210px;',
items: [
{ template: _.template('<div id="id-toolbar-menu-insertspark" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
})
})
lock : [_set.editCell, _set.selChartText, _set.selShape, _set.selShapeText, _set.selImage, _set.lostConnect, _set.coAuth],
menu : new Common.UI.Menu({
style: 'width: 435px;',
items: [
{ template: _.template('<div id="id-toolbar-menu-insertchart" class="menu-insertchart" style="margin: 5px 5px 5px 10px;"></div>') }
]
})*/
})
});
me.btnEditChart = new Common.UI.Button({
......@@ -1714,20 +1694,22 @@ define([
]
}));
/*
this.mnuInsertChartPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-insertchart'),
parentMenu: this.mnuInsertChart.menu,
parentMenu: this.btnInsertChart.menu,
showLast: false,
restoreHeight: 411,
restoreHeight: 539,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-bar', caption: this.textColumn },
{ id: 'menu-chart-group-line', caption: this.textLine },
{ id: 'menu-chart-group-pie', caption: this.textPie },
{ id: 'menu-chart-group-hbar', caption: this.textBar },
{ id: 'menu-chart-group-area', caption: this.textArea },
{ id: 'menu-chart-group-scatter', caption: this.textPoint },
{ id: 'menu-chart-group-stock', caption: this.textStock }
{ id: 'menu-chart-group-bar', caption: me.textColumn, headername: me.textCharts },
{ id: 'menu-chart-group-line', caption: me.textLine },
{ id: 'menu-chart-group-pie', caption: me.textPie },
{ id: 'menu-chart-group-hbar', caption: me.textBar },
{ id: 'menu-chart-group-area', caption: me.textArea, inline: true },
{ id: 'menu-chart-group-scatter', caption: me.textPoint, inline: true },
{ id: 'menu-chart-group-stock', caption: me.textStock, inline: true },
{ id: 'menu-chart-group-sparkcolumn', inline: true, headername: me.textSparks },
{ id: 'menu-chart-group-sparkline', inline: true },
{ id: 'menu-chart-group-sparkwin', inline: true }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-bar', type: Asc.c_oAscChartTypeSettings.barNormal, allowSelected: true, iconCls: 'column-normal', selected: true},
......@@ -1754,29 +1736,13 @@ define([
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStacked, allowSelected: true, iconCls: 'area-stack'},
{ group: 'menu-chart-group-area', type: Asc.c_oAscChartTypeSettings.areaStackedPer, allowSelected: true, iconCls: 'area-pstack'},
{ group: 'menu-chart-group-scatter', type: Asc.c_oAscChartTypeSettings.scatter, allowSelected: true, iconCls: 'point-normal'},
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'}
{ group: 'menu-chart-group-stock', type: Asc.c_oAscChartTypeSettings.stock, allowSelected: true, iconCls: 'stock-normal'},
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column', tip: me.textColumnSpark},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line', tip: me.textLineSpark},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win', tip: me.textWinLossSpark}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
});
this.mnuInsertSparkPicker = new Common.UI.DataView({
el: $('#id-toolbar-menu-insertspark'),
parentMenu: this.mnuInsertSparkline.menu,
showLast: false,
restoreHeight: 200,
allowScrollbar: false,
groups: new Common.UI.DataViewGroupStore([
{ id: 'menu-chart-group-sparkcolumn', caption: this.textColumnSpark },
{ id: 'menu-chart-group-sparkline', caption: this.textLineSpark },
{ id: 'menu-chart-group-sparkwin', caption: this.textWinLossSpark }
]),
store: new Common.UI.DataViewStore([
{ group: 'menu-chart-group-sparkcolumn', type: Asc.c_oAscSparklineType.Column, allowSelected: true, iconCls: 'spark-column'},
{ group: 'menu-chart-group-sparkline', type: Asc.c_oAscSparklineType.Line, allowSelected: true, iconCls: 'spark-line'},
{ group: 'menu-chart-group-sparkwin', type: Asc.c_oAscSparklineType.Stacked, allowSelected: true, iconCls: 'spark-win'}
]),
itemTemplate: _.template('<div id="<%= id %>" class="item-chartlist <%= iconCls %>"></div>')
})
*/
},
setApi: function(api) {
......@@ -2124,17 +2090,18 @@ define([
textInsText: 'Insert text box',
textInsTextArt: 'Insert Text Art',
textInsCharts: 'Charts',
textLine: 'Line Chart',
textColumn: 'Column Chart',
textBar: 'Bar Chart',
textArea: 'Area Chart',
textPie: 'Pie Chart',
textPoint: 'Point Chart',
textStock: 'Stock Chart',
textInsSparklines: 'Sparklines',
textLine: 'Line',
textColumn: 'Column',
textBar: 'Bar',
textArea: 'Area',
textPie: 'Pie',
textPoint: 'XY (Scatter)',
textStock: 'Stock',
textLineSpark: 'Line',
textColumnSpark: 'Column',
textWinLossSpark: 'Win/Loss',
tipInsertEquation: 'Insert Equation'
tipInsertEquation: 'Insert Equation',
textCharts: 'Charts',
textSparks: 'Sparklines'
}, SSE.Views.Toolbar || {}));
});
\ No newline at end of file
apps/spreadsheeteditor/main/locale/en.json
View file @ 3fe8ee25
......@@ -721,33 +721,36 @@
"SSE.Views.CellRangeDialog.txtInvalidRange": "ERROR! Invalid cells range",
"SSE.Views.CellRangeDialog.txtTitle": "Select Data Range",
"SSE.Views.ChartSettings.textAdvanced": "Show advanced settings",
"SSE.Views.ChartSettings.textArea": "Area Chart",
"SSE.Views.ChartSettings.textBar": "Bar Chart",
"SSE.Views.ChartSettings.textArea": "Area",
"SSE.Views.ChartSettings.textBar": "Bar",
"SSE.Views.ChartSettings.textChartType": "Change Chart Type",
"SSE.Views.ChartSettings.textColumn": "Column Chart",
"SSE.Views.ChartSettings.textColumn": "Column",
"SSE.Views.ChartSettings.textEditData": "Edit Data and Location",
"SSE.Views.ChartSettings.textHeight": "Height",
"SSE.Views.ChartSettings.textKeepRatio": "Constant Proportions",
"SSE.Views.ChartSettings.textLine": "Line Chart",
"SSE.Views.ChartSettings.textPie": "Pie Chart",
"SSE.Views.ChartSettings.textPoint": "XY (Scatter) Chart",
"SSE.Views.ChartSettings.textLine": "Line",
"SSE.Views.ChartSettings.textPie": "Pie",
"SSE.Views.ChartSettings.textPoint": "XY (Scatter)",
"SSE.Views.ChartSettings.textRanges": "Data Range",
"SSE.Views.ChartSettings.textSelectData": "Select Data",
"SSE.Views.ChartSettings.textSize": "Size",
"SSE.Views.ChartSettings.textStock": "Stock Chart",
"SSE.Views.ChartSettings.textStock": "Stock",
"SSE.Views.ChartSettings.textStyle": "Style",
"SSE.Views.ChartSettings.textType": "Type",
"SSE.Views.ChartSettings.textWidth": "Width",
"SSE.Views.ChartSettings.textLineSpark": "Line",
"SSE.Views.ChartSettings.textColumnSpark": "Column",
"SSE.Views.ChartSettings.textWinLossSpark": "Win/Loss",
"SSE.Views.ChartSettingsDlg.cancelButtonText": "Cancel",
"SSE.Views.ChartSettingsDlg.errorMaxRows": "ERROR! The maximum number of data series per chart is 255",
"SSE.Views.ChartSettingsDlg.errorStockChart": "Incorrect row order. To build a stock chart place the data on the sheet in the following order:<br> opening price, max price, min price, closing price.",
"SSE.Views.ChartSettingsDlg.textArea": "Area Chart",
"SSE.Views.ChartSettingsDlg.textArea": "Area",
"SSE.Views.ChartSettingsDlg.textAuto": "Auto",
"SSE.Views.ChartSettingsDlg.textAxisCrosses": "Axis Crosses",
"SSE.Views.ChartSettingsDlg.textAxisOptions": "Axis Options",
"SSE.Views.ChartSettingsDlg.textAxisPos": "Axis Position",
"SSE.Views.ChartSettingsDlg.textAxisSettings": "Axis Settings",
"SSE.Views.ChartSettingsDlg.textBar": "Bar Chart",
"SSE.Views.ChartSettingsDlg.textBar": "Bar",
"SSE.Views.ChartSettingsDlg.textBetweenTickMarks": "Between Tick Marks",
"SSE.Views.ChartSettingsDlg.textBillions": "Billions",
"SSE.Views.ChartSettingsDlg.textBottom": "Bottom",
......@@ -755,7 +758,7 @@
"SSE.Views.ChartSettingsDlg.textCenter": "Center",
"SSE.Views.ChartSettingsDlg.textChartElementsLegend": "Chart Elements &<br/>Chart Legend",
"SSE.Views.ChartSettingsDlg.textChartTitle": "Chart Title",
"SSE.Views.ChartSettingsDlg.textColumn": "Column Chart",
"SSE.Views.ChartSettingsDlg.textColumn": "Column",
"SSE.Views.ChartSettingsDlg.textCross": "Cross",
"SSE.Views.ChartSettingsDlg.textCustom": "Custom",
"SSE.Views.ChartSettingsDlg.textDataColumns": "in columns",
......@@ -813,8 +816,8 @@
"SSE.Views.ChartSettingsDlg.textOut": "Out",
"SSE.Views.ChartSettingsDlg.textOuterTop": "Outer Top",
"SSE.Views.ChartSettingsDlg.textOverlay": "Overlay",
"SSE.Views.ChartSettingsDlg.textPie": "Pie Chart",
"SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter) Chart",
"SSE.Views.ChartSettingsDlg.textPie": "Pie",
"SSE.Views.ChartSettingsDlg.textPoint": "XY (Scatter)",
"SSE.Views.ChartSettingsDlg.textReverse": "Values in reverse order",
"SSE.Views.ChartSettingsDlg.textRight": "Right",
"SSE.Views.ChartSettingsDlg.textRightOverlay": "Right Overlay",
......@@ -828,7 +831,7 @@
"SSE.Views.ChartSettingsDlg.textShowGrid": "Grid Lines",
"SSE.Views.ChartSettingsDlg.textShowValues": "Display chart values",
"SSE.Views.ChartSettingsDlg.textSmooth": "Smooth",
"SSE.Views.ChartSettingsDlg.textStock": "Stock Chart",
"SSE.Views.ChartSettingsDlg.textStock": "Stock",
"SSE.Views.ChartSettingsDlg.textStraight": "Straight",
"SSE.Views.ChartSettingsDlg.textStyle": "Style",
"SSE.Views.ChartSettingsDlg.textTenMillions": "10 000 000",
......@@ -849,6 +852,9 @@
"SSE.Views.ChartSettingsDlg.textXAxisTitle": "X Axis Title",
"SSE.Views.ChartSettingsDlg.textYAxisTitle": "Y Axis Title",
"SSE.Views.ChartSettingsDlg.txtEmpty": "This field is required",
"SSE.Views.ChartSettingsDlg.textLineSpark": "Line",
"SSE.Views.ChartSettingsDlg.textColumnSpark": "Column",
"SSE.Views.ChartSettingsDlg.textWinLossSpark": "Win/Loss",
"SSE.Views.DigitalFilterDialog.cancelButtonText": "Cancel",
"SSE.Views.DigitalFilterDialog.capAnd": "And",
"SSE.Views.DigitalFilterDialog.capCondition1": "equals",
......@@ -1425,6 +1431,15 @@
"SSE.Views.Toolbar.textBottomBorders": "Bottom Borders",
"SSE.Views.Toolbar.textCenterBorders": "Inside Vertical Borders",
"SSE.Views.Toolbar.textClockwise": "Angle Clockwise",
"SSE.Views.Toolbar.textArea": "Area",
"SSE.Views.Toolbar.textBar": "Bar",
"SSE.Views.Toolbar.textColumn": "Column",
"SSE.Views.Toolbar.textLine": "Line",
"SSE.Views.Toolbar.textPie": "Pie",
"SSE.Views.Toolbar.textPoint": "XY (Scatter)",
"SSE.Views.Toolbar.textStock": "Stock",
"SSE.Views.Toolbar.textCharts": "Charts",
"SSE.Views.Toolbar.textSparks": "Sparklines",
"SSE.Views.Toolbar.textCompactToolbar": "View Compact Toolbar",
"SSE.Views.Toolbar.textCounterCw": "Angle Counterclockwise",
"SSE.Views.Toolbar.textDelLeft": "Shift Cells Left",
......@@ -1578,6 +1593,9 @@
"SSE.Views.Toolbar.txtTime": "Time",
"SSE.Views.Toolbar.txtUnmerge": "Unmerge Cells",
"SSE.Views.Toolbar.txtYen": "¥ Yen",
"SSE.Views.Toolbar.textLineSpark": "Line",
"SSE.Views.Toolbar.textColumnSpark": "Column",
"SSE.Views.Toolbar.textWinLossSpark": "Win/Loss",
"SSE.Views.Top10FilterDialog.cancelButtonText": "Cancel",
"SSE.Views.Top10FilterDialog.okButtonText": "OK",
"SSE.Views.Top10FilterDialog.textType": "Show",
......
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file @ 3fe8ee25
......@@ -459,8 +459,6 @@
.header-name {
padding: 7px 2px 7px 10px;
font-weight: bold;
cursor: default;
}
}
}
......
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View file @ 3fe8ee25
......@@ -172,20 +172,12 @@ button:active:not(.disabled) .btn-change-shape {background-position: -56px -
.menu-insertchart {
.group-description {
float: left;
width: 125px;
line-height: 58px;
padding-left: 6px;
padding-left: 4px;
}
.group-items-container {
float: left;
position: relative;
& > div {
float: left;
margin: 0 0 0 14px;
}
}
}
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7