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

[DE][PE] File menu refactoring

Browse source
This commit is contained in:
Julia Radzhabova 2020-08-07 13:51:26 +03:00
parent 08b5e32261
commit 1b5abe0aa9
4 changed files with 32 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -188,7 +188,7 @@ define([
menu: undefined, menu: undefined,
template: _.template([ template: _.template([
'<div id="fms-flex-settings">', '<div class="flex-settings">',
'<table style="margin: 30px 0 0;"><tbody>', '<table style="margin: 30px 0 0;"><tbody>',
/** coauthoring begin **/ /** coauthoring begin **/
'<tr class="comments">', '<tr class="comments">',
@ -452,7 +452,7 @@ define([
this.btnApply.on('click', this.applySettings.bind(this)); this.btnApply.on('click', this.applySettings.bind(this));
this.pnlSettings = $markup.findById('#fms-flex-settings'); this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.$el = $(node).html($markup); this.$el = $(node).html($markup);
@ -846,7 +846,7 @@ define([
this.rendered = false; this.rendered = false;
this.template = _.template([ this.template = _.template([
'<div id="fms-flex-info">', '<div class="flex-settings">',
'<table class="main" style="margin: 30px 0 0;">', '<table class="main" style="margin: 30px 0 0;">',
'<tr>', '<tr>',
'<td class="left"><label>' + this.txtPlacement + '</label></td>', '<td class="left"><label>' + this.txtPlacement + '</label></td>',
@ -1052,7 +1052,7 @@ define([
}); });
this.btnApply.on('click', _.bind(this.applySettings, this)); this.btnApply.on('click', _.bind(this.applySettings, this));
this.pnlInfo = $markup.findById('#fms-flex-info'); this.pnlInfo = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.findById('#fms-flex-apply'); this.pnlApply = $markup.findById('#fms-flex-apply');
this.rendered = true; this.rendered = true;

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

@ -120,21 +120,26 @@
} }
} }
#panel-settings { .flex-settings {
#file-menu-panel & { #file-menu-panel & {
padding: 0;
display: flex;
flex-direction: column;
}
#fms-flex-settings {
&.bordered { &.bordered {
border-bottom: 1px solid @gray; border-bottom: 1px solid @gray;
} }
overflow: hidden; overflow: hidden;
position: relative; position: relative;
} }
}
#panel-settings,
#panel-info {
#file-menu-panel & {
padding: 0;
display: flex;
flex-direction: column;
}
}
#panel-settings {
table { table {
width: 100%; width: 100%;
@ -315,23 +320,6 @@
} }
} }
#panel-info {
#file-menu-panel & {
padding: 0;
display: flex;
flex-direction: column;
}
#fms-flex-info {
&.bordered {
border-bottom: 1px solid @gray;
}
overflow: hidden;
position: relative;
}
}
#panel-rights { #panel-rights {
#file-menu-panel & { #file-menu-panel & {
padding: 0 30px; padding: 0 30px;

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

@ -180,7 +180,7 @@ define([
menu: undefined, menu: undefined,
template: _.template([ template: _.template([
'<div id="fms-flex-settings">', '<div class="flex-settings">',
'<table style="margin: 30px 0 0;"><tbody>', '<table style="margin: 30px 0 0;"><tbody>',
'<tr class="edit">', '<tr class="edit">',
'<td class="left"><label><%= scope.txtSpellCheck %></label></td>', '<td class="left"><label><%= scope.txtSpellCheck %></label></td>',
@ -395,7 +395,7 @@ define([
this.btnApply.on('click', _.bind(this.applySettings, this)); this.btnApply.on('click', _.bind(this.applySettings, this));
this.pnlSettings = $markup.findById('#fms-flex-settings'); this.pnlSettings = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.$el = $(node).html($markup); this.$el = $(node).html($markup);
@ -752,7 +752,7 @@ define([
this.rendered = false; this.rendered = false;
this.template = _.template([ this.template = _.template([
'<div id="fms-flex-info">', '<div class="flex-settings">',
'<table class="main" style="margin: 30px 0 0;">', '<table class="main" style="margin: 30px 0 0;">',
'<tr>', '<tr>',
'<td class="left"><label>' + this.txtPlacement + '</label></td>', '<td class="left"><label>' + this.txtPlacement + '</label></td>',
@ -926,7 +926,7 @@ define([
}); });
this.btnApply.on('click', _.bind(this.applySettings, this)); this.btnApply.on('click', _.bind(this.applySettings, this));
this.pnlInfo = $markup.findById('#fms-flex-info'); this.pnlInfo = $markup.find('.flex-settings').addBack().filter('.flex-settings');
this.pnlApply = $markup.findById('#fms-flex-apply'); this.pnlApply = $markup.findById('#fms-flex-apply');
this.rendered = true; this.rendered = true;

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

@ -189,19 +189,22 @@
} }
} }
#panel-settings { .flex-settings {
&.bordered {
border-bottom: 1px solid @gray;
}
overflow: hidden;
position: relative;
}
#panel-settings,
#panel-info {
padding: 0; padding: 0;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
}
#fms-flex-settings { #panel-settings {
&.bordered {
border-bottom: 1px solid @gray;
}
overflow: hidden;
position: relative;
}
table { table {
width: 100%; width: 100%;
@ -385,21 +388,6 @@
} }
} }
#panel-info {
padding: 0;
display: flex;
flex-direction: column;
#fms-flex-info {
&.bordered {
border-bottom: 1px solid @gray;
}
overflow: hidden;
position: relative;
}
}
#panel-rights { #panel-rights {
padding: 0 30px; padding: 0 30px;
} }