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

Merge branch 'release/v6.5.0' into develop

Browse source
This commit is contained in:
Julia Radzhabova 2021-09-30 19:27:01 +03:00
parent 2a1ecec65d fe1ed7431f
commit ad35620a2e
44 changed files with 296 additions and 188 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/api/documents/api.js
View file

@ -105,7 +105,7 @@
customization: {
logo: {
image: url,
imageEmbedded: url,
imageEmbedded: url, // deprecated, use image instead
url: http://...
},
customer: {
@ -933,8 +933,8 @@
if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.loaderLogo) {
if (config.editorConfig.customization.loaderLogo !== '') params += "&logo=" + encodeURIComponent(config.editorConfig.customization.loaderLogo);
} else if ( (typeof(config.editorConfig.customization) == 'object') && config.editorConfig.customization.logo) {
if (config.type=='embedded' && config.editorConfig.customization.logo.imageEmbedded)
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.imageEmbedded);
if (config.type=='embedded' && (config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded))
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image || config.editorConfig.customization.logo.imageEmbedded);
else if (config.type!='embedded' && config.editorConfig.customization.logo.image)
params += "&headerlogo=" + encodeURIComponent(config.editorConfig.customization.logo.image);
}

5
apps/common/embed/resources/img/logo.svg
View file

@ -1 +1,4 @@
<svg id="Layer_2" xmlns="http://www.w3.org/2000/svg" viewBox="-4 23 100 24"><style>.st0{fill:#5B5B5B;} .st1{fill:#3A3A3A;} .st2{opacity:0.42;fill:#8C8C8C;enable-background:new ;} .st3{opacity:0.72;fill:#9B9B9B;enable-background:new ;} .st4{fill:#9B9B9B;}</style><path class="st0" d="M21.3 35.5c0-1.5.4-2.7 1.3-3.5.9-.8 1.9-1.2 3.1-1.2 1.2 0 2.2.4 3.1 1.2.9.8 1.3 1.9 1.3 3.5 0 1.5-.4 2.7-1.3 3.5-.9.8-1.9 1.2-3.1 1.2-1.2 0-2.2-.4-3.1-1.2-.8-.8-1.3-2-1.3-3.5zm1.9 0c0 1.1.2 1.8.6 2.3.4.5.8.8 1.3.9.1 0 .2 0 .3.1h.6c.1 0 .2 0 .3-.1.5-.1.9-.4 1.3-.9s.6-1.3.6-2.3c0-1-.2-1.8-.6-2.3-.4-.5-.8-.8-1.3-.9-.1 0-.2-.1-.3-.1h-.6c-.1 0-.2 0-.3.1-.5.1-.9.4-1.3.9s-.6 1.2-.6 2.3zm7.8-4.4h2.4l3.1 5.6.5 1.2v-6.8h1.8V40h-2.3l-3.2-5.9-.4-1h-.1l.1 1.6V40H31zm9.3 0h1.9v7.4h3.6V40h-5.5zm4.4 0h2.1l1.8 3 .2.7h.1l.3-.7 1.8-3h2l-3.3 5.2V40H48v-3.7z"/><path class="st1" d="M53.1 35.5c0-1.5.4-2.7 1.3-3.5.9-.8 1.9-1.2 3.1-1.2s2.2.4 3.1 1.2c.9.8 1.3 1.9 1.3 3.5 0 1.5-.4 2.7-1.3 3.5-.9.8-1.9 1.2-3.1 1.2-1.2 0-2.2-.4-3.1-1.2-.9-.8-1.3-2-1.3-3.5zm1.9 0c0 1.1.2 1.8.6 2.3.4.5.8.8 1.3.9.1 0 .2 0 .3.1h.6c.1 0 .2 0 .3-.1.5-.1.9-.4 1.3-.9s.6-1.3.6-2.3c0-1-.2-1.8-.6-2.3s-.8-.8-1.3-.9c-.1 0-.2-.1-.3-.1h-.6s-.2 0-.3.1c-.5.1-.9.4-1.3.9s-.6 1.2-.6 2.3zm7.8-4.4h5v1.5h-3.2v2.1h3.1v1.5h-3.1V40h-1.8zm6.1 0h5v1.5h-3.2v2.1h3v1.5h-3V40h-1.8zm6 8.9v-8.9h1.9V40zM85 31.3v1.6c-.3-.1-.6-.2-1-.3s-.7-.1-1.1-.1c-1 0-1.7.3-2.2.9-.5.6-.8 1.3-.8 2.2s.2 1.6.7 2.2c.5.6 1.2.9 2.1.9.3 0 .7 0 1-.1.4 0 .8-.2 1.2-.3l.1 1.5c-.1 0-.1.1-.2.1s-.2.1-.4.1h-.8c-.3 0-.7.1-1.1.1h-.4c-1-.1-2-.5-2.9-1.2-.9-.7-1.3-1.8-1.3-3.4 0-1.5.4-2.6 1.3-3.5.9-.8 2-1.2 3.4-1.2h1c.3 0 .6.1.9.2.1 0 .1 0 .2.1s.2.1.3.2zm1.1-.2h5.5v1.4H88v2.1h3.2V36H88v2.6h3.6V40h-5.5z"/><path class="st2" d="M7.4 43.1l-7.7-3.7c-.7-.3-.7-.8 0-1.1L2.3 37l5.1 2.4c.7.3 1.7.3 2.4 0l5.1-2.4 2.7 1.3c.7.3.7.8 0 1.1l-7.7 3.7c-.7.3-1.8.3-2.5 0z"/><path class="st3" d="M7.4 38.7L-.3 35c-.7-.3-.7-.8 0-1.1l2.7-1.3L7.5 35c.7.3 1.7.3 2.4 0l5.2-2.4 2.7 1.2c.7.3.7.8 0 1.1L10 38.6c-.8.4-1.9.4-2.6.1z"/><path class="st4" d="M7.4 34.3l-7.7-3.7c-.7-.3-.7-.8 0-1.1l7.7-3.7c.7-.3 1.7-.3 2.4 0l7.7 3.7c.7.3.7.8 0 1.1l-7.7 3.7c-.6.3-1.7.3-2.4 0z"/></svg>
<svg xmlns="http://www.w3.org/2000/svg" width="85" height="20" fill="none">
<g fill-rule="evenodd" fill="#444"><path d="M20.211 7.003C19.395 7.655 19 8.658 19 9.987s.395 2.332 1.21 3.009S21.947 14 23.026 14c1.053 0 2-.326 2.79-1.003.79-.652 1.184-1.655 1.184-2.984 0-1.354-.395-2.332-1.184-3.009S24.105 6 23.026 6 21 6.326 20.211 7.003zm1.053 4.991c-.342-.426-.526-1.078-.526-2.006 0-.903.184-1.555.526-1.956.368-.426.763-.702 1.184-.803h0c.105-.025.211-.05.289-.05.079-.025.158-.025.263-.025h0a1.03 1.03 0 0 1 .145.013l.145.013c.079 0 .184.025.289.05.421.1.816.376 1.158.803s.526 1.103.526 1.981-.184 1.555-.526 1.981-.737.702-1.158.803l-.052.013c-.081.02-.15.037-.237.037-.105.025-.184.025-.29.025-.04 0-.085-.006-.132-.013h0l-.132-.013c-.087 0-.156-.017-.237-.037h0 0l-.052-.013c-.421-.1-.816-.376-1.184-.803zM30.134 6H28v8h1.639V9.282l-.026-1.41h.026l.416.897L32.866 14H35V6h-1.639v4.718l.026 1.41h-.026l-.416-1.077L30.134 6zm6.186 0H38v6.641h3.5V14h-5.18V6zm5.687 0H40l3.161 4.744V14h1.732v-3.256L48 6h-1.842l-1.787 2.821-.275.538h-.055l-.275-.538L42.007 6zM48 9.987c0-1.329.395-2.332 1.211-2.984C50 6.326 50.947 6 52.026 6s2 .326 2.79 1.003S56 8.658 56 10.013c0 1.329-.395 2.332-1.184 2.984-.79.677-1.737 1.003-2.79 1.003-1.079 0-2-.326-2.816-1.003C48.421 12.32 48 11.317 48 9.987zm1.737 0c0 .928.184 1.58.526 2.006.368.426.737.702 1.184.803.105.025.21.05.289.05.039 0 .086.006.132.013l.132.013c.105 0 .184 0 .289-.025.087 0 .156-.017.237-.037l.038-.009.014-.003c.421-.1.816-.376 1.158-.803s.526-1.103.526-1.981-.184-1.555-.526-1.981-.737-.702-1.158-.803c-.105-.025-.21-.05-.289-.05-.053 0-.099-.006-.145-.013L52 7.154c-.105 0-.184 0-.263.025-.079 0-.184.025-.289.05-.421.1-.816.376-1.184.803-.342.401-.526 1.053-.526 1.956zM62 6h-4.63v8H59v-3.359h2.871V9.282H59V7.359h3V6zm1.37 0H68v1.359h-3v1.923h2.871v1.359H65V14h-1.63V6zm6.13 0v8h1.638V6H69.5zm9 .202v1.363c-.273-.101-.546-.177-.843-.227a5.79 5.79 0 0 0-.967-.076c-.818 0-1.438.252-1.884.782-.446.505-.669 1.161-.669 1.943 0 .757.198 1.388.62 1.893s1.016.782 1.785.782c.236 0 .471-.019.739-.04h0l.129-.01c.322-.05.645-.126.992-.278l.099 1.338c-.05.025-.124.05-.198.076l-.322.076a4.65 4.65 0 0 1-.446.08h0l-.297.046-.917.05h-.248c-.893-.05-1.711-.404-2.455-1.009-.744-.631-1.116-1.615-1.116-2.927 0-1.287.372-2.297 1.091-3.003S75.302 6 76.517 6l.868.025c.236.022.454.063.684.106l.109.02c.025.013.056.019.087.025a.35.35 0 0 1 .087.025c.015-.016.04-.012.074-.007.021.003.046.007.074.007zM85 6h-5v8h5v-1.256h-3.336v-2.231h2.885V9.256h-2.885v-2H85V6z"/><path opacity=".5" d="M1.605 12.508l4.958 2.318c.503.229 1.348.229 1.874 0l4.936-2.307 1.188.557c.525.252.525.641 0 .87l-6.169 2.883c-.48.229-1.325.229-1.828 0L.394 13.945c-.526-.252-.526-.641 0-.87l1.21-.568z"/><path opacity=".75" d="M1.555 8.985l5.008 2.341c.503.229 1.348.229 1.874 0l5.008-2.341 1.161.544c.526.252.526.641 0 .87l-6.169 2.883c-.526.252-1.371.252-1.874 0L.394 10.398c-.526-.252-.526-.641 0-.87l1.161-.543z"/><path d="M6.563 9.825L.394 6.942c-.526-.252-.526-.641 0-.87l6.169-2.883c.525-.252 1.371-.252 1.874 0l6.169 2.883c.525.252.525.641 0 .87L8.437 9.825c-.526.229-1.371.229-1.874 0z"/>
</g><defs />
</svg>
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

10
apps/common/embed/resources/less/common.less
View file

@ -99,13 +99,13 @@
right: 0;
&.top {
top: 48px;
top: 40px;
bottom: 0;
}
&.bottom {
top: 0;
bottom: 46px;
bottom: 38px;
}
}
@ -126,7 +126,7 @@
top: 0;
left: 0;
width: 100%;
height: 48px;
height: 40px;
-webkit-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
//-moz-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
@ -137,7 +137,7 @@
bottom: 0;
left: 0;
width: 100%;
height: 46px;
height: 38px;
-webkit-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
//-moz-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
@ -238,7 +238,7 @@
.brand-logo {
display: block;
width: 100px;
height: 24px;
height: 20px;
background: data-uri('../../../../common/embed/resources/img/logo.svg') no-repeat;
}

107
apps/common/forms/resources/less/common.less
View file

@ -78,13 +78,11 @@
@import "../../../../common/main/resources/less/calendar.less";
@import "../../../../common/main/resources/less/spinner.less";
@toolbarBorderColor: #dbdbdb;
@toolbarBorderShadowColor: #FAFAFA;
@toolbarTopColor: #F7F7F7;
@toolbarBorderColor: @border-toolbar-ie;
@toolbarBorderColor: @border-toolbar;
@toolbarTopColor: @background-toolbar-ie;
@toolbarTopColor: @background-toolbar;
@toolbarFontSize: 12px;
@btnColored: #446995;
@btnActiveColored: #293F59;
@btnHoverColored: #375478;
@iconSpriteCommonPath: "../../../../common/forms/resources/img/glyphicons.png";
@icon-socnet-size: 40px;
@ -115,7 +113,7 @@
right: 0;
&.top {
top: 48px;
top: 40px;
bottom: 0;
}
@ -142,22 +140,9 @@
top: 0;
left: 0;
width: 100%;
height: 48px;
height: 40px;
-webkit-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
//-moz-box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
box-shadow: inset 0 -1px 0 @toolbarBorderColor, inset 0 1px 0 @toolbarBorderShadowColor;
}
&.bottom {
bottom: 0;
left: 0;
width: 100%;
height: 46px;
-webkit-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
//-moz-box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
box-shadow: inset 0 1px 0 @toolbarBorderColor, inset 0 2px 0 @toolbarBorderShadowColor;
.box-inner-shadow(0 -1px 0 @toolbarBorderColor);
}
.group {
@ -211,27 +196,6 @@
text-overflow: ellipsis;
}
}
.separator {
height: 22px;
margin: 0 9px;
border-right: 1px solid @toolbarBorderShadowColor;
border-left: 1px solid @toolbarBorderColor;
}
}
.close {
font-size: 28px;
font-family: Arial, sans-serif;
color: #666666;
opacity: 0.8;
display: block;
line-height: 22px;
&:hover {
opacity: 1;
color: #666666;
}
}
.margin-right-small {
@ -253,28 +217,34 @@
.brand-logo {
display: block;
width: 100px;
height: 24px;
background: data-uri('../../../../common/forms/resources/img/logo.svg') no-repeat;
height: 20px;
background: data-uri('../../../../common/main/resources/img/header/dark-logo_s.svg') no-repeat;
}
.theme-dark {
.brand-logo {
background: data-uri('../../../../common/main/resources/img/header/header-logo_s.svg') no-repeat;
}
}
.btn-text-default {
&.colored {
padding: 0 16px;
height: 28px;
background-color: @btnColored;
background-color: @background-accent-button;
border: 1px solid transparent;
border-radius: 3px;
color: #ffffff;
color: @text-contrast-background !important;
font-weight: 700;
&:hover:not(.disabled),
.over:not(.disabled) {
background-color: @btnHoverColored !important;
background-color: @highlight-accent-button-hover !important;
}
&:active:not(.disabled),
&.active:not(.disabled) {
background-color: @btnActiveColored !important;;
background-color: @highlight-accent-button-pressed !important;
}
}
}
@ -320,9 +290,7 @@
background-origin: content-box;
padding: 1px 0 0 1px;
-webkit-box-shadow: 0 0 0 2px rgba(255,255,255,0.3);
-moz-box-shadow: 0 0 0 2px rgba(255,255,255,0.3);
box-shadow: 0 0 0 2px rgba(255,255,255,0.3);
.box-shadow(0 0 0 2px rgba(255,255,255,0.3));
&:hover {
opacity: .6;
@ -453,21 +421,32 @@
@icon-width: 20px;
@icon-height: 20px;
.theme-dark {
@neg-value: -@icon-height;
--icon-normal-top: @neg-value;
}
@icon-normal-top: var(--icon-normal-top, 0);
.svg-icon {
background: data-uri('../../../../common/forms/resources/img/icon-menu-sprite.svg') no-repeat;
background-size: @icon-width*19 @icon-height*2;
&.download {
background-position: -@icon-width 0;
background-position: -@icon-width @icon-normal-top;
}
&.share {
background-position: -@icon-width*2 0;
background-position: -@icon-width*2 @icon-normal-top;
}
&.embed {
background-position: -@icon-width*3 0;
background-position: -@icon-width*3 @icon-normal-top;
}
&.fullscr {
background-position: -@icon-width*4 0;
background-position: -@icon-width*4 @icon-normal-top;
}
&.zoom-up {
background-position: -@icon-width*5 -@icon-height;
@ -492,22 +471,28 @@
&.print {
background-position: -@icon-width*11 0;
background-position: -@icon-width*11 @icon-normal-top;
}
&.arrow-up {
background-position: -@icon-width*17 0;
background-position: -@icon-width*17 @icon-normal-top;
}
&.arrow-down {
background-position: -@icon-width*16 0;
background-position: -@icon-width*16 @icon-normal-top;
}
&.clear-style {
background-position: -@icon-width*12 0;
background-position: -@icon-width*12 @icon-normal-top;
}
&.go-to-location {
background-position: -@icon-width*15 0;
background-position: -@icon-width*15 @icon-normal-top;
}
&.more-vertical {
background-position: -@icon-width*14 0;
background-position: -@icon-width*14 @icon-normal-top;
}
}
@ -579,8 +564,7 @@
.masked {
background-color: transparent;
border-color: transparent;
-webkit-box-shadow: none;
box-shadow: none;
.box-shadow(none);
}
#pages {
@ -604,9 +588,9 @@
padding: 7px 15px;
border-radius: 5px;
background-color: @background-notification-popover-ie;
background-color: @background-notification-popover;
-webkit-box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5);
box-shadow: 0 4px 15px -2px rgba(0, 0, 0, 0.5);
.box-shadow(0 4px 15px -2px rgba(0, 0, 0, 0.5));
font-size: 11px;
}
@ -619,22 +603,23 @@
}
.asc-synchronizetip {
background-color: @btnColored;
color: @text-toolbar-header;
background-color: @background-contrast-popover;
color: @text-contrast-background;
.close {
&:before, &:after {
background-color: @text-toolbar-header;
background-color: @text-contrast-background;
}
}
}
.tip-arrow:after {
background-color: @btnColored;
background-color: @background-contrast-popover;
}
.btn-div {
display: inline-block;
border: 1px solid #fff;
border: 1px solid @border-regular-control-ie;
border: 1px solid @border-regular-control;
border-radius: 2px;
padding: 3px 12px;
margin-top: 10px;

6
apps/common/main/lib/component/HSBColorPicker.js
View file

@ -55,7 +55,7 @@ define([
'<% } %>'+
'<div>'+
'<div class="cnt-hb img-colorpicker">'+
'<div class="cnt-hb-arrow img-colorpicker"></div>'+
'<div class="cnt-hb-arrow"></div>'+
'</div>'+
'<% if (this.changeSaturation) { %>'+
'<div class="cnt-root">'+
@ -106,6 +106,7 @@ define([
refreshUI();
me.trigger('changecolor', me, me.color);
};
var refreshUI = function(){
@ -125,8 +126,7 @@ define([
previewColorText[0].innerHTML = (me.color == 'transparent') ? me.textNoColor : me.color.toUpperCase();
if (arrowSatBrightness.length>0 && arrowHue.length>0) {
arrowSatBrightness.css('left', saturationVal + '%');
arrowSatBrightness.css('top', 100 - brightnessVal + '%');
arrowSatBrightness.css({'left': saturationVal + '%', 'top': 100 - brightnessVal + '%', 'background-color' : me.color});
arrowHue.css('top', parseInt(hueVal * 100 / 360.0) + '%');
}
};

3
apps/common/main/lib/controller/Themes.js
View file

@ -82,6 +82,7 @@ define([
"text-inverse",
"text-toolbar-header",
"text-contrast-background",
"text-alt-key-hint",
"icon-normal",
"icon-normal-pressed",
@ -117,6 +118,8 @@ define([
"canvas-dark-cell-title-border",
"canvas-dark-cell-title-border-hover",
"canvas-dark-cell-title-border-selected",
"canvas-dark-content-background",
"canvas-dark-page-border",
"canvas-scroll-thumb",
"canvas-scroll-thumb-hover",

BIN
apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 11 KiB

After

Width:  |  Height:  |  Size: 26 KiB

BIN
apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.25x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 38 KiB

BIN
apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.5x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 53 KiB

BIN
apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@1.75x.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 70 KiB

BIN
apps/common/main/resources/img/hsbcolorpicker/hsb-colorpicker@2x.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 88 KiB

11
apps/common/main/resources/less/asc-mixins.less
View file

@ -327,11 +327,12 @@
}
}
@img-colorpicker-width: 205px;
@img-colorpicker-width: 208px;
.img-colorpicker, .hsb-colorpicker .empty-color:before
{
background-image: if(@icon-src-base64, data-uri(%("%s",'@{common-image-path}/hsbcolorpicker/hsb-colorpicker.png')), ~"url(@{common-image-const-path}/hsbcolorpicker/hsb-colorpicker.png)");
background-repeat: no-repeat;
background-size: @img-colorpicker-width auto;
@media only screen {
@media (-webkit-min-device-pixel-ratio: 1.5) and (-webkit-max-device-pixel-ratio: 1.9),
@ -350,6 +351,14 @@
background-size: @img-colorpicker-width auto;
}
}
.pixel-ratio__1_25 & {
background-image: ~"url(@{common-image-const-path}/hsbcolorpicker/hsb-colorpicker@1.25x.png)";
}
.pixel-ratio__1_75 & {
background-image: ~"url(@{common-image-const-path}/hsbcolorpicker/hsb-colorpicker@1.75x.png)";
}
}
.icon.lang-flag {

4
apps/common/main/resources/less/buttons.less
View file

@ -758,6 +758,10 @@
box-shadow: inset 0 0 0 @scaled-one-px-value-ie @border-control-focus-ie;
box-shadow: inset 0 0 0 @scaled-one-px-value @border-control-focus;
}
&.border-off {
box-shadow: none;
}
}
.btn-text-default {

1
apps/common/main/resources/less/colors-table-classic.less
View file

@ -14,6 +14,7 @@
--background-notification-badge: #ffd112;
--background-scrim: fade(#000, 20%);
--background-loader: fade(#000, 65%);
--background-contrast-popover: #444444;
--highlight-button-hover: #d8dadc;
--highlight-button-pressed: #7d858c;

1
apps/common/main/resources/less/colors-table-dark.less
View file

@ -15,6 +15,7 @@
--background-scrim: fade(black, 60%);
--background-loader: fade(#181818, 90%);
--background-alt-key-hint: #FFD938;
--background-contrast-popover: #363636;
--highlight-button-hover: #555;
--highlight-button-pressed: #707070;

11
apps/common/main/resources/less/colors-table.less
View file

@ -25,6 +25,8 @@
--background-scrim: fade(#000, 20%);
--background-loader: fade(#181818, 90%);
--background-alt-key-hint: #FFD938;
--background-accent-button: #446995;
--background-contrast-popover: #444444;
--highlight-button-hover: #e0e0e0;
--highlight-button-pressed: #cbcbcb;
@ -34,6 +36,8 @@
--highlight-header-button-pressed: fade(#fff, 25%);
--highlight-toolbar-tab-underline: #444;
--highlight-text-select: #3494fb;
--highlight-accent-button-hover: #375478;
--highlight-accent-button-pressed: #293F59;
--border-toolbar: #cbcbcb;
--border-divider: #dfdfdf;
@ -56,6 +60,7 @@
--text-inverse: #fff;
--text-toolbar-header: #fff;
--text-contrast-background: #fff;
--text-alt-key-hint: fade(#000, 80%);
--icon-normal: #444;
--icon-normal-pressed: #444;
@ -93,6 +98,8 @@
--canvas-dark-cell-title-border: #3d3d3d;
--canvas-dark-cell-title-border-hover: #5c5c5c;
--canvas-dark-cell-title-border-selected: #0f0f0f;
--canvas-dark-content-background: #3a3a3a;
--canvas-dark-page-border: #2a2a2a;
--canvas-scroll-thumb: #f7f7f7;
--canvas-scroll-thumb-hover: #c0c0c0;
@ -151,6 +158,8 @@
@background-scrim: var(--background-scrim);
@background-loader: var(--background-loader);
@background-alt-key-hint: var(--background-alt-key-hint);
@background-accent-button: var(--background-accent-button);
@background-contrast-popover: var(--background-contrast-popover);
// Highlight
// -------------------------
@ -162,6 +171,8 @@
@highlight-header-button-pressed: var(--highlight-header-button-pressed);
@highlight-toolbar-tab-underline: var(--highlight-toolbar-tab-underline);
@highlight-text-select: var(--highlight-text-select);
@highlight-accent-button-hover: var(--highlight-accent-button-hover);
@highlight-accent-button-pressed: var(--highlight-accent-button-pressed);
// Border
// -------------------------

5
apps/common/main/resources/less/extended-color-picker.less
View file

@ -38,9 +38,8 @@
width: 63px;
height: 20px;
background-color: transparent;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
border: @scaled-one-px-value-ie solid @border-color-shading-ie;
border: @scaled-one-px-value solid @border-color-shading;
&.top {
border-bottom: none;
}

37
apps/common/main/resources/less/hsb-colorpicker.less
View file

@ -32,12 +32,9 @@
.cnt-hb {
display: inline-block;
overflow: hidden;
width: 195px;
height: 196px;
position: relative;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
border: @scaled-one-px-value solid @border-regular-control;
background-position: 0 0;
}
@ -49,7 +46,7 @@
}
.cnt-sat {
width: 10px;
width: 12px;
height: 100%;
position: relative;
border: @scaled-one-px-value-ie solid @border-regular-control-ie;
@ -58,21 +55,33 @@
}
.cnt-hb-arrow {
width: 9px;
height: 9px;
margin: -4px;
display: block;
width: 12px;
height: 12px;
margin: -6px;
position: absolute;
background-position: 0 -196px;
border: @scaled-one-px-value-ie solid #000;
border: @scaled-one-px-value solid #000;
.border-radius(50%);
&:after{
content: ' ';
position: absolute;
width: 100%;
height: 100%;
border: @scaled-one-px-value-ie solid #fff;
border: @scaled-one-px-value solid #fff;
.border-radius(50%);
}
}
.cnt-sat-arrow {
width: 14px;
height: 9px;
margin-top: -4px;
margin-left: -3px;
margin-left: calc(-2px - @scaled-one-px-value);
width: 20px;
height: 12px;
margin-top: -6px;
margin-left: -4px;
margin-left: calc(-3px - @scaled-one-px-value);
position: absolute;
background-position: -11px -196px;
background-position: -12px -196px;
}
.empty-color {

6
apps/documenteditor/embed/index.html
View file

@ -29,7 +29,7 @@
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
max-width: 124px;
max-width: 100px;
max-height: 20px;
opacity: 0;
}

6
apps/documenteditor/embed/index.html.deploy
View file

@ -27,7 +27,7 @@
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
@ -41,14 +41,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
max-width: 124px;
max-width: 100px;
max-height: 20px;
opacity: 0;
}

14
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -403,7 +403,7 @@ DE.ApplicationController = new(function(){
itemsCount--;
}
if ( !embedConfig.saveUrl && permissions.print === false || appOptions.canFillForms) {
if ( !embedConfig.saveUrl || permissions.download === false || appOptions.canFillForms) {
$('#idt-download').hide();
itemsCount--;
}
@ -439,7 +439,6 @@ DE.ApplicationController = new(function(){
itemsCount--;
}
// if ( !embedConfig.saveUrl && permissions.print === false && (!embedConfig.shareUrl || appOptions.canFillForms) && (!embedConfig.embedUrl || appOptions.canFillForms) && !embedConfig.fullscreenUrl && !config.canBackToFolder)
if (itemsCount<1)
$('#box-tools').addClass('hidden');
else if ((!embedConfig.embedUrl || appOptions.canFillForms) && !embedConfig.fullscreenUrl)
@ -477,11 +476,8 @@ DE.ApplicationController = new(function(){
DE.ApplicationView.tools.get('#idt-download')
.on('click', function(){
if ( !!embedConfig.saveUrl ){
if ( !!embedConfig.saveUrl && permissions.download !== false){
common.utils.openLink(embedConfig.saveUrl);
} else
if (api && permissions.print!==false){
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
}
Common.Analytics.trackEvent('Save');
@ -605,9 +601,11 @@ DE.ApplicationController = new(function(){
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded) {
logo.html('<img src="'+config.customization.logo.imageEmbedded+'" style="max-width:124px; max-height:20px;"/>');
if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (config.customization.logo.url) {

1
apps/documenteditor/forms/app.js
View file

@ -150,6 +150,7 @@ require([
'documenteditor/forms/app/view/ApplicationView',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Themes',
'common/forms/lib/view/modals'
], function() {
app.start();

77
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -58,6 +58,8 @@ define([
'embedded' : true
});
Common.UI.Themes.init(this.api);
$(window).on('resize', this.onDocumentResize.bind(this));
this.boxSdk = $('#editor_sdk');
@ -456,9 +458,7 @@ define([
this.appOptions.canFillForms = this.appOptions.canLicense && (this.permissions.fillForms===true) && (this.editorConfig.mode !== 'view');
this.api.asc_setViewMode(!this.appOptions.canFillForms);
var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType);
this.appOptions.canDownloadOrigin = this.permissions.download !== false && (type && typeof type[1] === 'string');
this.appOptions.canDownload = this.permissions.download !== false && (!type || typeof type[1] !== 'string');
this.appOptions.canDownload = this.permissions.download !== false;
this.appOptions.canPrint = (this.permissions.print !== false);
this.appOptions.fileKey = this.document.key;
@ -776,11 +776,11 @@ define([
},
onDownloadAs: function() {
if ( !this.appOptions.canDownload && !this.appOptions.canDownloadOrigin ) {
if ( !this.appOptions.canDownload ) {
Common.Gateway.reportError(Asc.c_oAscError.ID.AccessDeny, this.errorAccessDeny);
return;
}
var type = /^(?:(pdf|djvu|xps))$/.exec(this.document.fileType);
var type = /^(?:(pdf|djvu|xps|oxps))$/.exec(this.document.fileType);
if (type && typeof type[1] === 'string')
this.api.asc_DownloadOrigin(true);
else
@ -1063,28 +1063,49 @@ define([
}
},
onThemeClick: function(menu, item) {
Common.UI.Themes.setTheme(item.value);
},
onThemeChange: function() {
var current = Common.UI.Themes.currentThemeId();
_.each(this.view.mnuThemes.items, function(item){
item.setChecked(current===item.value, true);
});
},
createDelayedElements: function() {
var me = this,
menuItems = this.view.btnOptions.menu.items,
itemsCount = menuItems.length-3;
itemsCount = menuItems.length-4;
var initMenu = function(menu) {
var last;
// print
if (!menuItems[0].isVisible())
menuItems[1].setVisible(false);
else
last = menuItems[1];
// download
if (!menuItems[2].isVisible() && !menuItems[3].isVisible() && !menuItems[4].isVisible())
menuItems[5].setVisible(false);
else
last = menuItems[5];
if (!menuItems[6].isVisible() && !menuItems[7].isVisible())
menuItems[8].setVisible(false);
// theme
if (!menuItems[6].isVisible())
menuItems[7].setVisible(false);
else
last = menuItems[8];
last = menuItems[7];
if (!menuItems[9].isVisible() && !menuItems[10].isVisible())
// share, location
if (!menuItems[8].isVisible() && !menuItems[9].isVisible())
menuItems[10].setVisible(false);
else
last = menuItems[10];
// embed, fullscreen
if (!menuItems[11].isVisible() && !menuItems[12].isVisible())
last && last.setVisible(false);
menu.off('show:after', initMenu);
@ -1095,7 +1116,7 @@ define([
itemsCount--;
}
if ( !this.embedConfig.saveUrl && !this.appOptions.canPrint || this.appOptions.canFillForms) {
if ( !this.embedConfig.saveUrl || !this.appOptions.canDownload || this.appOptions.canFillForms) {
menuItems[2].setVisible(false);
itemsCount--;
}
@ -1106,23 +1127,43 @@ define([
itemsCount -= 2;
}
if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) {
if (Common.UI.Themes.available()) {
var current = Common.UI.Themes.currentThemeId();
for (var t in Common.UI.Themes.map()) {
this.view.mnuThemes.addItem(new Common.UI.MenuItem({
caption : Common.UI.Themes.get(t).text,
value : t,
toggleGroup : 'themes',
checkable : true,
checked : t===current
}));
}
}
if (this.view.mnuThemes.items.length<1) {
menuItems[6].setVisible(false);
itemsCount--;
} else {
this.view.mnuThemes.on('item:click', _.bind(this.onThemeClick, this));
Common.NotificationCenter.on('uitheme:changed', this.onThemeChange.bind(this));
}
if ( !this.embedConfig.shareUrl || this.appOptions.canFillForms) {
menuItems[8].setVisible(false);
itemsCount--;
}
if (!this.appOptions.canBackToFolder) {
menuItems[7].setVisible(false);
itemsCount--;
}
if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) {
menuItems[9].setVisible(false);
itemsCount--;
}
if ( !this.embedConfig.embedUrl || this.appOptions.canFillForms) {
menuItems[11].setVisible(false);
itemsCount--;
}
if ( !this.embedConfig.fullscreenUrl ) {
menuItems[10].setVisible(false);
menuItems[12].setVisible(false);
itemsCount--;
}
if (itemsCount<1)

12
apps/documenteditor/forms/app/view/ApplicationView.js
View file

@ -23,6 +23,15 @@ define([
{caption: this.txtDownloadDocx, value: 'download-docx', iconCls: 'mi-icon svg-icon download'},
{caption: this.txtDownloadPdf, value: 'download-pdf', iconCls: 'mi-icon'},
{caption: '--'},
{caption: this.txtTheme, value: 'theme', iconCls: 'mi-icon',
menu : this.mnuThemes = new Common.UI.Menu({
cls: 'shifted-right',
menuAlign: 'tl-tr',
restoreHeight: true,
items: []
})
},
{caption: '--'},
{caption: this.txtShare, value: 'share', iconCls: 'mi-icon svg-icon share'},
{caption: this.txtFileLocation, value: 'close', iconCls: 'mi-icon svg-icon go-to-location'},
{caption: '--'},
@ -81,6 +90,7 @@ define([
txtDownloadPdf: 'Download as pdf',
textNext: 'Next Field',
textClear: 'Clear All Fields',
textSubmit: 'Submit'
textSubmit: 'Submit',
txtTheme: 'Interface theme'
});
});

1
apps/documenteditor/forms/app_dev.js
View file

@ -140,6 +140,7 @@ require([
'documenteditor/forms/app/view/ApplicationView',
'common/main/lib/util/utils',
'common/main/lib/util/LocalStorage',
'common/main/lib/controller/Themes',
'common/forms/lib/view/modals'
], function() {
window.compareVersions = true;

50
apps/documenteditor/forms/index.html
View file

@ -14,6 +14,23 @@
<!-- splash -->
<style type="text/css">
.theme-dark {
--background-toolbar: #404040;
--border-toolbar: #2a2a2a;
--highlight-button-hover: #555;
--canvas-background: #555;
}
.theme-classic-light {
}
.theme-light {
--background-toolbar: #f7f7f7;
--border-toolbar: #cbcbcb;
--highlight-button-hover: #e0e0e0;
--canvas-background: #eee;
}
.loadmask {
left: 0;
top: 0;
@ -22,17 +39,21 @@
width: 100%;
overflow: hidden;
border: none;
background-color: #f4f4f4;
background-color: #e2e2e2;
background-color: var(--canvas-background, #e2e2e2);
z-index: 1001;
}
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
background-color: var(--background-toolbar, #F7F7F7);
-webkit-box-shadow: inset 0 -1px 0 #cbcbcb;
box-shadow: inset 0 -1px 0 #cbcbcb;
-webkit-box-shadow: inset 0 -1px 0 var(--border-toolbar, #cbcbcb);
box-shadow: inset 0 -1px 0 var(--border-toolbar, #cbcbcb);
}
.loadmask > .brendpanel > div {
@ -43,7 +64,7 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
@ -60,8 +81,8 @@
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 24px;
height: 24px;
width: 20px;
height: 20px;
border-radius: 12px;
margin: 4px 10px;
background: rgba(255, 255, 255, 0.2);
@ -77,7 +98,7 @@
.loadmask > .placeholder > .line {
height: 15px;
margin: 30px;
background: #e2e2e2;
background: rgba(0,0,0,.05);
overflow: hidden;
position: relative;
@ -112,18 +133,12 @@
<!--[if lt IE 9]>
<script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.6.1/html5shiv.js"></script>
<![endif]-->
<script src="../../common/main/lib/util/themeinit.js"></script>
</head>
<body class="embed-body theme-classic-light theme-type-light">
<body class="embed-body">
<script src="../../common/main/lib/util/htmlutils.js"></script>
<div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="brand-logo loading-logo"><img src=""></div><div class="doc-title"></div><div class="circle"></div></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>
<!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script>
<script src="../../../vendor/less/dist/less.js" type="text/javascript"></script>
<!-- debug end -->
<script>
var userAgent = navigator.userAgent.toLowerCase(),
check = function(regex){ return regex.test(userAgent); },
@ -225,6 +240,11 @@
</div>
</div>
<!-- debug begin -->
<script type="text/javascript">var less=less||{};less.env='development';</script>
<script src="../../../vendor/less/dist/less.js" type="text/javascript"></script>
<!-- debug end -->
<!--vendor-->
<script type="text/javascript" src="../../../vendor/jquery/jquery.min.js"></script>
<script type="text/javascript" src="../../../vendor/xregexp/xregexp-all-min.js"></script>

22
apps/documenteditor/forms/index.html.deploy
View file

@ -20,17 +20,21 @@
width: 100%;
overflow: hidden;
border: none;
background-color: #f4f4f4;
background-color: #e2e2e2;
background-color: var(--canvas-background, #e2e2e2);
z-index: 1001;
}
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
background-color: var(--background-toolbar, #F7F7F7);
-webkit-box-shadow: inset 0 -1px 0 #cbcbcb;
box-shadow: inset 0 -1px 0 #cbcbcb;
-webkit-box-shadow: inset 0 -1px 0 var(--border-toolbar, #cbcbcb);
box-shadow: inset 0 -1px 0 var(--border-toolbar, #cbcbcb);
}
.loadmask > .brendpanel > div {
@ -41,7 +45,7 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
@ -58,8 +62,8 @@
.loadmask > .brendpanel .circle {
vertical-align: middle;
width: 24px;
height: 24px;
width: 20px;
height: 20px;
border-radius: 12px;
margin: 4px 10px;
background: rgba(255, 255, 255, 0.2);
@ -75,7 +79,7 @@
.loadmask > .placeholder > .line {
height: 15px;
margin: 30px;
background: #e2e2e2;
background: rgba(0,0,0,.05);
overflow: hidden;
position: relative;
@ -112,7 +116,7 @@
<![endif]-->
</head>
<body class="embed-body theme-classic-light theme-type-light">
<body class="embed-body">
<script src="../../../../../apps/common/main/lib/util/htmlutils.js?__inline=true"></script>
<div id="loading-mask" class="loadmask"><div class="brendpanel"><div><div class="brand-logo loading-logo"><img src=""></div><div class="doc-title"></div><div class="circle"></div></div></div><div class="placeholder"><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div><div class="line"></div></div></div>

3
apps/documenteditor/forms/locale/en.json
View file

@ -57,5 +57,6 @@
"DE.ApplicationView.txtShare": "Share",
"DE.ApplicationView.textSubmit": "Submit",
"DE.ApplicationView.textClear": "Clear All Fields",
"DE.ApplicationView.textNext": "Next Field"
"DE.ApplicationView.textNext": "Next Field",
"DE.ApplicationView.txtTheme": "Interface theme"
}

2
apps/documenteditor/main/app/view/DropcapSettingsAdvanced.js
View file

@ -129,7 +129,7 @@ define([
strId : item[1],
iconCls : item[2],
style : 'margin-left: 5px; margin-bottom: 4px;',
cls : 'btn-options large'
cls : 'btn-options large border-off'
});
_btn.on('click', function(btn) {

2
apps/documenteditor/main/app/view/ParagraphSettingsAdvanced.js
View file

@ -411,7 +411,7 @@ define([ 'text!documenteditor/main/app/template/ParagraphSettingsAdvanced.tem
var _btn = new Common.UI.Button({
parentEl: $('#'+item[2]),
style: 'margin-left: 5px; margin-bottom: 4px;',
cls: 'btn-options large',
cls: 'btn-options large border-off',
iconCls: item[1],
strId :item[0],
hint: item[3]

4
apps/documenteditor/main/app/view/TableSettingsAdvanced.js
View file

@ -949,7 +949,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
var _btn = new Common.UI.Button({
parentEl: $('#'+item[2]),
style: 'margin-left: 5px; margin-bottom: 4px;',
cls: 'btn-options large',
cls: 'btn-options large border-off',
iconCls: item[1],
strId :item[0],
hint: item[3]
@ -975,7 +975,7 @@ define([ 'text!documenteditor/main/app/template/TableSettingsAdvanced.templat
var _btn = new Common.UI.Button({
parentEl: $('#'+item[3]),
style: 'margin-left: 5px; margin-bottom: 4px;',
cls: 'btn-options large',
cls: 'btn-options large border-off',
iconCls: item[2],
strCellId :item[0],
strTableId :item[1],

6
apps/presentationeditor/embed/index.html
View file

@ -29,7 +29,7 @@
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
max-width: 124px;
max-width: 100px;
max-height: 20px;
opacity: 0;
}

6
apps/presentationeditor/embed/index.html.deploy
View file

@ -27,7 +27,7 @@
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
@ -41,14 +41,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
max-width: 124px;
max-width: 100px;
max-height: 20px;
opacity: 0;
}

17
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -76,11 +76,13 @@ PE.ApplicationController = new(function(){
if (embedConfig.toolbarDocked === 'bottom') {
$('#toolbar').addClass('bottom');
$('#editor_sdk').addClass('bottom');
$('#box-preview').addClass('bottom');
$('#box-tools').removeClass('dropdown').addClass('dropup');
ttOffset[1] = -40;
} else {
$('#toolbar').addClass('top');
$('#editor_sdk').addClass('top');
$('#box-preview').addClass('top');
}
config.canBackToFolder = (config.canBackToFolder!==false) && config.customization && config.customization.goback &&
@ -261,7 +263,7 @@ PE.ApplicationController = new(function(){
if ( permissions.print === false)
$('#idt-print').hide();
if (!embedConfig.saveUrl && permissions.print === false)
if (!embedConfig.saveUrl || permissions.download === false)
$('#idt-download').hide();
if ( !embedConfig.shareUrl )
@ -276,7 +278,7 @@ PE.ApplicationController = new(function(){
if ( !embedConfig.fullscreenUrl )
$('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl && !config.canBackToFolder)
if ( (!embedConfig.saveUrl || permissions.download === false) && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl && !config.canBackToFolder)
$('#box-tools').addClass('hidden');
else if (!embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools .divider').hide();
@ -311,11 +313,8 @@ PE.ApplicationController = new(function(){
PE.ApplicationView.tools.get('#idt-download')
.on('click', function(){
if ( !!embedConfig.saveUrl ){
if ( !!embedConfig.saveUrl && permissions.download !== false){
common.utils.openLink(embedConfig.saveUrl);
} else
if (api && permissions.print!==false){
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
}
Common.Analytics.trackEvent('Save');
@ -460,9 +459,11 @@ PE.ApplicationController = new(function(){
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded) {
logo.html('<img src="'+config.customization.logo.imageEmbedded+'" style="max-width:124px; max-height:20px;"/>');
if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (config.customization.logo.url) {

9
apps/presentationeditor/embed/resources/less/application.less
View file

@ -16,7 +16,14 @@
width:100%;
height:100%;
z-index: 10;
padding: 48px 0 0 0;
padding: 0;
&.top {
padding-top: 40px;
}
&.bottom {
padding-bottom: 38px;
}
}
#id-preview {

6
apps/spreadsheeteditor/embed/index.html
View file

@ -29,7 +29,7 @@
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
@ -43,14 +43,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
max-width: 124px;
max-width: 100px;
max-height: 20px;
opacity: 0;
}

6
apps/spreadsheeteditor/embed/index.html.deploy
View file

@ -26,7 +26,7 @@
.loadmask > .brendpanel {
width: 100%;
position: absolute;
height: 48px;
height: 40px;
background-color: #F7F7F7;
-webkit-box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
box-shadow: inset 0 -1px 0 #dbdbdb, inset 0 1px 0 #FAFAFA;
@ -40,14 +40,14 @@
.loadmask > .brendpanel .loading-logo {
max-width: 200px;
height: 24px;
height: 20px;
margin-left: 10px;
text-align: center;
}
.loadmask > .brendpanel .loading-logo > img {
display: inline-block;
max-width: 124px;
max-width: 100px;
max-height: 20px;
opacity: 0;
}

15
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -205,7 +205,7 @@ SSE.ApplicationController = new(function(){
if ( permissions.print === false)
$('#idt-print').hide();
if ( !embedConfig.saveUrl && permissions.print === false)
if ( !embedConfig.saveUrl || permissions.download === false)
$('#idt-download').hide();
if ( !embedConfig.shareUrl )
@ -220,7 +220,7 @@ SSE.ApplicationController = new(function(){
if ( !embedConfig.fullscreenUrl )
$('#idt-fullscreen').hide();
if ( !embedConfig.saveUrl && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl && !config.canBackToFolder)
if ( (!embedConfig.saveUrl || permissions.download === false) && permissions.print === false && !embedConfig.shareUrl && !embedConfig.embedUrl && !embedConfig.fullscreenUrl && !config.canBackToFolder)
$('#box-tools').addClass('hidden');
else if (!embedConfig.embedUrl && !embedConfig.fullscreenUrl)
$('#box-tools .divider').hide();
@ -248,11 +248,8 @@ SSE.ApplicationController = new(function(){
SSE.ApplicationView.tools.get('#idt-download')
.on('click', function(){
if ( !!embedConfig.saveUrl ){
if ( !!embedConfig.saveUrl && permissions.download !== false){
common.utils.openLink(embedConfig.saveUrl);
} else
if (permissions.print!==false){
api.asc_Print(new Asc.asc_CDownloadOptions(null, $.browser.chrome || $.browser.safari || $.browser.opera || $.browser.mozilla && $.browser.versionNumber>86));
}
Common.Analytics.trackEvent('Save');
@ -358,9 +355,11 @@ SSE.ApplicationController = new(function(){
config.customization && config.customization.logo ) {
var logo = $('#header-logo');
if (config.customization.logo.imageEmbedded) {
logo.html('<img src="'+config.customization.logo.imageEmbedded+'" style="max-width:124px; max-height:20px;"/>');
if (config.customization.logo.image || config.customization.logo.imageEmbedded) {
logo.html('<img src="'+(config.customization.logo.image || config.customization.logo.imageEmbedded)+'" style="max-width:100px; max-height:20px;"/>');
logo.css({'background-image': 'none', width: 'auto', height: 'auto'});
config.customization.logo.imageEmbedded && console.log("Obsolete: The 'imageEmbedded' parameter of the 'customization.logo' section is deprecated. Please use 'image' parameter instead.");
}
if (config.customization.logo.url) {

2
apps/spreadsheeteditor/main/app/controller/WBProtection.js
View file

@ -293,7 +293,7 @@ define([
onChangeProtectSheet: function() {
var props = this.getWSProps(true);
if (this.view) {
if (this.view && props) {
this.view.btnProtectSheet.toggle(props.wsLock, true); //current sheet
Common.Utils.lockControls(SSE.enumLock['Objects'], props.wsProps['Objects'], { array: [this.view.chLockedText, this.view.chLockedShape]});
Common.Utils.lockControls(SSE.enumLock.wsLock, props.wsLock, { array: [this.view.btnAllowRanges]});

2
apps/spreadsheeteditor/main/app/view/AutoFilterDialog.js
View file

@ -1622,7 +1622,7 @@ define([
}
}
if (isLabel || event.target.className.match('checkbox')) {
if (isLabel || event.target.className.match('checkbox') && event.target.localName!=='input') {
this.updateCellCheck(listView, record);
_.delay(function () {

2
apps/spreadsheeteditor/main/app/view/PivotSettings.js
View file

@ -612,7 +612,7 @@ define([
}
}
if (isLabel || event.target.className.match('checkbox')) {
if (isLabel || event.target.className.match('checkbox') && event.target.localName!=='input') {
this.updateFieldCheck(listView, record);
}
}

2
apps/spreadsheeteditor/main/app/view/ProtectDialog.js
View file

@ -289,7 +289,7 @@ define([
}
}
if (isLabel || event.target.className.match('checkbox')) {
if (isLabel || event.target.className.match('checkbox') && event.target.localName!=='input') {
this.updateCellCheck(listView, record);
_.delay(function () {

2
apps/spreadsheeteditor/main/app/view/RemoveDuplicatesDialog.js
View file

@ -195,7 +195,7 @@ define([
}
}
if (isLabel || event.target.className.match('checkbox')) {
if (isLabel || event.target.className.match('checkbox') && event.target.localName!=='input') {
this.updateCellCheck(listView, record);
_.delay(function () {

2
apps/spreadsheeteditor/main/app/view/SlicerAddDialog.js
View file

@ -150,7 +150,7 @@ define([
}
}
if (isLabel || event.target.className.match('checkbox')) {
if (isLabel || event.target.className.match('checkbox') && event.target.localName!=='input') {
this.updateCellCheck(listView, record);
_.delay(function () {