Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix bugs

Browse source
This commit is contained in:
OVSharova 2022-02-25 05:02:26 +03:00
parent c6a9e1ccbc
commit b635255954
6 changed files with 73 additions and 52 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -247,6 +247,7 @@ define([
'<tr class="edit">',
'<td colspan="2"><span id="fms-chb-compatible"></span></td>',
'</tr>',
'<tr class ="editsave divider-group"></tr>',
'<tr class="collaboration">',
'<td colspan="2" class="group-name"><label><%= scope.txtCollaboration %></label></td>',
'</tr>',
@ -265,6 +266,7 @@ define([
'<label class="comment-text"><%= scope.txtStrictTip %></label></span>',
'</div></td>',
'</tr>',
'<tr class ="divider-subgroup coauth changes-mode"></tr>',
'<tr class="view-review">',
'<td colspan="2" class="subgroup-name"><label><%= scope.txtShowTrackChanges %></label></td>',
'</tr>',
@ -274,6 +276,7 @@ define([
'<tr class="view-review">',
'<td colspan="2"><div id="fms-rb-show-track-tooltips"></div></td>',
'</tr>',
'<tr class ="divider-subgroup view-review"></tr>',
'<tr class="comments">',
'<td colspan="2" class="subgroup-name"><label><%= scope.strShowChanges %></label></td>',
'</tr>',
@ -285,13 +288,14 @@ define([
'</tr>',
'<tr class="coauth changes-show">',
'<td colspan="2"><div id="fms-rb-show-changes-last"></div></td>',
'</tr>','<tr class="divider cchanges-show"></tr>',
'</tr>','<tr class="divider coauth changes-show"></tr>',
'<tr class="comments">',
'<td colspan="2"><div id="fms-chb-live-comment"></div></td>',
'</tr>',
'<tr class="comments">',
'<td colspan="2"><div id="fms-chb-resolved-comment"></div></td>',
'</tr>',
'<tr class ="collaboration divider-group"></tr>',
'<tr class ="edit">',
'<td colspan="2" class="group-name proofing"><label><%= scope.txtProofing %></label></td>',
'</tr>',
@ -301,6 +305,7 @@ define([
'<tr class="edit">',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtAutoCorrect %></button></div></td>',
'</tr>',
'<tr class ="edit divider-group"></tr>',
'<tr>',
'<td colspan="2" class="group-name"><label><%= scope.txtWorkspace %></label></td>',
'</tr>',
@ -333,7 +338,8 @@ define([
'<td>',
'<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px; vertical-align: middle;"></div>',
'</tr>',
'<tr class="fms-btn-apply">',
'<tr class ="divider-group"></tr>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.okButtonText %></button></td>',
'<td></td>',
'</tr>',
@ -435,8 +441,9 @@ define([
this.cmbZoom = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-zoom'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
menuStyle : 'max-height: 157px;',
data : [
@ -537,8 +544,9 @@ define([
].join(''));
this.cmbFontRender = new Common.UI.ComboBox({
el : $markup.find('#fms-cmb-font-render'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
itemsTemplate: itemsTemplate,
data : [
@ -555,7 +563,8 @@ define([
this.cmbUnit = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-unit'),
style : 'width: 160px;',
style : 'width: 128px;',
menuCls : 'menu-aligned',
editable : false,
cls : 'input-group-nr',
data : [
@ -570,7 +579,7 @@ define([
this.cmbMacros = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-macros'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
@ -605,8 +614,9 @@ define([
this.cmbTheme = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-theme'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
dataHint: '2',
dataHintDirection: 'bottom',
@ -682,7 +692,7 @@ define([
$('tr.forcesave', this.el)[mode.canForcesave ? 'show' : 'hide']();
$('tr.editsave',this.el)[mode.isEdit || mode.canForcesave ? 'show' : 'hide']();
if (this.mode.isDesktopApp && this.mode.isOffline) {
this.chAutosave.setCaption(this.strAutoRecover);
this.chAutosave.setCaption(this.textAutoRecover);
}
/** coauthoring begin **/
$('tr.collaboration', this.el)[mode.canCoAuthoring || mode.canViewReview ? 'show' : 'hide']();

16
apps/documenteditor/main/resources/less/filemenu.less
View file

@ -127,13 +127,9 @@
tr {
td {
padding: 6px 10px;
&.group-name {
padding-top: 22px;
&.top{padding-top: 5px}
label {
font-size: 14px;
.font-weight-bold();
}
&.group-name label {
font-size: 14px;
.font-weight-bold();
}
&.subgroup-name label{
@ -162,6 +158,12 @@
&.divider {
height: 10px;
}
&.divider-group {
height: 12px;
}
&.divider-subgroup{
height: 4px;
}
}
}
}

14
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -212,6 +212,7 @@ define([
'<tr class="edit">',
'<td colspan="2"><div id="fms-chb-paste-settings"></div></td>',
'</tr>',
'<tr class ="editsave divider-group"></tr>',
'<tr class="coauth changes">',
'<td colspan="2" class="group-name"><label><%= scope.txtCollaboration %></label></td>',
'</tr>',
@ -232,6 +233,7 @@ define([
'<label class="comment-text"><%= scope.txtStrictTip %></label></span>',
'</div></td>',
'</tr>',
'<tr class ="coauth changes divider-group"></tr>',
'<tr class="edit">',
'<td colspan="2" class="group-name"><label><%= scope.txtProofing %></label></td>',
'</tr>',
@ -241,6 +243,7 @@ define([
'<tr class="edit">',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.txtAutoCorrect %></button></div></td>',
'</tr>',
'<tr class ="edit divider-group"></tr>',
'<tr>',
'<td colspan="2" class="group-name"><label><%= scope.txtWorkspace %></label></td>',
'</tr>',
@ -271,6 +274,7 @@ define([
'<td><label><%= scope.strMacrosSettings %></label></td>',
'<td><div><div id="fms-cmb-macros"></div></div></td>',
'</tr>',
'<tr class ="divider-group"></tr>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="medium"><%= scope.okButtonText %></button></td>',
'<td></td>',
@ -315,7 +319,7 @@ define([
this.cmbZoom = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-zoom'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
cls : 'input-group-nr',
menuStyle : 'max-height: 157px;',
@ -398,7 +402,7 @@ define([
].join(''));
this.cmbFontRender = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-font-render'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
cls : 'input-group-nr',
itemsTemplate: itemsTemplate,
@ -416,7 +420,7 @@ define([
this.cmbUnit = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-unit'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
cls : 'input-group-nr',
data : [
@ -431,7 +435,7 @@ define([
this.cmbMacros = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-macros'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
@ -469,7 +473,7 @@ define([
this.cmbTheme = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-theme'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
cls : 'input-group-nr',
dataHint : '2',

13
apps/presentationeditor/main/resources/less/leftmenu.less
View file

@ -166,13 +166,9 @@
td {
padding: 6px 10px;
width: auto !important;
&.group-name {
padding-top: 22px;
&.top{padding-top: 5px}
label {
font-size: 14px;
.font-weight-bold();
}
&.group-name label {
font-size: 14px;
.font-weight-bold();
}
&.subgroup-name label{
@ -201,6 +197,9 @@
&.divider {
height: 10px;
}
&.divider-group {
height: 12px;
}
}
}
}

41
apps/spreadsheeteditor/main/app/view/FileMenuPanels.js
View file

@ -202,6 +202,7 @@ define([
'<tr class="edit">',
'<td colspan = "2"><div id="fms-chb-paste-settings"></div></td>',
'</tr>',
'<tr class ="editsave divider-group"></tr>',
'<tr class="collaboration" >',
'<td class="group-name" colspan="2"><label><%= scope.txtCollaboration %></label></td>',
'</tr>',
@ -222,12 +223,14 @@ define([
'<label class="comment-text"><%= scope.txtStrictTip %></label></span>',
'</div></td>',
'</div></tr>',
'<tr class ="divider coauth changes"></tr>',
'<tr class="comments">',
'<td colspan="2"><div id="fms-chb-live-comment"></div></td>',
'</tr>',
'<tr class="comments">',
'<td colspan="2"><div id="fms-chb-resolved-comment"></div></td>',
'</tr>',
'<tr class ="collaboration divider-group"></tr>',
'<tr >',
'<td class="group-name" colspan="2"><label><%= scope.txtWorkspace %></label></td>',
'</tr>',
@ -257,6 +260,7 @@ define([
'<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
'</td>',
'</tr>',
'<tr class ="divider-group"></tr>',
'<tr>',
'<td class="group-name" colspan="2"><label><%= scope.strRegSettings %></label></td>',
'</tr>',
@ -276,14 +280,15 @@ define([
'<td colspan="2"><div id="fms-chb-separator-settings"></div></td>',
'</tr>',
'<tr>',
'<td><label><%= scope.strDecimalSeparator %></label></td>',
'<td><label class = "label-separator"><%= scope.strDecimalSeparator %></label></td>',
'<td><div id="fms-decimal-separator"></div></td>',
'</tr>',
'<tr>',
'<td><label><%= scope.strThousandsSeparator %></label></td>',
'<td><label class = "label-separator"><%= scope.strThousandsSeparator %></label></td>',
'<td><div id="fms-thousands-separator"></div></td>',
'</tr>',
'<tr>',
'<tr class ="divider-group"></tr>',
'<tr class="edit">',
'<td colspan="2" class="group-name"><label><%= scope.txtProofing %></label></td>',
'</tr>',
'<tr class="spellcheck">',
@ -297,10 +302,10 @@ define([
'<tr class="spellcheck">',
'<td colspan="2"><span id="fms-chb-ignore-numbers-words"></span></td>',
'</tr>',
'<tr>',
'<tr class="edit">',
'<td colspan="2"><button type="button" class="btn btn-text-default" id="fms-btn-auto-correct" style="width:auto; display: inline-block;padding-right: 10px;padding-left: 10px;" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.txtAutoCorrect %></button></div></td>',
'</tr>',
'<tr class ="divider-group"></tr>',
'<tr class="fms-btn-apply">',
'<td style="padding-top:15px; padding-bottom: 15px;"><button class="btn normal dlg-btn primary" data-hint="3" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
'<td></td>',
@ -378,8 +383,9 @@ define([
this.cmbZoom = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-zoom'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
menuStyle : 'max-height: 157px;',
data : [
@ -411,8 +417,9 @@ define([
].join(''));
this.cmbFontRender = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-font-render'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
itemsTemplate: itemsTemplate,
data : [
@ -449,8 +456,9 @@ define([
this.cmbUnit = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-unit'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
data : [
{ value: Common.Utils.Metric.c_MetricUnits['cm'], displayValue: this.txtCm },
@ -476,7 +484,7 @@ define([
this.cmbFuncLocale = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-func-locale'),
style : 'width: 160px;',
style : 'width: 200px;',
menuStyle: 'max-height: 185px;',
editable : false,
cls : 'input-group-nr',
@ -499,7 +507,7 @@ define([
this.cmbRegSettings = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-reg-settings'),
style : 'width: 160px;',
style : 'width: 200px;',
menuStyle: 'max-height: 185px;',
editable : false,
cls : 'input-group-nr',
@ -590,7 +598,7 @@ define([
this.cmbMacros = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-macros'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
menuCls : 'menu-aligned',
cls : 'input-group-nr',
@ -621,7 +629,7 @@ define([
this.cmbTheme = new Common.UI.ComboBox({
el : $markup.findById('#fms-cmb-theme'),
style : 'width: 160px;',
style : 'width: 128px;',
editable : false,
cls : 'input-group-nr',
dataHint : '2',
@ -632,8 +640,9 @@ define([
this.cmbDictionaryLanguage = new Common.UI.ComboBox({
el: $markup.findById('#fms-cmb-dictionary-language'),
cls: 'input-group-nr',
style: 'width: 267px;',
style: 'width: 200px;',
editable: false,
menuCls : 'menu-aligned',
menuStyle: 'min-width: 267px; max-height: 209px;',
dataHint: '2',
dataHintDirection: 'bottom',
@ -734,7 +743,7 @@ define([
if ( !Common.UI.Themes.available() ) {
$('tr.themes, tr.themes + tr.divider', this.el).hide();
}
$('tr.spellcheck', this.el)[Common.UI.FeaturesManager.canChange('spellcheck') ? 'show' : 'hide']();
$('tr.spellcheck', this.el)[Common.UI.FeaturesManager.canChange('spellcheck') && mode.isEdit ? 'show' : 'hide']();
},
setApi: function(api) {
@ -835,7 +844,7 @@ define([
this.cmbTheme.setValue(item ? item.get('value') : Common.UI.Themes.defaultThemeId());
}
if (Common.UI.FeaturesManager.canChange('spellcheck')) {
if (Common.UI.FeaturesManager.canChange('spellcheck') && this.mode.isEdit) {
var arrLang = SSE.getController('Spellcheck').loadLanguages(),
allLangs = arrLang[0],
@ -926,7 +935,7 @@ define([
Common.NotificationCenter.trigger('settings:unitschanged', this);
}
if (Common.UI.FeaturesManager.canChange('spellcheck')) {
if (Common.UI.FeaturesManager.canChange('spellcheck') && this.mode.isEdit) {
var value = this.chIgnoreUppercase.isChecked();
Common.localStorage.setBool("sse-spellcheck-ignore-uppercase-words", value);

15
apps/spreadsheeteditor/main/resources/less/leftmenu.less
View file

@ -211,13 +211,9 @@
td {
//padding: 5px 10px;
padding: 6px 10px;
&.group-name {
padding-top: 22px;
&.top{padding-top: 5px}
label {
font-size: 14px;
.font-weight-bold();
}
&.group-name label {
font-size: 14px;
.font-weight-bold();
}
&.subgroup-name label{
@ -229,8 +225,6 @@
opacity: 0.45;
}
&.left {
text-align: right;
width: 30%;
@ -249,6 +243,9 @@
&.divider {
height: 10px;
}
&.divider-group {
height: 12px;
}
}
&.main {