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

Feature/bugfix (#300)

Browse source 
* [PE] Bug 42759

* Fux Bug 44131

* [SSE] Update skeleton
This commit is contained in:
Julia Radzhabova 2020-01-15 16:12:53 +03:00 committed by Alexey Golubev
parent 40bea73251
commit 6b58820098
22 changed files with 120 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -803,6 +803,9 @@
if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader) if (config.editorConfig && config.editorConfig.customization && !!config.editorConfig.customization.compactHeader)
params += "&compact=true"; params += "&compact=true";
if (config.editorConfig && config.editorConfig.customization && (config.editorConfig.customization.toolbar===false))
params += "&toolbar=false";
return params; return params;
} }

17
apps/documenteditor/main/index.html
View file

@ -24,7 +24,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
min-height: 32px; min-height: 28px;
background: #446995; background: #446995;
} }
@ -223,14 +223,23 @@
<script> <script>
var params = getUrlParams(), var params = getUrlParams(),
notoolbar = params["toolbar"] == 'false',
compact = params["compact"] == 'true', compact = params["compact"] == 'true',
view = params["mode"] == 'view'; view = params["mode"] == 'view';
(compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
if (compact || view) { if (compact || view) {
document.querySelector('.brendpanel > :nth-child(2)').remove(); if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.brendpanel > :nth-child(1)').remove();
document.querySelector('.brendpanel').remove();
} else
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
} else if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
} }
if (view) {
if (view || notoolbar) {
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }

16
apps/documenteditor/main/index.html.deploy
View file

@ -25,7 +25,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
min-height: 32px; min-height: 28px;
background: #446995; background: #446995;
} }
@ -216,14 +216,22 @@
<script> <script>
var params = getUrlParams(), var params = getUrlParams(),
notoolbar = params["toolbar"] == 'false',
compact = params["compact"] == 'true', compact = params["compact"] == 'true',
view = params["mode"] == 'view'; view = params["mode"] == 'view';
(compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
if (compact || view) { if (compact || view) {
document.querySelector('.brendpanel > :nth-child(2)').remove(); if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.brendpanel > :nth-child(1)').remove();
document.querySelector('.brendpanel').remove();
} else
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
} else if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
} }
if (view) { if (view || notoolbar) {
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }

17
apps/presentationeditor/main/index.html
View file

@ -23,7 +23,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
min-height: 32px; min-height: 28px;
background: #aa5252; background: #aa5252;
} }
@ -252,14 +252,23 @@
<script> <script>
var params = getUrlParams(), var params = getUrlParams(),
notoolbar = params["toolbar"] == 'false',
compact = params["compact"] == 'true', compact = params["compact"] == 'true',
view = params["mode"] == 'view'; view = params["mode"] == 'view';
(compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
if (compact || view) { if (compact || view) {
document.querySelector('.brendpanel > :nth-child(2)').remove(); if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.brendpanel > :nth-child(1)').remove();
document.querySelector('.brendpanel').remove();
} else
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
} else if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
} }
if (view) {
if (view || notoolbar) {
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }

16
apps/presentationeditor/main/index.html.deploy
View file

@ -25,7 +25,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
min-height: 32px; min-height: 28px;
background: #aa5252; background: #aa5252;
} }
@ -265,14 +265,22 @@
<script> <script>
var params = getUrlParams(), var params = getUrlParams(),
notoolbar = params["toolbar"] == 'false',
compact = params["compact"] == 'true', compact = params["compact"] == 'true',
view = params["mode"] == 'view'; view = params["mode"] == 'view';
(compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
if (compact || view) { if (compact || view) {
document.querySelector('.brendpanel > :nth-child(2)').remove(); if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.brendpanel > :nth-child(1)').remove();
document.querySelector('.brendpanel').remove();
} else
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
} else if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
} }
if (view) { if (view || notoolbar) {
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }

12
apps/presentationeditor/mobile/app/controller/edit/EditSlide.js
View file

@ -396,10 +396,18 @@ define([
_themes = []; _themes = [];
_.each(defaultThemes.concat(docThemes), function(theme) { _.each(defaultThemes, function(theme, index) {
_themes.push({
themeId : theme.get_Index(),
offsety : index * 38
});
});
_.each(docThemes, function(theme) {
_themes.push({ _themes.push({
imageUrl: theme.get_Image(), imageUrl: theme.get_Image(),
themeId : theme.get_Index() themeId : theme.get_Index(),
offsety : 0
}); });
}); });

2
apps/presentationeditor/mobile/app/view/edit/EditSlide.js
View file

@ -310,7 +310,7 @@ define([
'<% _.each(themes, function(row) { %>', '<% _.each(themes, function(row) { %>',
'<div class="row">', '<div class="row">',
'<% _.each(row, function(theme) { %>', '<% _.each(row, function(theme) { %>',
'<div data-type="<%= theme.themeId %>"><img src="<%= theme.imageUrl %>"></div>', '<div class="item-theme" data-type="<%= theme.themeId %>" style="' + '<% if (typeof theme.imageUrl !== "undefined") { %>' + 'background-image: url(<%= theme.imageUrl %>);' + '<% } %> background-position: 0 -<%= theme.offsety %>px;"/>',
'<% }); %>', '<% }); %>',
'</div>', '</div>',
'<% }); %>' '<% }); %>'

3
apps/presentationeditor/mobile/resources/css/app-ios.css
View file

@ -7115,6 +7115,9 @@ html.pixel-ratio-3 .numbers li {
width: 85px; width: 85px;
height: 38px; height: 38px;
} }
.slide-theme .item-theme {
background-image: url('../../../../../../sdkjs/common/Images/themes_thumbnail.png');
}
.chart-types li { .chart-types li {
width: 60px; width: 60px;
height: 60px; height: 60px;

3
apps/presentationeditor/mobile/resources/css/app-material.css
View file

@ -6944,6 +6944,9 @@ html.pixel-ratio-3 .numbers li {
width: 85px; width: 85px;
height: 38px; height: 38px;
} }
.slide-theme .item-theme {
background-image: url('../../../../../../sdkjs/common/Images/themes_thumbnail.png');
}
.chart-types li { .chart-types li {
width: 60px; width: 60px;
height: 60px; height: 60px;

4
apps/presentationeditor/mobile/resources/less/app-ios.less
View file

@ -211,6 +211,10 @@ input, textarea {
height: 38px; height: 38px;
} }
} }
.item-theme {
background-image: url('../../../../../../sdkjs/common/Images/themes_thumbnail.png');
}
} }
// Charts // Charts

3
apps/presentationeditor/mobile/resources/less/app-material.less
View file

@ -211,6 +211,9 @@ input, textarea {
height: 38px; height: 38px;
} }
} }
.item-theme {
background-image: url('../../../../../../sdkjs/common/Images/themes_thumbnail.png');
}
} }
// Charts // Charts

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

@ -67,6 +67,7 @@
background: #fbfbfb; background: #fbfbfb;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
padding-top: 32px; padding-top: 32px;
@ -91,7 +92,7 @@
position: absolute; position: absolute;
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
@keyframes flickerAnimation { @keyframes flickerAnimation {

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

@ -64,6 +64,7 @@
background: #fbfbfb; background: #fbfbfb;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
padding-top: 32px; padding-top: 32px;
@ -88,7 +89,7 @@
position: absolute; position: absolute;
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
@keyframes flickerAnimation { @keyframes flickerAnimation {

17
apps/spreadsheeteditor/main/index.html
View file

@ -22,7 +22,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
min-height: 32px; min-height: 28px;
background: #40865c; background: #40865c;
} }
@ -259,6 +259,7 @@
<script> <script>
var params = getUrlParams(), var params = getUrlParams(),
notoolbar = params["toolbar"] == 'false',
internal = params["internal"] == 'true', internal = params["internal"] == 'true',
compact = params["compact"] == 'true', compact = params["compact"] == 'true',
view = params["mode"] == 'view'; view = params["mode"] == 'view';
@ -268,11 +269,19 @@
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }
(compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
if (compact || view) { if (compact || view) {
document.querySelector('.brendpanel > :nth-child(2)').remove(); if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.brendpanel > :nth-child(1)').remove();
document.querySelector('.brendpanel').remove();
} else
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
} else if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
} }
if (view) {
if (view || notoolbar) {
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }

16
apps/spreadsheeteditor/main/index.html.deploy
View file

@ -24,7 +24,7 @@
.loadmask > .brendpanel { .loadmask > .brendpanel {
width: 100%; width: 100%;
height: 56px; min-height: 28px;
background: #40865c; background: #40865c;
} }
@ -271,6 +271,7 @@
<script> <script>
var params = getUrlParams(), var params = getUrlParams(),
internal = params["internal"] == 'true', internal = params["internal"] == 'true',
notoolbar = params["toolbar"] == 'false',
compact = params["compact"] == 'true', compact = params["compact"] == 'true',
view = params["mode"] == 'view'; view = params["mode"] == 'view';
@ -279,11 +280,18 @@
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }
(compact || view || notoolbar) && document.querySelector('.brendpanel > :nth-child(2)').remove();
if (compact || view) { if (compact || view) {
document.querySelector('.brendpanel > :nth-child(2)').remove(); if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px'; document.querySelector('.brendpanel > :nth-child(1)').remove();
document.querySelector('.brendpanel').remove();
} else
document.querySelector('.brendpanel > :nth-child(1)').style.height = '32px';
} else if (notoolbar) {
document.querySelector('.brendpanel > :nth-child(1)').style.height = '28px';
} }
if (view) { if (view || notoolbar) {
document.querySelector('.sktoolbar').remove(); document.querySelector('.sktoolbar').remove();
} }

3
apps/spreadsheeteditor/main/resources/less/app.less
View file

@ -156,6 +156,7 @@
display: flex; display: flex;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
@ -176,7 +177,7 @@
&:first-child { &:first-child {
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
} }
} }

3
apps/spreadsheeteditor/mobile/index.html
View file

@ -77,6 +77,7 @@
background: #fbfbfb; background: #fbfbfb;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
padding-top: 43px; padding-top: 43px;
@ -105,7 +106,7 @@
position: absolute; position: absolute;
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
@keyframes flickerAnimation { @keyframes flickerAnimation {

3
apps/spreadsheeteditor/mobile/index.html.deploy
View file

@ -73,6 +73,7 @@
background: #fbfbfb; background: #fbfbfb;
width: 100%; width: 100%;
height: 100%; height: 100%;
font-size: 0;
border: 1px solid #dfdfdf; border: 1px solid #dfdfdf;
white-space: nowrap; white-space: nowrap;
padding-top: 43px; padding-top: 43px;
@ -101,7 +102,7 @@
position: absolute; position: absolute;
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
@keyframes flickerAnimation { @keyframes flickerAnimation {

3
apps/spreadsheeteditor/mobile/resources/css/app-ios.css
View file

@ -7714,6 +7714,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
font-size: 0;
} }
.doc-placeholder > .columns { .doc-placeholder > .columns {
width: 100%; width: 100%;
@ -7729,5 +7730,5 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
.doc-placeholder > .columns:first-child { .doc-placeholder > .columns:first-child {
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }

3
apps/spreadsheeteditor/mobile/resources/css/app-material.css
View file

@ -7576,6 +7576,7 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
font-size: 0;
} }
.doc-placeholder > .columns { .doc-placeholder > .columns {
width: 100%; width: 100%;
@ -7591,5 +7592,5 @@ html.pixel-ratio-3 .cell-styles.dataview .row li {
.doc-placeholder > .columns:first-child { .doc-placeholder > .columns:first-child {
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }

3
apps/spreadsheeteditor/mobile/resources/less/app-ios.less
View file

@ -305,6 +305,7 @@ input, textarea {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
font-size: 0;
> .columns { > .columns {
width: 100%; width: 100%;
@ -323,7 +324,7 @@ input, textarea {
&:first-child { &:first-child {
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
} }
} }

3
apps/spreadsheeteditor/mobile/resources/less/app-material.less
View file

@ -293,6 +293,7 @@ input, textarea {
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
font-size: 0;
> .columns { > .columns {
width: 100%; width: 100%;
@ -311,7 +312,7 @@ input, textarea {
&:first-child { &:first-child {
background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0; background: linear-gradient(#f1f1f1 19px, #d5d5d5 20px) 0 0;
background-size: 20px 20px; background-size: 20px 20px;
width: 35px; width: 25px;
} }
} }
} }