pengjunjie/web-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/web-apps.git synced 2026-04-07 14:06:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request 'feat: load svg icons for 1 and 2+ scale ratio' (#56) from feature/1x-svg-icons into develop"

Browse Source 
This reverts commit 01b702c7ab, reversing
changes made to 5996ce6d6d.
This commit is contained in:
maxkadushkin
2024-11-02 20:21:08 +03:00
parent 01b702c7ab
commit c3876af72e
41 changed files with 336 additions and 335 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
apps/common/main/lib/component/Button.js
View File

@ -184,9 +184,10 @@ define([
'<% if ( iconImg ) { %>' +
'<img src="<%= iconImg %>">' +
'<% } else { %>' +
'<svg class="icon <%= (iconCls ? iconCls.indexOf("icon-rtl") : -1) > -1 ? "icon-rtl" : "" %>">' +
'<use class="zoom-int" xlink:href="#<%= /btn-[^\\s]+/.exec(iconCls)[0] %>"></use>' +
'</svg>' +
'<% if (/svgicon/.test(iconCls)) {' +
'print(\'<svg class=\"icon uni-scale\"><use class=\"zoom-int\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'\"></use></svg>\');' +
'} else ' +
'print(\'<i class=\"icon \' + iconCls + \'\">&nbsp;</i>\'); %>' +
'<% } %>';
var templateBtnCaption =
@ -282,17 +283,14 @@ define([
template: _.template([
'<% var applyicon = function() { %>',
'<% if (iconImg) { %>',
'<img src="<%= iconImg %>" alt="Icon">',
'<% } else if (iconCls) { %>',
'<% if (/btn-[^\\s]+/.test(iconCls)) { %>',
'<svg class="icon <%= (iconCls ? iconCls.indexOf("icon-rtl") : -1) > -1 ? "icon-rtl" : "" %>"><use class="zoom-int" xlink:href="#<%= /btn-[^\\s]+/.exec(iconCls)[0] %>"></use></svg>',
'<% } else if (/svg-[^\\s]+/.test(iconCls)) { %>',
'<svg class="icon permanent-icon <%= (iconCls ? iconCls.indexOf("icon-rtl") : -1) > -1 ? "icon-rtl" : "" %>"><use class="zoom-int" xlink:href="#<%= /svg-[^\\s]+/.exec(iconCls)[0] %>"></use></svg>',
'<% } else { %>',
'<i class="icon <% iconCls %>"></i>',
'<% } %>',
'<% } %>',
'<% if (iconImg) { print(\'<img src=\"\' + iconImg + \'\">\'); } else { %>',
// '<% if (iconCls != "") { print(\'<i class=\"icon \' + iconCls + \'\">&nbsp;</i>\'); }} %>',
'<% if (iconCls != "") { ' +
' if (/svgicon/.test(iconCls)) {' +
'print(\'<svg class=\"icon uni-scale\"><use class=\"zoom-int\" xlink:href=\"#\' + /svgicon\\s(\\S+)/.exec(iconCls)[1] + \'\"></use></svg>\');' +
'} else ' +
'print(\'<i class=\"icon \' + iconCls + \'\">&nbsp;</i>\'); ' +
'}} %>',
'<% } %>',
'<% if ( !menu && onlyIcon ) { %>',
'<button type="button" class="btn <%= cls %>" id="<%= id %>" style="<%= style %>" data-hint="<%= dataHint %>" data-hint-direction="<%= dataHintDirection %>" data-hint-offset="<%= dataHintOffset %>" <% if (dataHintTitle) { %> data-hint-title="<%= dataHintTitle %>" <% } %>>',
@ -434,7 +432,8 @@ define([
if ( me.split === true ) {
!!me.cls && (me.cls = me.cls.replace(/\s?(?:x-huge|icon-top)/g, ''));
this.template = _.template(templateHugeSplitCaption);
} else if ( !!me.menu ) {
} else
if ( !!me.menu ) {
this.template = _.template(templateHugeMenuCaption);
} else {
this.template = _.template(templateHugeCaption);
@ -472,16 +471,6 @@ define([
parentEl.html(me.cmpEl);
me.$icon = me.$el.find('.icon');
}
} else {
if (me.options.el || me.cmpEl) {
if ( !$('.icon', me.cmpEl).length && (me.iconCls || me.options.iconImg) ) {
const icon_el = _.template(templateBtnIcon)({
iconCls : me.iconCls,
iconImg : me.options.iconImg,
});
me.cmpEl.append(icon_el);
}
}
}
if (!me.rendered) {
@ -585,7 +574,7 @@ define([
var onAfterHideMenu = function(e, isFromInputControl) {
me.cmpEl.find('.dropdown-toggle').blur();
if (me.cmpEl.hasClass('active') !== me.pressed)
if (me.cmpEl.hasClass('active') !== me.pressed)
me.cmpEl.trigger('button.internal.active', [me.pressed]);
};
@ -629,7 +618,9 @@ define([
me.applyScaling(Common.UI.Scaling.currentRatio());
el.on('app:scaling', function (e, info) {
me.applyScaling(info.ratio);
if ( me.options.scaling != info.ratio ) {
me.applyScaling(info.ratio);
}
});
}
@ -773,34 +764,41 @@ define([
svgIcon = $(this.el).find('.icon use.zoom-int');
this.iconCls = cls;
svgIcon.attr('xlink:href', cls.length > 0 ? '#' + /btn-[^\s]+/.exec(this.iconCls)[0] : '');
btnIconEl.removeClass(oldCls);
btnIconEl.addClass(cls || '');
if (this.options.scaling === false) {
btnIconEl.addClass('scaling-off');
if (/svgicon/.test(this.iconCls)) {
var icon = /svgicon\s(\S+)/.exec(this.iconCls);
svgIcon.attr('xlink:href', icon && icon.length > 1 ? '#' + icon[1] : '');
} else {
if (svgIcon.length) {
var icon = /btn-[^\s]+/.exec(this.iconCls);
svgIcon.attr('href', icon ? '#' + icon[0]: '');
}
btnIconEl.removeClass(oldCls);
btnIconEl.addClass(cls || '');
if (this.options.scaling === false) {
btnIconEl.addClass('scaling-off');
}
}
},
changeIcon: function(opts) {
let btnIconEl = $(this.el).find('i.icon');
let svgIcon = $(this.el).find('.icon use.zoom-int');
if (opts && (opts.curr || opts.next)) {
var me = this,
btnIconEl = $(this.el).find('i.icon');
if (btnIconEl.length > 1) btnIconEl = $(btnIconEl[0]);
if (opts && (opts.curr || opts.next) && btnIconEl) {
var svgIcon = $(this.el).find('.icon use.zoom-int');
if (opts.curr) {
btnIconEl.length && btnIconEl.removeClass(opts.curr);
this.iconCls = this.iconCls.replace(opts.curr, '').trim();
btnIconEl.removeClass(opts.curr);
me.iconCls = me.iconCls.replace(opts.curr, '').trim();
}
if (opts.next) {
!btnIconEl.hasClass(opts.next) && (btnIconEl.addClass(opts.next));
(this.iconCls.indexOf(opts.next) < 0) && (this.iconCls += ' ' + opts.next);
(me.iconCls.indexOf(opts.next)<0) && (me.iconCls += ' ' + opts.next);
}
svgIcon.length && !!opts.next && svgIcon.attr('href', '#' + opts.next);
if (!!this.options.signals) {
if (!(this.options.signals.indexOf('icon:changed') < 0)) {
this.trigger('icon:changed', this, opts);
if ( !!me.options.signals ) {
if ( !(me.options.signals.indexOf('icon:changed') < 0) ) {
me.trigger('icon:changed', me, opts);
}
}
}
@ -990,13 +988,25 @@ define([
},
applyScaling: function (ratio) {
if (this.options.scaling !== ratio) {
this.options.scaling = ratio;
const me = this;
if ( me.options.scaling != ratio ) {
// me.cmpEl.attr('ratio', ratio);
me.options.scaling = ratio;
const $el = this.$el.is('button') ? this.$el : this.$el.find('button:first');
if (ratio > 1 && ratio < 2) {
if (!$el.find('i.icon').length && !this.options.iconCls.includes('svgicon')) {
$el.find('svg.icon').after(`<i class="icon ${this.iconCls}">&nbsp;</i>`);
if (ratio > 2) {
const $el = me.$el.is('button') ? me.$el : me.$el.find('button:first');
if (!$el.find('svg.icon').length) {
const iconCls = me.iconCls || $el.find('i.icon').attr('class');
const re_icon_name = /btn-[^\s]+/.exec(iconCls);
const icon_name = re_icon_name ? re_icon_name[0] : "null";
const rtlCls = (iconCls ? iconCls.indexOf('icon-rtl') : -1) > -1 ? 'icon-rtl' : '';
const svg_icon = '<svg class="icon %rtlCls"><use class="zoom-int" href="#%iconname"></use></svg>'.replace('%iconname', icon_name).replace('%rtlCls', rtlCls);
$el.find('i.icon').after(svg_icon);
}
} else {
if (!me.$el.find('i.icon')) {
const png_icon = '<i class="icon %cls">&nbsp;</i>'.replace('%cls', me.iconCls);
me.$el.find('svg.icon').after(png_icon);
}
}
}

2
apps/common/main/lib/component/DataView.js
View File

@ -231,7 +231,7 @@ define([
applyScaling: function (ratio) {
this.scaling = ratio;
if (ratio === 1 || ratio >= 2) {
if (ratio > 2) {
var el = this.$el || $(this.el),
icon = el.find('.options__icon');
if (icon.length > 0) {

30
apps/common/main/lib/component/Label.js
View File

@ -56,13 +56,12 @@ define([
caption : ''
},
template: _.template('<label class="label-cmp <%= cls %>" style="<%= style %>">' +
'<% if ( iconCls ) { %>' +
'<svg class="icon"><use class="zoom-int" xlink:href="#<%= /btn-[^\\s]+/.exec(iconCls)[0] %>"></use></svg>' +
'<% } %>' +
'<span class="caption"><%= caption %></span>' +
'</label>'
),
template : _.template('<label class="label-cmp <%= cls %>" style="<%= style %>">' +
'<% if ( iconCls ) { %>' +
'<i class="icon <%= iconCls %>"></i>' +
'<% } %>' +
'<span class="caption"><%= caption %></span>' +
'</label>'),
initialize : function(options) {
Common.UI.BaseView.prototype.initialize.call(this, options);
@ -109,7 +108,9 @@ define([
this.applyScaling(Common.UI.Scaling.currentRatio());
this.$label.on('app:scaling', function (e, info) {
me.applyScaling(info.ratio);
if (me.options.scaling != info.ratio) {
me.applyScaling(info.ratio);
}
});
}
@ -133,12 +134,17 @@ define([
},
applyScaling: function (ratio) {
if (this.options.scaling !== ratio) {
if (this.options.scaling != ratio) {
this.options.scaling = ratio;
if (ratio > 1 && ratio < 2) {
if (!this.$label.find('i.icon').length) {
this.$label.find('svg.icon').after(`<i class="icon ${this.iconCls}"></i>`);
if (ratio > 2) {
if (!this.$label.find('svg.icon').length) {
var iconCls = this.iconCls,
re_icon_name = /btn-[^\s]+/.exec(iconCls),
icon_name = re_icon_name ? re_icon_name[0] : "null",
svg_icon = '<svg class="icon"><use class="zoom-int" href="#%iconname"></use></svg>'.replace('%iconname', icon_name);
this.$label.find('i.icon').after(svg_icon);
}
}
}

31
apps/common/main/lib/component/MenuItem.js
View File

@ -114,9 +114,7 @@ define([
template: _.template([
'<a id="<%= id %>" class="menu-item" <% if (_.isEmpty(iconCls)) { %> data-no-icon <% } %> style="<%= style %>" <% if(options.canFocused) { %> tabindex="-1" type="menuitem" <% }; if(!_.isUndefined(options.stopPropagation)) { %> data-stopPropagation="true" <% }; if(!_.isUndefined(options.dataHint)) { %> data-hint="<%= options.dataHint %>" <% }; if(!_.isUndefined(options.dataHintDirection)) { %> data-hint-direction="<%= options.dataHintDirection %>" <% }; if(!_.isUndefined(options.dataHintOffset)) { %> data-hint-offset="<%= options.dataHintOffset %>" <% }; if(options.dataHintTitle) { %> data-hint-title="<%= options.dataHintTitle %>" <% }; %> >',
'<% if (!_.isEmpty(iconCls)) { %>',
'<svg class="menu-item-icon <%= (iconCls ? iconCls.indexOf("icon-rtl") : -1) > -1 ? "icon-rtl" : "" %>">',
'<use class="zoom-int" xlink:href="#<%= /btn-[^\\s]+/.exec(iconCls)[0] %>"></use>',
'</svg>',
'<span class="menu-item-icon <%= iconCls %>"></span>',
'<% } else if (!_.isEmpty(iconImg)) { %>',
'<img src="<%= iconImg %>" class="menu-item-icon">',
'<% } %>',
@ -241,7 +239,9 @@ define([
me.applyScaling(Common.UI.Scaling.currentRatio());
el.on('app:scaling', function (e, info) {
me.applyScaling(info.ratio);
if ( me.options.scaling != info.ratio ) {
me.applyScaling(info.ratio);
}
});
}
}
@ -264,7 +264,6 @@ define([
},
setIconCls: function(iconCls) {
// todo: rework setIconCls
if (this.rendered && !_.isEmpty(this.iconCls)) {
var firstChild = this.cmpEl.children(':first');
if (firstChild) {
@ -393,7 +392,7 @@ define([
_doUnHover: function(e) {
var me = this;
if (me.cmpEl.hasClass('dropdown-submenu') && me.cmpEl.hasClass('over') &&
(e && e.relatedTarget && me.cmpEl.find(e.relatedTarget).length>0 || me.cmpEl.hasClass('focused-submenu'))) {
(e && e.relatedTarget && me.cmpEl.find(e.relatedTarget).length>0 || me.cmpEl.hasClass('focused-submenu'))) {
// When focus go from menuItem to it's submenu don't hide this submenu
me.cmpEl.removeClass('focused-submenu');
return;
@ -439,12 +438,20 @@ define([
},
applyScaling: function (ratio) {
if (this.options.scaling !== ratio) {
this.options.scaling = ratio;
if (ratio > 1 && ratio < 2) {
const firstChild = this.cmpEl.children(':first');
if (!firstChild.find('span.menu-item-icon').length) {
firstChild.find('svg.menu-item-icon').after(`<span class="menu-item-icon ${this.iconCls}"></span>`);
var me = this;
if (me.options.scaling != ratio) {
me.options.scaling = ratio;
var firstChild = this.cmpEl.children(':first');
if (ratio > 2) {
if (!firstChild.find('svg.menu-item-icon').length) {
var iconCls = me.iconCls,
re_icon_name = /btn-[^\s]+/.exec(iconCls),
icon_name = re_icon_name ? re_icon_name[0] : "null",
rtlCls = (iconCls ? iconCls.indexOf('icon-rtl') : -1) > -1 ? 'icon-rtl' : '',
svg_icon = '<svg class="menu-item-icon %rtlCls"><use class="zoom-int" href="#%iconname"></use></svg>'.replace('%iconname', icon_name).replace('%rtlCls', rtlCls);
firstChild.find('span.menu-item-icon').after(svg_icon);
}
}
}

10
apps/common/main/lib/component/UpDownPicker.js
View File

@ -56,15 +56,9 @@ define([
template:_.template([
'<label class="title float-left"><%= options.caption %></label>',
'<button type="button" class="btn small btn-toolbar updown-picker-button-up float-right">',
'<i class="icon menu__icon <%= options.iconUpCls %>">&nbsp;</i>',
'<svg class="icon uni-scale"><use class="zoom-int" xlink:href="#<%= /btn-[^\\s]+/.exec(options.iconUpCls)[0] %>"></use></svg>',
'</button>',
'<button type="button" class="btn small btn-toolbar updown-picker-button-up float-right"><i class="icon menu__icon <%= options.iconUpCls %>">&nbsp;</i></button>',
'<label class="updown-picker-value float-right" style="min-width: <%= options.minWidth %>px;"></label>',
'<button type="button" class="btn small btn-toolbar updown-picker-button-down float-right">',
'<i class="icon menu__icon <%= options.iconDownCls %>">&nbsp;</i>',
'<svg class="icon uni-scale"><use class="zoom-int" xlink:href="#<%= /btn-[^\\s]+/.exec(options.iconDownCls)[0] %>"></use></svg>',
'</button>'
'<button type="button" class="btn small btn-toolbar updown-picker-button-down float-right"><i class="icon menu__icon <%= options.iconDownCls %>">&nbsp;</i></button>'
].join('')),
initialize : function(options) {

43
apps/common/main/resources/less/bigscaling.less
View File

@ -1,13 +1,13 @@
//body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) {
.pixel-ratio__2_5 {
.btn-toolbar,
.btn-header,
.btn-category,
.btn-options,
.label-cmp {
i.icon {
//&:not(.scaling-off) {
//display: none;
//}
&:not(.scaling-off) {
display: none;
}
}
}
@ -50,40 +50,23 @@
}
}
}
//}
}
.btn-toolbar,
.btn-header,
.btn-category,
.btn-options,
.dataview,
.label-cmp {
body:not(.pixel-ratio__1_25, .pixel-ratio__1_5, .pixel-ratio__1_75) & {
i.icon {
&:not(.scaling-off) {
display: none;
}
}
}
.pixel-ratio__1_25 &, .pixel-ratio__1_5 &, .pixel-ratio__1_75 & {
svg.icon:not(.permanent-icon) {
display: none;
}
&:has(svg.permanent-icon) {
i.icon {
display: none;
}
}
.label-cmp
{
svg.icon:not(.uni-scale):not(.pixel-ratio__2_5 *) {
display: none;
}
}
.dropdown-menu .menu-item {
.pixel-ratio__1_25 &, .pixel-ratio__1_5 &, .pixel-ratio__1_75 & {
svg.menu-item-icon {
display: none;
}
svg.menu-item-icon:not(.uni-scale):not(.pixel-ratio__2_5 *) {
display: none;
}
}
@ -95,7 +78,7 @@
&:active,
&.active {
&:not(.disabled) {
svg.icon {
svg.icon:not(.uni-scale) {
fill: @icon-normal-pressed-ie;
fill: @icon-normal-pressed;
.btn& {
@ -105,7 +88,7 @@
}
}
svg.icon {
svg.icon:not(.uni-scale) {
fill: @icon-normal-ie;
fill: @icon-normal;

2
apps/common/main/resources/less/buttons.less
View File

@ -595,7 +595,7 @@
opacity: @component-disabled-opacity;
}
&:is(:not(.pixel-ratio__1_25 *, .pixel-ratio__1_5 *, .pixel-ratio__1_75 *)) {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
justify-content: center;

30
apps/common/main/resources/less/common.less
View File

@ -210,22 +210,11 @@ label {
}
svg.menu-item-icon {
display: block;
fill: var(--icon-normal);
}
span.menu-item-icon {
display: none;
}
.pixel-ratio__1_25 &, .pixel-ratio__1_5 &, .pixel-ratio__1_75 & {
svg.menu-item-icon {
display: none;
}
span.menu-item-icon {
display: block;
}
span.menu-item-icon {
display: block;
}
li {
@ -358,6 +347,21 @@ label {
}
}
.pixel-ratio__2_5 {
#file-menu-panel {
.panel-menu {
svg.menu-item-icon {
fill: var(--icon-normal);
display: block;
}
span.menu-item-icon {
display: none;
}
}
}
}
.settings-panel {
display: none;
overflow: visible;

2
apps/common/main/resources/less/header.less
View File

@ -298,7 +298,7 @@
}
}
&:is(:not(.pixel-ratio__1_25 *, .pixel-ratio__1_5 *, .pixel-ratio__1_75 *)) {
.pixel-ratio__2_5 & {
i.icon {
display: none;
}

42
apps/common/main/resources/less/scroller.less
View File

@ -45,7 +45,12 @@
background-size: auto 14px;
}
.pixel-ratio__2 &, .pixel-ratio__2_5 & {
.pixel-ratio__2 & {
background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABoAAAAcCAYAAAB/E6/TAAAAUElEQVR4nGJioBMYtYhswHL+/Pn/IIahoSEjiKYVf/gF3ahFgx8Mv6AbtWjUIjhg+fjxI7h05efnB5e2tOIPv6AbtWjwg+EXdHSzCBAAAP//nKY3dwCCOM8AAAAASUVORK5CYII=');
background-size: auto 14px;
}
.pixel-ratio__2_5 & {
mask-image: data-uri('data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMyIgaGVpZ2h0PSI3IiB2aWV3Qm94PSIwIDAgMTMgNyI+DQogICAgPHBhdGggZD0iTTAsNWwwLTNoMXYzSDB6IE0yLDVWMmgxdjNIMnogTTQsNVYyaDF2M0g0eiBNNiw1VjJoMXYzSDZ6IE04LDVWMmgxdjNIOHogTTEwLDVWMmgxdjNIMTB6IE0xMiw1VjJoMXYzSDEyeiIvPg0KPC9zdmc+DQo=');
background-color: @canvas-scroll-arrow;
@ -74,10 +79,14 @@
&.always-visible-x {
background-color: @canvas-scroll-thumb-hover-ie;
background-color: @canvas-scroll-thumb-hover;
background-position: center -7px;
div {
.pixel-ratio__2 &, .pixel-ratio__2_5 & {
background-position: center -7px;
.pixel-ratio__1_75 & {
background-position: center -6px;
}
.pixel-ratio__2_5 & {
background-color: @canvas-scroll-arrow-hover;
}
}
@ -95,10 +104,14 @@
background-color: @canvas-scroll-thumb-hover;
border-color: @canvas-scroll-thumb-border-hover-ie;
border-color: @canvas-scroll-thumb-border-hover;
background-position: center -7px;
div {
.pixel-ratio__2 &, .pixel-ratio__2_5 & {
background-position: center -7px;
.pixel-ratio__1_75 & {
background-position: center -6px;
}
.pixel-ratio__2_5 & {
background-color: @canvas-scroll-arrow-hover;
}
}
@ -154,7 +167,12 @@
background-position: @scaled-one-px-value center;
}
.pixel-ratio__2 &, .pixel-ratio__2_5 & {
.pixel-ratio__2 & {
background-image: data-uri('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAaCAAAAACBP2NVAAAAAnRSTlMAAHaTzTgAAAAfSURBVHgBYwCB82DAAAUfwQDEwi1JERg4O0ftHLUTADyCkwGAuWTrAAAAAElFTkSuQmCC');
background-size: 14px auto;
}
.pixel-ratio__2_5 & {
mask-image: data-uri('data:image/svg+xml;base64,PHN2ZyB3aWR0aD0iNyIgaGVpZ2h0PSIxMyIgdmlld0JveD0iMCAwIDcgMTMiIGZpbGw9Im5vbmUiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyI+CiAgICA8cGF0aCBkPSJNMiAwaDN2MUgyem0wIDJoM3YxSDJ6bTAgMmgzdjFIMnptMCAyaDN2MUgyem0wIDJoM3YxSDJ6bTAgMmgzdjFIMnptMCAyaDN2MUgyeiIgZmlsbD0iY3VycmVudENvbG9yIi8+Cjwvc3ZnPgo=');
background-color: @canvas-scroll-arrow;
@ -185,7 +203,12 @@
background-color: @canvas-scroll-thumb-hover;
div {
.pixel-ratio__2 &, .pixel-ratio__2_5 & {
background-position: -7px center;
.pixel-ratio__1_75 & {
background-position: -6px center;
}
.pixel-ratio__2_5 & {
background-color: @canvas-scroll-arrow-hover;
}
}
@ -205,7 +228,8 @@
border-color: @canvas-scroll-thumb-border-hover;
div {
.pixel-ratio__2 &, .pixel-ratio__2_5 & {
background-position: -7px center;
.pixel-ratio__2_5 & {
background-color: @canvas-scroll-arrow-hover;
}
}
@ -394,4 +418,4 @@
textarea {
.custom-scrollbar();
}
}

2
apps/common/main/resources/less/toolbar.less
View File

@ -1141,7 +1141,7 @@ section .field-styles {
#special-paste-container {
.btn-group,
.btn-toolbar {
body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) & {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
}

14
apps/documenteditor/main/app/template/LeftMenu.template
View File

@ -1,14 +1,14 @@
<div id="view-left-menu" class="tool-menu left">
<div class="tool-menu-btns" role="menubar" aria-orientation="vertical" aria-label="<%= scope.ariaLeftMenu %>">
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"></button>
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
<!-- /** coauthoring begin **/ -->
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"></button>
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"></button>
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ -->
<button id="left-btn-navigation" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="" data-layout-name="leftMenu-navigation"></button>
<button id="left-btn-thumbnails" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-navigation" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="" data-layout-name="leftMenu-navigation"><i class="icon toolbar__icon btn-menu-navigation">&nbsp;</i></button>
<button id="left-btn-thumbnails" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
<div id="slot-left-menu-more"></div>
</div>
<div class="left-panel side-panel" style="">

20
apps/documenteditor/main/app/template/RightMenu.template
View File

@ -23,16 +23,16 @@
</div>
<div class="tool-menu-btns" role="menubar" aria-label="<%= scope.ariaRightMenu %>" aria-orientation="vertical">
<div class="ct-btn-category arrow-left"></div>
<button id="id-right-menu-text" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-paragraph-settings"></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-table-settings"></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-image-settings"></button>
<button id="id-right-menu-header" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-header-settings"></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-shape-settings"></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-chart-settings"></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-textart-settings"></button>
<button id="id-right-menu-mail-merge" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-mail-merge-settings"></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-signature-settings"></button>
<button id="id-right-menu-form" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-form-settings"></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-paragraph-settings"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-header" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-header-settings"><i class="icon toolbar__icon btn-menu-header">&nbsp;</i></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-mail-merge" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-mail-merge-settings"><i class="icon toolbar__icon btn-mailmerge">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
<button id="id-right-menu-form" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-form-settings"><i class="icon toolbar__icon btn-field">&nbsp;</i></button>
<div id="slot-right-menu-more"></div>
</div>
</div>

12
apps/documenteditor/main/app/template/StatusBar.template
View File

@ -24,17 +24,17 @@
<div id="btn-doc-review" class="el-edit el-review margin-top-small" style="display: inline-block;"></div>
<div class="separator short el-edit el-review"></div>
<div class="separator short hide-select-tools"></div>
<button id="status-btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="status-btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="status-btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-select-tool">&nbsp;</i></button>
<button id="status-btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-hand-tool">&nbsp;</i></button>
<div class="separator short hide-select-tools"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"></button>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</i></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</i></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
<label id="label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small"></button>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div>
</div>

14
apps/documenteditor/main/app/view/LeftMenu.js
View File

@ -81,7 +81,7 @@ define([
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch,
disabled: true,
iconCls: 'toolbar__icon btn-menu-search',
iconCls: 'btn-menu-search',
enableToggle: true,
toggleGroup: 'leftMenuGroup'
});
@ -97,7 +97,7 @@ define([
hint: this.tipAbout,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-about',
iconCls: 'btn-menu-about',
toggleGroup: 'leftMenuGroup'
});
this.btnAbout.on('toggle', this.onBtnMenuToggle.bind(this));
@ -106,7 +106,7 @@ define([
action: 'support',
el: $markup.elementById('#left-btn-support'),
hint: this.tipSupport,
iconCls: 'toolbar__icon btn-menu-support',
iconCls: 'btn-menu-support',
disabled: true
});
this.btnSupport.on('click', _.bind(function() {
@ -122,7 +122,7 @@ define([
hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-comments',
iconCls: 'btn-menu-comments',
toggleGroup: 'leftMenuGroup'
});
this.btnComments.on('click', this.onBtnMenuClick.bind(this));
@ -133,7 +133,7 @@ define([
hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q', ' (' + (Common.Utils.isMac ? Common.Utils.String.textCtrl + '+' : '') + '{0})'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chat',
iconCls: 'btn-menu-chat',
toggleGroup: 'leftMenuGroup'
});
this.btnChat.on('click', this.onBtnMenuClick.bind(this));
@ -148,7 +148,7 @@ define([
hint: this.tipOutline,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-navigation',
iconCls: 'btn-menu-navigation',
toggleGroup: 'leftMenuGroup'
});
this.btnNavigation.on('click', this.onBtnMenuClick.bind(this));
@ -161,7 +161,7 @@ define([
hint: this.tipPageThumbnails,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-thumbs',
iconCls: 'btn-menu-thumbs',
toggleGroup: 'leftMenuGroup'
});
this.btnThumbnails.hide();

20
apps/documenteditor/main/app/view/RightMenu.js
View File

@ -82,7 +82,7 @@ define([
asctype: Common.Utils.documentSettingsType.Paragraph,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-paragraph',
iconCls: 'btn-paragraph',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -91,7 +91,7 @@ define([
asctype: Common.Utils.documentSettingsType.Table,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-table',
iconCls: 'btn-menu-table',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -100,7 +100,7 @@ define([
asctype: Common.Utils.documentSettingsType.Image,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-image',
iconCls: 'btn-menu-image',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -109,7 +109,7 @@ define([
asctype: Common.Utils.documentSettingsType.Header,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-header',
iconCls: 'btn-menu-header',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -118,7 +118,7 @@ define([
asctype: Common.Utils.documentSettingsType.Chart,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chart',
iconCls: 'btn-menu-chart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -127,7 +127,7 @@ define([
asctype: Common.Utils.documentSettingsType.Shape,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-shape',
iconCls: 'btn-menu-shape',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -137,7 +137,7 @@ define([
asctype: Common.Utils.documentSettingsType.TextArt,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-textart',
iconCls: 'btn-menu-textart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -200,7 +200,7 @@ define([
asctype: Common.Utils.documentSettingsType.MailMerge,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-mailmerge',
iconCls: 'btn-mailmerge',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -216,7 +216,7 @@ define([
asctype: Common.Utils.documentSettingsType.Signature,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-signature',
iconCls: 'btn-menu-signature',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -232,7 +232,7 @@ define([
asctype: Common.Utils.documentSettingsType.Form,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-field',
iconCls: 'btn-field',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});

19
apps/documenteditor/main/app/view/Statusbar.js
View File

@ -193,30 +193,26 @@ define([
hintAnchor: 'top',
toggleGroup: 'select-tools',
enableToggle: true,
allowDepress: false,
iconCls: 'toolbar__icon btn-select-tool'
allowDepress: false
});
this.btnHandTool = new Common.UI.Button({
hintAnchor: 'top',
toggleGroup: 'select-tools',
enableToggle: true,
allowDepress: false,
iconCls: 'toolbar__icon btn-hand-tool'
allowDepress: false
});
this.btnZoomToPage = new Common.UI.Button({
hintAnchor: 'top',
toggleGroup: 'status-zoom',
enableToggle: true,
iconCls: 'toolbar__icon btn-ic-zoomtopage'
enableToggle: true
});
this.btnZoomToWidth = new Common.UI.Button({
hintAnchor: 'top',
toggleGroup: 'status-zoom',
enableToggle: true,
iconCls: 'toolbar__icon btn-ic-zoomtowidth'
enableToggle: true
});
this.cntZoom = new Common.UI.Button({
@ -224,14 +220,11 @@ define([
});
this.btnZoomDown = new Common.UI.Button({
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-zoomdown'
hintAnchor: 'top'
});
this.btnZoomUp = new Common.UI.Button({
hintAnchor: 'top-right',
iconCls: 'toolbar__icon btn-zoomup'
hintAnchor: 'top-right'
});
this.btnLanguage = new Common.UI.Button({

2
apps/documenteditor/main/resources/less/rightmenu.less
View File

@ -14,7 +14,7 @@
}
.btn.align-left {
body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) & {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
}

2
apps/documenteditor/main/resources/less/statusbar.less
View File

@ -62,7 +62,7 @@
#slot-status-btn-info {
button {
font-weight: 700;
body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) & {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
}

14
apps/pdfeditor/main/app/template/LeftMenu.template
View File

@ -1,14 +1,14 @@
<div id="view-left-menu" class="tool-menu left">
<div class="tool-menu-btns" role="menubar" aria-orientation="vertical" aria-label="<%= scope.ariaLeftMenu %>">
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"></button>
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
<!-- /** coauthoring begin **/ -->
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"></button>
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"></button>
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ -->
<button id="left-btn-navigation" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="" data-layout-name="leftMenu-navigation"></button>
<button id="left-btn-thumbnails" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-navigation" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="" data-layout-name="leftMenu-navigation"><i class="icon toolbar__icon btn-menu-navigation">&nbsp;</i></button>
<button id="left-btn-thumbnails" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
<div id="slot-left-menu-more"></div>
</div>
<div class="left-panel side-panel" style="">

14
apps/pdfeditor/main/app/template/RightMenu.template
View File

@ -17,13 +17,13 @@
</div>
<div class="tool-menu-btns" role="menubar" aria-label="<%= scope.ariaRightMenu %>" aria-orientation="vertical">
<div class="ct-btn-category arrow-left"></div>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<!-- <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>-->
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<!-- <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>-->
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<!-- <button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>-->
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<!-- <button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>-->
<div id="slot-right-menu-more"></div>
</div>
</div>

12
apps/pdfeditor/main/app/template/StatusBar.template
View File

@ -17,17 +17,17 @@
</div>
<div class="status-group" style="">
<div class="separator short hide-select-tools"></div>
<button id="status-btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="status-btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="status-btn-select-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-select-tool">&nbsp;</i></button>
<button id="status-btn-hand-tool" type="button" class="btn small btn-toolbar hide-select-tools margin-top-small" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-hand-tool">&nbsp;</i></button>
<div class="separator short hide-select-tools"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"></button>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtopage">&nbsp;</i></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</i></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
<label id="label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small"></button>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div>
</div>

14
apps/pdfeditor/main/app/view/LeftMenu.js
View File

@ -80,7 +80,7 @@ define([
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch,
disabled: true,
iconCls: 'toolbar__icon btn-menu-search',
iconCls: 'btn-menu-search',
enableToggle: true,
toggleGroup: 'leftMenuGroup'
});
@ -92,7 +92,7 @@ define([
hint: this.tipAbout,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-about',
iconCls: 'btn-menu-about',
toggleGroup: 'leftMenuGroup'
});
this.btnAbout.on('toggle', this.onBtnMenuToggle.bind(this));
@ -101,7 +101,7 @@ define([
action: 'support',
el: $markup.elementById('#left-btn-support'),
hint: this.tipSupport,
iconCls: 'toolbar__icon btn-menu-support',
iconCls: 'btn-menu-support',
disabled: true
});
this.btnSupport.on('click', _.bind(function() {
@ -117,7 +117,7 @@ define([
hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-comments',
iconCls: 'btn-menu-comments',
toggleGroup: 'leftMenuGroup'
});
this.btnComments.on('click', this.onBtnMenuClick.bind(this));
@ -128,7 +128,7 @@ define([
hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q', ' (' + (Common.Utils.isMac ? Common.Utils.String.textCtrl + '+' : '') + '{0})'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chat',
iconCls: 'btn-menu-chat',
toggleGroup: 'leftMenuGroup'
});
this.btnChat.on('click', this.onBtnMenuClick.bind(this));
@ -143,7 +143,7 @@ define([
hint: this.tipOutline,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-navigation',
iconCls: 'btn-menu-navigation',
toggleGroup: 'leftMenuGroup'
});
this.btnNavigation.on('click', this.onBtnMenuClick.bind(this));
@ -156,7 +156,7 @@ define([
hint: this.tipPageThumbnails,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-thumbs',
iconCls: 'btn-menu-thumbs',
toggleGroup: 'leftMenuGroup'
});
this.btnThumbnails.hide();

10
apps/pdfeditor/main/app/view/RightMenu.js
View File

@ -78,7 +78,7 @@ define([
asctype: Common.Utils.documentSettingsType.Paragraph,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-paragraph',
iconCls: 'btn-paragraph',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -87,7 +87,7 @@ define([
asctype: Common.Utils.documentSettingsType.Table,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-table',
iconCls: 'btn-menu-table',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -96,7 +96,7 @@ define([
asctype: Common.Utils.documentSettingsType.Image,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-image',
iconCls: 'btn-menu-image',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -114,7 +114,7 @@ define([
asctype: Common.Utils.documentSettingsType.Shape,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-shape',
iconCls: 'btn-menu-shape',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -124,7 +124,7 @@ define([
asctype: Common.Utils.documentSettingsType.TextArt,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-textart',
iconCls: 'btn-menu-textart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});

18
apps/pdfeditor/main/app/view/Statusbar.js
View File

@ -176,30 +176,26 @@ define([
hintAnchor: 'top',
toggleGroup: 'select-tools',
enableToggle: true,
allowDepress: false,
iconCls: 'toolbar__icon btn-select-tool'
allowDepress: false
});
this.btnHandTool = new Common.UI.Button({
hintAnchor: 'top',
toggleGroup: 'select-tools',
enableToggle: true,
allowDepress: false,
iconCls: 'toolbar__icon btn-hand-tool'
allowDepress: false
});
this.btnZoomToPage = new Common.UI.Button({
hintAnchor: 'top',
toggleGroup: 'status-zoom',
enableToggle: true,
iconCls: 'toolbar__icon btn-ic-zoomtopage'
enableToggle: true
});
this.btnZoomToWidth = new Common.UI.Button({
hintAnchor: 'top',
toggleGroup: 'status-zoom',
enableToggle: true,
iconCls: 'toolbar__icon btn-ic-zoomtowidth'
enableToggle: true
});
this.cntZoom = new Common.UI.Button({
@ -207,13 +203,11 @@ define([
});
this.btnZoomDown = new Common.UI.Button({
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-zoomdown'
hintAnchor: 'top'
});
this.btnZoomUp = new Common.UI.Button({
hintAnchor: 'top-right',
iconCls: 'toolbar__icon btn-zoomup'
hintAnchor: 'top-right'
});
this.zoomMenu = new Common.UI.Menu({

2
apps/pdfeditor/main/resources/less/rightmenu.less
View File

@ -5,7 +5,7 @@
}
.btn.align-left {
body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) & {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
}

12
apps/presentationeditor/main/app/template/LeftMenu.template
View File

@ -1,13 +1,13 @@
<div id="view-left-menu" class="tool-menu left">
<div class="tool-menu-btns" role="menubar" aria-orientation="vertical" aria-label="<%= scope.ariaLeftMenu %>">
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"></button>
<button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
<button id="left-btn-thumbs" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-thumbs">&nbsp;</i></button>
<!-- /** coauthoring begin **/ -->
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"></button>
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"></button>
<button id="left-btn-comments" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-comments"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
<button id="left-btn-chat" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-chat"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ -->
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""></button>
<button id="left-btn-support" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target=""><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
<div class="separator horizontal separator-plugins" style="display: none;"></div>
<div id="slot-left-menu-more"></div>
</div>

16
apps/presentationeditor/main/app/template/RightMenu.template
View File

@ -19,14 +19,14 @@
</div>
<div class="tool-menu-btns" role="menubar" aria-label="<%= scope.ariaRightMenu %>" aria-orientation="vertical">
<div class="ct-btn-category arrow-left"></div>
<button id="id-right-menu-slide" class="btn btn-category arrow-left" content-target="id-slide-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"></button>
<button id="id-right-menu-slide" class="btn btn-category arrow-left" content-target="id-slide-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-slide">&nbsp;</i></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" content-target="id-shape-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" content-target="id-image-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" content-target="id-paragraph-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" content-target="id-table-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" content-target="id-chart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" content-target="id-textart-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" content-target="id-signature-settings" data-hint="0" data-hint-direction="left" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
<div id="slot-right-menu-more"></div>
</div>
</div>

8
apps/presentationeditor/main/app/template/StatusBar.template
View File

@ -20,14 +20,14 @@
<div class="separator short el-edit space"></div>
<span id="btn-doc-spell" class="el-edit margin-top-small"></span>
<div class="separator short el-edit el-lang"></div>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"></button>
<button id="btn-zoom-topage" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtoslide">&nbsp;</i></button>
<button id="btn-zoom-towidth" type="button" class="btn small btn-toolbar margin-top-small" aria-pressed="false" data-hint="0" data-hint-direction="top" data-hint-offset="small"><i class="icon toolbar__icon btn-ic-zoomtowidth">&nbsp;</i></button>
<button id="btn-zoom-down" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
<label id="status-label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small"></button>
<button id="btn-zoom-up" type="button" class="btn small btn-toolbar margin-top-small"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div>
</div>

12
apps/presentationeditor/main/app/view/LeftMenu.js
View File

@ -79,7 +79,7 @@ define([
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch,
disabled: true,
iconCls: 'toolbar__icon btn-menu-search',
iconCls: 'btn-menu-search',
enableToggle: true,
toggleGroup: 'leftMenuGroup'
});
@ -95,7 +95,7 @@ define([
hint: this.tipSlides,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-thumbs',
iconCls: 'btn-menu-thumbs',
toggleGroup: 'leftMenuGroup'
});
this.btnThumbs.on('click', _.bind(this.onBtnMenuClick, this));
@ -106,7 +106,7 @@ define([
hint: this.tipAbout,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-about',
iconCls: 'btn-menu-about',
toggleGroup: 'leftMenuGroup'
});
this.btnAbout.on('toggle', _.bind(this.onBtnMenuToggle, this));
@ -117,7 +117,7 @@ define([
el: $markup.elementById('#left-btn-support'),
hint: this.tipSupport,
disabled: true,
iconCls: 'toolbar__icon btn-menu-support'
iconCls: 'btn-menu-support'
});
this.btnSupport.on('click', _.bind(function() {
var config = this.mode.customization;
@ -132,7 +132,7 @@ define([
hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-comments',
iconCls: 'btn-menu-comments',
toggleGroup: 'leftMenuGroup'
});
this.btnComments.on('click', this.onBtnMenuClick.bind(this));
@ -142,7 +142,7 @@ define([
hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q', ' (' + (Common.Utils.isMac ? Common.Utils.String.textCtrl + '+' : '') + '{0})'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chat',
iconCls: 'btn-menu-chat',
toggleGroup: 'leftMenuGroup'
});
this.btnChat.on('click', this.onBtnMenuClick.bind(this));

16
apps/presentationeditor/main/app/view/RightMenu.js
View File

@ -79,7 +79,7 @@ define([
asctype: Common.Utils.documentSettingsType.Paragraph,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-paragraph',
iconCls: 'btn-paragraph',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -88,7 +88,7 @@ define([
asctype: Common.Utils.documentSettingsType.Table,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-table',
iconCls: 'btn-menu-table',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -97,7 +97,7 @@ define([
asctype: Common.Utils.documentSettingsType.Image,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-image',
iconCls: 'btn-menu-image',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -106,7 +106,7 @@ define([
asctype: Common.Utils.documentSettingsType.Slide,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-slide',
iconCls: 'btn-menu-slide',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -115,7 +115,7 @@ define([
asctype: Common.Utils.documentSettingsType.Chart,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chart',
iconCls: 'btn-menu-chart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -124,7 +124,7 @@ define([
asctype: Common.Utils.documentSettingsType.Shape,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-shape',
iconCls: 'btn-menu-shape',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -134,7 +134,7 @@ define([
asctype: Common.Utils.documentSettingsType.TextArt,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-textart',
iconCls: 'btn-menu-textart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -198,7 +198,7 @@ define([
asctype: Common.Utils.documentSettingsType.Signature,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-signature',
iconCls: 'btn-menu-signature',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});

12
apps/presentationeditor/main/app/view/Statusbar.js
View File

@ -107,8 +107,7 @@ define([
hint: this.tipFitPage,
hintAnchor: 'top',
toggleGroup: 'status-zoom',
enableToggle: true,
iconCls: 'toolbar__icon btn-ic-zoomtoslide'
enableToggle: true
});
this.btnZoomToWidth = new Common.UI.Button({
@ -116,22 +115,19 @@ define([
hint: this.tipFitWidth,
hintAnchor: 'top',
toggleGroup: 'status-zoom',
enableToggle: true,
iconCls: 'toolbar__icon btn-ic-zoomtowidth'
enableToggle: true
});
this.btnZoomDown = new Common.UI.Button({
el: $('#btn-zoom-down',this.el),
hint: this.tipZoomOut+Common.Utils.String.platformKey('Ctrl+-'),
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-zoomdown'
hintAnchor: 'top'
});
this.btnZoomUp = new Common.UI.Button({
el: $('#btn-zoom-up',this.el),
hint: this.tipZoomIn+Common.Utils.String.platformKey('Ctrl++'),
hintAnchor: 'top-right',
iconCls: 'toolbar__icon btn-zoomup'
hintAnchor: 'top-right'
});
this.cntZoom = new Common.UI.Button({

2
apps/presentationeditor/main/resources/less/rightmenu.less
View File

@ -5,7 +5,7 @@
}
.btn.align-left {
body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) & {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
}

12
apps/spreadsheeteditor/main/app/template/LeftMenu.template
View File

@ -1,13 +1,13 @@
<div id="view-left-menu" class="tool-menu left">
<div class="tool-menu-btns" role="menubar" aria-orientation="vertical" aria-label="<%= scope.ariaLeftMenu %>">
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"></button>
<button id="left-btn-searchbar" class="btn btn-category" data-hint="0" data-hint-direction="right" data-hint-offset="big" content-target="left-panel-search"><i class="icon toolbar__icon btn-menu-search">&nbsp;</i></button>
<!-- /** coauthoring begin **/ -->
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"></button>
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"></button>
<button id="left-btn-comments" class="btn btn-category" content-target="left-panel-comments" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-comments">&nbsp;</i></button>
<button id="left-btn-chat" class="btn btn-category" content-target="left-panel-chat" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-chat">&nbsp;</i></button>
<!-- /** coauthoring end **/ -->
<button id="left-btn-spellcheck" class="btn btn-category" content-target="left-panel-spellcheck" data-hint="0" data-hint-direction="right" data-hint-offset="big" data-layout-name="leftMenu-spellcheck"></button>
<button id="left-btn-support" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"></button>
<button id="left-btn-about" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"></button>
<button id="left-btn-spellcheck" class="btn btn-category" content-target="left-panel-spellcheck" data-hint="0" data-hint-direction="right" data-hint-offset="big" data-layout-name="leftMenu-spellcheck"><i class="icon toolbar__icon btn-ic-docspell">&nbsp;</i></button>
<button id="left-btn-support" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-support">&nbsp;</i></button>
<button id="left-btn-about" class="btn btn-category" content-target="" data-hint="0" data-hint-direction="right" data-hint-offset="big"><i class="icon toolbar__icon btn-menu-about">&nbsp;</i></button>
<div class="separator horizontal separator-plugins" style="display: none;"></div>
<div id="slot-left-menu-more"></div>
</div>

20
apps/spreadsheeteditor/main/app/template/RightMenu.template
View File

@ -23,16 +23,16 @@
</div>
<div class="tool-menu-btns" role="menubar" aria-label="<%= scope.ariaRightMenu %>" aria-orientation="vertical">
<div class="ct-btn-category arrow-left"></div>
<button id="id-right-menu-cell" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-cell-settings"></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-table-settings"></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-shape-settings"></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-image-settings"></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-chart-settings"></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-paragraph-settings"></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-textart-settings"></button>
<button id="id-right-menu-pivot" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-pivot-settings"></button>
<button id="id-right-menu-slicer" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-slicer-settings"></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-signature-settings"></button>
<button id="id-right-menu-cell" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-cell-settings"><i class="icon toolbar__icon btn-menu-cell">&nbsp;</i></button>
<button id="id-right-menu-table" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-table-settings"><i class="icon toolbar__icon btn-menu-table">&nbsp;</i></button>
<button id="id-right-menu-shape" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-shape-settings"><i class="icon toolbar__icon btn-menu-shape">&nbsp;</i></button>
<button id="id-right-menu-image" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-image-settings"><i class="icon toolbar__icon btn-menu-image">&nbsp;</i></button>
<button id="id-right-menu-chart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-chart-settings"><i class="icon toolbar__icon btn-menu-chart">&nbsp;</i></button>
<button id="id-right-menu-text" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-paragraph-settings"><i class="icon toolbar__icon btn-paragraph">&nbsp;</i></button>
<button id="id-right-menu-textart" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-textart-settings"><i class="icon toolbar__icon btn-menu-textart">&nbsp;</i></button>
<button id="id-right-menu-pivot" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-pivot-settings"><i class="icon toolbar__icon btn-pivot-sum">&nbsp;</i></button>
<button id="id-right-menu-slicer" class="btn btn-category arrow-left" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-slicer-settings"><i class="icon toolbar__icon btn-slicer">&nbsp;</i></button>
<button id="id-right-menu-signature" class="btn btn-category arrow-left hidden" data-hint="0" data-hint-direction="left" data-hint-offset="big" content-target="id-signature-settings"><i class="icon toolbar__icon btn-menu-signature">&nbsp;</i></button>
<div id="slot-right-menu-more"></div>
</div>
</div>

12
apps/spreadsheeteditor/main/app/template/StatusBar.template
View File

@ -1,24 +1,24 @@
<div class="statusbar">
<div id="status-tabs-scroll" class="status-group" dir="ltr">
<button id="status-btn-tabback" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="G"></button>
<button id="status-btn-tabnext" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="J"></button>
<button id="status-btn-tabback" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="G"><i class="icon toolbar__icon btn-previtem">&nbsp;</i></button>
<button id="status-btn-tabnext" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="J"><i class="icon toolbar__icon btn-nextitem">&nbsp;</i></button>
</div>
<div id="status-addtabs-box" class="status-group">
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="X"></button>
<button id="status-btn-addtab" type="button" class="btn small btn-toolbar" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="X"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
<div class="cnt-tabslist">
<button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="N"></button>
<button id="status-btn-tabslist" type="button" class="btn small btn-toolbar dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" data-hint-offset="small" data-hint-title="N"><i class="icon toolbar__icon btn-sheet-list">&nbsp;</i></button>
</div>
</div>
<div id="status-zoom-box" class="status-group">
<div class="separator short"></div>
<button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"></button>
<button id="status-btn-zoomdown" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomdown">&nbsp;</i></button>
<div class="cnt-zoom">
<div class="dropdown-toggle" data-toggle="dropdown" data-hint="0" data-hint-direction="top" role="button" aria-haspopup="menu" aria-expanded="false">
<label id="status-label-zoom" class="status-label">Zoom 100%</label>
</div>
</div>
<button id="status-btn-zoomup" type="button" class="btn small btn-toolbar"></button>
<button id="status-btn-zoomup" type="button" class="btn small btn-toolbar"><i class="icon toolbar__icon btn-zoomup">&nbsp;</i></button>
</div>
<div id="status-math-box" class="status-group">
<div class="separator short"></div>

2
apps/spreadsheeteditor/main/app/view/CellEditor.js
View File

@ -106,7 +106,7 @@ define([
},
applyScaling: function (ratio) {
if ((ratio === 1 || ratio >= 2) && !this.$btnfunc.find('svg.icon').length) {
if (ratio > 2 && !this.$btnfunc.find('svg.icon').length) {
var icon_name = 'btn-function',
svg_icon = '<svg class="icon"><use class="zoom-int" href="#%iconname"></use></svg>'.replace('%iconname', icon_name);
this.$btnfunc.find('i.icon').after(svg_icon);

12
apps/spreadsheeteditor/main/app/view/LeftMenu.js
View File

@ -72,7 +72,7 @@ define([
el: $markup.elementById('#left-btn-searchbar'),
hint: this.tipSearch,
disabled: true,
iconCls: 'toolbar__icon btn-menu-search',
iconCls: 'btn-menu-search',
enableToggle: true,
toggleGroup: 'leftMenuGroup'
});
@ -84,7 +84,7 @@ define([
hint: this.tipAbout,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-about',
iconCls: 'btn-menu-about',
toggleGroup: 'leftMenuGroup'
});
this.btnAbout.on('toggle', _.bind(this.onBtnMenuToggle, this));
@ -94,7 +94,7 @@ define([
el: $markup.elementById('#left-btn-support'),
hint: this.tipSupport,
disabled: true,
iconCls: 'toolbar__icon btn-menu-support'
iconCls: 'btn-menu-support'
});
this.btnSupport.on('click', _.bind(function() {
var config = this.mode.customization;
@ -109,7 +109,7 @@ define([
hint: this.tipComments + Common.Utils.String.platformKey('Ctrl+Shift+H'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-comments',
iconCls: 'btn-menu-comments',
toggleGroup: 'leftMenuGroup'
});
this.btnComments.on('toggle', this.onBtnCommentsToggle.bind(this));
@ -120,7 +120,7 @@ define([
hint: this.tipChat + Common.Utils.String.platformKey('Alt+Q', ' (' + (Common.Utils.isMac ? Common.Utils.String.textCtrl + '+' : '') + '{0})'),
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chat',
iconCls: 'btn-menu-chat',
toggleGroup: 'leftMenuGroup'
});
this.btnChat.on('click', this.onBtnMenuClick.bind(this));
@ -134,7 +134,7 @@ define([
hint: this.tipSpellcheck,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-ic-docspell',
iconCls: 'btn-ic-docspell',
toggleGroup: 'leftMenuGroup'
});
this.btnSpellcheck.hide();

20
apps/spreadsheeteditor/main/app/view/RightMenu.js
View File

@ -81,7 +81,7 @@ define([
asctype: Common.Utils.documentSettingsType.Paragraph,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-paragraph',
iconCls: 'btn-paragraph',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -90,7 +90,7 @@ define([
asctype: Common.Utils.documentSettingsType.Image,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-image',
iconCls: 'btn-menu-image',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -99,7 +99,7 @@ define([
asctype: Common.Utils.documentSettingsType.Chart,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-chart',
iconCls: 'btn-menu-chart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -108,7 +108,7 @@ define([
asctype: Common.Utils.documentSettingsType.Shape,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-shape',
iconCls: 'btn-menu-shape',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -118,7 +118,7 @@ define([
asctype: Common.Utils.documentSettingsType.TextArt,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-textart',
iconCls: 'btn-menu-textart',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -128,7 +128,7 @@ define([
asctype: Common.Utils.documentSettingsType.Table,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-table',
iconCls: 'btn-menu-table',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -138,7 +138,7 @@ define([
asctype: Common.Utils.documentSettingsType.Pivot,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-pivot-sum',
iconCls: 'btn-pivot-sum',
visible: false,
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
@ -148,7 +148,7 @@ define([
asctype: Common.Utils.documentSettingsType.Cell,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-cell',
iconCls: 'btn-menu-cell',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -157,7 +157,7 @@ define([
asctype: Common.Utils.documentSettingsType.Slicer,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-slicer',
iconCls: 'btn-slicer',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});
@ -230,7 +230,7 @@ define([
asctype: Common.Utils.documentSettingsType.Signature,
enableToggle: true,
disabled: true,
iconCls: 'toolbar__icon btn-menu-signature',
iconCls: 'btn-menu-signature',
toggleGroup: 'tabpanelbtnsGroup',
allowMouseEventsOnDisabled: true
});

22
apps/spreadsheeteditor/main/app/view/Statusbar.js
View File

@ -89,39 +89,34 @@ define([
this.btnZoomDown = new Common.UI.Button({
el: $('#status-btn-zoomdown',this.el),
hint: this.tipZoomOut+' (Ctrl+-)',
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-zoomdown'
hintAnchor: 'top'
});
this.btnZoomUp = new Common.UI.Button({
el: $('#status-btn-zoomup',this.el),
hint: this.tipZoomIn+' (Ctrl++)',
hintAnchor: 'top-right',
iconCls: 'toolbar__icon btn-zoomup'
hintAnchor: 'top-right'
});
this.btnScrollBack = new Common.UI.Button({
el: $('#status-btn-tabback',this.el),
hint: this.tipPrev,
disabled: true,
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-previtem'
hintAnchor: 'top'
});
this.btnScrollNext = new Common.UI.Button({
el: $('#status-btn-tabnext',this.el),
hint: this.tipNext,
disabled: true,
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-nextitem'
hintAnchor: 'top'
});
this.btnAddWorksheet = new Common.UI.Button({
el: $('#status-btn-addtab',this.el),
hint: this.tipAddTab,
disabled: true,
hintAnchor: 'top',
iconCls: 'toolbar__icon btn-zoomup'
hintAnchor: 'top'
});
this.cntSheetList = new Common.UI.Button({
@ -129,12 +124,7 @@ define([
hint: this.tipListOfSheets,
hintAnchor: 'top'
});
this.btnSheetList = new Common.UI.Button({
el: $('#status-btn-tabslist', this.$el),
iconCls: 'toolbar__icon btn-sheet-list'
});
this.btnSheetList = $('#status-btn-tabslist',this.$el);
this.sheetListMenu = new Common.UI.Menu({
style: 'margin-top:-3px;',
menuAlign: 'bl-tl',

2
apps/spreadsheeteditor/main/resources/less/rightmenu.less
View File

@ -5,7 +5,7 @@
}
.btn.align-left {
body:not(.pixel-ratio__1_25):not(.pixel-ratio__1_5):not(.pixel-ratio__1_75) & {
.pixel-ratio__2_5 & {
display: flex;
align-items: center;
}