DE restyle
This commit is contained in:
OVSharova
parent
d239ff5831
commit
4748c7a6cd
|
|
@ -231,108 +231,107 @@ define([
|
|||
|
||||
template: _.template([
|
||||
'<div class="flex-settings">',
|
||||
'<table style="margin: 30px 0 0;"><tbody>',
|
||||
'<table style="margin: 11px 0 0;"><tbody>',
|
||||
'<tr class="edit">',
|
||||
'<td class="left"><label><%= scope.txtEditingSaving %></label></td>',
|
||||
'<td class="group-name top"><label><%= scope.txtEditingSaving %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="autosave">',
|
||||
'<td class="right"><span id="fms-chb-autosave"></span></td>',
|
||||
'<td><span id="fms-chb-autosave"></span></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="right"><div id="fms-chb-paste-settings"></div></td>',
|
||||
'<td><div id="fms-chb-paste-settings"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="right"><span id="fms-chb-compatible"></span></td>',
|
||||
'<td><span id="fms-chb-compatible"></span></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="left"><label><%= scope.txtCollaboration %></label></td>',
|
||||
'<td class="group-name"><label><%= scope.txtCollaboration %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="coauth changes-mode">',
|
||||
'<td class="left"><label><%= scope.strCoAuthMode %></label></td>',
|
||||
'<td class="subgroup-name"><label><%= scope.strCoAuthMode %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="coauth changes-mode">',
|
||||
'<td class="right" style="display: flex;"><div id="fms-rb-coauth-mode-fast" ></div>',
|
||||
'<span><label><%= scope.strFast %></label><br>',
|
||||
'<label>Real-time co-editing. All changes are saved automatically</label></span></div></div>',
|
||||
'<td style="display: flex;"><div id="fms-rb-coauth-mode-fast"></div>',
|
||||
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strFast %></label>',
|
||||
'<label class="comment-text">Real-time co-editing. All changes are saved automatically</label></span></div></div>',
|
||||
'</td>',
|
||||
'</tr>',
|
||||
'<tr class="coauth changes-mode">',
|
||||
'<td class="right" style="display: flex;"><div id="fms-rb-coauth-mode-strict"></div>',
|
||||
'<span><label><%= scope.strStrict %></label><br>',
|
||||
'<label>Use the \'Save\' button to sync the changes you and others make</label></span>',
|
||||
'<td style="display: flex;"><div id="fms-rb-coauth-mode-strict"></div>',
|
||||
'<span style ="display: flex; flex-direction: column;"><label><%= scope.strStrict %></label>',
|
||||
'<label class="comment-text">Use the \'Save\' button to sync the changes you and others make</label></span>',
|
||||
'</div></td>',
|
||||
'</tr>',
|
||||
'<tr class="view-review">',
|
||||
'<td class="left"><label><%= scope.txtShowTrackChanges %></label></td>',
|
||||
'<td class="subgroup-name"><label><%= scope.txtShowTrackChanges %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="view-review">',
|
||||
'<td class="right"><div id="fms-rb-show-track-ballons"></div></td>',
|
||||
'<td><div id="fms-rb-show-track-ballons"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="view-review">',
|
||||
'<td class="right"><div id="fms-rb-show-track-tooltips"></div></td>',
|
||||
'<td><div id="fms-rb-show-track-tooltips"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="left"><label><%= scope.strShowChanges %></label></td>',
|
||||
'<td class="subgroup-name"><label><%= scope.strShowChanges %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit show-changes">',
|
||||
'<td class="right"><div id="fms-rb-show-changes-none"></div></td>',
|
||||
'<td><div id="fms-rb-show-changes-none"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit show-changes">',
|
||||
'<td class="right"><div id="fms-rb-show-changes-all"></div></td>',
|
||||
'<td><div id="fms-rb-show-changes-all"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit show-changes">',
|
||||
'<td class="right"><div id="fms-rb-show-changes-last"></div></td>',
|
||||
'<td><div id="fms-rb-show-changes-last"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="comments">',
|
||||
'<td class="right"><div id="fms-chb-live-comment"></div></td>',
|
||||
'<td><div id="fms-chb-live-comment"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="comments">',
|
||||
'<td class="right"><div id="fms-chb-resolved-comment"></div></td>',
|
||||
'<td><div id="fms-chb-resolved-comment"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="left"><label><%= scope.txtProofing %></label></td>',
|
||||
'<td class="group-name"><label><%= scope.txtProofing %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit spellcheck">',
|
||||
'<td class="right"><div id="fms-chb-spell-check"></div></td>',
|
||||
'<td><div id="fms-chb-spell-check"></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="right"><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>',
|
||||
'<td><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">',
|
||||
'<td class="left"><label><%= scope.txtWorkspace %></label></td>',
|
||||
'<td class="group-name"><label><%= scope.txtWorkspace %></label></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="right"><span id="fms-chb-align-guides"></span></td>',
|
||||
'<td><span id="fms-chb-align-guides"></span></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="right"><div id="fms-chb-input-mode"></div></td>',
|
||||
'<td><div id="fms-chb-input-mode"></div></td>',
|
||||
'</tr>',
|
||||
|
||||
'</tbody></table>',
|
||||
'<table style="margin: 30px 0 0;"><tbody>',
|
||||
'<table style="margin: 16px 0 0;"><tbody>',
|
||||
'<tr class="themes">',
|
||||
'<td class="left"><label><%= scope.strTheme %></label></td>',
|
||||
'<td class="right">',
|
||||
'<div><div id="fms-cmb-theme" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
|
||||
'<td><label><%= scope.strTheme %></label></td>',
|
||||
'<td>',
|
||||
'<div style="display: flex;"><div id="fms-cmb-theme" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
|
||||
'<div id="fms-chb-dark-mode" style="display: inline-block; vertical-align: middle;margin-top: 2px;"></div></div></td>',
|
||||
'</tr>',
|
||||
'<tr class="edit">',
|
||||
'<td class="left"><label><%= scope.strUnit %></label></td>',
|
||||
'<td class="right"><span id="fms-cmb-unit"></span></td>',
|
||||
'<td><label><%= scope.strUnit %></label></td>',
|
||||
'<td><span id="fms-cmb-unit"></span></td>',
|
||||
'</tr>',
|
||||
'<tr>',
|
||||
'<td class="left"><label><%= scope.strZoom %></label></td>',
|
||||
'<td class="right"><div id="fms-cmb-zoom" class="input-group-nr"></div></td>',
|
||||
'<td><label><%= scope.strZoom %></label></td>',
|
||||
'<td><div id="fms-cmb-zoom" class="input-group-nr"></div></td>',
|
||||
'</tr>',
|
||||
'<tr>',
|
||||
'<td class="left"><label><%= scope.strFontRender %></label></td>',
|
||||
'<td class="right"><span id="fms-cmb-font-render"></span></td>',
|
||||
'<td><label><%= scope.strFontRender %></label></td>',
|
||||
'<td><span id="fms-cmb-font-render"></span></td>',
|
||||
'</tr>',
|
||||
'<tr class="macros">',
|
||||
'<td class="left"><label><%= scope.strMacrosSettings %></label></td>',
|
||||
'<td class="right">',
|
||||
'<td><label><%= scope.strMacrosSettings %></label></td>',
|
||||
'<td>',
|
||||
'<div><div id="fms-cmb-macros" style="display: inline-block; margin-right: 15px;vertical-align: middle;"></div>',
|
||||
'<label id="fms-lbl-macros" style="vertical-align: middle;"><%= scope.txtWarnMacrosDesc %></label></div></td>',
|
||||
'</tr>',
|
||||
'</tbody></table>',
|
||||
|
||||
|
|
@ -341,7 +340,7 @@ define([
|
|||
'<table style="margin: 10px 0;"><tbody>',
|
||||
'<tr>',
|
||||
'<td class="left"></td>',
|
||||
'<td class="right"><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
|
||||
'<td><button class="btn normal dlg-btn primary" data-hint="2" data-hint-direction="bottom" data-hint-offset="big"><%= scope.okButtonText %></button></td>',
|
||||
'</tr>',
|
||||
'</tbody></table>',
|
||||
'</div>'
|
||||
|
|
@ -579,13 +578,16 @@ define([
|
|||
{ value: 0, displayValue: this.txtWarnMacros, descValue: this.txtWarnMacrosDesc },
|
||||
{ value: 1, displayValue: this.txtRunMacros, descValue: this.txtRunMacrosDesc }
|
||||
],
|
||||
itemsTemplate: _.template([
|
||||
'<% _.each(items, function(item) { %>',
|
||||
'<li id="<%= item.id %>" data-value="<%- item.value %>"><a tabindex="-1" type="menuitem" style ="display: flex; flex-direction: column;">',
|
||||
'<label><%= scope.getDisplayValue(item) %></label><label class="comment-text"><%= item.descValue %></label></a></li>',
|
||||
'<% }); %>'
|
||||
].join('')),
|
||||
dataHint: '2',
|
||||
dataHintDirection: 'bottom',
|
||||
dataHintOffset: 'big'
|
||||
}).on('selected', function(combo, record) {
|
||||
me.lblMacrosDesc.text(record.descValue);
|
||||
});
|
||||
this.lblMacrosDesc = $markup.findById('#fms-lbl-macros');
|
||||
|
||||
this.chPaste = new Common.UI.CheckBox({
|
||||
el: $markup.findById('#fms-chb-paste-settings'),
|
||||
|
|
@ -767,7 +769,6 @@ define([
|
|||
|
||||
item = this.cmbMacros.store.findWhere({value: Common.Utils.InternalSettings.get("de-macros-mode")});
|
||||
this.cmbMacros.setValue(item ? item.get('value') : 0);
|
||||
this.lblMacrosDesc.text(item ? item.get('descValue') : this.txtWarnMacrosDesc);
|
||||
|
||||
this.chPaste.setValue(Common.Utils.InternalSettings.get("de-settings-paste-button"));
|
||||
|
||||
|
|
|
|||
|
|
@ -123,30 +123,46 @@
|
|||
|
||||
#panel-settings {
|
||||
table {
|
||||
width: 100%;
|
||||
width: 500px;
|
||||
tr {
|
||||
|
||||
td {
|
||||
padding: 5px 10px;
|
||||
|
||||
&.left {
|
||||
//text-align: right;
|
||||
width: 30%;
|
||||
|
||||
padding: 6px 10px;
|
||||
&.group-name {
|
||||
padding-top: 22px;
|
||||
&.top{padding-top: 5px}
|
||||
label {
|
||||
font-size: 14px;
|
||||
.font-weight-bold();
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
&.right {
|
||||
width: 70%;
|
||||
&.subgroup-name label{
|
||||
font-size: 11px;
|
||||
.font-weight-bold();
|
||||
}
|
||||
|
||||
.comment-text{
|
||||
opacity: 0.45;
|
||||
}
|
||||
}
|
||||
|
||||
&.left {
|
||||
text-align: right;
|
||||
width: 30%;
|
||||
label {
|
||||
.font-weight-bold();
|
||||
font-size: 12px;
|
||||
}
|
||||
}
|
||||
|
||||
&.right {
|
||||
width: 70%;
|
||||
}
|
||||
|
||||
&.divider {
|
||||
height: 10px;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue